From ec4c2d75faf57bcf6335e63a291a667ee2cc1d57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/[A-Z]*: convert patches to -Np1 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- srcpkgs/Aegisub/patches/boost-1.68.patch | 4 +- srcpkgs/Aegisub/patches/boost-1.69.patch | 16 +-- srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch | 8 +- .../Aegisub/patches/fix-icu-62-build.patch | 12 +- .../Aegisub/patches/fix-no-narrowing.patch | 4 +- srcpkgs/Aegisub/patches/libatomic.patch | 12 +- srcpkgs/Aegisub/patches/luajit_21.patch | 30 ++-- srcpkgs/Aegisub/patches/make43.patch | 4 +- .../remove-vendor-luajit-dependency.patch | 20 +-- srcpkgs/Aegisub/patches/system-luajit.patch | 4 +- srcpkgs/Aegisub/patches/wxwidgets.patch | 4 +- srcpkgs/Aegisub/template | 1 - .../patches/deharcode-compiler.patch | 4 +- srcpkgs/Brainfunk/template | 1 - .../patches/define_ACCESSPERMS_on_musl.patch | 4 +- srcpkgs/CPU-X/patches/fix-no-pie-check.patch | 4 +- .../CPU-X/patches/fix_bitness_detection.patch | 4 +- srcpkgs/CPU-X/template | 1 - srcpkgs/Carla/patches/libmagic.patch | 4 +- srcpkgs/Carla/patches/qt5-5.15.0.patch | 4 +- srcpkgs/Carla/template | 1 - .../patches/data-core-cmake.patch | 4 +- .../Cataclysm-DDA/patches/fsigned-char.patch | 4 +- srcpkgs/Cataclysm-DDA/template | 1 - .../patches/backport-zero-division.patch | 4 +- srcpkgs/Chipmunk2D/patches/musl-sysctl.patch | 4 +- srcpkgs/Chipmunk2D/template | 1 - srcpkgs/Clight/patches/fix-musl.patch | 4 +- srcpkgs/Clight/template | 1 - srcpkgs/Clp/patches/disable-avx.patch | 8 +- srcpkgs/Clp/template | 1 - .../CoinMP/patches/fix-gcc9.1-strncpy.patch | 4 +- srcpkgs/CoinMP/patches/mips.patch | 4 +- srcpkgs/CoinMP/template | 1 - srcpkgs/CubicSDR/patches/hamlib42.patch | 8 +- .../patches/revert-migration-to-wx3.1.patch | 136 +++++++++--------- srcpkgs/CubicSDR/template | 1 - .../patches/do-no-install-test.patch | 4 +- srcpkgs/DarkRadiant/patches/musl.patch | 4 +- srcpkgs/DarkRadiant/template | 1 - .../EmptyEpsilon/patches/musl_and_ppc.patch | 8 +- srcpkgs/EmptyEpsilon/template | 1 - srcpkgs/FreeDoko/patches/makefiles.patch | 20 +-- srcpkgs/FreeDoko/template | 1 - srcpkgs/Fritzing/patches/libgit2.patch | 4 +- srcpkgs/Fritzing/template | 1 - .../GConf/patches/01_xml-gettext-domain.patch | 28 ++-- srcpkgs/GConf/patches/gconf-reload.patch | 4 +- srcpkgs/GConf/patches/locale.patch | 4 +- srcpkgs/GConf/template | 1 - srcpkgs/Gauche/patches/src-makefile.patch | 4 +- srcpkgs/Gauche/template | 1 - .../patches/disable_perlmagick_tests.patch | 8 +- srcpkgs/GraphicsMagick/template | 1 - .../Haru/patches/unitialized-ptr_error.patch | 4 +- srcpkgs/Haru/template | 1 - ...ild-issue-as-reported-in-1111-and-11.patch | 56 ++++---- srcpkgs/LibreCAD/patches/QPainterPath.patch | 8 +- srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch | 4 +- srcpkgs/LibreCAD/template | 1 - .../aarch64-register-allocation-bug-fix.patch | 4 +- .../LuaJIT/patches/enable-debug-symbols.patch | 4 +- srcpkgs/LuaJIT/patches/fix-bcsave-ppc64.patch | 4 +- .../get-rid-of-luajit-version-sym.patch | 12 +- .../patches/unpollute-global-namespace.patch | 4 +- srcpkgs/LuaJIT/template | 1 - srcpkgs/MEGAcmd/patches/include.am.patch | 4 +- srcpkgs/MEGAcmd/template | 1 - .../Maelstrom/patches/include-time_h.patch | 4 +- .../patches/struct-button-typedef.patch | 4 +- srcpkgs/Maelstrom/template | 1 - srcpkgs/MonkeysAudio/patches/big-endian.patch | 4 +- srcpkgs/MonkeysAudio/patches/endian.patch | 8 +- srcpkgs/MonkeysAudio/patches/ppc64.patch | 8 +- srcpkgs/MonkeysAudio/template | 1 - .../patches/patch-linc2_src_Makefile.in.diff | 4 +- srcpkgs/ORBit2/template | 1 - .../OpenCPN/patches/actually-set-arch.patch | 4 +- srcpkgs/OpenCPN/patches/musl.patch | 8 +- srcpkgs/OpenCPN/template | 1 - .../patches/fix-gcc6-ambigous_abs.patch | 4 +- .../openxcom-cmath-algorithm-fixes.patch | 20 +-- srcpkgs/OpenXcom/template | 1 - ...a44c793a61bb3eb7aa110c08db51938d4502.patch | 4 +- srcpkgs/PAmix/template | 1 - ...-sys-unistd.h-with-unistd.h-for-musl.patch | 4 +- ...ace-get_current_thread_name-for-musl.patch | 4 +- srcpkgs/PrusaSlicer/patches/cross.patch | 4 +- srcpkgs/PrusaSlicer/template | 1 - srcpkgs/QLC+/patches/include-types.patch | 4 +- srcpkgs/QLC+/template | 1 - .../patches/SDL-1.2.10-GrabNotViewable.patch | 4 +- srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch | 4 +- srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch | 24 ++-- srcpkgs/SDL/template | 1 - .../SDL2/patches/gl_version_es_cm_1_0.patch | 4 +- srcpkgs/SDL2/template | 1 - srcpkgs/SLADE/patches/pointer-decay.patch | 4 +- srcpkgs/SLADE/patches/system-libraries.patch | 4 +- srcpkgs/SLADE/template | 1 - .../SMC/patches/fix-boost_filesystem.patch | 12 +- srcpkgs/SMC/patches/fix-cegui07.patch | 44 +++--- srcpkgs/SMC/template | 1 - .../patches/build-from-tarball.patch | 4 +- srcpkgs/Signal-Desktop/template | 1 - srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch | 8 +- srcpkgs/SoapyUHD/template | 1 - srcpkgs/TSC/patches/no-scriptdocs-cross.patch | 4 +- srcpkgs/TSC/template | 1 - .../patches/x86_64-musl-termios_h.patch | 4 +- srcpkgs/Terminal/template | 1 - srcpkgs/VeraCrypt/patches/include-types.patch | 4 +- srcpkgs/VeraCrypt/template | 1 - srcpkgs/XyGrib/patches/qt5-5.15.0.patch | 4 +- srcpkgs/XyGrib/template | 1 - srcpkgs/ZMusic/patches/ppc-musl.patch | 4 +- srcpkgs/ZMusic/template | 1 - 117 files changed, 367 insertions(+), 407 deletions(-) diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch index d33a7238bb2..57836061656 100644 --- a/srcpkgs/Aegisub/patches/boost-1.68.patch +++ b/srcpkgs/Aegisub/patches/boost-1.68.patch @@ -21,8 +21,8 @@ distance(_InputIter __first, _InputIter __last) diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp index 594c21e5e..14c71680d 100644 ---- src/search_replace_engine.cpp -+++ src/search_replace_engine.cpp +--- a/src/search_replace_engine.cpp ++++ b/src/search_replace_engine.cpp @@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { if (MatchState ms = matches(&diag, 0)) { auto& diag_field = diag.*get_dialogue_field(settings.field); diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch index c80860f7f4c..b67e06dfa3b 100644 --- a/srcpkgs/Aegisub/patches/boost-1.69.patch +++ b/srcpkgs/Aegisub/patches/boost-1.69.patch @@ -14,8 +14,8 @@ Fix Aegisub/Aegisub#93 diff --git a/src/colour_button.cpp b/src/colour_button.cpp index c0b1c5d58..48a87856c 100644 ---- src/colour_button.cpp -+++ src/colour_button.cpp +--- a/src/colour_button.cpp ++++ b/src/colour_button.cpp @@ -18,7 +18,7 @@ #include "dialogs.h" @@ -27,8 +27,8 @@ index c0b1c5d58..48a87856c 100644 diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp index efb5cb481..fb62e3334 100644 ---- src/subtitles_provider_libass.cpp -+++ src/subtitles_provider_libass.cpp +--- a/src/subtitles_provider_libass.cpp ++++ b/src/subtitles_provider_libass.cpp @@ -46,7 +46,7 @@ #include @@ -40,8 +40,8 @@ index efb5cb481..fb62e3334 100644 diff --git a/src/video_frame.cpp b/src/video_frame.cpp index 610005879..c51f929ac 100644 ---- src/video_frame.cpp -+++ src/video_frame.cpp +--- a/src/video_frame.cpp ++++ b/src/video_frame.cpp @@ -16,7 +16,7 @@ #include "video_frame.h" @@ -53,8 +53,8 @@ index 610005879..c51f929ac 100644 namespace { diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp index b68b206b7..eca5ac261 100644 ---- src/video_provider_dummy.cpp -+++ src/video_provider_dummy.cpp +--- a/src/video_provider_dummy.cpp ++++ b/src/video_provider_dummy.cpp @@ -45,7 +45,7 @@ #include #include diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch index bec02003130..70acd48f37c 100644 --- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch +++ b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones ---- src/ffmpegsource_common.cpp 2014-12-08 01:07:09.000000000 +0100 -+++ src/ffmpegsource_common.cpp 2021-01-18 21:12:42.209582337 +0100 +--- a/src/ffmpegsource_common.cpp 2014-12-08 01:07:09.000000000 +0100 ++++ b/src/ffmpegsource_common.cpp 2021-01-18 21:12:42.209582337 +0100 @@ -98,7 +98,6 @@ ps->SetProgress(Current, Total); return ps->IsCancelled(); @@ -13,8 +13,8 @@ Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones + Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo); }); ---- src/video_provider_ffmpegsource.cpp 2014-12-08 01:07:09.000000000 +0100 -+++ src/video_provider_ffmpegsource.cpp 2021-01-18 21:07:47.205800051 +0100 +--- a/src/video_provider_ffmpegsource.cpp 2014-12-08 01:07:09.000000000 +0100 ++++ b/src/video_provider_ffmpegsource.cpp 2021-01-18 21:07:47.205800051 +0100 @@ -42,6 +42,7 @@ #include diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch index f6e55e591b6..9fbb2a6289a 100644 --- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch +++ b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch @@ -1,8 +1,8 @@ Upstream: Yes Author: sidneys Reason: fix build w/ ICU >= 60 ---- libaegisub/common/character_count.cpp -+++ libaegisub/common/character_count.cpp +--- a/libaegisub/common/character_count.cpp ++++ b/libaegisub/common/character_count.cpp @@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) { static std::once_flag token; std::call_once(token, [&] { @@ -30,8 +30,8 @@ Reason: fix build w/ ICU >= 60 return str.size(); if (n == 0) return pos; ---- src/utils.cpp -+++ src/utils.cpp +--- a/src/utils.cpp ++++ b/src/utils.cpp @@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio } @@ -44,8 +44,8 @@ Reason: fix build w/ ICU >= 60 iculoc.getDisplayName(iculoc, ustr); #ifdef _MSC_VER return wxString(ustr.getBuffer()); ---- src/utils.cpp -+++ src/utils.cpp +--- a/src/utils.cpp ++++ b/src/utils.cpp @@ -44,6 +44,7 @@ #include #include diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch index ecccc927abe..c865978dffb 100644 --- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch +++ b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch @@ -1,5 +1,5 @@ ---- configure.ac 2021-01-18 20:39:16.546501531 +0100 -+++ configure.ac 2021-01-18 20:57:43.667587518 +0100 +--- a/configure.ac 2021-01-18 20:39:16.546501531 +0100 ++++ b/configure.ac 2021-01-18 20:57:43.667587518 +0100 @@ -142,7 +142,8 @@ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch index 0b834dadd1f..a608752e57a 100644 --- a/srcpkgs/Aegisub/patches/libatomic.patch +++ b/srcpkgs/Aegisub/patches/libatomic.patch @@ -1,5 +1,5 @@ ---- Makefile.inc.in -+++ Makefile.inc.in +--- a/Makefile.inc.in ++++ b/Makefile.inc.in @@ -8,6 +8,7 @@ HAVE_OSS = @with_oss@ HAVE_PORTAUDIO = @with_portaudio@ HAVE_FFMS2 = @with_ffms2@ @@ -8,8 +8,8 @@ ############## # BUILD OUTPUT ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support]) AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support]) @@ -20,8 +20,8 @@ ###################################################### # Debugging support ###################################################### ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL) src_OBJ += $(d)spellchecker_hunspell.o endif diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch index 8be178c6c6d..b4d145366a2 100644 --- a/srcpkgs/Aegisub/patches/luajit_21.patch +++ b/srcpkgs/Aegisub/patches/luajit_21.patch @@ -8,8 +8,8 @@ Applied-upstream: yes Index: libaegisub/lua/modules/lpeg.c =================================================================== ---- libaegisub/lua/modules/lpeg.c -+++ libaegisub/lua/modules/lpeg.c +--- a/libaegisub/lua/modules/lpeg.c ++++ b/libaegisub/lua/modules/lpeg.c @@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) { } @@ -30,8 +30,8 @@ Index: libaegisub/lua/modules/lpeg.c {"__sub", diff_l}, Index: vendor/luabins/AUTHORS =================================================================== ---- vendor/luabins/AUTHORS -+++ vendor/luabins/AUTHORS +--- a/vendor/luabins/AUTHORS ++++ b/vendor/luabins/AUTHORS @@ -2,3 +2,4 @@ Luabins authors: ---------------- @@ -39,8 +39,8 @@ Index: vendor/luabins/AUTHORS +hanxi Index: vendor/luabins/README.md =================================================================== ---- vendor/luabins/README.md -+++ vendor/luabins/README.md +--- a/vendor/luabins/README.md ++++ b/vendor/luabins/README.md @@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib Allows to save tuples of primitive Lua types into binary chunks and to load saved data back. @@ -52,8 +52,8 @@ Index: vendor/luabins/README.md Index: vendor/luabins/src/luabins.c =================================================================== ---- vendor/luabins/src/luabins.c -+++ vendor/luabins/src/luabins.c +--- a/vendor/luabins/src/luabins.c ++++ b/vendor/luabins/src/luabins.c @@ -54,7 +54,7 @@ static int l_load(lua_State * L) } @@ -65,8 +65,8 @@ Index: vendor/luabins/src/luabins.c { "load", l_load }, Index: vendor/luabins/src/luaheaders.h =================================================================== ---- vendor/luabins/src/luaheaders.h -+++ vendor/luabins/src/luaheaders.h +--- a/vendor/luabins/src/luaheaders.h ++++ b/vendor/luabins/src/luaheaders.h @@ -7,6 +7,16 @@ extern "C" { #include @@ -86,8 +86,8 @@ Index: vendor/luabins/src/luaheaders.h #endif Index: vendor/luabins/src/luainternals.h =================================================================== ---- vendor/luabins/src/luainternals.h -+++ vendor/luabins/src/luainternals.h +--- a/vendor/luabins/src/luainternals.h ++++ b/vendor/luabins/src/luainternals.h @@ -7,6 +7,24 @@ #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_ #define LUABINS_LUAINTERNALS_H_INCLUDED_ @@ -124,7 +124,7 @@ Index: vendor/luabins/src/luainternals.h Index: vendor/luabins/src/lualess.c =================================================================== --- /dev/null -+++ vendor/luabins/src/lualess.c ++++ b/vendor/luabins/src/lualess.c @@ -0,0 +1,32 @@ +/* +* lualess.h @@ -160,8 +160,8 @@ Index: vendor/luabins/src/lualess.c +} Index: vendor/luabins/test/test.lua =================================================================== ---- vendor/luabins/test/test.lua -+++ vendor/luabins/test/test.lua +--- a/vendor/luabins/test/test.lua ++++ b/vendor/luabins/test/test.lua @@ -6,6 +6,8 @@ package.cpath = "./?.so;"..package.cpath diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch index 88dfac8ed6e..6edb8c3b5e7 100644 --- a/srcpkgs/Aegisub/patches/make43.patch +++ b/srcpkgs/Aegisub/patches/make43.patch @@ -10,8 +10,8 @@ Fix Aegisub/Aegisub#171 diff --git a/Makefile.target b/Makefile.target index 516ef3c24..5c4c5d259 100644 ---- Makefile.target -+++ Makefile.target +--- a/Makefile.target ++++ b/Makefile.target @@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< # Libraries contain all object files they depend on (but they may depend on other files) # Not using libtool on OS X because it has an unsilenceable warning about a diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch index d03d3a7d809..0b0e67a499b 100644 --- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch +++ b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch @@ -5,8 +5,8 @@ Last-Update: 2014-08-06 Upstream: Yes Reason: Use system luajit ---- header.mk -+++ header.mk +--- a/header.mk ++++ b/header.mk @@ -13,7 +13,6 @@ tests \ tools \ @@ -15,8 +15,8 @@ Reason: Use system luajit vendor/universalchardet subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) ---- Makefile.inc.in -+++ Makefile.inc.in +--- a/Makefile.inc.in ++++ b/Makefile.inc.in @@ -78,7 +78,7 @@ CFLAGS_ICU = @ICU_I18N_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@ @@ -35,8 +35,8 @@ Reason: Use system luajit LIBS_OPENAL = @OPENAL_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ LIBS_PTHREAD = @PTHREAD_LIBS@ ---- tools/Makefile -+++ tools/Makefile +--- a/tools/Makefile ++++ b/tools/Makefile @@ -12,6 +12,4 @@ PROGRAM += $(d)repack-thes-dict @@ -44,8 +44,8 @@ Reason: Use system luajit -$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua - include $(TOP)Makefile.target ---- tools/respack.lua -+++ tools/respack.lua +--- a/tools/respack.lua ++++ b/tools/respack.lua @@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n') for line in manifest:lines() do if line:find('.') then @@ -55,8 +55,8 @@ Reason: Use system luajit out_cpp:write("const unsigned char " .. id .. "[] = {") local len = 0 ---- src/libresrc/Makefile -+++ src/libresrc/Makefile +--- a/src/libresrc/Makefile ++++ b/src/libresrc/Makefile @@ -10,7 +10,7 @@ $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch index aa9d60b705f..5ae4a004d98 100644 --- a/srcpkgs/Aegisub/patches/system-luajit.patch +++ b/srcpkgs/Aegisub/patches/system-luajit.patch @@ -3,8 +3,8 @@ Upstream: Yes Reason: Use system luajit diff --git a/configure.ac b/configure.ac index be657b0..2c03951 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support]) AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support]) diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch index 8461c7cf2af..f33fcd35d4c 100644 --- a/srcpkgs/Aegisub/patches/wxwidgets.patch +++ b/srcpkgs/Aegisub/patches/wxwidgets.patch @@ -11,8 +11,8 @@ directly. diff --git a/src/frame_main.cpp b/src/frame_main.cpp index b35c32960..df115b27c 100644 ---- src/frame_main.cpp -+++ src/frame_main.cpp +--- a/src/frame_main.cpp ++++ b/src/frame_main.cpp @@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) { TopSizer->Show(videoBox, showVideo, true); ToolsSizer->Show(audioBox, showAudio, true); diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template index 8dcd52f2a62..2ddf6c24ee6 100644 --- a/srcpkgs/Aegisub/template +++ b/srcpkgs/Aegisub/template @@ -17,7 +17,6 @@ license="BSD-3-Clause, MIT" homepage="http://www.aegisub.org" distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz" checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd -patch_args=-Np0 build_options="fftw openal portaudio" build_options_default="fftw" diff --git a/srcpkgs/Brainfunk/patches/deharcode-compiler.patch b/srcpkgs/Brainfunk/patches/deharcode-compiler.patch index aaf6efb61fe..9f712fc7272 100644 --- a/srcpkgs/Brainfunk/patches/deharcode-compiler.patch +++ b/srcpkgs/Brainfunk/patches/deharcode-compiler.patch @@ -1,5 +1,5 @@ ---- Makefile 2018-11-04 13:26:07.744752852 -0700 -+++ Makefile 2018-11-04 13:27:46.074222441 -0700 +--- a/Makefile 2018-11-04 13:26:07.744752852 -0700 ++++ b/Makefile 2018-11-04 13:27:46.074222441 -0700 @@ -1,25 +1,26 @@ -CFLAGS=-O3 --std=gnu++11 -LFLAGS=-s -lpng diff --git a/srcpkgs/Brainfunk/template b/srcpkgs/Brainfunk/template index 389100d545c..309179b0715 100644 --- a/srcpkgs/Brainfunk/template +++ b/srcpkgs/Brainfunk/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/GReaperEx/Brainfunk" distfiles="${homepage}/archive/v${version}-beta.tar.gz" checksum=6b48bd1fbe0dbce20f3e8af5c799023ea820ddc45aca8fac0ccecfa2de359ee2 -patch_args=-Np0 do_install() { vbin bfk diff --git a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch b/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch index f4df56c5e70..58d81eaf909 100644 --- a/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch +++ b/srcpkgs/CPU-X/patches/define_ACCESSPERMS_on_musl.patch @@ -1,5 +1,5 @@ ---- src/util.c -+++ src/util.c +--- a/src/util.c ++++ b/src/util.c @@ -35,6 +35,12 @@ #include #include diff --git a/srcpkgs/CPU-X/patches/fix-no-pie-check.patch b/srcpkgs/CPU-X/patches/fix-no-pie-check.patch index 267dbb3843a..c0050be75bd 100644 --- a/srcpkgs/CPU-X/patches/fix-no-pie-check.patch +++ b/srcpkgs/CPU-X/patches/fix-no-pie-check.patch @@ -1,6 +1,6 @@ This shouldn't exist and erroneously fails for us. ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -35,12 +35,6 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") diff --git a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch b/srcpkgs/CPU-X/patches/fix_bitness_detection.patch index f5965948f15..b4ae465ed46 100644 --- a/srcpkgs/CPU-X/patches/fix_bitness_detection.patch +++ b/srcpkgs/CPU-X/patches/fix_bitness_detection.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -25,11 +25,11 @@ set(APP_EXEC ${CMAKE_PROJECT_NAME}) set(DAEMON_EXEC ${CMAKE_PROJECT_NAME}-daemon) diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index f99e7a8e62a..0947bcfef81 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://x0rg.github.io/CPU-X/" distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz" checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf -patch_args=-Np0 build_options="gtk3" build_options_default="gtk3" diff --git a/srcpkgs/Carla/patches/libmagic.patch b/srcpkgs/Carla/patches/libmagic.patch index d53a7c56887..f116eadc68c 100644 --- a/srcpkgs/Carla/patches/libmagic.patch +++ b/srcpkgs/Carla/patches/libmagic.patch @@ -1,5 +1,5 @@ ---- source/Makefile.mk -+++ source/Makefile.mk +--- a/source/Makefile.mk ++++ b/source/Makefile.mk @@ -233,10 +233,7 @@ # Check for optional libs (special non-pkgconfig tests) diff --git a/srcpkgs/Carla/patches/qt5-5.15.0.patch b/srcpkgs/Carla/patches/qt5-5.15.0.patch index 2d936a7ce7c..ed58b7f6e69 100644 --- a/srcpkgs/Carla/patches/qt5-5.15.0.patch +++ b/srcpkgs/Carla/patches/qt5-5.15.0.patch @@ -1,5 +1,5 @@ ---- source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200 -+++ source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200 +--- a/source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200 ++++ b/source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200 @@ -22,6 +22,7 @@ #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template index bc39346ecec..701fd0ea30f 100644 --- a/srcpkgs/Carla/template +++ b/srcpkgs/Carla/template @@ -18,7 +18,6 @@ homepage="https://kxstudio.linuxaudio.org/Applications:Carla" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963 python_version=3 -patch_args=-Np0 case $XBPS_TARGET_MACHINE in x86_64* | i686*);; diff --git a/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch b/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch index faa81bc7ee5..34e9ed51e28 100644 --- a/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch +++ b/srcpkgs/Cataclysm-DDA/patches/data-core-cmake.patch @@ -1,5 +1,5 @@ ---- data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100 -+++ - 2019-10-22 16:03:45.682652708 +0200 +--- a/data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100 ++++ b/data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100 @@ -10,6 +10,7 @@ ${CMAKE_SOURCE_DIR}/data/motd ${CMAKE_SOURCE_DIR}/data/credits diff --git a/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch b/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch index 31eceff22c2..f34bf8fc720 100644 --- a/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch +++ b/srcpkgs/Cataclysm-DDA/patches/fsigned-char.patch @@ -10,8 +10,8 @@ This fixes the build on ARM. diff --git CMakeLists.txt CMakeLists.txt index 095d6e23b20..d0f5e0cc7f3 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -240,9 +240,10 @@ ELSE() IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows) SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls") diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template index 8e57303fe87..bbe66b9f29b 100644 --- a/srcpkgs/Cataclysm-DDA/template +++ b/srcpkgs/Cataclysm-DDA/template @@ -15,7 +15,6 @@ license="CC-BY-SA-3.0, CC-BY-3.0" homepage="https://cataclysmdda.org/" distfiles="https://github.com/CleverRaven/Cataclysm-DDA/archive/${version}.tar.gz" checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3 -patch_args=-Np0 build_options="tiles backtrace" build_options_default="tiles" diff --git a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch b/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch index 8c95a2ac832..2ced601be10 100644 --- a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch +++ b/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch @@ -10,8 +10,8 @@ Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass, diff --git src/cpBody.c src/cpBody.c index a8e0797..8ad2bc9 100644 ---- src/cpBody.c -+++ src/cpBody.c +--- a/src/cpBody.c ++++ b/src/cpBody.c @@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass) cpBodyActivate(body); diff --git a/srcpkgs/Chipmunk2D/patches/musl-sysctl.patch b/srcpkgs/Chipmunk2D/patches/musl-sysctl.patch index 7b154bc62a8..debf12499f5 100644 --- a/srcpkgs/Chipmunk2D/patches/musl-sysctl.patch +++ b/srcpkgs/Chipmunk2D/patches/musl-sysctl.patch @@ -1,7 +1,7 @@ diff --git src/cpHastySpace.c src/cpHastySpace.c index 8dca425..e087df8 100644 ---- src/cpHastySpace.c -+++ src/cpHastySpace.c +--- a/src/cpHastySpace.c ++++ b/src/cpHastySpace.c @@ -8,7 +8,9 @@ //#include diff --git a/srcpkgs/Chipmunk2D/template b/srcpkgs/Chipmunk2D/template index 1f4180bda36..142051ec0a4 100644 --- a/srcpkgs/Chipmunk2D/template +++ b/srcpkgs/Chipmunk2D/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://chipmunk-physics.net/" distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz" checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca -patch_args=-Np0 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/Clight/patches/fix-musl.patch b/srcpkgs/Clight/patches/fix-musl.patch index ffd80ed7152..64227202c54 100644 --- a/srcpkgs/Clight/patches/fix-musl.patch +++ b/srcpkgs/Clight/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- src/utils/log.c.orig -+++ src/utils/log.c +--- a/src/utils/log.c ++++ b/src/utils/log.c @@ -1,5 +1,7 @@ +#include #include diff --git a/srcpkgs/Clight/template b/srcpkgs/Clight/template index 70d18bd53b7..cff8201154a 100644 --- a/srcpkgs/Clight/template +++ b/srcpkgs/Clight/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/FedeDP/Clight" distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz" checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e -patch_args=-Np0 post_install() { vcompletion Extra/completions/_clight zsh diff --git a/srcpkgs/Clp/patches/disable-avx.patch b/srcpkgs/Clp/patches/disable-avx.patch index 53cd2e0be42..ce0ddfa6392 100644 --- a/srcpkgs/Clp/patches/disable-avx.patch +++ b/srcpkgs/Clp/patches/disable-avx.patch @@ -7,8 +7,8 @@ We need it disabled on x86_64 because we're generic (and AVX is sandybridge and newer, but the enabled code was for haswell and newer), and on other arches it's disabled for obvious reasons. ---- Clp/src/ClpPackedMatrix.cpp -+++ Clp/src/ClpPackedMatrix.cpp +--- a/Clp/src/ClpPackedMatrix.cpp ++++ b/Clp/src/ClpPackedMatrix.cpp @@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3() } #ifdef _MSC_VER @@ -30,8 +30,8 @@ arches it's disabled for obvious reasons. #ifndef COIN_AVX2 #define COIN_AVX2 4 #else ---- Clp/src/ClpSimplexDual.cpp -+++ Clp/src/ClpSimplexDual.cpp +--- a/Clp/src/ClpSimplexDual.cpp ++++ b/Clp/src/ClpSimplexDual.cpp @@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra) #endif #ifdef _MSC_VER diff --git a/srcpkgs/Clp/template b/srcpkgs/Clp/template index fe3a9f916b1..5b2af733ca3 100644 --- a/srcpkgs/Clp/template +++ b/srcpkgs/Clp/template @@ -10,7 +10,6 @@ license="EPL-1.0" homepage="http://projects.coin-or.org/Clp" distfiles="https://www.coin-or.org/Tarballs/${pkgname}/${pkgname}-${version}.tgz" checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573 -patch_args=-Np0 libClp-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/CoinMP/patches/fix-gcc9.1-strncpy.patch b/srcpkgs/CoinMP/patches/fix-gcc9.1-strncpy.patch index 869361ede21..4a11b94eeaa 100644 --- a/srcpkgs/CoinMP/patches/fix-gcc9.1-strncpy.patch +++ b/srcpkgs/CoinMP/patches/fix-gcc9.1-strncpy.patch @@ -1,5 +1,5 @@ ---- CoinMP/src/CoinProblem.c 2011-11-03 04:43:29.000000000 +0100 -+++ CoinMP/src/CoinProblem.c 2019-05-20 12:06:36.762510299 +0200 +--- a/CoinMP/src/CoinProblem.c 2011-11-03 04:43:29.000000000 +0100 ++++ b/CoinMP/src/CoinProblem.c 2019-05-20 12:06:36.762510299 +0200 @@ -126,14 +126,8 @@ void coinSetProblemName(PPROBLEM pProblem, const char *ProblemName) diff --git a/srcpkgs/CoinMP/patches/mips.patch b/srcpkgs/CoinMP/patches/mips.patch index badc0ebe631..425d1919c28 100644 --- a/srcpkgs/CoinMP/patches/mips.patch +++ b/srcpkgs/CoinMP/patches/mips.patch @@ -1,7 +1,7 @@ Avoid `mips' as a parameter name. It is a reserved name for mips* targets. ---- Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200 -+++ Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100 +--- a/Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200 ++++ b/Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100 @@ -2394,8 +2394,8 @@ void redoWalkBack(); //@} diff --git a/srcpkgs/CoinMP/template b/srcpkgs/CoinMP/template index a889ea92d33..995353eee42 100644 --- a/srcpkgs/CoinMP/template +++ b/srcpkgs/CoinMP/template @@ -10,7 +10,6 @@ license="CPL-1.0" homepage="https://projects.coin-or.org/CoinMP" distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz" checksum=3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d -patch_args=-Np0 post_configure() { # remove erroneous cross base prefix from include paths diff --git a/srcpkgs/CubicSDR/patches/hamlib42.patch b/srcpkgs/CubicSDR/patches/hamlib42.patch index e6d0da47b76..8e38d8c0407 100644 --- a/srcpkgs/CubicSDR/patches/hamlib42.patch +++ b/srcpkgs/CubicSDR/patches/hamlib42.patch @@ -1,7 +1,7 @@ Index: external/hamlib/hamlib/rig.h =================================================================== ---- external/hamlib/hamlib/rig.h -+++ external/hamlib/hamlib/rig.h +--- a/external/hamlib/hamlib/rig.h ++++ b/external/hamlib/hamlib/rig.h @@ -147,7 +147,7 @@ typedef struct rig RIG; #define RIGNAMSIZ 30 @@ -23,8 +23,8 @@ Index: external/hamlib/hamlib/rig.h Index: src/rig/RigThread.cpp =================================================================== ---- src/rig/RigThread.cpp -+++ src/rig/RigThread.cpp +--- a/src/rig/RigThread.cpp ++++ b/src/rig/RigThread.cpp @@ -114,7 +114,7 @@ void RigThread::run() { std::cout << "Rig thread starting." << std::endl; diff --git a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch index 26447433e36..6f57501e264 100644 --- a/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch +++ b/srcpkgs/CubicSDR/patches/revert-migration-to-wx3.1.patch @@ -41,8 +41,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. src/visual/WaterfallCanvas.h | 2 +- 34 files changed, 57 insertions(+), 73 deletions(-) ---- src/AppFrame.cpp -+++ src/AppFrame.cpp +--- a/src/AppFrame.cpp ++++ b/src/AppFrame.cpp @@ -88,10 +88,10 @@ AppFrame::AppFrame() : wxBoxSizer *demodScopeTray = new wxBoxSizer(wxVERTICAL); wxBoxSizer *demodTunerTray = new wxBoxSizer(wxHORIZONTAL); @@ -58,8 +58,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. mainSplitter = new wxSplitterWindow( this, wxID_MAIN_SPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH | wxSP_LIVE_UPDATE ); mainSplitter->SetSashGravity(10.0f / 37.0f); ---- src/CubicSDR.cpp -+++ src/CubicSDR.cpp +--- a/src/CubicSDR.cpp ++++ b/src/CubicSDR.cpp @@ -206,14 +206,6 @@ CubicSDR::CubicSDR() : frequency(0), off shuttingDown.store(false); fdlgTarget = FrequencyDialog::FDIALOG_TARGET_DEFAULT; @@ -95,8 +95,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void CubicSDR::OnInitCmdLine(wxCmdLineParser& parser) { parser.SetDesc (commandLineInfo); parser.SetSwitchChars (wxT("-")); ---- src/CubicSDR.h -+++ src/CubicSDR.h +--- a/src/CubicSDR.h ++++ b/src/CubicSDR.h @@ -71,7 +71,6 @@ public: CubicSDR(); @@ -123,8 +123,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. std::vector *devs = nullptr; DemodulatorMgr demodMgr; ---- src/ui/UITestCanvas.cpp -+++ src/ui/UITestCanvas.cpp +--- a/src/ui/UITestCanvas.cpp ++++ b/src/ui/UITestCanvas.cpp @@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLe EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() @@ -138,8 +138,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. } UITestCanvas::~UITestCanvas() { ---- src/ui/UITestCanvas.h -+++ src/ui/UITestCanvas.h +--- a/src/ui/UITestCanvas.h ++++ b/src/ui/UITestCanvas.h @@ -17,7 +17,7 @@ class UITestCanvas: public InteractiveCanvas { @@ -149,8 +149,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~UITestCanvas(); private: ---- src/ui/UITestContext.cpp -+++ src/ui/UITestContext.cpp +--- a/src/ui/UITestContext.cpp ++++ b/src/ui/UITestContext.cpp @@ -5,8 +5,8 @@ #include "UITestCanvas.h" #include "ColorTheme.h" @@ -162,8 +162,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. testPanel.setPosition(0.0, 0.0); testPanel.setSize(1.0, 1.0); ---- src/ui/UITestContext.h -+++ src/ui/UITestContext.h +--- a/src/ui/UITestContext.h ++++ b/src/ui/UITestContext.h @@ -11,7 +11,7 @@ class UITestCanvas; class UITestContext: public PrimaryGLContext { @@ -173,8 +173,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void DrawBegin(); void Draw(); ---- src/util/GLExt.cpp -+++ src/util/GLExt.cpp +--- a/src/util/GLExt.cpp ++++ b/src/util/GLExt.cpp @@ -46,8 +46,7 @@ void initGLExtensions() { #ifdef _WIN32 @@ -185,8 +185,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT"); wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC) wglGetProcAddress("wglGetSwapIntervalEXT"); ---- src/visual/GainCanvas.cpp -+++ src/visual/GainCanvas.cpp +--- a/src/visual/GainCanvas.cpp ++++ b/src/visual/GainCanvas.cpp @@ -29,10 +29,10 @@ EVT_ENTER_WINDOW(GainCanvas::OnMouseEnte EVT_MOUSEWHEEL(GainCanvas::OnMouseWheelMoved) wxEND_EVENT_TABLE() @@ -200,8 +200,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. bgPanel.setCoordinateSystem(GLPanel::GLPANEL_Y_UP); bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_X); ---- src/visual/GainCanvas.h -+++ src/visual/GainCanvas.h +--- a/src/visual/GainCanvas.h ++++ b/src/visual/GainCanvas.h @@ -21,7 +21,7 @@ class GainCanvas: public InteractiveCanvas { @@ -211,8 +211,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~GainCanvas(); void setHelpTip(std::string tip); ---- src/visual/InteractiveCanvas.cpp -+++ src/visual/InteractiveCanvas.cpp +--- a/src/visual/InteractiveCanvas.cpp ++++ b/src/visual/InteractiveCanvas.cpp @@ -20,9 +20,9 @@ #include @@ -226,8 +226,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. false) { mouseTracker.setTarget(this); } ---- src/visual/InteractiveCanvas.h -+++ src/visual/InteractiveCanvas.h +--- a/src/visual/InteractiveCanvas.h ++++ b/src/visual/InteractiveCanvas.h @@ -12,7 +12,7 @@ class InteractiveCanvas: public wxGLCanvas { @@ -237,8 +237,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. virtual ~InteractiveCanvas(); long long getFrequencyAt(float x); ---- src/visual/MeterCanvas.cpp -+++ src/visual/MeterCanvas.cpp +--- a/src/visual/MeterCanvas.cpp ++++ b/src/visual/MeterCanvas.cpp @@ -30,10 +30,10 @@ EVT_LEAVE_WINDOW(MeterCanvas::OnMouseLef EVT_ENTER_WINDOW(MeterCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() @@ -252,8 +252,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. } MeterCanvas::~MeterCanvas() { ---- src/visual/MeterCanvas.h -+++ src/visual/MeterCanvas.h +--- a/src/visual/MeterCanvas.h ++++ b/src/visual/MeterCanvas.h @@ -17,7 +17,7 @@ class MeterCanvas: public InteractiveCanvas { @@ -263,8 +263,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~MeterCanvas(); void setLevel(float level_in); ---- src/visual/MeterContext.cpp -+++ src/visual/MeterContext.cpp +--- a/src/visual/MeterContext.cpp ++++ b/src/visual/MeterContext.cpp @@ -5,8 +5,8 @@ #include "MeterCanvas.h" #include "ColorTheme.h" @@ -276,8 +276,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. } void MeterContext::DrawBegin() { ---- src/visual/MeterContext.h -+++ src/visual/MeterContext.h +--- a/src/visual/MeterContext.h ++++ b/src/visual/MeterContext.h @@ -12,7 +12,7 @@ class MeterCanvas; class MeterContext: public PrimaryGLContext { @@ -287,8 +287,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void DrawBegin(); void Draw(float r, float g, float b, float a, float level); ---- src/visual/ModeSelectorCanvas.cpp -+++ src/visual/ModeSelectorCanvas.cpp +--- a/src/visual/ModeSelectorCanvas.cpp ++++ b/src/visual/ModeSelectorCanvas.cpp @@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(ModeSelectorCanvas::OnM EVT_ENTER_WINDOW(ModeSelectorCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() @@ -302,8 +302,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. highlightColor = RGBA4f(1.0,1.0,1.0,1.0); } ---- src/visual/ModeSelectorCanvas.h -+++ src/visual/ModeSelectorCanvas.h +--- a/src/visual/ModeSelectorCanvas.h ++++ b/src/visual/ModeSelectorCanvas.h @@ -27,7 +27,7 @@ public: class ModeSelectorCanvas: public InteractiveCanvas { @@ -313,8 +313,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~ModeSelectorCanvas(); int getHoveredSelection(); ---- src/visual/ModeSelectorContext.cpp -+++ src/visual/ModeSelectorContext.cpp +--- a/src/visual/ModeSelectorContext.cpp ++++ b/src/visual/ModeSelectorContext.cpp @@ -6,8 +6,8 @@ #include "ColorTheme.h" @@ -326,8 +326,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); ---- src/visual/ModeSelectorContext.h -+++ src/visual/ModeSelectorContext.h +--- a/src/visual/ModeSelectorContext.h ++++ b/src/visual/ModeSelectorContext.h @@ -12,7 +12,7 @@ class ModeSelectorCanvas; class ModeSelectorContext: public PrimaryGLContext { @@ -337,8 +337,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void DrawBegin(); void DrawSelector(std::string label, int c, int cMax, bool on, float r, float g, float b, float a, float padx, float pady); ---- src/visual/PrimaryGLContext.cpp -+++ src/visual/PrimaryGLContext.cpp +--- a/src/visual/PrimaryGLContext.cpp ++++ b/src/visual/PrimaryGLContext.cpp @@ -50,11 +50,8 @@ void PrimaryGLContext::CheckGLError() { } } @@ -353,8 +353,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. //#ifndef __linux__ // SetCurrent(*canvas); // // Pre-load fonts ---- src/visual/PrimaryGLContext.h -+++ src/visual/PrimaryGLContext.h +--- a/src/visual/PrimaryGLContext.h ++++ b/src/visual/PrimaryGLContext.h @@ -16,7 +16,7 @@ class PrimaryGLContext: public wxGLContext { @@ -364,8 +364,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. static wxString glGetwxString(GLenum name); static void CheckGLError(); ---- src/visual/ScopeCanvas.cpp -+++ src/visual/ScopeCanvas.cpp +--- a/src/visual/ScopeCanvas.cpp ++++ b/src/visual/ScopeCanvas.cpp @@ -31,9 +31,9 @@ EVT_LEAVE_WINDOW(ScopeCanvas::OnMouseLef EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow) wxEND_EVENT_TABLE() @@ -378,8 +378,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. inputData->set_max_num_items(2); bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_Y); bgPanel.setSize(1.0, 0.5f); ---- src/visual/ScopeCanvas.h -+++ src/visual/ScopeCanvas.h +--- a/src/visual/ScopeCanvas.h ++++ b/src/visual/ScopeCanvas.h @@ -18,7 +18,7 @@ class ScopeCanvas: public InteractiveCanvas { @@ -389,8 +389,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~ScopeCanvas(); //This is public because it is indeed forwarded from ---- src/visual/ScopeContext.cpp -+++ src/visual/ScopeContext.cpp +--- a/src/visual/ScopeContext.cpp ++++ b/src/visual/ScopeContext.cpp @@ -6,8 +6,8 @@ #include "ScopeCanvas.h" #include "ColorTheme.h" @@ -402,8 +402,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. glDisable (GL_CULL_FACE); glDisable (GL_DEPTH_TEST); ---- src/visual/ScopeContext.h -+++ src/visual/ScopeContext.h +--- a/src/visual/ScopeContext.h ++++ b/src/visual/ScopeContext.h @@ -12,7 +12,7 @@ class ScopeCanvas; class ScopeContext: public PrimaryGLContext { @@ -413,8 +413,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void DrawBegin(bool clear=true); void DrawTunerTitles(bool ppmMode=false); ---- src/visual/SpectrumCanvas.cpp -+++ src/visual/SpectrumCanvas.cpp +--- a/src/visual/SpectrumCanvas.cpp ++++ b/src/visual/SpectrumCanvas.cpp @@ -32,10 +32,10 @@ EVT_RIGHT_DOWN(SpectrumCanvas::OnMouseRi EVT_RIGHT_UP(SpectrumCanvas::OnMouseRightReleased) wxEND_EVENT_TABLE() @@ -428,8 +428,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. visualDataQueue->set_max_num_items(1); ---- src/visual/SpectrumCanvas.h -+++ src/visual/SpectrumCanvas.h +--- a/src/visual/SpectrumCanvas.h ++++ b/src/visual/SpectrumCanvas.h @@ -17,7 +17,7 @@ class WaterfallCanvas; class SpectrumCanvas: public InteractiveCanvas { @@ -439,8 +439,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~SpectrumCanvas(); //This is public because it is indeed forwarded from ---- src/visual/TuningCanvas.cpp -+++ src/visual/TuningCanvas.cpp +--- a/src/visual/TuningCanvas.cpp ++++ b/src/visual/TuningCanvas.cpp @@ -33,10 +33,10 @@ EVT_MOUSEWHEEL(TuningCanvas::OnMouseWhee //EVT_KEY_UP(TuningCanvas::OnKeyUp) wxEND_EVENT_TABLE() @@ -462,8 +462,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. } void TuningCanvas::OnMouseMoved(wxMouseEvent& event) { ---- src/visual/TuningCanvas.h -+++ src/visual/TuningCanvas.h +--- a/src/visual/TuningCanvas.h ++++ b/src/visual/TuningCanvas.h @@ -20,7 +20,7 @@ public: enum ActiveState { TUNING_HOVER_NONE, TUNING_HOVER_FREQ, TUNING_HOVER_BW, TUNING_HOVER_PPM, TUNING_HOVER_CENTER @@ -473,8 +473,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. ~TuningCanvas(); void setHelpTip(std::string tip); ---- src/visual/TuningContext.cpp -+++ src/visual/TuningContext.cpp +--- a/src/visual/TuningContext.cpp ++++ b/src/visual/TuningContext.cpp @@ -18,8 +18,8 @@ protected: } }; @@ -486,8 +486,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); ---- src/visual/TuningContext.h -+++ src/visual/TuningContext.h +--- a/src/visual/TuningContext.h ++++ b/src/visual/TuningContext.h @@ -12,7 +12,7 @@ class TuningCanvas; class TuningContext: public PrimaryGLContext { @@ -497,8 +497,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. void DrawBegin(); void Draw(float r, float g, float b, float a, float p1, float p2); ---- src/visual/WaterfallCanvas.cpp -+++ src/visual/WaterfallCanvas.cpp +--- a/src/visual/WaterfallCanvas.cpp ++++ b/src/visual/WaterfallCanvas.cpp @@ -39,11 +39,11 @@ EVT_ENTER_WINDOW(WaterfallCanvas::OnMous EVT_MOUSEWHEEL(WaterfallCanvas::OnMouseWheelMoved) wxEND_EVENT_TABLE() @@ -521,8 +521,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109. } void WaterfallCanvas::updateHoverState() { ---- src/visual/WaterfallCanvas.h -+++ src/visual/WaterfallCanvas.h +--- a/src/visual/WaterfallCanvas.h ++++ b/src/visual/WaterfallCanvas.h @@ -21,7 +21,7 @@ public: WF_DRAG_NONE, WF_DRAG_BANDWIDTH_LEFT, WF_DRAG_BANDWIDTH_RIGHT, WF_DRAG_FREQUENCY, WF_DRAG_RANGE }; diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index fbc8339d6da..f2eb67e7f9b 100644 --- a/srcpkgs/CubicSDR/template +++ b/srcpkgs/CubicSDR/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://cubicsdr.com" distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz" checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d -patch_args=-Np0 build_options="alsa pulseaudio jack" build_options_default="alsa pulseaudio" diff --git a/srcpkgs/DarkRadiant/patches/do-no-install-test.patch b/srcpkgs/DarkRadiant/patches/do-no-install-test.patch index 444acad58c8..97debadf6bf 100644 --- a/srcpkgs/DarkRadiant/patches/do-no-install-test.patch +++ b/srcpkgs/DarkRadiant/patches/do-no-install-test.patch @@ -1,5 +1,5 @@ ---- test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200 -+++ - 2021-05-03 17:29:15.242919282 +0200 +--- a/test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200 ++++ b/test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200 @@ -47,6 +47,4 @@ ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES} diff --git a/srcpkgs/DarkRadiant/patches/musl.patch b/srcpkgs/DarkRadiant/patches/musl.patch index fcc1a56318a..806ea769e4c 100644 --- a/srcpkgs/DarkRadiant/patches/musl.patch +++ b/srcpkgs/DarkRadiant/patches/musl.patch @@ -1,5 +1,5 @@ ---- radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200 -+++ - 2021-05-04 19:37:03.411760291 +0200 +--- a/radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200 ++++ b/radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200 @@ -2,7 +2,7 @@ #include "itextstream.h" diff --git a/srcpkgs/DarkRadiant/template b/srcpkgs/DarkRadiant/template index e5a0057af19..1d47801303d 100644 --- a/srcpkgs/DarkRadiant/template +++ b/srcpkgs/DarkRadiant/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/codereader/DarkRadiant/" distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz" checksum=8c5dc0f7d160dea7e9c735f9739e36462dd8c8719a3022156f9584250fc3b867 -patch_args=-Np0 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0" diff --git a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch index 821b212ab8b..9d377ce40f2 100644 --- a/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch +++ b/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch @@ -2,8 +2,8 @@ this fixes the serial driver on musl as well as on ppc diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp index 0bb0228..d935c63 100644 ---- src/hardware/serialDriver.cpp -+++ src/hardware/serialDriver.cpp +--- a/src/hardware/serialDriver.cpp ++++ b/src/hardware/serialDriver.cpp @@ -2,20 +2,31 @@ #ifdef __WIN32__ #include @@ -156,8 +156,8 @@ index 0bb0228..d935c63 100644 return ""; diff --git src/hardware/serialDriver.h src/hardware/serialDriver.h index 29cc0b5..9513457 100644 ---- src/hardware/serialDriver.h -+++ src/hardware/serialDriver.h +--- a/src/hardware/serialDriver.h ++++ b/src/hardware/serialDriver.h @@ -14,7 +14,7 @@ private: #ifdef __WIN32__ HANDLE handle; diff --git a/srcpkgs/EmptyEpsilon/template b/srcpkgs/EmptyEpsilon/template index c9ba6f8595b..f191433eec5 100644 --- a/srcpkgs/EmptyEpsilon/template +++ b/srcpkgs/EmptyEpsilon/template @@ -22,4 +22,3 @@ distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz" checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7" -patch_args=-Np0 diff --git a/srcpkgs/FreeDoko/patches/makefiles.patch b/srcpkgs/FreeDoko/patches/makefiles.patch index 4df01f717e3..b2ac609e7ec 100644 --- a/srcpkgs/FreeDoko/patches/makefiles.patch +++ b/srcpkgs/FreeDoko/patches/makefiles.patch @@ -1,5 +1,5 @@ ---- Makefile 2018-01-04 07:11:48.000000000 +0100 -+++ Makefile 2018-01-05 09:47:57.905760414 +0100 +--- a/Makefile 2018-01-04 07:11:48.000000000 +0100 ++++ b/Makefile 2018-01-05 09:47:57.905760414 +0100 @@ -316,8 +316,7 @@ echo "Kopiere das Programm" mkdir -p $(DESTDIR)$(BIN_DIRECTORY) @@ -57,8 +57,8 @@ .PHONY: uninstall ---- Makefile.install.directories 2018-01-04 07:11:48.000000000 +0100 -+++ Makefile.install.directories 2018-01-05 09:49:04.236760414 +0100 +--- a/Makefile.install.directories 2018-01-04 07:11:48.000000000 +0100 ++++ b/Makefile.install.directories 2018-01-05 09:49:04.236760414 +0100 @@ -4,14 +4,14 @@ # the different directories for the files @@ -100,8 +100,8 @@ # release # where the temporary release files are saved ---- data/Makefile 2018-01-04 07:11:48.000000000 +0100 -+++ data/Makefile 2018-01-05 09:49:28.201760414 +0100 +--- a/data/Makefile 2018-01-04 07:11:48.000000000 +0100 ++++ b/data/Makefile 2018-01-05 09:49:28.201760414 +0100 @@ -32,8 +32,7 @@ for d in cardsets iconsets backgrounds sounds; do \ $(MAKE) -C $$d install; \ @@ -113,8 +113,8 @@ ifeq ($(SHELLTYPE), sh) ---- doc/Makefile 2018-01-04 07:11:48.000000000 +0100 -+++ doc/Makefile 2018-01-05 09:49:46.401760414 +0100 +--- a/doc/Makefile 2018-01-04 07:11:48.000000000 +0100 ++++ b/doc/Makefile 2018-01-05 09:49:46.401760414 +0100 @@ -34,8 +34,7 @@ fi cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/ @@ -126,8 +126,8 @@ endif ---- src/Makefile 2018-01-04 07:11:48.000000000 +0100 -+++ src/Makefile 2018-01-05 09:50:07.057760414 +0100 +--- a/src/Makefile 2018-01-04 07:11:48.000000000 +0100 ++++ b/src/Makefile 2018-01-05 09:50:07.057760414 +0100 @@ -282,7 +282,6 @@ -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \ -DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \ diff --git a/srcpkgs/FreeDoko/template b/srcpkgs/FreeDoko/template index 80746fe5d89..6ec209a1892 100644 --- a/srcpkgs/FreeDoko/template +++ b/srcpkgs/FreeDoko/template @@ -13,4 +13,3 @@ homepage="http://free-doko.sourceforge.net/en/FreeDoko.html" license="GPL-2.0-or-later" distfiles="${SOURCEFORGE_SITE}/free-doko/FreeDoko_${version}.src.zip" checksum=5b9ca3ad915f36dba17a4bd22b3d7d68ac2526cf125d045a819aa8d4a2cceb4c -patch_args=-Np0 diff --git a/srcpkgs/Fritzing/patches/libgit2.patch b/srcpkgs/Fritzing/patches/libgit2.patch index 2692ae065ef..beb24655b92 100644 --- a/srcpkgs/Fritzing/patches/libgit2.patch +++ b/srcpkgs/Fritzing/patches/libgit2.patch @@ -2,8 +2,8 @@ make compatible with libgit2 >= 0.24.0 https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079 ---- src/version/partschecker.cpp.orig 2016-06-01 21:48:27.000000000 +0200 -+++ src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 +--- a/src/version/partschecker.cpp 2016-06-01 21:48:27.000000000 +0200 ++++ b/src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 @@ -121,7 +121,13 @@ /** * Connect to the remote. diff --git a/srcpkgs/Fritzing/template b/srcpkgs/Fritzing/template index 4dd6b0cb08f..d97ab1654a5 100644 --- a/srcpkgs/Fritzing/template +++ b/srcpkgs/Fritzing/template @@ -16,7 +16,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.g https://github.com/${pkgname}/${pkgname}-parts/archive/${_partshash}.tar.gz>fritzing-parts-${_partshash}.tar.gz" checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8 2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd" -patch_args=-Np0 post_extract() { # looks for libgit2 and boost in the source tree diff --git a/srcpkgs/GConf/patches/01_xml-gettext-domain.patch b/srcpkgs/GConf/patches/01_xml-gettext-domain.patch index f2345c3a807..2a1bf25ff93 100644 --- a/srcpkgs/GConf/patches/01_xml-gettext-domain.patch +++ b/srcpkgs/GConf/patches/01_xml-gettext-domain.patch @@ -1,8 +1,8 @@ # Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks. # Ubuntu: https://bugs.launchpad.net/bugs/123025 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845 ---- backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 -+++ backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +--- a/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 ++++ b/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 @@ -52,6 +52,7 @@ struct _MarkupEntry char *schema_name; char *mod_user; @@ -115,8 +115,8 @@ if (stype == GCONF_VALUE_LIST) { diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd ---- doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 -+++ doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +--- a/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 ++++ b/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 @@ -7,7 +7,7 @@ diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c ---- gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 -+++ gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +--- a/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 ++++ b/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 @@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); @@ -153,8 +153,8 @@ diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-i GConfValue* val; diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c ---- gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 -+++ gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +--- a/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 ++++ b/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 @@ -32,9 +32,10 @@ typedef struct { GConfValueType car_type; /* Pair car type of the described entry */ GConfValueType cdr_type; /* Pair cdr type of the described entry */ @@ -276,8 +276,8 @@ diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-sche const char* diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h ---- gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 -+++ gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +--- a/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 ++++ b/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 @@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type GConfValueType type); void gconf_schema_set_locale (GConfSchema *sc, @@ -296,8 +296,8 @@ diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-sche const char* gconf_schema_get_long_desc (const GConfSchema *schema); const char* gconf_schema_get_owner (const GConfSchema *schema); diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c ---- gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 -+++ gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +--- a/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 ++++ b/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 @@ -3295,6 +3295,7 @@ struct _SchemaInfo { GConfValueType cdr_type; GConfValue* global_default; @@ -350,8 +350,8 @@ diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c { process_locale_info(iter, &info); diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl ---- gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 -+++ gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +--- a/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 ++++ b/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 @@ -16,6 +16,7 @@ struct ConfigSchema { string short_desc; string long_desc; diff --git a/srcpkgs/GConf/patches/gconf-reload.patch b/srcpkgs/GConf/patches/gconf-reload.patch index 9cccb7fbc7c..d88d33e380f 100644 --- a/srcpkgs/GConf/patches/gconf-reload.patch +++ b/srcpkgs/GConf/patches/gconf-reload.patch @@ -1,5 +1,5 @@ ---- gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000 -+++ gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000 +--- a/gconf/gconftool.c 2006-10-14 17:37:14.000000000 +0000 ++++ b/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000 @@ -963,6 +963,8 @@ main (int argc, char** argv) gconf_engine_unref (conf); diff --git a/srcpkgs/GConf/patches/locale.patch b/srcpkgs/GConf/patches/locale.patch index 1f7e22cd2e7..e01d1c38374 100644 --- a/srcpkgs/GConf/patches/locale.patch +++ b/srcpkgs/GConf/patches/locale.patch @@ -1,7 +1,7 @@ Index: configure =================================================================== ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -18589,8 +18589,8 @@ fi DATADIRNAME=share ;; diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index 51c792007cb..4365c11e584 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -22,7 +22,6 @@ make_dirs="/usr/share/gconf/schemas 0755 root root /etc/gconf/gconf.xml.defaults 0755 root root /etc/gconf/gconf.xml.mandatory 0755 root root /etc/gconf/gconf.xml.system 0755 root root" -patch_args=-Np0 # Package build options build_options="gir" diff --git a/srcpkgs/Gauche/patches/src-makefile.patch b/srcpkgs/Gauche/patches/src-makefile.patch index 02fddf9cffd..f74d19149b7 100644 --- a/srcpkgs/Gauche/patches/src-makefile.patch +++ b/srcpkgs/Gauche/patches/src-makefile.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in 2019-12-13 22:50:49.000000000 +0100 -+++ src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200 +--- a/src/Makefile.in 2019-12-13 22:50:49.000000000 +0100 ++++ b/src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200 @@ -59,6 +59,7 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template index f40f1d382f9..74beafdc686 100644 --- a/srcpkgs/Gauche/template +++ b/srcpkgs/Gauche/template @@ -15,7 +15,6 @@ alternatives=" scheme:scheme:/usr/bin/gauche scheme:scheme.1:/usr/share/man/man1/gauche.1 " -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then # Gauche needs itself to bootstrap for cross compilation. diff --git a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch index 2080d6da7c9..14690333634 100644 --- a/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch +++ b/srcpkgs/GraphicsMagick/patches/disable_perlmagick_tests.patch @@ -1,7 +1,7 @@ # workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/ ---- Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800 -+++ Makefile.am 2021-02-14 00:46:48.431547444 -0800 +--- a/Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800 ++++ b/Makefile.am 2021-02-14 00:46:48.431547444 -0800 @@ -79,7 +79,6 @@ # Tests to run @@ -11,8 +11,8 @@ $(MAGICKPP_TESTS) \ $(WAND_TESTS) \ ---- Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800 -+++ Makefile.in 2021-02-14 00:50:19.996138472 -0800 +--- a/Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800 ++++ b/Makefile.in 2021-02-14 00:50:19.996138472 -0800 @@ -4767,7 +4767,7 @@ @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local diff --git a/srcpkgs/GraphicsMagick/template b/srcpkgs/GraphicsMagick/template index 68825a0d4a7..35f5269eac7 100644 --- a/srcpkgs/GraphicsMagick/template +++ b/srcpkgs/GraphicsMagick/template @@ -21,7 +21,6 @@ changelog="http://www.graphicsmagick.org/NEWS.html" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563 keep_libtool_archives=yes -patch_args=-Np0 post_install() { vlicense Copyright.txt LICENSE diff --git a/srcpkgs/Haru/patches/unitialized-ptr_error.patch b/srcpkgs/Haru/patches/unitialized-ptr_error.patch index 47cbf9296e2..39412d61af2 100644 --- a/srcpkgs/Haru/patches/unitialized-ptr_error.patch +++ b/srcpkgs/Haru/patches/unitialized-ptr_error.patch @@ -10,8 +10,8 @@ also deleted two line ending spaces diff --git src/hpdf_image_png.c src/hpdf_image_png.c index 3a35f5c..3f20a77 100644 ---- src/hpdf_image_png.c -+++ src/hpdf_image_png.c +--- a/src/hpdf_image_png.c ++++ b/src/hpdf_image_png.c @@ -280,8 +280,8 @@ ReadTransparentPngData (HPDF_Dict image, case PNG_COLOR_TYPE_RGB_ALPHA: row_len = 3 * width * sizeof(png_byte); diff --git a/srcpkgs/Haru/template b/srcpkgs/Haru/template index 439b4f93404..d1207b72b88 100644 --- a/srcpkgs/Haru/template +++ b/srcpkgs/Haru/template @@ -12,7 +12,6 @@ license="Zlib" homepage="http://libharu.org/" distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz" checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch b/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch index 62bdec0c26b..caea9024c1a 100644 --- a/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch +++ b/srcpkgs/LibreCAD/patches/0001-fix-for-GCC-9-build-issue-as-reported-in-1111-and-11.patch @@ -22,8 +22,8 @@ Subject: [PATCH] fix for GCC 9 build issue, as reported in #1111 and #1117 diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.cpp librecad/src/actions/rs_actiondrawcircletan1_2p.cpp index c14da00e..f305408a 100644 ---- librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -+++ librecad/src/actions/rs_actiondrawcircletan1_2p.cpp +--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp ++++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp @@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rs_preview.h" #include "rs_debug.h" @@ -38,8 +38,8 @@ index c14da00e..f305408a 100644 RS_CircleData cData; diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.h librecad/src/actions/rs_actiondrawcircletan1_2p.h index a6f40a6e..b5976c9f 100644 ---- librecad/src/actions/rs_actiondrawcircletan1_2p.h -+++ librecad/src/actions/rs_actiondrawcircletan1_2p.h +--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h ++++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h @@ -79,6 +79,9 @@ protected: private: struct Points; @@ -52,8 +52,8 @@ index a6f40a6e..b5976c9f 100644 #endif diff --git librecad/src/actions/rs_actiondrawcircletan2.cpp librecad/src/actions/rs_actiondrawcircletan2.cpp index d0558f05..820e4226 100644 ---- librecad/src/actions/rs_actiondrawcircletan2.cpp -+++ librecad/src/actions/rs_actiondrawcircletan2.cpp +--- a/librecad/src/actions/rs_actiondrawcircletan2.cpp ++++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp @@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rs_preview.h" #include "rs_debug.h" @@ -67,8 +67,8 @@ index d0558f05..820e4226 100644 RS_Vector coord; diff --git librecad/src/actions/rs_actiondrawcircletan2.h librecad/src/actions/rs_actiondrawcircletan2.h index bed56897..5b2040e9 100644 ---- librecad/src/actions/rs_actiondrawcircletan2.h -+++ librecad/src/actions/rs_actiondrawcircletan2.h +--- a/librecad/src/actions/rs_actiondrawcircletan2.h ++++ b/librecad/src/actions/rs_actiondrawcircletan2.h @@ -77,6 +77,9 @@ protected: private: struct Points; @@ -81,8 +81,8 @@ index bed56897..5b2040e9 100644 #endif diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.cpp librecad/src/actions/rs_actiondrawcircletan2_1p.cpp index 324c1668..51cd29a1 100644 ---- librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -+++ librecad/src/actions/rs_actiondrawcircletan2_1p.cpp +--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp ++++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp @@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rs_preview.h" #include "rs_debug.h" @@ -96,8 +96,8 @@ index 324c1668..51cd29a1 100644 RS_CircleData cData; diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.h librecad/src/actions/rs_actiondrawcircletan2_1p.h index 40c23903..e44a56c3 100644 ---- librecad/src/actions/rs_actiondrawcircletan2_1p.h -+++ librecad/src/actions/rs_actiondrawcircletan2_1p.h +--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h ++++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h @@ -73,6 +73,9 @@ protected: private: struct Points; @@ -110,8 +110,8 @@ index 40c23903..e44a56c3 100644 #endif diff --git librecad/src/actions/rs_actiondrawcircletan3.cpp librecad/src/actions/rs_actiondrawcircletan3.cpp index 026ed30e..eaca13d6 100644 ---- librecad/src/actions/rs_actiondrawcircletan3.cpp -+++ librecad/src/actions/rs_actiondrawcircletan3.cpp +--- a/librecad/src/actions/rs_actiondrawcircletan3.cpp ++++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp @@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "rs_preview.h" #include "rs_debug.h" @@ -125,8 +125,8 @@ index 026ed30e..eaca13d6 100644 std::shared_ptr cData{std::make_shared()}; diff --git librecad/src/actions/rs_actiondrawcircletan3.h librecad/src/actions/rs_actiondrawcircletan3.h index d0cabfa2..3201c5f8 100644 ---- librecad/src/actions/rs_actiondrawcircletan3.h -+++ librecad/src/actions/rs_actiondrawcircletan3.h +--- a/librecad/src/actions/rs_actiondrawcircletan3.h ++++ b/librecad/src/actions/rs_actiondrawcircletan3.h @@ -78,6 +78,8 @@ public: struct Points; std::unique_ptr pPoints; @@ -138,8 +138,8 @@ index d0cabfa2..3201c5f8 100644 #endif diff --git librecad/src/actions/rs_actiondrawlinerelangle.cpp librecad/src/actions/rs_actiondrawlinerelangle.cpp index 8415dd60..b9ce996f 100644 ---- librecad/src/actions/rs_actiondrawlinerelangle.cpp -+++ librecad/src/actions/rs_actiondrawlinerelangle.cpp +--- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp ++++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp @@ -38,11 +38,6 @@ #include "rs_preview.h" #include "rs_debug.h" @@ -154,8 +154,8 @@ index 8415dd60..b9ce996f 100644 RS_GraphicView& graphicView, diff --git librecad/src/actions/rs_actiondrawlinerelangle.h librecad/src/actions/rs_actiondrawlinerelangle.h index 1e102792..71e5185b 100644 ---- librecad/src/actions/rs_actiondrawlinerelangle.h -+++ librecad/src/actions/rs_actiondrawlinerelangle.h +--- a/librecad/src/actions/rs_actiondrawlinerelangle.h ++++ b/librecad/src/actions/rs_actiondrawlinerelangle.h @@ -110,6 +110,9 @@ private: * Is the angle fixed? */ @@ -168,8 +168,8 @@ index 1e102792..71e5185b 100644 #endif diff --git librecad/src/actions/rs_actiondrawlinetangent1.cpp librecad/src/actions/rs_actiondrawlinetangent1.cpp index 197b0cb6..47a93c76 100644 ---- librecad/src/actions/rs_actiondrawlinetangent1.cpp -+++ librecad/src/actions/rs_actiondrawlinetangent1.cpp +--- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp ++++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp @@ -36,12 +36,6 @@ #include "rs_preview.h" #include "rs_debug.h" @@ -185,8 +185,8 @@ index 197b0cb6..47a93c76 100644 RS_GraphicView& graphicView) diff --git librecad/src/actions/rs_actiondrawlinetangent1.h librecad/src/actions/rs_actiondrawlinetangent1.h index 0f76b368..d20d302d 100644 ---- librecad/src/actions/rs_actiondrawlinetangent1.h -+++ librecad/src/actions/rs_actiondrawlinetangent1.h +--- a/librecad/src/actions/rs_actiondrawlinetangent1.h ++++ b/librecad/src/actions/rs_actiondrawlinetangent1.h @@ -66,6 +66,12 @@ private: std::unique_ptr point; /** Chosen entity */ @@ -202,8 +202,8 @@ index 0f76b368..d20d302d 100644 #endif diff --git librecad/src/actions/rs_actiondrawlinetangent2.cpp librecad/src/actions/rs_actiondrawlinetangent2.cpp index fed3545e..0f1600e5 100644 ---- librecad/src/actions/rs_actiondrawlinetangent2.cpp -+++ librecad/src/actions/rs_actiondrawlinetangent2.cpp +--- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp ++++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp @@ -35,10 +35,6 @@ #include "rs_preview.h" #include "rs_debug.h" @@ -217,8 +217,8 @@ index fed3545e..0f1600e5 100644 RS_GraphicView& graphicView) diff --git librecad/src/actions/rs_actiondrawlinetangent2.h librecad/src/actions/rs_actiondrawlinetangent2.h index b0d884cd..95d82465 100644 ---- librecad/src/actions/rs_actiondrawlinetangent2.h -+++ librecad/src/actions/rs_actiondrawlinetangent2.h +--- a/librecad/src/actions/rs_actiondrawlinetangent2.h ++++ b/librecad/src/actions/rs_actiondrawlinetangent2.h @@ -68,6 +68,9 @@ private: /** 2nd chosen entity */ RS_Entity* circle2; diff --git a/srcpkgs/LibreCAD/patches/QPainterPath.patch b/srcpkgs/LibreCAD/patches/QPainterPath.patch index 47476c18323..c482f115909 100644 --- a/srcpkgs/LibreCAD/patches/QPainterPath.patch +++ b/srcpkgs/LibreCAD/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- librecad/src/lib/engine/lc_splinepoints.h 2016-09-23 07:34:43.000000000 +0200 -+++ librecad/src/lib/engine/lc_splinepoints.h 2020-10-26 19:40:13.317774271 +0100 +--- a/librecad/src/lib/engine/lc_splinepoints.h 2016-09-23 07:34:43.000000000 +0200 ++++ b/librecad/src/lib/engine/lc_splinepoints.h 2020-10-26 19:40:13.317774271 +0100 @@ -27,6 +27,7 @@ #include @@ -8,8 +8,8 @@ class QPolygonF; struct RS_LineTypePattern; ---- librecad/src/lib/gui/rs_painterqt.h 2016-09-23 07:34:43.000000000 +0200 -+++ librecad/src/lib/gui/rs_painterqt.h 2020-10-26 19:43:13.804763513 +0100 +--- a/librecad/src/lib/gui/rs_painterqt.h 2016-09-23 07:34:43.000000000 +0200 ++++ b/librecad/src/lib/gui/rs_painterqt.h 2020-10-26 19:43:13.804763513 +0100 @@ -29,6 +29,7 @@ #define RS_PAINTERQT_H diff --git a/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch b/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch index 21ac005d0e8..9d6e104b550 100644 --- a/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch +++ b/srcpkgs/LibreCAD/patches/fix-ftbfs-qt5.patch @@ -1,5 +1,5 @@ ---- librecad/src/ui/generic/widgetcreator.cpp -+++ librecad/src/ui/generic/widgetcreator.cpp +--- a/librecad/src/ui/generic/widgetcreator.cpp ++++ b/librecad/src/ui/generic/widgetcreator.cpp @@ -30,6 +30,7 @@ #include #include diff --git a/srcpkgs/LibreCAD/template b/srcpkgs/LibreCAD/template index da6fd2e7239..3a5224f907e 100644 --- a/srcpkgs/LibreCAD/template +++ b/srcpkgs/LibreCAD/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="http://librecad.org" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06 -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr" diff --git a/srcpkgs/LuaJIT/patches/aarch64-register-allocation-bug-fix.patch b/srcpkgs/LuaJIT/patches/aarch64-register-allocation-bug-fix.patch index 43d85a002f4..c3026478675 100644 --- a/srcpkgs/LuaJIT/patches/aarch64-register-allocation-bug-fix.patch +++ b/srcpkgs/LuaJIT/patches/aarch64-register-allocation-bug-fix.patch @@ -8,8 +8,8 @@ Subject: Fix register allocation bug in arm64 diff --git src/lj_asm_arm64.h src/lj_asm_arm64.h index 8fd92e7..549f8a6 100644 ---- src/lj_asm_arm64.h -+++ src/lj_asm_arm64.h +--- a/src/lj_asm_arm64.h ++++ b/src/lj_asm_arm64.h @@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir) int bigofs = !emit_checkofs(A64I_LDRx, ofs); RegSet allow = RSET_GPR; diff --git a/srcpkgs/LuaJIT/patches/enable-debug-symbols.patch b/srcpkgs/LuaJIT/patches/enable-debug-symbols.patch index 5e812d5a37d..96e4c9106ac 100644 --- a/srcpkgs/LuaJIT/patches/enable-debug-symbols.patch +++ b/srcpkgs/LuaJIT/patches/enable-debug-symbols.patch @@ -8,8 +8,8 @@ Subject: Enable debugging symbols in the build diff --git src/Makefile src/Makefile index 8a38efd..6b73a89 100644 ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -54,9 +54,9 @@ CCOPT_arm64= CCOPT_ppc= CCOPT_mips= diff --git a/srcpkgs/LuaJIT/patches/fix-bcsave-ppc64.patch b/srcpkgs/LuaJIT/patches/fix-bcsave-ppc64.patch index ba5e26da8ad..f53e2110710 100644 --- a/srcpkgs/LuaJIT/patches/fix-bcsave-ppc64.patch +++ b/srcpkgs/LuaJIT/patches/fix-bcsave-ppc64.patch @@ -1,5 +1,5 @@ ---- src/jit/bcsave.lua.orig 2018-12-17 19:06:27.215042417 +0100 -+++ src/jit/bcsave.lua 2018-12-17 19:17:12.982477945 +0100 +--- a/src/jit/bcsave.lua 2018-12-17 19:06:27.215042417 +0100 ++++ b/src/jit/bcsave.lua 2018-12-17 19:17:12.982477945 +0100 @@ -64,7 +64,7 @@ local map_arch = { diff --git a/srcpkgs/LuaJIT/patches/get-rid-of-luajit-version-sym.patch b/srcpkgs/LuaJIT/patches/get-rid-of-luajit-version-sym.patch index 7e0faaf8255..59e1ee72fcb 100644 --- a/srcpkgs/LuaJIT/patches/get-rid-of-luajit-version-sym.patch +++ b/srcpkgs/LuaJIT/patches/get-rid-of-luajit-version-sym.patch @@ -10,8 +10,8 @@ Subject: Get rid of LUAJIT_VERSION_SYM that changes ABI on every patch release diff --git src/lj_dispatch.c src/lj_dispatch.c index 5d6795f..e865a78 100644 ---- src/lj_dispatch.c -+++ src/lj_dispatch.c +--- a/src/lj_dispatch.c ++++ b/src/lj_dispatch.c @@ -319,11 +319,6 @@ int luaJIT_setmode(lua_State *L, int idx, int mode) return 1; /* OK. */ } @@ -26,8 +26,8 @@ index 5d6795f..e865a78 100644 /* This function can be called asynchronously (e.g. during a signal). */ diff --git src/luajit.c src/luajit.c index 1ca2430..ccf425e 100644 ---- src/luajit.c -+++ src/luajit.c +--- a/src/luajit.c ++++ b/src/luajit.c @@ -516,8 +516,6 @@ static int pmain(lua_State *L) globalL = L; if (argv[0] && argv[0][0]) progname = argv[0]; @@ -39,8 +39,8 @@ index 1ca2430..ccf425e 100644 print_usage(); diff --git src/luajit.h src/luajit.h index 708a5a1..35ae02c 100644 ---- src/luajit.h -+++ src/luajit.h +--- a/src/luajit.h ++++ b/src/luajit.h @@ -73,7 +73,4 @@ LUA_API void luaJIT_profile_stop(lua_State *L); LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt, int depth, size_t *len); diff --git a/srcpkgs/LuaJIT/patches/unpollute-global-namespace.patch b/srcpkgs/LuaJIT/patches/unpollute-global-namespace.patch index a2cbca9a789..aedaacbaaea 100644 --- a/srcpkgs/LuaJIT/patches/unpollute-global-namespace.patch +++ b/srcpkgs/LuaJIT/patches/unpollute-global-namespace.patch @@ -8,8 +8,8 @@ Subject: Make ccall_copy_struct static to unpollute global library namespace diff --git src/lj_ccall.c src/lj_ccall.c index b891591..a7dcc1b 100644 ---- src/lj_ccall.c -+++ src/lj_ccall.c +--- a/src/lj_ccall.c ++++ b/src/lj_ccall.c @@ -960,7 +960,7 @@ noth: /* Not a homogeneous float/double aggregate. */ return 0; /* Struct is in GPRs. */ } diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index e270384ecd3..9fbc72cbe4e 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -12,7 +12,6 @@ license="MIT" homepage="http://www.luajit.org" distfiles="http://luajit.org/download/${pkgname}-${_dist_version}.tar.gz" checksum=1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3 -patch_args=-Np0 build_options="lua52compat" diff --git a/srcpkgs/MEGAcmd/patches/include.am.patch b/srcpkgs/MEGAcmd/patches/include.am.patch index 66a0d7287d4..04da09953f1 100644 --- a/srcpkgs/MEGAcmd/patches/include.am.patch +++ b/srcpkgs/MEGAcmd/patches/include.am.patch @@ -1,5 +1,5 @@ ---- src/include.am 2019-09-15 11:19:21.139430520 +0300 -+++ - 2019-09-15 11:20:24.234994345 +0300 +--- a/src/include.am 2019-09-15 11:19:21.139430520 +0300 ++++ b/src/include.am 2019-09-15 11:19:21.139430520 +0300 @@ -7,9 +7,9 @@ MEGACMD = mega-cmd mega-exec mega-cmd-server diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template index 893d78c880c..eb94684afcf 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -14,7 +14,6 @@ homepage="https://github.com/meganz/MEGAcmd" distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz" checksum=2a3626a9f1d22303fe2123f984a8ecf3779d6d59ac6c67c1bf43c2423dcb832d replaces="megacmd>=0" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args="--with-libtool-sysroot=${XBPS_CROSS_BASE}" diff --git a/srcpkgs/Maelstrom/patches/include-time_h.patch b/srcpkgs/Maelstrom/patches/include-time_h.patch index d66afafb586..986c3dd8149 100644 --- a/srcpkgs/Maelstrom/patches/include-time_h.patch +++ b/srcpkgs/Maelstrom/patches/include-time_h.patch @@ -1,5 +1,5 @@ ---- Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100 -+++ Maelstrom-netd.c 2021-02-08 10:34:17.661600013 +0100 +--- a/Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100 ++++ b/Maelstrom-netd.c 2021-02-08 10:34:17.661600013 +0100 @@ -12,6 +12,7 @@ #include #include diff --git a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch index b551a393d0c..178c9cdaa0c 100644 --- a/srcpkgs/Maelstrom/patches/struct-button-typedef.patch +++ b/srcpkgs/Maelstrom/patches/struct-button-typedef.patch @@ -1,5 +1,5 @@ ---- buttonlist.h 2000-01-25 17:41:32.000000000 +0100 -+++ buttonlist.h 2021-02-08 10:38:39.377296739 +0100 +--- a/buttonlist.h 2000-01-25 17:41:32.000000000 +0100 ++++ b/buttonlist.h 2021-02-08 10:38:39.377296739 +0100 @@ -16,7 +16,7 @@ void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, diff --git a/srcpkgs/Maelstrom/template b/srcpkgs/Maelstrom/template index ea3d28d0c4f..7c4be8c13b2 100644 --- a/srcpkgs/Maelstrom/template +++ b/srcpkgs/Maelstrom/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://www.libsdl.org/projects/Maelstrom/" distfiles="${homepage}/src/${pkgname}-${version}.tar.gz" checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036 -patch_args=-Np0 CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result" diff --git a/srcpkgs/MonkeysAudio/patches/big-endian.patch b/srcpkgs/MonkeysAudio/patches/big-endian.patch index 6b37531dca3..41255cccd4f 100644 --- a/srcpkgs/MonkeysAudio/patches/big-endian.patch +++ b/srcpkgs/MonkeysAudio/patches/big-endian.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix build on big endian diff --git Source/MACLib/MD5.cpp Source/MACLib/MD5.cpp index c122fb5..89079b2 100644 ---- Source/MACLib/MD5.cpp -+++ Source/MACLib/MD5.cpp +--- a/Source/MACLib/MD5.cpp ++++ b/Source/MACLib/MD5.cpp @@ -35,11 +35,11 @@ CopyToLittleEndian ( uint32_t* dst, const uint8_t* src, size_t length ) diff --git a/srcpkgs/MonkeysAudio/patches/endian.patch b/srcpkgs/MonkeysAudio/patches/endian.patch index 38c21755670..e5fbe8a10af 100644 --- a/srcpkgs/MonkeysAudio/patches/endian.patch +++ b/srcpkgs/MonkeysAudio/patches/endian.patch @@ -11,8 +11,8 @@ Subject: [PATCH] MonkeysAudio: patch out bad endian definitions breaking diff --git Shared/All.h Shared/All.h index 6dfb669..cc9a988 100644 ---- Shared/All.h -+++ Shared/All.h +--- a/Shared/All.h ++++ b/Shared/All.h @@ -45,6 +45,7 @@ Global includes #include #include @@ -37,8 +37,8 @@ index 6dfb669..cc9a988 100644 *****************************************************************************************/ diff --git Source/Shared/All.h Source/Shared/All.h index 6dfb669..cc9a988 100644 ---- Source/Shared/All.h -+++ Source/Shared/All.h +--- a/Source/Shared/All.h ++++ b/Source/Shared/All.h @@ -45,6 +45,7 @@ Global includes #include #include diff --git a/srcpkgs/MonkeysAudio/patches/ppc64.patch b/srcpkgs/MonkeysAudio/patches/ppc64.patch index f8d9c55008c..5cfac477c67 100644 --- a/srcpkgs/MonkeysAudio/patches/ppc64.patch +++ b/srcpkgs/MonkeysAudio/patches/ppc64.patch @@ -10,8 +10,8 @@ Subject: [PATCH] add powerpc64 in 64-bit platforms to unbreak build diff --git Shared/All.h Shared/All.h index cc9a988..615e3d1 100644 ---- Shared/All.h -+++ Shared/All.h +--- a/Shared/All.h ++++ b/Shared/All.h @@ -123,7 +123,7 @@ Global compiler settings (useful for porting) #endif #endif @@ -23,8 +23,8 @@ index cc9a988..615e3d1 100644 #endif diff --git Source/Shared/All.h Source/Shared/All.h index cc9a988..615e3d1 100644 ---- Source/Shared/All.h -+++ Source/Shared/All.h +--- a/Source/Shared/All.h ++++ b/Source/Shared/All.h @@ -123,7 +123,7 @@ Global compiler settings (useful for porting) #endif #endif diff --git a/srcpkgs/MonkeysAudio/template b/srcpkgs/MonkeysAudio/template index 202b419fa84..6b9f47eda5e 100644 --- a/srcpkgs/MonkeysAudio/template +++ b/srcpkgs/MonkeysAudio/template @@ -14,7 +14,6 @@ distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip checksum="0000cbfad5f008014bf3d963b72039c518a1e93ded55b23da715d912c830623e 7d60dabaf760f32180e272b5955d5f1a2febcf9930eff13e49a1934a286a5819" skip_extraction="license.html" -patch_args=-Np0 do_build() { cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/license.html ${wrksrc} diff --git a/srcpkgs/ORBit2/patches/patch-linc2_src_Makefile.in.diff b/srcpkgs/ORBit2/patches/patch-linc2_src_Makefile.in.diff index e86dd8c304a..26071f0dbae 100644 --- a/srcpkgs/ORBit2/patches/patch-linc2_src_Makefile.in.diff +++ b/srcpkgs/ORBit2/patches/patch-linc2_src_Makefile.in.diff @@ -2,8 +2,8 @@ $NetBSD: patch-linc2_src_Makefile.in,v 1.1 2013/04/19 14:28:54 prlw1 Exp $ Avoid compilation error caused by use of deprecated g_thread API ---- linc2/src/Makefile.in.orig 2010-09-28 09:39:39.000000000 +0000 -+++ linc2/src/Makefile.in +--- a/linc2/src/Makefile.in 2010-09-28 09:39:39.000000000 +0000 ++++ b/linc2/src/Makefile.in @@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la # -I$(top_srcdir)/include INCLUDES = -I$(top_builddir)/linc2/include \ diff --git a/srcpkgs/ORBit2/template b/srcpkgs/ORBit2/template index 34ac1a00a44..10e7f52924b 100644 --- a/srcpkgs/ORBit2/template +++ b/srcpkgs/ORBit2/template @@ -13,7 +13,6 @@ homepage="http://projects.gnome.org/ORBit2/" distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2" checksum=55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 disable_parallel_build=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" ORBit2" diff --git a/srcpkgs/OpenCPN/patches/actually-set-arch.patch b/srcpkgs/OpenCPN/patches/actually-set-arch.patch index a1d45760cd8..d152c409288 100644 --- a/srcpkgs/OpenCPN/patches/actually-set-arch.patch +++ b/srcpkgs/OpenCPN/patches/actually-set-arch.patch @@ -1,5 +1,5 @@ ---- cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 -+++ - 2020-07-25 17:12:30.624868454 +0200 +--- a/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 ++++ b/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 @@ -14,6 +14,25 @@ # default set (ARCH "i386") diff --git a/srcpkgs/OpenCPN/patches/musl.patch b/srcpkgs/OpenCPN/patches/musl.patch index 7df6fbc16bd..75923e019b2 100644 --- a/srcpkgs/OpenCPN/patches/musl.patch +++ b/srcpkgs/OpenCPN/patches/musl.patch @@ -1,5 +1,5 @@ ---- include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200 -+++ - 2020-07-25 18:04:24.579351335 +0200 +--- a/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200 ++++ b/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200 @@ -20,9 +20,7 @@ #define WIN32_LEAN_AND_MEAN #include @@ -18,8 +18,8 @@ -#endif // ZEROCONF_DETAIL_HPP \ No newline at end of file +#endif // ZEROCONF_DETAIL_HPP ---- include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200 -+++ - 2020-07-25 18:10:40.700768834 +0200 +--- a/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200 ++++ b/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200 @@ -27,6 +27,7 @@ #include #include diff --git a/srcpkgs/OpenCPN/template b/srcpkgs/OpenCPN/template index 63796b6f17d..ee67dbaff01 100644 --- a/srcpkgs/OpenCPN/template +++ b/srcpkgs/OpenCPN/template @@ -20,7 +20,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-e homepage="https://opencpn.org/" distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz" checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7 -patch_args=-Np0 build_options="lzma libarchive exif crashreport" build_options_default="lzma libarchive exif" diff --git a/srcpkgs/OpenXcom/patches/fix-gcc6-ambigous_abs.patch b/srcpkgs/OpenXcom/patches/fix-gcc6-ambigous_abs.patch index f4198f8ed5a..fe1c39193bd 100644 --- a/srcpkgs/OpenXcom/patches/fix-gcc6-ambigous_abs.patch +++ b/srcpkgs/OpenXcom/patches/fix-gcc6-ambigous_abs.patch @@ -1,7 +1,7 @@ Disambiguate abs() for gcc6 ---- src/Geoscape/Globe.cpp 2014-06-13 21:14:43.000000000 +0200 -+++ src/Geoscape/Globe.cpp 2016-10-03 16:35:38.988290974 +0200 +--- a/src/Geoscape/Globe.cpp 2014-06-13 21:14:43.000000000 +0200 ++++ b/src/Geoscape/Globe.cpp 2016-10-03 16:35:38.988290974 +0200 @@ -1390,12 +1390,12 @@ if (fabs(sx)<0.01) diff --git a/srcpkgs/OpenXcom/patches/openxcom-cmath-algorithm-fixes.patch b/srcpkgs/OpenXcom/patches/openxcom-cmath-algorithm-fixes.patch index 63181b59c96..f5cce0ff1b0 100644 --- a/srcpkgs/OpenXcom/patches/openxcom-cmath-algorithm-fixes.patch +++ b/srcpkgs/OpenXcom/patches/openxcom-cmath-algorithm-fixes.patch @@ -1,6 +1,6 @@ diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h ---- src/Basescape/BaseInfoState.h 2018-03-14 15:06:59.665628271 +0000 -+++ src/Basescape/BaseInfoState.h 2018-03-14 15:43:22.067605905 +0000 +--- a/src/Basescape/BaseInfoState.h 2018-03-14 15:06:59.665628271 +0000 ++++ b/src/Basescape/BaseInfoState.h 2018-03-14 15:43:22.067605905 +0000 @@ -19,6 +19,7 @@ #ifndef OPENXCOM_BASEINFOSTATE_H #define OPENXCOM_BASEINFOSTATE_H @@ -10,8 +10,8 @@ diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h namespace OpenXcom diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h ---- src/Basescape/CraftInfoState.h 2018-03-14 15:02:09.783729176 +0000 -+++ src/Basescape/CraftInfoState.h 2018-03-14 15:43:16.476703036 +0000 +--- a/src/Basescape/CraftInfoState.h 2018-03-14 15:02:09.783729176 +0000 ++++ b/src/Basescape/CraftInfoState.h 2018-03-14 15:43:16.476703036 +0000 @@ -19,6 +19,7 @@ #ifndef OPENXCOM_CRAFTINFOSTATE_H #define OPENXCOM_CRAFTINFOSTATE_H @@ -21,8 +21,8 @@ diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h namespace OpenXcom diff -aur src/Engine/Language.h src/Engine/Language.h ---- src/Engine/Language.h 2018-03-14 15:11:37.236763021 +0000 -+++ src/Engine/Language.h 2018-03-14 15:42:14.751775215 +0000 +--- a/src/Engine/Language.h 2018-03-14 15:11:37.236763021 +0000 ++++ b/src/Engine/Language.h 2018-03-14 15:42:14.751775215 +0000 @@ -23,6 +23,7 @@ #include #include @@ -32,8 +32,8 @@ diff -aur src/Engine/Language.h src/Engine/Language.h #include "../Savegame/Soldier.h" diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h ---- src/Engine/OptionInfo.h 2018-03-14 15:14:50.346384845 +0000 -+++ src/Engine/OptionInfo.h 2018-03-14 15:42:14.750775233 +0000 +--- a/src/Engine/OptionInfo.h 2018-03-14 15:14:50.346384845 +0000 ++++ b/src/Engine/OptionInfo.h 2018-03-14 15:42:14.750775233 +0000 @@ -23,6 +23,7 @@ #include #include @@ -43,8 +43,8 @@ diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h namespace OpenXcom { diff -aur src/Savegame/CraftWeapon.h src/Savegame/CraftWeapon.h ---- src/Savegame/CraftWeapon.h 2018-03-14 15:27:14.695387913 +0000 -+++ src/Savegame/CraftWeapon.h 2018-03-14 15:42:14.748775267 +0000 +--- a/src/Savegame/CraftWeapon.h 2018-03-14 15:27:14.695387913 +0000 ++++ b/src/Savegame/CraftWeapon.h 2018-03-14 15:42:14.748775267 +0000 @@ -21,6 +21,7 @@ #include diff --git a/srcpkgs/OpenXcom/template b/srcpkgs/OpenXcom/template index fc79fbb7e1f..f44cc1e9d91 100644 --- a/srcpkgs/OpenXcom/template +++ b/srcpkgs/OpenXcom/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="http://openxcom.org/" distfiles="https://github.com/SupSuper/${pkgname}/archive/v${version}.tar.gz" checksum=45acb280010a01d60506b1c5f2951ae501c012cc6161aac470bd15c1e6981246 -patch_args=-Np0 pre_configure() { aclocal --install -Im4 diff --git a/srcpkgs/PAmix/patches/4807a44c793a61bb3eb7aa110c08db51938d4502.patch b/srcpkgs/PAmix/patches/4807a44c793a61bb3eb7aa110c08db51938d4502.patch index e0e8a2bf109..8664a6b1dc6 100644 --- a/srcpkgs/PAmix/patches/4807a44c793a61bb3eb7aa110c08db51938d4502.patch +++ b/srcpkgs/PAmix/patches/4807a44c793a61bb3eb7aa110c08db51938d4502.patch @@ -10,8 +10,8 @@ fixes #37 diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp index ed2d65e..16a2e34 100644 ---- src/pamix_ui.cpp -+++ src/pamix_ui.cpp +--- a/src/pamix_ui.cpp ++++ b/src/pamix_ui.cpp @@ -1,13 +1,5 @@ #include diff --git a/srcpkgs/PAmix/template b/srcpkgs/PAmix/template index fece21ed427..dc087f8c7f0 100644 --- a/srcpkgs/PAmix/template +++ b/srcpkgs/PAmix/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://github.com/patroclos/PAmix" distfiles="${homepage}/archive/${version}.tar.gz" checksum=b63522889d70920d64229c66e2ab6929950476538443af297f6b242f7e9dc406 -patch_args=-Np0 case "${XBPS_TARGET_MACHINE}" in *-musl) broken="Parts of ncurses, not available on musl";; diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch index 4abae3ef38a..c759e84879a 100644 --- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch +++ b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp index 601719b50..43dab2390 100644 ---- src/slic3r/Utils/Serial.cpp -+++ src/slic3r/Utils/Serial.cpp +--- a/src/slic3r/Utils/Serial.cpp ++++ b/src/slic3r/Utils/Serial.cpp @@ -42,7 +42,7 @@ #ifndef _WIN32 #include diff --git a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch index 8080380427b..1dca187b2ba 100644 --- a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch +++ b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch @@ -1,5 +1,5 @@ ---- src/libslic3r/Thread.cpp.orig 2021-01-24 13:50:00.469444149 +0100 -+++ src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100 +--- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100 ++++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100 @@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre return true; } diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch index 6b355fee78d..d64a450d9e9 100644 --- a/srcpkgs/PrusaSlicer/patches/cross.patch +++ b/srcpkgs/PrusaSlicer/patches/cross.patch @@ -1,5 +1,5 @@ ---- src/avrdude/CMakeLists.txt.orig 2020-06-04 09:19:26.017251215 +0200 -+++ src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200 +--- a/src/avrdude/CMakeLists.txt 2020-06-04 09:19:26.017251215 +0200 ++++ b/src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200 @@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen add_custom_command( DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 9a073edcf57..dd0e76cb801 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -18,7 +18,6 @@ homepage="https://www.prusa3d.com/prusaslicer/" distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio" -patch_args=-Np0 Slic3rPE_package() { build_style=meta diff --git a/srcpkgs/QLC+/patches/include-types.patch b/srcpkgs/QLC+/patches/include-types.patch index 61b364a734f..41e889f2359 100644 --- a/srcpkgs/QLC+/patches/include-types.patch +++ b/srcpkgs/QLC+/patches/include-types.patch @@ -1,5 +1,5 @@ ---- plugins/velleman/src/velleman_mock.cpp.orig 2020-07-05 16:57:25.002161999 -0700 -+++ plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:58:10.053165244 -0700 +--- a/plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:57:25.002161999 -0700 ++++ b/plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:58:10.053165244 -0700 @@ -18,9 +18,7 @@ */ diff --git a/srcpkgs/QLC+/template b/srcpkgs/QLC+/template index 8da1cc17f80..38322eb305c 100644 --- a/srcpkgs/QLC+/template +++ b/srcpkgs/QLC+/template @@ -14,7 +14,6 @@ license="Apache-2.0" homepage="https://www.qlcplus.org/" distfiles="https://github.com/mcallegari/qlcplus/archive/QLC+_$version.tar.gz" checksum=cefb5e84dee04b3567733fcaf4f8125069eec859b506e790ba8a9d921f1e75cc -patch_args=-Np0 pre_build() { vsed -i 's/QMAKE_CXXFLAGS/#QMAKE_CXXFLAGS/' variables.pri diff --git a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch b/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch index e1eefb812e7..a05c37044c6 100644 --- a/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch +++ b/srcpkgs/SDL/patches/SDL-1.2.10-GrabNotViewable.patch @@ -2,8 +2,8 @@ Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not viewable. Patch provided by . See . ---- src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000 -+++ src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000 +--- a/src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000 ++++ b/src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000 @@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, result = XGrabPointer(SDL_Display, SDL_Window, True, 0, GrabModeAsync, GrabModeAsync, diff --git a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch b/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch index b1cfd0047eb..5afa0a4059f 100644 --- a/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch +++ b/srcpkgs/SDL/patches/SDL-1.2.12-multilib.patch @@ -1,5 +1,5 @@ ---- sdl-config.in.multilib 2007-07-20 07:52:45.000000000 +0200 -+++ sdl-config.in 2007-11-06 17:07:25.000000000 +0100 +--- a/sdl-config.in.multilib 2007-07-20 07:52:45.000000000 +0200 ++++ b/sdl-config.in 2007-11-06 17:07:25.000000000 +0100 @@ -3,7 +3,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch b/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch index 9baa22ce122..94d13f92230 100644 --- a/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch +++ b/srcpkgs/SDL/patches/SDL-1.2.15-sndio.patch @@ -1,5 +1,5 @@ ---- configure 2012-01-19 07:30:12.000000000 +0100 -+++ configure 2018-11-27 22:58:07.344753821 +0100 +--- a/configure 2012-01-19 07:30:12.000000000 +0100 ++++ b/configure 2018-11-27 22:58:07.344753821 +0100 @@ -1514,6 +1514,7 @@ --disable-esdtest Do not try to compile and run a test ESD program --enable-esd-shared dynamically load ESD audio support [default=yes] @@ -40,8 +40,8 @@ CheckESD CheckPulseAudio CheckNAS ---- include/SDL_config.h.in 2018-11-27 21:52:07.645177938 +0100 -+++ include/SDL_config.h.in 2018-11-27 22:03:06.217107399 +0100 +--- a/include/SDL_config.h.in 2018-11-27 21:52:07.645177938 +0100 ++++ b/include/SDL_config.h.in 2018-11-27 22:03:06.217107399 +0100 @@ -184,6 +184,7 @@ #undef SDL_AUDIO_DRIVER_QNXNTO #undef SDL_AUDIO_DRIVER_SNDMGR @@ -50,8 +50,8 @@ #undef SDL_AUDIO_DRIVER_WAVEOUT /* Enable various cdrom drivers */ ---- src/audio/SDL_audio.c 2018-11-27 21:52:07.646177937 +0100 -+++ src/audio/SDL_audio.c 2018-11-27 22:04:37.977097571 +0100 +--- a/src/audio/SDL_audio.c 2018-11-27 21:52:07.646177937 +0100 ++++ b/src/audio/SDL_audio.c 2018-11-27 22:04:37.977097571 +0100 @@ -42,6 +42,9 @@ #if SDL_AUDIO_DRIVER_ALSA &ALSA_bootstrap, @@ -62,8 +62,8 @@ #if SDL_AUDIO_DRIVER_BSD &BSD_AUDIO_bootstrap, #endif ---- src/audio/SDL_sysaudio.h 2018-11-27 21:52:07.647177937 +0100 -+++ src/audio/SDL_sysaudio.h 2018-11-27 22:05:13.697093745 +0100 +--- a/src/audio/SDL_sysaudio.h 2018-11-27 21:52:07.647177937 +0100 ++++ b/src/audio/SDL_sysaudio.h 2018-11-27 22:05:13.697093745 +0100 @@ -105,6 +105,9 @@ #if SDL_AUDIO_DRIVER_BSD extern AudioBootStrap BSD_AUDIO_bootstrap; @@ -74,8 +74,8 @@ #if SDL_AUDIO_DRIVER_PULSE extern AudioBootStrap PULSE_bootstrap; #endif ---- src/audio/sndio/SDL_sndioaudio.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/audio/sndio/SDL_sndioaudio.c 2013-12-19 10:24:18.000000000 +0100 +--- a/src/audio/sndio/SDL_sndioaudio.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/src/audio/sndio/SDL_sndioaudio.c 2013-12-19 10:24:18.000000000 +0100 @@ -0,0 +1,243 @@ +/* + * Copyright (c) 2008 Jacob Meuser @@ -320,8 +320,8 @@ + /* We're ready to rock and roll. :-) */ + return(0); +} ---- src/audio/sndio/SDL_sndioaudio.h 1970-01-01 01:00:00.000000000 +0100 -+++ src/audio/sndio/SDL_sndioaudio.h 2013-12-15 02:57:55.000000000 +0100 +--- a/src/audio/sndio/SDL_sndioaudio.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/src/audio/sndio/SDL_sndioaudio.h 2013-12-15 02:57:55.000000000 +0100 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2008 Jacob Meuser diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template index 03c5de1df7d..d55ee7ab382 100644 --- a/srcpkgs/SDL/template +++ b/srcpkgs/SDL/template @@ -19,7 +19,6 @@ license="LGPL-2.1-only" homepage="http://www.libsdl.org/" distfiles="http://www.libsdl.org/release/SDL-${version}.tar.gz" checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 -patch_args=-Np0 # Package build options build_options="x11 opengl aalib pulseaudio" diff --git a/srcpkgs/SDL2/patches/gl_version_es_cm_1_0.patch b/srcpkgs/SDL2/patches/gl_version_es_cm_1_0.patch index 57db21561e9..a83cab0f77a 100644 --- a/srcpkgs/SDL2/patches/gl_version_es_cm_1_0.patch +++ b/srcpkgs/SDL2/patches/gl_version_es_cm_1_0.patch @@ -1,5 +1,5 @@ ---- include/SDL_opengl_glext.h 2019-07-25 06:32:36.000000000 +0200 -+++ include/SDL_opengl_glext.h 2019-12-13 01:24:33.908796188 +0100 +--- a/include/SDL_opengl_glext.h 2019-07-25 06:32:36.000000000 +0200 ++++ b/include/SDL_opengl_glext.h 2019-12-13 01:24:33.908796188 +0100 @@ -469,9 +469,10 @@ typedef long GLsizeiptr; typedef long GLintptr; diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 7bc1e95d78b..9013c2e73e2 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -15,7 +15,6 @@ license="Zlib" homepage="http://www.libsdl.org/" distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz" checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc -patch_args=-Np0 # Package build options build_options="gles opengl pulseaudio sndio vulkan wayland x11" diff --git a/srcpkgs/SLADE/patches/pointer-decay.patch b/srcpkgs/SLADE/patches/pointer-decay.patch index 87f3370a85f..7719471b03f 100644 --- a/srcpkgs/SLADE/patches/pointer-decay.patch +++ b/srcpkgs/SLADE/patches/pointer-decay.patch @@ -1,5 +1,5 @@ ---- src/External/sol/sol.hpp -+++ src/External/sol/sol.hpp +--- a/src/External/sol/sol.hpp ++++ b/src/External/sol/sol.hpp @@ -6818,7 +6818,7 @@ } diff --git a/srcpkgs/SLADE/patches/system-libraries.patch b/srcpkgs/SLADE/patches/system-libraries.patch index 9f114e04204..d2a0ca72471 100644 --- a/srcpkgs/SLADE/patches/system-libraries.patch +++ b/srcpkgs/SLADE/patches/system-libraries.patch @@ -1,6 +1,6 @@ lzma is p7zip not liblzma ---- src/External/CMakeLists.txt -+++ src/External/CMakeLists.txt +--- a/src/External/CMakeLists.txt ++++ b/src/External/CMakeLists.txt @@ -24,12 +24,10 @@ file(GLOB_RECURSE EXTERNAL_SOURCES *.cpp diff --git a/srcpkgs/SLADE/template b/srcpkgs/SLADE/template index 1557b2429b3..030aac7a61b 100644 --- a/srcpkgs/SLADE/template +++ b/srcpkgs/SLADE/template @@ -15,7 +15,6 @@ homepage="https://github.com/sirjuddington/SLADE" changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}" distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz" checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60 -patch_args=-Np0 pre_configure() { case $XBPS_TARGET_MACHINE in diff --git a/srcpkgs/SMC/patches/fix-boost_filesystem.patch b/srcpkgs/SMC/patches/fix-boost_filesystem.patch index 44eff087ee0..926ffb6afe9 100644 --- a/srcpkgs/SMC/patches/fix-boost_filesystem.patch +++ b/srcpkgs/SMC/patches/fix-boost_filesystem.patch @@ -2,8 +2,8 @@ Boost >= 1.5 renamed path::leaf() to path::filename(). Function path(const string_type&, name_check) was removed, thus here we use path(const string_type&). ---- src/core/filesystem/filesystem.cpp 2015-10-30 19:17:02.512620204 +0100 -+++ src/core/filesystem/filesystem.cpp 2015-10-30 19:17:57.036620043 +0100 +--- a/src/core/filesystem/filesystem.cpp 2015-10-30 19:17:02.512620204 +0100 ++++ b/src/core/filesystem/filesystem.cpp 2015-10-30 19:17:57.036620043 +0100 @@ -64,7 +64,7 @@ bool Dir_Exists( const std::string &dir ) @@ -70,8 +70,8 @@ thus here we use path(const string_type&). } } ---- src/overworld/world_manager.cpp 2015-10-30 19:17:02.649620204 +0100 -+++ src/overworld/world_manager.cpp 2015-10-30 18:30:23.299628497 +0100 +--- a/src/overworld/world_manager.cpp 2015-10-30 19:17:02.649620204 +0100 ++++ b/src/overworld/world_manager.cpp 2015-10-30 18:30:23.299628497 +0100 @@ -111,7 +111,7 @@ void cOverworld_Manager :: Load_Dir( const std::string &dir, bool user_dir /* = 0 */ ) { @@ -90,8 +90,8 @@ thus here we use path(const string_type&). // only directories with an existing description if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) ) ---- src/video/video.cpp 2015-10-30 19:17:02.822620203 +0100 -+++ src/video/video.cpp 2015-10-30 19:18:57.493619864 +0100 +--- a/src/video/video.cpp 2015-10-30 19:17:02.822620203 +0100 ++++ b/src/video/video.cpp 2015-10-30 19:18:57.493619864 +0100 @@ -747,7 +747,7 @@ { try diff --git a/srcpkgs/SMC/patches/fix-cegui07.patch b/srcpkgs/SMC/patches/fix-cegui07.patch index 20d962e404c..3fcdb8370a9 100644 --- a/srcpkgs/SMC/patches/fix-cegui07.patch +++ b/srcpkgs/SMC/patches/fix-cegui07.patch @@ -1,6 +1,6 @@ diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ configure.ac 2011-01-19 00:43:37.809884881 +0100 +--- a/configure.ac 2009-08-17 15:59:00.000000000 +0200 ++++ b/configure.ac 2011-01-19 00:43:37.809884881 +0100 @@ -53,7 +53,7 @@ AC_MSG_ERROR([SDL_ttf library not found])) @@ -11,8 +11,8 @@ diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac LIBS="$LIBS $CEGUI_LIBS" diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 +--- a/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 ++++ b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 @@ -118,16 +118,10 @@ return tmp; } @@ -49,8 +49,8 @@ diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp // draw items for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ ) diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 +--- a/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 ++++ b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 @@ -62,8 +62,7 @@ */ virtual CEGUI::Size getPixelSize( void ) const; @@ -62,8 +62,8 @@ diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h void Draw_Image( void ); diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 +--- a/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 ++++ b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 @@ -265,7 +265,7 @@ @@ -92,8 +92,8 @@ diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp while( draw ) { diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 +--- a/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 ++++ b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 @@ -444,13 +444,15 @@ if( pGuiSystem ) @@ -122,8 +122,8 @@ diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp } case SDL_KEYDOWN: diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 +--- a/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 ++++ b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 @@ -946,7 +946,7 @@ m_text_debug_text->setVisible( 1 ); @@ -134,8 +134,8 @@ diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp if( text_width > 800.0f ) diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 +--- a/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 ++++ b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 @@ -432,17 +432,12 @@ void cMouseCursor :: Render( void ) const @@ -159,8 +159,8 @@ diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp void cMouseCursor :: Update_Position( void ) diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 +--- a/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 ++++ b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 @@ -163,8 +163,8 @@ editbox->setText( int_to_string( bg_color_2.blue ).c_str() ); // preview window @@ -184,8 +184,8 @@ diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings if( !File_Exists( filename ) ) { diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 +--- a/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 ++++ b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 @@ -1663,7 +1663,7 @@ window_name->setText( name ); window_name->setTooltipText( tooltip ); @@ -196,8 +196,8 @@ diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp // all names should have the same width if( text_width > m_editor_window_name_width ) diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 +--- a/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 ++++ b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 @@ -103,15 +103,15 @@ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */ @@ -302,8 +302,8 @@ diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp // check if CEGUI is initialized bool cegui_initialized = pGuiSystem->getGUISheet() != NULL; diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ src/video/video.h 2011-01-19 01:16:42.791283379 +0100 +--- a/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 ++++ b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 @@ -23,7 +23,7 @@ #include "SDL_opengl.h" // CEGUI diff --git a/srcpkgs/SMC/template b/srcpkgs/SMC/template index 15f8f14acef..d67469fc18a 100644 --- a/srcpkgs/SMC/template +++ b/srcpkgs/SMC/template @@ -18,7 +18,6 @@ checksum=" b4194e70d3f1de3da884dd1a11e4f5cec25a205f66a3b85cc9fc1c86289b237d c5bb2e1830c7cbe499c93851f5a02b2b900b4730d2c7a133a44a7b43a297dab8" replaces="SMC-data>=0" -patch_args=-Np0 CXXFLAGS="-fpermissive -std=c++11" LDFLAGS="-Wl,--no-as-needed -lX11 -lboost_system" diff --git a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch index e8c3db0e087..cab451f7f35 100644 --- a/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch +++ b/srcpkgs/Signal-Desktop/patches/build-from-tarball.patch @@ -1,5 +1,5 @@ ---- Gruntfile.js.orig 2020-04-26 23:32:09.861789510 +0200 -+++ Gruntfile.js 2020-04-26 23:32:21.424734031 +0200 +--- a/Gruntfile.js 2020-04-26 23:32:09.861789510 +0200 ++++ b/Gruntfile.js 2020-04-26 23:32:21.424734031 +0200 @@ -452,6 +452,5 @@ 'concat', 'copy:deps', diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 7fa1635eeff..8999b6e483f 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -14,7 +14,6 @@ homepage="https://github.com/signalapp/Signal-Desktop" distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz" checksum=f9f55c0195579b43712bf370b753337432eda4bcf89809d1c8f3deb0b4ee4400 nostrip_files="signal-desktop" -patch_args=-Np0 pre_build() { vsed -e 's/"node": "/&>=/' -i package.json diff --git a/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch b/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch index a2ffc27f98f..5183ca9f20c 100644 --- a/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch +++ b/srcpkgs/SoapyUHD/patches/uhd-4.0.0.0.patch @@ -1,5 +1,5 @@ ---- SoapyUHDDevice.cpp.orig 2020-11-28 06:35:26.325250052 +0700 -+++ SoapyUHDDevice.cpp 2020-11-28 06:35:57.557546069 +0700 +--- a/SoapyUHDDevice.cpp 2020-11-28 06:35:26.325250052 +0700 ++++ b/SoapyUHDDevice.cpp 2020-11-28 06:35:57.557546069 +0700 @@ -20,6 +20,7 @@ #include #include @@ -8,8 +8,8 @@ /*********************************************************************** * Stream wrapper ---- UHDSoapyDevice.cpp.orig 2020-11-28 06:37:27.567376170 +0700 -+++ UHDSoapyDevice.cpp 2020-11-28 06:43:28.476925258 +0700 +--- a/UHDSoapyDevice.cpp 2020-11-28 06:37:27.567376170 +0700 ++++ b/UHDSoapyDevice.cpp 2020-11-28 06:43:28.476925258 +0700 @@ -179,8 +179,8 @@ std::map> _sampleRates; diff --git a/srcpkgs/SoapyUHD/template b/srcpkgs/SoapyUHD/template index 5549897fda7..90f51db7b9c 100644 --- a/srcpkgs/SoapyUHD/template +++ b/srcpkgs/SoapyUHD/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/pothosware/SoapyUHD" distfiles="${homepage}/archive/soapy-uhd-${version}.tar.gz" checksum=0ac7fd0967e6922f16d1ba1a7ecb72f1fbcc14dd80e5134af9a5c9b86c1bccb8 -patch_args=-Np0 diff --git a/srcpkgs/TSC/patches/no-scriptdocs-cross.patch b/srcpkgs/TSC/patches/no-scriptdocs-cross.patch index 5af778dab6e..0f45353f80f 100644 --- a/srcpkgs/TSC/patches/no-scriptdocs-cross.patch +++ b/srcpkgs/TSC/patches/no-scriptdocs-cross.patch @@ -1,5 +1,5 @@ ---- tsc/CMakeLists.txt 2020-05-17 12:21:43.000000000 +0200 -+++ tsc/CMakeLists.txt 2020-09-25 15:46:16.492926109 +0200 +--- a/tsc/CMakeLists.txt 2020-05-17 12:21:43.000000000 +0200 ++++ b/tsc/CMakeLists.txt 2020-09-25 15:46:16.492926109 +0200 @@ -297,9 +297,11 @@ install(DIRECTORY "${TSC_SOURCE_DIR}/data/worlds/" DESTINATION ${CMAKE_INSTALL_DATADIR}/tsc/worlds diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template index 66ebf5dd530..71534315cf7 100644 --- a/srcpkgs/TSC/template +++ b/srcpkgs/TSC/template @@ -19,7 +19,6 @@ homepage="https://www.secretchronicles.org/" distfiles="https://ftp.secretchronicles.org/releases/${pkgname}-${version}.tar.gz" checksum=6a16765b4951e3d5d1ea2b84e6da8f67b0271460f0c570b53ccdab80d7396261 replaces="TSC-data" -patch_args=-Np0 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then broken="The host ($XBPS_WORDSIZE) and target ($XBPS_TARGET_WORDSIZE) word sizes need to be the same for cross building." diff --git a/srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch b/srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch index 0e6c14d8f93..86b620222e8 100644 --- a/srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch +++ b/srcpkgs/Terminal/patches/x86_64-musl-termios_h.patch @@ -2,8 +2,8 @@ Building on x86_64-musl fails with: TerminalView.m:49:12: fatal error: termio.h: No such file or directory ---- TerminalView.m 2017-08-02 13:17:43.000000000 -0400 -+++ TerminalView.m 2020-12-17 01:38:16.124286870 -0500 +--- a/TerminalView.m 2017-08-02 13:17:43.000000000 -0400 ++++ b/TerminalView.m 2020-12-17 01:38:16.124286870 -0500 @@ -49 +49 @@ activated */ -# include +# include diff --git a/srcpkgs/Terminal/template b/srcpkgs/Terminal/template index d2fddec6eb3..9cd7970fcc2 100644 --- a/srcpkgs/Terminal/template +++ b/srcpkgs/Terminal/template @@ -15,4 +15,3 @@ homepage="http://gap.nongnu.org/terminal/" distfiles="${NONGNU_SITE}/gap/${pkgname}-${version}.tar.gz" checksum=27f81bbecdbd10cde8c080012cde4973bec20e551c58c29f353733cf03c220e9 nocross="objc doesn't get cross build at present within gcc (see gnustep-base)" -patch_args=-Np0 diff --git a/srcpkgs/VeraCrypt/patches/include-types.patch b/srcpkgs/VeraCrypt/patches/include-types.patch index 6b53861bac9..4a34b8562f8 100644 --- a/srcpkgs/VeraCrypt/patches/include-types.patch +++ b/srcpkgs/VeraCrypt/patches/include-types.patch @@ -1,5 +1,5 @@ ---- src/Crypto/jitterentropy.h -+++ src/Crypto/jitterentropy.h +--- a/src/Crypto/jitterentropy.h ++++ b/src/Crypto/jitterentropy.h @@ -44,6 +44,7 @@ #ifndef _JITTERENTROPY_H #define _JITTERENTROPY_H diff --git a/srcpkgs/VeraCrypt/template b/srcpkgs/VeraCrypt/template index c95a8fa6b25..2b4dd9fcc7e 100644 --- a/srcpkgs/VeraCrypt/template +++ b/srcpkgs/VeraCrypt/template @@ -16,7 +16,6 @@ license="Apache-2.0, custom:TrueCrypt-3.0" homepage="https://www.veracrypt.fr" distfiles="https://www.veracrypt.fr/code/VeraCrypt/snapshot/VeraCrypt-VeraCrypt_${_realversion}.tar.gz" checksum=cbdecffdfc258dccca6de1b79759e673dee3329280849b10d8253e802d45b41e -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) ;; diff --git a/srcpkgs/XyGrib/patches/qt5-5.15.0.patch b/srcpkgs/XyGrib/patches/qt5-5.15.0.patch index 7cbc1757e4e..ab4c4bc9aa7 100644 --- a/srcpkgs/XyGrib/patches/qt5-5.15.0.patch +++ b/srcpkgs/XyGrib/patches/qt5-5.15.0.patch @@ -1,5 +1,5 @@ ---- src/SkewT.h 2019-07-05 11:01:01.000000000 +0200 -+++ src/SkewT.h 2020-07-28 16:08:15.572570312 +0200 +--- a/src/SkewT.h 2019-07-05 11:01:01.000000000 +0200 ++++ b/src/SkewT.h 2020-07-28 16:08:15.572570312 +0200 @@ -16,6 +16,7 @@ #include #include diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template index ccad1528e34..e4aa3a2e026 100644 --- a/srcpkgs/XyGrib/template +++ b/srcpkgs/XyGrib/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://opengribs.org/" distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz" checksum=2dc6099293ae6f7a4bfbfc0cab590cf7ad48241d608e6d7a76e35961b9fc2157 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++" diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch index 729b73b155d..f0c4d23aab4 100644 --- a/srcpkgs/ZMusic/patches/ppc-musl.patch +++ b/srcpkgs/ZMusic/patches/ppc-musl.patch @@ -1,7 +1,7 @@ Taken from libgme package. ---- thirdparty/game-music-emu/gme/blargg_endian.h -+++ thirdparty/game-music-emu/gme/blargg_endian.h +--- a/thirdparty/game-music-emu/gme/blargg_endian.h ++++ b/thirdparty/game-music-emu/gme/blargg_endian.h @@ -36,7 +36,7 @@ #endif diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template index 002c59fdc49..23e805e3c99 100644 --- a/srcpkgs/ZMusic/template +++ b/srcpkgs/ZMusic/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/coelckers/ZMusic" distfiles="${homepage}/archive/${version}.tar.gz" checksum=73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-fts-devel"