From 861ac185a6b60134292ff93d40e40b5391d0aa8e 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/l*: 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/laditools/patches/enum34.patch | 4 +- srcpkgs/laditools/patches/vte3.patch | 4 +- srcpkgs/laditools/template | 1 - srcpkgs/ladspa-sdk/patches/fix-cross.patch | 4 +- srcpkgs/ladspa-sdk/patches/fix-pie.patch | 4 +- srcpkgs/ladspa-sdk/template | 1 - ...prototypes-for-deprecated-LAPACK-fun.patch | 4 +- .../cmake-make-both-static-shared.patch | 16 ++-- .../cmake-make-cblas-lapacke-soname.patch | 8 +- srcpkgs/lapack/template | 1 - srcpkgs/latencytop/patches/use_cc.patch | 4 +- srcpkgs/latencytop/template | 1 - srcpkgs/lbreakouthd/patches/musl.patch | 76 +++++++++---------- srcpkgs/lbreakouthd/template | 1 - srcpkgs/lbzip2/patches/fseterr.patch | 4 +- srcpkgs/lbzip2/template | 1 - .../lcov/patches/fix-undef-behaviour.patch | 8 +- .../lcov/patches/handle-equals-signs.patch | 4 +- srcpkgs/lcov/template | 1 - ...ast-the-trailing-NULL-on-execl-calls.patch | 4 +- srcpkgs/ldapvi/patches/renamed-getline.patch | 12 +-- srcpkgs/ldapvi/template | 1 - .../patches/disable-compile-error-test.patch | 4 +- srcpkgs/ldb/template | 1 - srcpkgs/ledger/patches/cmake_wtf.patch | 4 +- srcpkgs/ledger/patches/fix-cflags.patch | 4 +- srcpkgs/ledger/template | 1 - srcpkgs/lfe/patches/no-install-on-build.patch | 4 +- srcpkgs/lfe/template | 1 - .../liba52/patches/a52dec-0.7.4-build.patch | 12 +-- .../liba52/patches/disable-globals-test.patch | 4 +- srcpkgs/liba52/template | 1 - srcpkgs/libabigail/patches/musl.patch | 12 +-- srcpkgs/libabigail/patches/xbps.patch | 4 +- srcpkgs/libabigail/template | 1 - srcpkgs/libabw/patches/boost.patch | 4 +- srcpkgs/libabw/template | 1 - srcpkgs/libaccounts-qt5/patches/cross.patch | 4 +- srcpkgs/libaccounts-qt5/template | 1 - .../patches/filter-xz-enable-threads.patch | 4 +- srcpkgs/libarchive/template | 1 - .../libatasmart-strpool-cross-flags.patch | 4 +- srcpkgs/libatasmart/template | 1 - srcpkgs/libax25/patches/musl.patch | 4 +- srcpkgs/libax25/template | 1 - srcpkgs/libbsd/patches/musl.patch | 4 +- srcpkgs/libbsd/patches/tests-musl.patch | 4 +- srcpkgs/libbsd/template | 1 - ...e-all-GdkDisplays-are-GdkX11Displays.patch | 8 +- srcpkgs/libcanberra/template | 1 - .../libcap-ng/patches/pid_t-portability.patch | 4 +- srcpkgs/libcap-ng/template | 1 - .../libcap/patches/fix-missing-capsh.patch | 4 +- srcpkgs/libcap/template | 1 - srcpkgs/libcec/patches/no-fqdn.patch | 4 +- srcpkgs/libcec/template | 1 - .../libcgroup/patches/CVE-2018-14348.patch | 4 +- .../patches/api.c-fix-infinite-loop.patch | 4 +- srcpkgs/libcgroup/patches/musl-decls.patch | 4 +- .../libcgroup/patches/musl-strerror_r.patch | 4 +- srcpkgs/libcgroup/template | 1 - ...no-include-cxx-headers-from-extern-c.patch | 4 +- srcpkgs/libcmis/template | 1 - srcpkgs/libcprops/patches/musl.patch | 4 +- srcpkgs/libcprops/template | 1 - ...use-unistd-h-instead-of-sys-unistd-h.patch | 4 +- srcpkgs/libdaemon/template | 1 - srcpkgs/libdbus-c++/patches/cross-tools.patch | 4 +- srcpkgs/libdbus-c++/template | 1 - srcpkgs/libdill/patches/gcc9.patch | 4 +- srcpkgs/libdill/template | 1 - .../patches/dont-build-noveau-tests.patch | 4 +- .../revert_set_fb_modifiers_flag.patch | 4 +- srcpkgs/libdrm/template | 1 - srcpkgs/libeatmydata/patches/musl.patch | 4 +- .../remove-debian-specific-command.patch | 4 +- srcpkgs/libeatmydata/template | 1 - srcpkgs/libesmtp/patches/openssl.patch | 4 +- srcpkgs/libesmtp/template | 1 - srcpkgs/libetpan/patches/fix-musl.patch | 4 +- srcpkgs/libetpan/patches/multilib.patch | 4 +- srcpkgs/libetpan/template | 1 - srcpkgs/libevdevPlus/patches/time64.patch | 4 +- srcpkgs/libevdevPlus/template | 1 - srcpkgs/libexecinfo/patches/01-execinfo.patch | 4 +- srcpkgs/libexecinfo/patches/02-makefile.patch | 4 +- .../patches/03-define-gnu-source.patch | 12 +-- .../libexecinfo/patches/libexecinfo_pc.patch | 2 +- srcpkgs/libexecinfo/template | 1 - srcpkgs/libfetch/patches/soname.patch | 4 +- .../libfetch/patches/use-ssl-pending.patch | 4 +- srcpkgs/libfetch/template | 1 - srcpkgs/libffado/patches/cross-build.patch | 16 ++-- srcpkgs/libffado/patches/musl-sigval_t.patch | 4 +- srcpkgs/libffado/patches/musl-stdint_h.patch | 4 +- srcpkgs/libffado/template | 1 - .../patches/libffi-race-condition.patch | 4 +- srcpkgs/libffi/patches/mips-soft-float.patch | 4 +- srcpkgs/libffi/patches/mips.sgidefs_h.patch | 4 +- .../libffi/patches/no-toolexeclibdir.patch | 4 +- srcpkgs/libffi/patches/powerpc-fix-2.patch | 4 +- srcpkgs/libffi/patches/powerpc-fix.patch | 4 +- srcpkgs/libffi/patches/powerpc64-fix-2.patch | 4 +- srcpkgs/libffi/patches/powerpc64-fix.patch | 4 +- srcpkgs/libffi/template | 1 - .../patches/fix-stderr-redefinition.patch | 4 +- srcpkgs/libfprint/template | 1 - .../patches/fix-stderr-redefinition.patch | 4 +- srcpkgs/libfprint0/template | 1 - .../patches/remove-extra-parens.patch | 4 +- srcpkgs/libfreehand/patches/umachine.patch | 4 +- srcpkgs/libfreehand/template | 1 - srcpkgs/libgadu/patches/musl-sys_types.h.diff | 4 +- srcpkgs/libgadu/template | 1 - ...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 8 +- ...c4893e6d14d488dfed25745d79f11bee45b9.patch | 4 +- srcpkgs/libgdal/template | 1 - srcpkgs/libgfshare/patches/cross.patch | 4 +- srcpkgs/libgfshare/template | 1 - .../patches/meson-vapi-link.patch | 4 +- srcpkgs/libgit2-glib/template | 1 - .../libglade/patches/libglade-gmodule.patch | 4 +- srcpkgs/libglade/template | 1 - .../libglvnd/patches/musl-noasm-use-o0.patch | 4 +- srcpkgs/libglvnd/template | 1 - srcpkgs/libgme/patches/ppc-musl.patch | 4 +- srcpkgs/libgme/template | 1 - ...Segmentation-fault-when-opening-ipod.patch | 4 +- .../libgpod-0.8.2-pkgconfig_overlinking.patch | 4 +- srcpkgs/libgpod/template | 1 - srcpkgs/libgsm/patches/gsm-1.0.12-64bit.patch | 4 +- .../libgsm/patches/gsm-1.0.12-memcpy.patch | 4 +- .../libgsm/patches/gsm-1.0.13-shared.patch | 4 +- srcpkgs/libgsm/template | 1 - srcpkgs/libguestfs/patches/conf.patch | 4 +- srcpkgs/libguestfs/template | 1 - srcpkgs/libieee1284/patches/musl.patch | 8 +- srcpkgs/libieee1284/template | 1 - .../libimobiledevice/patches/python3.patch | 4 +- srcpkgs/libimobiledevice/template | 1 - srcpkgs/libindicator/patches/gtk+3.patch | 4 +- srcpkgs/libindicator/template | 1 - .../patches/musl-remove-wchar_t-check.patch | 4 +- srcpkgs/libiodbc/template | 1 - srcpkgs/libixion/patches/nullptr_t.patch | 4 +- srcpkgs/libixion/template | 1 - srcpkgs/libmad/patches/CVE-2017-8372.patch | 4 +- srcpkgs/libmad/patches/CVE-2017-8374.patch | 16 ++-- srcpkgs/libmad/patches/amd64-64bit.diff | 4 +- srcpkgs/libmad/patches/libmad.patch | 12 +-- srcpkgs/libmad/patches/mips-mode_di.patch | 4 +- srcpkgs/libmad/patches/optimize.diff | 4 +- srcpkgs/libmad/template | 1 - ...emcached-fix-linking-with-libpthread.patch | 4 +- srcpkgs/libmemcached/patches/memflush.patch | 4 +- srcpkgs/libmemcached/patches/musl-fixes.patch | 12 +-- srcpkgs/libmemcached/template | 1 - srcpkgs/libmill/patches/gcc9.patch | 4 +- srcpkgs/libmill/template | 1 - .../patches/enabled-shared-library.patch | 6 +- srcpkgs/libmilter/patches/glibc230.patch | 8 +- srcpkgs/libmilter/patches/musl-fix.patch | 4 +- .../libmilter/patches/thread-stacksize.patch | 8 +- srcpkgs/libmilter/template | 1 - srcpkgs/libmirage/patches/girpath.patch | 4 +- srcpkgs/libmirage/template | 1 - srcpkgs/libmowgli/patches/aarch64.patch | 4 +- .../libmowgli/patches/fix-memory-leak.patch | 4 +- srcpkgs/libmowgli/template | 1 - .../libmp4v2/patches/gcc7-fix-char_ptr.patch | 4 +- srcpkgs/libmp4v2/template | 1 - srcpkgs/libmpd/patches/fix-build.patch | 4 +- srcpkgs/libmpd/template | 1 - .../patches/fix-MSPUBMetaData_cstdint.patch | 4 +- srcpkgs/libmspub/template | 1 - srcpkgs/libmygpo-qt/patches/fix-cflags.patch | 4 +- srcpkgs/libmygpo-qt/template | 1 - srcpkgs/libmygui/patches/0001-OIS.patch | 4 +- srcpkgs/libmygui/template | 1 - srcpkgs/libnet/patches/musl-build-fix.patch | 4 +- srcpkgs/libnet/template | 1 - .../libnetfilter_log/patches/sys-types.patch | 4 +- .../libnetfilter_log/patches/sys-types2.patch | 4 +- srcpkgs/libnetfilter_log/template | 1 - srcpkgs/libnfc/patches/fix-musl.patch | 4 +- srcpkgs/libnfc/template | 1 - srcpkgs/libnfs/patches/fix-musl.patch | 4 +- srcpkgs/libnfs/template | 1 - srcpkgs/libnih/patches/musl.patch | 4 +- srcpkgs/libnih/template | 1 - srcpkgs/libnl/patches/fix-includes.patch | 8 +- srcpkgs/libnl/patches/fix-strerror_r.patch | 12 +-- srcpkgs/libnl/patches/libnl-1.1-flags.patch | 4 +- srcpkgs/libnl/template | 1 - srcpkgs/libogre/patches/musl_str_l.patch | 4 +- srcpkgs/libogre/template | 1 - .../patches/fedora-fixes.patch | 28 +++---- .../patches/fix-malloc-size.patch | 4 +- .../patches/memcpy-bounds.patch | 4 +- srcpkgs/libomxil-bellagio/template | 1 - .../patches/fix-cflags.patch | 4 +- srcpkgs/libopenglrecorder/template | 1 - .../libopenshot-audio/patches/fix-musl.patch | 12 +-- srcpkgs/libopenshot-audio/template | 1 - .../libosinfo/patches/meson-force-cross.patch | 4 +- srcpkgs/libosinfo/template | 1 - srcpkgs/libostree/patches/gir-cross.patch | 4 +- srcpkgs/libostree/patches/musl-fixes.patch | 4 +- srcpkgs/libostree/template | 1 - srcpkgs/libowfat/patches/fix-cross.patch | 8 +- srcpkgs/libowfat/patches/fix-glibc.patch | 4 +- srcpkgs/libowfat/template | 1 - srcpkgs/libportal/patches/optional_docs.patch | 8 +- srcpkgs/libportal/template | 1 - .../patches/libproxy-0.4.7-unistd.patch | 16 ++-- srcpkgs/libproxy/template | 1 - .../patches/fix-makefile.patch | 4 +- srcpkgs/libpurple-steam/template | 1 - .../patches/fix-usage-of-error.patch | 12 +-- srcpkgs/libratbag/template | 1 - .../patches/accept-ncursesw.patch | 12 +-- .../patches/no-rpath-and-link.patch | 12 +-- srcpkgs/libreadline8/template | 1 - .../0003-configure_ac-libc-version.patch | 4 +- .../libreoffice/patches/fix-vlc-backend.patch | 4 +- srcpkgs/libreoffice/template | 1 - .../patches/rpi.patch | 8 +- .../patches/string.patch | 4 +- .../patches/types.patch | 8 +- srcpkgs/libretro-mupen64plus-rpi/template | 1 - .../patches/add-string.patch | 4 +- .../patches/gl-typedefs.patch | 4 +- .../libretro-mupen64plus/patches/types.patch | 8 +- srcpkgs/libretro-mupen64plus/template | 1 - srcpkgs/librtas/patches/fix-endian_h.patch | 8 +- srcpkgs/librtas/template | 1 - srcpkgs/libscrypt/patches/makefile.patch | 4 +- srcpkgs/libscrypt/template | 1 - .../patches/01-glib-include-kludge.patch | 4 +- srcpkgs/libsearpc/template | 1 - srcpkgs/libselinux/patches/fts.patch | 4 +- srcpkgs/libselinux/template | 1 - ...figure.ac-Add-support-for-Python-3.9.patch | 4 +- srcpkgs/libsigrokdecode/template | 1 - srcpkgs/libsigsegv/patches/ppc-musl.patch | 4 +- srcpkgs/libsigsegv/template | 1 - srcpkgs/libsmbios/patches/fix-musl.patch | 8 +- srcpkgs/libsmbios/template | 1 - .../patches/OO.Makefile.fix-liblinks.patch | 4 +- srcpkgs/libspnav/template | 1 - srcpkgs/libssh/patches/fix-includes.patch | 4 +- srcpkgs/libssh/template | 1 - srcpkgs/libtecla/patches/fix-destdir.patch | 4 +- srcpkgs/libtecla/patches/musl-build.patch | 4 +- srcpkgs/libtecla/template | 1 - srcpkgs/libticables2/patches/ppc64le.patch | 4 +- srcpkgs/libticables2/template | 1 - .../libtool/patches/0001-trailingslash.patch | 8 +- .../patches/0002-rename-with-sysroot.patch | 20 ++--- .../patches/0004-use-sysroot-in-libpath.patch | 4 +- srcpkgs/libtool/template | 1 - .../patches/fix-sysroot-handling.patch | 4 +- srcpkgs/libtorrent/template | 1 - .../patches/disable-help2man.patch | 4 +- .../patches/lowercase-boolean.patch | 4 +- srcpkgs/libu2f-host/template | 1 - .../patches/lowercase-boolean.patch | 4 +- .../libu2f-server/patches/no-help2man.patch | 4 +- .../libu2f-server/patches/src-no-help.patch | 4 +- srcpkgs/libu2f-server/template | 1 - ...1327180cff73904b28f04cfdb604fc7d0773.patch | 4 +- srcpkgs/libucl/template | 1 - srcpkgs/libuninum/patches/fix-unicode.patch | 8 +- srcpkgs/libuninum/template | 1 - .../libunique/patches/gcc7-fix-char_ptr.patch | 4 +- srcpkgs/libunique/template | 1 - srcpkgs/libunwind/patches/mips-musl.patch | 4 +- .../patches/mips-read_write_s32.patch | 4 +- .../libunwind/patches/mips-registers.patch | 4 +- srcpkgs/libunwind/patches/ppc32-musl.patch | 8 +- srcpkgs/libunwind/patches/ppc64-musl.patch | 4 +- srcpkgs/libunwind/template | 1 - srcpkgs/libusb-compat/patches/fix-musl.patch | 4 +- srcpkgs/libusb-compat/template | 1 - .../patches/fix-descriptor-parsing.patch | 4 +- .../libusb/patches/portability-fixes.patch | 4 +- srcpkgs/libusb/template | 1 - srcpkgs/libusbmuxd/patches/musl.patch | 4 +- srcpkgs/libusbmuxd/template | 1 - srcpkgs/libuv/patches/disable-fs-chown.patch | 4 +- .../libuv/patches/disable-setuid-test.patch | 4 +- srcpkgs/libuv/template | 1 - .../patches/CreateSurfaceFromV4L2Buf.patch | 8 +- .../patches/fix-aarch64-musl.patch | 4 +- ...-driver-0.7.4-VAEncH264VUIBufferType.patch | 4 +- ...river-0.7.4-glext-missing-definition.patch | 4 +- ...ibva-vdpau-driver-0.7.4-libvdpau-0.8.patch | 4 +- srcpkgs/libva-vdpau-driver/template | 1 - srcpkgs/libvdpau/patches/dlclose.patch | 4 +- srcpkgs/libvdpau/template | 1 - srcpkgs/libvidstab/patches/fix-cflags.patch | 12 +-- srcpkgs/libvidstab/template | 1 - srcpkgs/libvirt-glib/patches/fix-cross.diff | 4 +- srcpkgs/libvirt-glib/template | 1 - srcpkgs/libwm/patches/wm-reg-event.patch | 8 +- srcpkgs/libwm/template | 1 - ...yer.c-integer-overflow-cve-2006-3376.patch | 4 +- ...ont.c-always-check-generated-fontmap.patch | 4 +- .../03_font.c-compare-fonts-by-name.patch | 4 +- ..._clip.c-use-after-free-cve-2009-1364.patch | 4 +- ...015-4588_CVE-2015-4695_CVE-2015-4696.patch | 12 +-- srcpkgs/libwmf/patches/CVE-2016-9011.patch | 4 +- .../fix-gdk-pixbuf-loaders-location.patch | 4 +- srcpkgs/libwmf/template | 1 - .../libxdg-basedir/patches/overflow-bug.patch | 4 +- srcpkgs/libxdg-basedir/template | 1 - .../libxkbcommon/patches/remove-fuzzing.patch | 4 +- srcpkgs/libxkbcommon/template | 1 - .../libxml2-python/patches/py39compat.patch | 8 +- .../libxml2-python/patches/python3-utf8.patch | 4 +- srcpkgs/libxml2-python/template | 1 - srcpkgs/libxml2/patches/CVE-2019-20388.patch | 4 +- srcpkgs/libxml2/template | 1 - srcpkgs/libxo/patches/fix-musl.patch | 4 +- srcpkgs/libxo/template | 1 - srcpkgs/libzim/patches/execinfo.patch | 4 +- srcpkgs/libzim/template | 1 - .../patches/conf.patch | 4 +- .../patches/musl.patch | 4 +- .../patches/void.patch | 8 +- srcpkgs/lightdm-webkit2-greeter/template | 1 - srcpkgs/lightdm/patches/musl-language.patch | 4 +- srcpkgs/lightdm/patches/musl-updwtmpx.patch | 4 +- srcpkgs/lightdm/template | 1 - srcpkgs/lighttpd/patches/020-meson-zstd.patch | 4 +- srcpkgs/lighttpd/template | 1 - srcpkgs/lightzone/patches/ppc.patch | 4 +- srcpkgs/lightzone/template | 1 - srcpkgs/lilo/patches/remove___GLIBC__.patch | 4 +- srcpkgs/lilo/template | 1 - srcpkgs/lilyterm/patches/lilyterm-musl.patch | 4 +- .../no-empty-environment-variables.patch | 4 +- srcpkgs/lilyterm/template | 1 - ...0933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch | 4 +- srcpkgs/linphone-desktop/template | 1 - srcpkgs/linssid/patches/project.patch | 4 +- srcpkgs/linssid/patches/time64.patch | 8 +- srcpkgs/linssid/template | 1 - srcpkgs/linux-tools/patches/musl.patch | 12 +-- srcpkgs/linux-tools/patches/ppc-bpf.patch | 4 +- srcpkgs/linux-tools/template | 1 - srcpkgs/linux-vt-setcolors/patches/8.diff | 4 +- srcpkgs/linux-vt-setcolors/template | 1 - srcpkgs/linux4.4/patches/ia32-sysexit.patch | 4 +- srcpkgs/linux4.4/template | 1 - .../liquid-dsp/patches/define-soname.patch | 8 +- .../liquid-dsp/patches/fix-make-install.patch | 4 +- srcpkgs/liquid-dsp/patches/ppc64.patch | 12 +-- srcpkgs/liquid-dsp/template | 1 - .../patches/liquidwar-5.6.4-underlink.patch | 4 +- .../patches/liquidwar-5.6.5-ovflfix.patch | 4 +- srcpkgs/liquidwar/template | 1 - srcpkgs/litecoin/patches/dequeu.patch | 4 +- srcpkgs/litecoin/patches/qt5.15.patch | 4 +- srcpkgs/litecoin/template | 1 - .../fix_flac_tracknumber_reading.patch | 4 +- srcpkgs/lltag/template | 1 - srcpkgs/llvm11/template | 1 - srcpkgs/llvm12/template | 1 - srcpkgs/lmdb/patches/soname.patch | 4 +- srcpkgs/lmdb/template | 1 - srcpkgs/lmms/patches/cross.patch | 8 +- srcpkgs/lmms/patches/ecm.patch | 4 +- srcpkgs/lmms/template | 1 - .../patches/100-bugfix-LOGCXX-284.patch | 4 +- .../patches/150-bugfix-LOGCXX-365.patch | 4 +- srcpkgs/log4cxx/patches/170-gcc6-fix.patch | 12 +-- .../patches/180-gcc-fix-testsuite.patch | 4 +- .../log4cxx/patches/missing-includes.patch | 12 +-- srcpkgs/log4cxx/template | 1 - srcpkgs/loksh/patches/ncursesw.patch | 4 +- srcpkgs/loksh/template | 1 - srcpkgs/loudmouth/patches/enable-ipv6.patch | 12 +-- srcpkgs/loudmouth/patches/fix-nonce_nul.patch | 4 +- srcpkgs/loudmouth/template | 1 - srcpkgs/lrzsz/patches/symlinks.patch | 4 +- srcpkgs/lrzsz/template | 1 - srcpkgs/lshw/patches/fix-lshw_sgml.patch | 4 +- srcpkgs/lshw/patches/musl-basename.patch | 4 +- srcpkgs/lshw/patches/musl-long_bits.patch | 4 +- srcpkgs/lshw/template | 1 - srcpkgs/ltrace/patches/musl-ppc.patch | 8 +- srcpkgs/ltrace/template | 1 - srcpkgs/lttng-tools/patches/musl-ino_t.patch | 4 +- srcpkgs/lttng-tools/template | 1 - .../patches/luasocket-arch.patch | 4 +- .../patches/luasocket-unixsocket.patch | 8 +- srcpkgs/lua51-luasocket/template | 1 - srcpkgs/lua51/patches/CVE-2014-5461.patch | 4 +- srcpkgs/lua51/patches/lua-5.1-cflags.diff | 4 +- srcpkgs/lua51/patches/lua-arch.patch | 16 ++-- srcpkgs/lua51/template | 1 - srcpkgs/lua52/patches/liblua.so.patch | 12 +-- srcpkgs/lua52/template | 1 - srcpkgs/lua53/patches/liblua.so.patch | 12 +-- srcpkgs/lua53/template | 1 - srcpkgs/lua54-lgi/patches/lua54.patch | 4 +- srcpkgs/lua54-lgi/template | 1 - srcpkgs/lua54-lualdap/patches/lua54.patch | 4 +- srcpkgs/lua54-lualdap/template | 1 - srcpkgs/lua54/patches/liblua.so.patch | 12 +-- srcpkgs/lua54/template | 1 - srcpkgs/luakit/patches/Makefile.patch | 4 +- srcpkgs/luakit/template | 1 - srcpkgs/lumina/patches/mandir.patch | 4 +- srcpkgs/lumina/template | 1 - srcpkgs/lvm2/patches/fix-stdio-usage.patch | 8 +- .../patches/mlockall-default-config.patch | 4 +- srcpkgs/lvm2/patches/portability.patch | 8 +- srcpkgs/lvm2/template | 1 - srcpkgs/lwipv6/patches/endian.patch | 4 +- .../lwipv6/patches/linux-headers-5.10.patch | 4 +- srcpkgs/lwipv6/patches/musl.patch | 8 +- srcpkgs/lwipv6/template | 1 - .../lxappearance/patches/fix-wayland.patch | 4 +- srcpkgs/lxappearance/template | 1 - srcpkgs/lxdm/patches/default-config.patch | 12 +-- srcpkgs/lxdm/patches/execinfo.patch | 8 +- srcpkgs/lxdm/patches/fix-msghdr-usage.patch | 4 +- srcpkgs/lxdm/template | 1 - .../lxpanel/patches/10-devproc-lxpanel.patch | 4 +- srcpkgs/lxpanel/template | 1 - srcpkgs/lzf/patches/Makefile_in-DISTDIR.patch | 4 +- srcpkgs/lzf/template | 1 - 434 files changed, 776 insertions(+), 940 deletions(-) diff --git a/srcpkgs/laditools/patches/enum34.patch b/srcpkgs/laditools/patches/enum34.patch index 4a54ad73fb..ade42e4fc3 100644 --- a/srcpkgs/laditools/patches/enum34.patch +++ b/srcpkgs/laditools/patches/enum34.patch @@ -9,8 +9,8 @@ Date: Tue Mar 8 00:02:09 2016 +0100 diff --git laditools/ladish.py laditools/ladish.py index 3613149..21fc53b 100644 ---- laditools/ladish.py -+++ laditools/ladish.py +--- a/laditools/ladish.py ++++ b/laditools/ladish.py @@ -28,10 +28,8 @@ control_obj_path = "/org/ladish/Control" studio_obj_path = "/org/ladish/Studio" service_name = name_base diff --git a/srcpkgs/laditools/patches/vte3.patch b/srcpkgs/laditools/patches/vte3.patch index d8ccb8d7bb..c84cca1dc0 100644 --- a/srcpkgs/laditools/patches/vte3.patch +++ b/srcpkgs/laditools/patches/vte3.patch @@ -1,8 +1,8 @@ Support for vte >= 0.52. See https://bugs.launchpad.net/ubuntu/+source/laditools/+bug/1669111. ---- ladi-system-log.orig 2015-09-13 23:38:51.000000000 +0200 -+++ ladi-system-log 2018-10-17 18:04:59.687899590 +0200 +--- a/ladi-system-log 2015-09-13 23:38:51.000000000 +0200 ++++ b/ladi-system-log 2018-10-17 18:04:59.687899590 +0200 @@ -190,13 +190,13 @@ def on_clear_text (self, data=None): diff --git a/srcpkgs/laditools/template b/srcpkgs/laditools/template index d5c06f7015..596f955b9d 100644 --- a/srcpkgs/laditools/template +++ b/srcpkgs/laditools/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/alessio/laditools" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=ca99f4b6e17b7333ed87dd12a2d91da4d486e53d89dd2677edfa29170ec6efe5 -patch_args=-Np0 post_install() { # remove wmladi, we do not have wmdocklib. diff --git a/srcpkgs/ladspa-sdk/patches/fix-cross.patch b/srcpkgs/ladspa-sdk/patches/fix-cross.patch index a72495dc71..ac5c20930d 100644 --- a/srcpkgs/ladspa-sdk/patches/fix-cross.patch +++ b/srcpkgs/ladspa-sdk/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- src/Makefile 2007-11-06 11:42:45.000000000 +0100 -+++ src/Makefile 2015-09-28 12:37:57.171530771 +0200 +--- a/src/Makefile 2007-11-06 11:42:45.000000000 +0100 ++++ b/src/Makefile 2015-09-28 12:37:57.171530771 +0200 @@ -46,17 +46,8 @@ # TARGETS # diff --git a/srcpkgs/ladspa-sdk/patches/fix-pie.patch b/srcpkgs/ladspa-sdk/patches/fix-pie.patch index f745f6e51b..0da54b6927 100644 --- a/srcpkgs/ladspa-sdk/patches/fix-pie.patch +++ b/srcpkgs/ladspa-sdk/patches/fix-pie.patch @@ -1,5 +1,5 @@ ---- src/makefile.orig -+++ src/Makefile +--- a/src/makefile ++++ b/src/Makefile @@ -15,7 +15,7 @@ INCLUDES = -I. diff --git a/srcpkgs/ladspa-sdk/template b/srcpkgs/ladspa-sdk/template index 4b3730a98f..175f3cb2c4 100644 --- a/srcpkgs/ladspa-sdk/template +++ b/srcpkgs/ladspa-sdk/template @@ -10,7 +10,6 @@ license="LGPL-2.1-or-later" homepage="http://www.ladspa.org/" distfiles="http://www.ladspa.org/download/ladspa_sdk_${version}.tgz" checksum=4229959b09d20c88c8c86f4aa76427843011705df22d9c28b38359fd1829fded -patch_args=-Np0 do_build() { make CC=$CC CPP=$CXX LD=$LD -C src diff --git a/srcpkgs/lapack/patches/Restore-missing-prototypes-for-deprecated-LAPACK-fun.patch b/srcpkgs/lapack/patches/Restore-missing-prototypes-for-deprecated-LAPACK-fun.patch index ec7c21a7ea..b79d26fd74 100644 --- a/srcpkgs/lapack/patches/Restore-missing-prototypes-for-deprecated-LAPACK-fun.patch +++ b/srcpkgs/lapack/patches/Restore-missing-prototypes-for-deprecated-LAPACK-fun.patch @@ -13,8 +13,8 @@ Closes #365 diff --git LAPACKE/include/lapack.h LAPACKE/include/lapack.h index 3f425325..5c131d84 100644 ---- LAPACKE/include/lapack.h -+++ LAPACKE/include/lapack.h +--- a/LAPACKE/include/lapack.h ++++ b/LAPACKE/include/lapack.h @@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf( lapack_complex_double* work, lapack_int const* lwork, lapack_int* info ); diff --git a/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch b/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch index 178f539e36..e3564e93d0 100644 --- a/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch +++ b/srcpkgs/lapack/patches/cmake-make-both-static-shared.patch @@ -1,7 +1,7 @@ diff --git BLAS/SRC/CMakeLists.txt BLAS/SRC/CMakeLists.txt index 41c48043..e3776ecd 100644 ---- BLAS/SRC/CMakeLists.txt -+++ BLAS/SRC/CMakeLists.txt +--- a/BLAS/SRC/CMakeLists.txt ++++ b/BLAS/SRC/CMakeLists.txt @@ -98,9 +98,15 @@ endif() list(REMOVE_DUPLICATES SOURCES) @@ -20,8 +20,8 @@ index 41c48043..e3776ecd 100644 +lapack_install_library(blas_static) diff --git CBLAS/src/CMakeLists.txt CBLAS/src/CMakeLists.txt index 90e19f81..b97d64d7 100644 ---- CBLAS/src/CMakeLists.txt -+++ CBLAS/src/CMakeLists.txt +--- a/CBLAS/src/CMakeLists.txt ++++ b/CBLAS/src/CMakeLists.txt @@ -114,15 +114,22 @@ endif() list(REMOVE_DUPLICATES SOURCES) @@ -47,8 +47,8 @@ index 90e19f81..b97d64d7 100644 +lapack_install_library(cblas_static) diff --git LAPACKE/CMakeLists.txt LAPACKE/CMakeLists.txt index 0589a74b..be63bba3 100644 ---- LAPACKE/CMakeLists.txt -+++ LAPACKE/CMakeLists.txt +--- a/LAPACKE/CMakeLists.txt ++++ b/LAPACKE/CMakeLists.txt @@ -73,12 +73,17 @@ endif() list(APPEND SOURCES ${UTILS}) @@ -83,8 +83,8 @@ index 0589a74b..be63bba3 100644 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} diff --git SRC/CMakeLists.txt SRC/CMakeLists.txt index f19bdd30..7a9a0661 100644 ---- SRC/CMakeLists.txt -+++ SRC/CMakeLists.txt +--- a/SRC/CMakeLists.txt ++++ b/SRC/CMakeLists.txt @@ -501,16 +501,23 @@ endif() list(REMOVE_DUPLICATES SOURCES) diff --git a/srcpkgs/lapack/patches/cmake-make-cblas-lapacke-soname.patch b/srcpkgs/lapack/patches/cmake-make-cblas-lapacke-soname.patch index 21d276ddcb..dca6d04a15 100644 --- a/srcpkgs/lapack/patches/cmake-make-cblas-lapacke-soname.patch +++ b/srcpkgs/lapack/patches/cmake-make-cblas-lapacke-soname.patch @@ -1,7 +1,7 @@ diff --git CBLAS/CMakeLists.txt CBLAS/CMakeLists.txt index 04c5ab79..8fa3b7d4 100644 ---- CBLAS/CMakeLists.txt -+++ CBLAS/CMakeLists.txt +--- a/CBLAS/CMakeLists.txt ++++ b/CBLAS/CMakeLists.txt @@ -88,6 +88,12 @@ install(FILES DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cblas-${LAPACK_VERSION} ) @@ -17,8 +17,8 @@ index 04c5ab79..8fa3b7d4 100644 # COMPONENT Development diff --git LAPACKE/CMakeLists.txt LAPACKE/CMakeLists.txt index 0589a74b..adc87a3e 100644 ---- LAPACKE/CMakeLists.txt -+++ LAPACKE/CMakeLists.txt +--- a/LAPACKE/CMakeLists.txt ++++ b/LAPACKE/CMakeLists.txt @@ -126,6 +126,12 @@ install(FILES COMPONENT Development ) diff --git a/srcpkgs/lapack/template b/srcpkgs/lapack/template index 525d64b965..3ca6027273 100644 --- a/srcpkgs/lapack/template +++ b/srcpkgs/lapack/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://www.netlib.org/lapack/" distfiles="https://github.com/Reference-LAPACK/lapack/archive/v${version}.tar.gz" checksum=106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/latencytop/patches/use_cc.patch b/srcpkgs/latencytop/patches/use_cc.patch index 3e289abf26..a1eaf34bfc 100644 --- a/srcpkgs/latencytop/patches/use_cc.patch +++ b/srcpkgs/latencytop/patches/use_cc.patch @@ -1,5 +1,5 @@ ---- /home/aviator/.vim/backups/Makefile~ 2009-04-28 09:37:54.000000000 -0400 -+++ Makefile 2016-06-19 16:04:19.885405164 -0400 +--- a//home/aviator/.vim/backups/Makefile~ 2009-04-28 09:37:54.000000000 -0400 ++++ b/Makefile 2016-06-19 16:04:19.885405164 -0400 @@ -26,10 +26,10 @@ # We write explicity this "implicit rule" diff --git a/srcpkgs/latencytop/template b/srcpkgs/latencytop/template index 0442408311..67071c436a 100644 --- a/srcpkgs/latencytop/template +++ b/srcpkgs/latencytop/template @@ -11,7 +11,6 @@ license="GPL-2" homepage="http://www.latencytop.org" distfiles="${DEBIAN_SITE}/main/l/$pkgname/${pkgname}_${version}.orig.tar.gz" checksum=9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef -patch_args=-Np0 pre_build() { export CFLAGS="$CFLAGS $LDFLAGS" diff --git a/srcpkgs/lbreakouthd/patches/musl.patch b/srcpkgs/lbreakouthd/patches/musl.patch index a4bb38476c..bd9ade2edc 100644 --- a/srcpkgs/lbreakouthd/patches/musl.patch +++ b/srcpkgs/lbreakouthd/patches/musl.patch @@ -1,8 +1,8 @@ uint is not portable, use unsigned int instead. Fixes musl. --xtraeme ---- src/clientgame.cpp 2018-12-21 19:43:51.000000000 +0100 -+++ src/clientgame.cpp 2019-06-10 11:04:25.230551850 +0200 +--- a/src/clientgame.cpp 2018-12-21 19:43:51.000000000 +0100 ++++ b/src/clientgame.cpp 2019-06-10 11:04:25.230551850 +0200 @@ -88,7 +88,7 @@ int ClientGame::init(const string& setna ClientPlayer *ClientGame::getNextPlayer() { @@ -21,8 +21,8 @@ uint is not portable, use unsigned int instead. Fixes musl. { int oldScore = game->paddles[0]->score; int ret = 0; ---- src/clientgame.h 2019-03-07 15:36:01.000000000 +0100 -+++ src/clientgame.h 2019-06-10 11:04:25.226551802 +0200 +--- a/src/clientgame.h 2019-03-07 15:36:01.000000000 +0100 ++++ b/src/clientgame.h 2019-06-10 11:04:25.226551802 +0200 @@ -21,19 +21,19 @@ class ClientPlayer { @@ -109,8 +109,8 @@ uint is not portable, use unsigned int instead. Fixes musl. players[pid]->setLives(lives); players[pid]->setScore(score); players[pid]->setLevel(level); ---- src/menu.cpp 2018-11-24 14:35:44.000000000 +0100 -+++ src/menu.cpp 2019-06-10 11:04:25.231551862 +0200 +--- a/src/menu.cpp 2018-11-24 14:35:44.000000000 +0100 ++++ b/src/menu.cpp 2019-06-10 11:04:25.231551862 +0200 @@ -24,7 +24,7 @@ extern SDL_Renderer *mrc; Font *MenuItem::fNormal = NULL; Font *MenuItem::fFocus = NULL; @@ -120,8 +120,8 @@ uint is not portable, use unsigned int instead. Fixes musl. /** Helper to render a part of the menu item. Position is determined * by given alignment. */ ---- src/menu.h 2018-12-22 13:30:58.000000000 +0100 -+++ src/menu.h 2019-06-10 11:04:25.227551814 +0200 +--- a/src/menu.h 2018-12-22 13:30:58.000000000 +0100 ++++ b/src/menu.h 2019-06-10 11:04:25.227551814 +0200 @@ -59,7 +59,7 @@ protected: } public: @@ -183,8 +183,8 @@ uint is not portable, use unsigned int instead. Fixes musl. for (auto& i : items) i->update(ms); } ---- src/mixer.h 2019-03-07 20:54:45.000000000 +0100 -+++ src/mixer.h 2019-06-10 11:04:25.228551826 +0200 +--- a/src/mixer.h 2019-03-07 20:54:45.000000000 +0100 ++++ b/src/mixer.h 2019-06-10 11:04:25.228551826 +0200 @@ -63,7 +63,7 @@ public: _loginfo("Mixer closed\n"); } @@ -194,8 +194,8 @@ uint is not portable, use unsigned int instead. Fixes musl. if (v > 100) v = 100; v = v * MIX_MAX_VOLUME / 100; ---- src/sdl.cpp 2019-03-07 14:07:05.000000000 +0100 -+++ src/sdl.cpp 2019-06-10 11:04:25.231551862 +0200 +--- a/src/sdl.cpp 2019-03-07 14:07:05.000000000 +0100 ++++ b/src/sdl.cpp 2019-06-10 11:04:25.231551862 +0200 @@ -484,7 +484,7 @@ void Font::writeText(int x, int y, const SDL_DestroyTexture(tex); } @@ -205,8 +205,8 @@ uint is not portable, use unsigned int instead. Fixes musl. { if (str == "") { empty = true; ---- src/sdl.h 2019-03-07 13:15:07.000000000 +0100 -+++ src/sdl.h 2019-06-10 11:04:25.228551826 +0200 +--- a/src/sdl.h 2019-03-07 13:15:07.000000000 +0100 ++++ b/src/sdl.h 2019-06-10 11:04:25.228551826 +0200 @@ -209,7 +209,7 @@ public: return TTF_SizeText(font,str.c_str(),w,h); return 0; @@ -240,8 +240,8 @@ uint is not portable, use unsigned int instead. Fixes musl. if (empty) return 0; return img.getWidth(); ---- src/selectdlg.cpp 2018-12-21 20:02:48.000000000 +0100 -+++ src/selectdlg.cpp 2019-06-10 11:04:25.232551874 +0200 +--- a/src/selectdlg.cpp 2018-12-21 20:02:48.000000000 +0100 ++++ b/src/selectdlg.cpp 2019-06-10 11:04:25.232551874 +0200 @@ -31,17 +31,17 @@ SetInfo::SetInfo(const string &n, Theme author = "?"; @@ -327,8 +327,8 @@ uint is not portable, use unsigned int instead. Fixes musl. if (pos + i < entries.size() && sel == (int)(pos + i)) font.setColor(theme.menuFontColorFocus); else ---- src/selectdlg.h 2018-10-31 18:49:34.000000000 +0100 -+++ src/selectdlg.h 2019-06-10 11:04:25.228551826 +0200 +--- a/src/selectdlg.h 2018-10-31 18:49:34.000000000 +0100 ++++ b/src/selectdlg.h 2019-06-10 11:04:25.228551826 +0200 @@ -21,7 +21,7 @@ class SetInfo { string name; string version; @@ -354,8 +354,8 @@ uint is not portable, use unsigned int instead. Fixes musl. Image background; ---- src/sprite.cpp 2018-09-02 18:47:18.000000000 +0200 -+++ src/sprite.cpp 2019-06-10 11:04:25.232551874 +0200 +--- a/src/sprite.cpp 2018-09-02 18:47:18.000000000 +0200 ++++ b/src/sprite.cpp 2019-06-10 11:04:25.232551874 +0200 @@ -24,7 +24,7 @@ extern SDL_Renderer *mrc; Particle::Particle(GridImage &simg, int _gx, int _gy, int _sx, int _sy, int _sw, int _sh, @@ -365,8 +365,8 @@ uint is not portable, use unsigned int instead. Fixes musl. : img(simg), gx(_gx), gy(_gy), sx(_sx), sy(_sy), sw(_sw), sh(_sh), pos(px,py), vel(vx,vy) { ---- src/sprite.h 2018-09-02 18:47:18.000000000 +0200 -+++ src/sprite.h 2019-06-10 11:04:25.229551838 +0200 +--- a/src/sprite.h 2018-09-02 18:47:18.000000000 +0200 ++++ b/src/sprite.h 2019-06-10 11:04:25.229551838 +0200 @@ -19,21 +19,21 @@ class Sprite { public: @@ -404,8 +404,8 @@ uint is not portable, use unsigned int instead. Fixes musl. pos.add(ms, vel); return sc.update(ms); } ---- src/theme.cpp 2019-03-07 15:14:49.000000000 +0100 -+++ src/theme.cpp 2019-06-10 11:04:25.233551886 +0200 +--- a/src/theme.cpp 2019-03-07 15:14:49.000000000 +0100 ++++ b/src/theme.cpp 2019-06-10 11:04:25.233551886 +0200 @@ -22,12 +22,12 @@ extern SDL_Renderer *mrc; /** Load resources and scale if necessary using bricks screen height. @@ -431,8 +431,8 @@ uint is not portable, use unsigned int instead. Fixes musl. if (fileExists(path + "/back0.png") || fileExists(path + "/back0.jpg")) { wpath = path; wbfh = brickFileHeight; ---- src/theme.h 2019-03-07 15:05:53.000000000 +0100 -+++ src/theme.h 2019-06-10 11:04:25.229551838 +0200 +--- a/src/theme.h 2019-03-07 15:05:53.000000000 +0100 ++++ b/src/theme.h 2019-06-10 11:04:25.229551838 +0200 @@ -33,37 +33,37 @@ class Theme { string stdPath; /* path to standard theme for fallbacks */ bool oldTheme; @@ -498,8 +498,8 @@ uint is not portable, use unsigned int instead. Fixes musl. int antialiasing); }; ---- src/tools.cpp 2018-11-04 12:04:17.000000000 +0100 -+++ src/tools.cpp 2019-06-10 11:04:25.233551886 +0200 +--- a/src/tools.cpp 2018-11-04 12:04:17.000000000 +0100 ++++ b/src/tools.cpp 2019-06-10 11:04:25.233551886 +0200 @@ -94,7 +94,7 @@ int FileParser::get(const string& k, int v = stoi(str); return ret; @@ -509,8 +509,8 @@ uint is not portable, use unsigned int instead. Fixes musl. { string str; int ret = get(k,str); ---- src/tools.h 2018-10-31 12:23:22.000000000 +0100 -+++ src/tools.h 2019-06-10 11:04:25.229551838 +0200 +--- a/src/tools.h 2018-10-31 12:23:22.000000000 +0100 ++++ b/src/tools.h 2019-06-10 11:04:25.229551838 +0200 @@ -95,7 +95,7 @@ public: FileParser(const string& fname); int get(const string& k, string &v); @@ -529,8 +529,8 @@ uint is not portable, use unsigned int instead. Fixes musl. SmoothCounter::init(SCT_REPEAT, 0, -0.01 + max, delay); } int get() { return SmoothCounter::get(); } ---- src/view.cpp 2019-03-08 19:13:31.000000000 +0100 -+++ src/view.cpp 2019-06-10 11:04:25.234551898 +0200 +--- a/src/view.cpp 2019-03-08 19:13:31.000000000 +0100 ++++ b/src/view.cpp 2019-06-10 11:04:25.234551898 +0200 @@ -74,7 +74,7 @@ View::View(Config &cfg, ClientGame &_cg) /** (Re)Initialize window, theme and menu. @@ -682,8 +682,8 @@ uint is not portable, use unsigned int instead. Fixes musl. darkenScreen(); ---- src/view.h 2019-03-07 15:44:36.000000000 +0100 -+++ src/view.h 2019-06-10 11:04:25.229551838 +0200 +--- a/src/view.h 2019-03-07 15:44:36.000000000 +0100 ++++ b/src/view.h 2019-06-10 11:04:25.229551838 +0200 @@ -105,7 +105,7 @@ class View { void showHelp(); void createParticles(BrickHit *hit); @@ -710,8 +710,8 @@ uint is not portable, use unsigned int instead. Fixes musl. void run(); void render(); void runMenu(); ---- src/clientgame.cpp.orig 2019-06-10 11:08:55.515756485 +0200 -+++ src/clientgame.cpp 2019-06-10 11:09:17.964021355 +0200 +--- a/src/clientgame.cpp 2019-06-10 11:08:55.515756485 +0200 ++++ b/src/clientgame.cpp 2019-06-10 11:09:17.964021355 +0200 @@ -95,7 +95,7 @@ ClientPlayer *ClientGame::getNextPlayer( if (curPlayer == players.size()) curPlayer = 0; @@ -730,8 +730,8 @@ uint is not portable, use unsigned int instead. Fixes musl. p->setLevelSnapshot(levelset->levels[p->getLevel()]); else { strprintf(msg,_("Congratulations, %s, you cleared all levels!"),p->getName().c_str()); ---- src/clientgame.h.orig 2019-06-10 11:10:30.500877231 +0200 -+++ src/clientgame.h 2019-06-10 11:10:41.972012581 +0200 +--- a/src/clientgame.h 2019-06-10 11:10:30.500877231 +0200 ++++ b/src/clientgame.h 2019-06-10 11:10:41.972012581 +0200 @@ -120,7 +120,7 @@ public: void getCurrentLevelNameAndAuthor(string &name, string &author) { ClientPlayer *p = players[curPlayer].get(); diff --git a/srcpkgs/lbreakouthd/template b/srcpkgs/lbreakouthd/template index c0025345fa..1f9accfb4a 100644 --- a/srcpkgs/lbreakouthd/template +++ b/srcpkgs/lbreakouthd/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://lgames.sourceforge.net/LBreakoutHD/" distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz" checksum=df5f8ad88bcf20bd34e1dfd77697b49a168d83ad43d8fdf5a3fee1fe272e15bd -patch_args=-Np0 diff --git a/srcpkgs/lbzip2/patches/fseterr.patch b/srcpkgs/lbzip2/patches/fseterr.patch index ce2dcc9a81..05784b142f 100644 --- a/srcpkgs/lbzip2/patches/fseterr.patch +++ b/srcpkgs/lbzip2/patches/fseterr.patch @@ -1,7 +1,7 @@ diff --git lib/fseterr.c lib/fseterr.c index 1e212e4..81f51ed 100644 ---- lib/fseterr.c -+++ lib/fseterr.c +--- a/lib/fseterr.c ++++ b/lib/fseterr.c @@ -1,5 +1,5 @@ /* Set the error indicator of a stream. - Copyright (C) 2007-2014 Free Software Foundation, Inc. diff --git a/srcpkgs/lbzip2/template b/srcpkgs/lbzip2/template index 3ac6ff9ec1..c6973fe171 100644 --- a/srcpkgs/lbzip2/template +++ b/srcpkgs/lbzip2/template @@ -9,4 +9,3 @@ license="GPL-3.0-or-later" homepage="http://lbzip2.org/" distfiles="http://archive.lbzip2.org/lbzip2-${version}.tar.gz" checksum=46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9 -patch_args=-Np0 diff --git a/srcpkgs/lcov/patches/fix-undef-behaviour.patch b/srcpkgs/lcov/patches/fix-undef-behaviour.patch index 15d954defc..5af7d2689f 100644 --- a/srcpkgs/lcov/patches/fix-undef-behaviour.patch +++ b/srcpkgs/lcov/patches/fix-undef-behaviour.patch @@ -6,8 +6,8 @@ Last-Updated: 2014-09-13 Index: lcov-1.12/bin/lcov =================================================================== ---- bin/lcov -+++ bin/lcov +--- a/bin/lcov ++++ b/bin/lcov @@ -224,7 +224,9 @@ Getopt::Long::Configure("default"); # Remove spaces around rc options my %new_opt_rc; @@ -21,8 +21,8 @@ Index: lcov-1.12/bin/lcov Index: lcov-1.12/bin/geninfo =================================================================== ---- bin/geninfo -+++ bin/geninfo +--- a/bin/geninfo ++++ b/bin/geninfo @@ -284,8 +284,9 @@ Getopt::Long::Configure("default"); { # Remove spaces around rc options diff --git a/srcpkgs/lcov/patches/handle-equals-signs.patch b/srcpkgs/lcov/patches/handle-equals-signs.patch index 5f4edb8278..b3d75e9f7d 100644 --- a/srcpkgs/lcov/patches/handle-equals-signs.patch +++ b/srcpkgs/lcov/patches/handle-equals-signs.patch @@ -7,8 +7,8 @@ Last-Update: 2013-02-01 Index: lcov-1.12/bin/geninfo =================================================================== ---- bin/geninfo -+++ bin/geninfo +--- a/bin/geninfo ++++ b/bin/geninfo @@ -1771,8 +1771,9 @@ sub read_gcov_file($) $number = (split(" ",substr($_, 0, 16)))[0]; diff --git a/srcpkgs/lcov/template b/srcpkgs/lcov/template index 787296423d..2d23c19f0c 100644 --- a/srcpkgs/lcov/template +++ b/srcpkgs/lcov/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="http://ltp.sourceforge.net/coverage/lcov.php" distfiles="https://github.com/linux-test-project/${pkgname}/archive/v${version}.tar.gz" checksum=d88b0718f59815862785ac379aed56974b9edd8037567347ae70081cd4a3542a -patch_args=-Np0 diff --git a/srcpkgs/ldapvi/patches/Cast-the-trailing-NULL-on-execl-calls.patch b/srcpkgs/ldapvi/patches/Cast-the-trailing-NULL-on-execl-calls.patch index 8539da70e2..80467c017c 100644 --- a/srcpkgs/ldapvi/patches/Cast-the-trailing-NULL-on-execl-calls.patch +++ b/srcpkgs/ldapvi/patches/Cast-the-trailing-NULL-on-execl-calls.patch @@ -17,8 +17,8 @@ Signed-off-by: Anders Kaseorg diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 3b6896e..e9a0d4c 100644 ---- misc.c -+++ misc.c +--- a/misc.c ++++ b/misc.c @@ -172,9 +172,9 @@ edit(char *pathname, long line) if (line > 0) { char buf[20]; diff --git a/srcpkgs/ldapvi/patches/renamed-getline.patch b/srcpkgs/ldapvi/patches/renamed-getline.patch index 73da80bf35..ded2a74f2f 100644 --- a/srcpkgs/ldapvi/patches/renamed-getline.patch +++ b/srcpkgs/ldapvi/patches/renamed-getline.patch @@ -11,8 +11,8 @@ Subject: [PATCH] renamed getline diff --git a/ldapvi/common.h b/ldapvi/common.h index 4c264e8..f731e62 100644 ---- common.h -+++ common.h +--- a/common.h ++++ b/common.h @@ -273,7 +273,7 @@ void pipeview_wait(int pid); char *home_filename(char *name); void read_ldapvi_history(void); @@ -24,8 +24,8 @@ index 4c264e8..f731e62 100644 void *xalloc(size_t size); diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c index 9d7d77c..7b312f8 100644 ---- ldapvi.c -+++ ldapvi.c +--- a/ldapvi.c ++++ b/ldapvi.c @@ -470,7 +470,7 @@ change_mechanism(bind_options *bo) bo->authmethod = LDAP_AUTH_SASL; puts("Switching to SASL authentication."); @@ -37,8 +37,8 @@ index 9d7d77c..7b312f8 100644 static int diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 0a9dba9..3b6896e 100644 ---- misc.c -+++ misc.c +--- a/misc.c ++++ b/misc.c @@ -315,7 +315,7 @@ write_ldapvi_history() } diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 3c5f6bae16..1dda3c2ae6 100644 --- a/srcpkgs/ldapvi/template +++ b/srcpkgs/ldapvi/template @@ -12,7 +12,6 @@ homepage="http://www.lichteblau.com/ldapvi/" short_desc="An interactive LDAP client for Unix terminals" distfiles="http://www.lichteblau.com/download/ldapvi-${version}.tar.gz" checksum=6f62e92d20ff2ac0d06125024a914b8622e5b8a0a0c2d390bf3e7990cbd2e153 -patch_args=-Np0 do_install() { vbin ldapvi diff --git a/srcpkgs/ldb/patches/disable-compile-error-test.patch b/srcpkgs/ldb/patches/disable-compile-error-test.patch index bbb497567f..d5164f6ec5 100644 --- a/srcpkgs/ldb/patches/disable-compile-error-test.patch +++ b/srcpkgs/ldb/patches/disable-compile-error-test.patch @@ -1,5 +1,5 @@ ---- tests/ldb_match_test.c -+++ tests/ldb_match_test.c +--- a/tests/ldb_match_test.c ++++ b/tests/ldb_match_test.c @@ -32,6 +32,8 @@ * This allows test applications to use custom definitions of C standard * library functions and types. diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template index 356615c375..ada2f20522 100644 --- a/srcpkgs/ldb/template +++ b/srcpkgs/ldb/template @@ -19,7 +19,6 @@ license="LGPL-3.0-or-later" homepage="https://www.samba.org/ldb/" distfiles="https://www.samba.org/ftp/pub/ldb/ldb-${version}.tar.gz" checksum=134bb51769709af59f30bf468e454d1377a8096acd4e80dcb42fd264f558bd5f -patch_args=-Np0 # workaround for cmocka's broken uintptr_t definition on musl if [ "$XBPS_TARGET_WORDSIZE" = "64" -a "$XBPS_TARGET_LIBC" = "musl" ]; then diff --git a/srcpkgs/ledger/patches/cmake_wtf.patch b/srcpkgs/ledger/patches/cmake_wtf.patch index 2b71e0bd64..46a6f401d0 100644 --- a/srcpkgs/ledger/patches/cmake_wtf.patch +++ b/srcpkgs/ledger/patches/cmake_wtf.patch @@ -1,5 +1,5 @@ ---- cmake/FindUtfcpp.cmake.old 2016-01-13 19:14:05.737426666 +0100 -+++ cmake/FindUtfcpp.cmake 2016-01-13 19:13:28.952877141 +0100 +--- a/cmake/FindUtfcpp.cmake.old 2016-01-13 19:14:05.737426666 +0100 ++++ b/cmake/FindUtfcpp.cmake 2016-01-13 19:13:28.952877141 +0100 @@ -1,23 +1,8 @@ -# - Try to find utfcpp -# Once done, this will define diff --git a/srcpkgs/ledger/patches/fix-cflags.patch b/srcpkgs/ledger/patches/fix-cflags.patch index 179ab79cd1..f6d3a07bb6 100644 --- a/srcpkgs/ledger/patches/fix-cflags.patch +++ b/srcpkgs/ledger/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -41,7 +41,6 @@ if (BUILD_DEBUG) set(CMAKE_BUILD_TYPE Debug) set(DEBUG_MODE 1) diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template index e1bd5419f0..c94b72709d 100644 --- a/srcpkgs/ledger/template +++ b/srcpkgs/ledger/template @@ -10,7 +10,6 @@ license="BSD-3-Clause" homepage="https://www.ledger-cli.org/" distfiles="https://github.com/ledger/${pkgname}/archive/v${version}.tar.gz" checksum=92bf09bc385b171987f456fe3ee9fa998ed5e40b97b3acdd562b663aa364384a -patch_args=-Np0 post_install() { rm -Rf ${DESTDIR}/usr/local diff --git a/srcpkgs/lfe/patches/no-install-on-build.patch b/srcpkgs/lfe/patches/no-install-on-build.patch index 21161d7791..863aa45ba1 100644 --- a/srcpkgs/lfe/patches/no-install-on-build.patch +++ b/srcpkgs/lfe/patches/no-install-on-build.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2018-01-15 14:49:00.426539554 +0100 -+++ Makefile 2018-01-15 14:49:04.968584026 +0100 +--- a/Makefile 2018-01-15 14:49:00.426539554 +0100 ++++ b/Makefile 2018-01-15 14:49:04.968584026 +0100 @@ -118,7 +118,7 @@ comp_opts.mk: -include comp_opts.mk diff --git a/srcpkgs/lfe/template b/srcpkgs/lfe/template index b57f4ad541..31f33e64ee 100644 --- a/srcpkgs/lfe/template +++ b/srcpkgs/lfe/template @@ -10,7 +10,6 @@ license="Apache-2.0" homepage="http://lfe.io/" distfiles="https://github.com/rvirding/lfe/archive/v${version}.tar.gz" checksum=04634f2c700ecedb55f4369962837792669e6be809dba90d81974198fc2b7b72 -patch_args=-Np0 do_build() { make diff --git a/srcpkgs/liba52/patches/a52dec-0.7.4-build.patch b/srcpkgs/liba52/patches/a52dec-0.7.4-build.patch index 919a72195e..20717ec8a6 100644 --- a/srcpkgs/liba52/patches/a52dec-0.7.4-build.patch +++ b/srcpkgs/liba52/patches/a52dec-0.7.4-build.patch @@ -1,12 +1,12 @@ ---- liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800 -+++ liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800 +--- a/liba52/Makefile.am 2002-01-27 20:36:48.000000000 -0800 ++++ b/liba52/Makefile.am 2004-11-05 01:10:21.317401872 -0800 @@ -1,4 +1,3 @@ -CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@ lib_LTLIBRARIES = liba52.la ---- liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800 -+++ liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800 +--- a/liba52/configure.incl 2002-01-27 20:36:48.000000000 -0800 ++++ b/liba52/configure.incl 2004-11-05 01:11:38.172672216 -0800 @@ -2,7 +2,6 @@ AC_SUBST([LIBA52_LIBS]) @@ -15,8 +15,8 @@ AC_ARG_ENABLE([double], [ --enable-double use double-precision samples]) ---- src/Makefile.am 2002-06-22 18:51:57.000000000 -0700 -+++ src/Makefile.am 2004-11-05 01:10:21.320401375 -0800 +--- a/src/Makefile.am 2002-06-22 18:51:57.000000000 -0700 ++++ b/src/Makefile.am 2004-11-05 01:10:21.320401375 -0800 @@ -1,4 +1,3 @@ -CFLAGS = @A52DEC_CFLAGS@ diff --git a/srcpkgs/liba52/patches/disable-globals-test.patch b/srcpkgs/liba52/patches/disable-globals-test.patch index 3a22a7c260..b81b4e289c 100644 --- a/srcpkgs/liba52/patches/disable-globals-test.patch +++ b/srcpkgs/liba52/patches/disable-globals-test.patch @@ -7,8 +7,8 @@ Author: Sebastian Ramacher Forwarded: not-needed Last-Update: 2017-02-04 ---- test/Makefile.am -+++ test/Makefile.am +--- a/test/Makefile.am ++++ b/test/Makefile.am @@ -3,4 +3,4 @@ compare_SOURCES = compare.c compare_LDADD = -lm diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template index 3c850ca622..f94b04c876 100644 --- a/srcpkgs/liba52/template +++ b/srcpkgs/liba52/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://liba52.sourceforge.net/" distfiles="http://liba52.sourceforge.net/files/a52dec-${version}.tar.gz" checksum=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 -patch_args=-Np0 pre_configure() { ./bootstrap diff --git a/srcpkgs/libabigail/patches/musl.patch b/srcpkgs/libabigail/patches/musl.patch index d7b972bd69..31e184107c 100644 --- a/srcpkgs/libabigail/patches/musl.patch +++ b/srcpkgs/libabigail/patches/musl.patch @@ -1,5 +1,5 @@ ---- include/abg-comparison.h.orig -+++ include/abg-comparison.h +--- a/include/abg-comparison.h ++++ b/include/abg-comparison.h @@ -27,6 +27,7 @@ #include @@ -8,8 +8,8 @@ #include "abg-corpus.h" #include "abg-diff-utils.h" #include "abg-ini.h" ---- src/abg-dwarf-reader.cc.orig -+++ src/abg-dwarf-reader.cc +--- a/src/abg-dwarf-reader.cc ++++ b/src/abg-dwarf-reader.cc @@ -37,6 +37,10 @@ #include #include @@ -21,8 +21,8 @@ #include #include #include ---- tools/abisym.cc.orig -+++ tools/abisym.cc +--- a/tools/abisym.cc ++++ b/tools/abisym.cc @@ -151,10 +151,10 @@ cout << "could not find symbol '" << opts.symbol_name diff --git a/srcpkgs/libabigail/patches/xbps.patch b/srcpkgs/libabigail/patches/xbps.patch index 9019a69456..82857cf28c 100644 --- a/srcpkgs/libabigail/patches/xbps.patch +++ b/srcpkgs/libabigail/patches/xbps.patch @@ -1,7 +1,7 @@ Detect .xbps as tarballs. ---- src/abg-tools-utils.cc.orig -+++ src/abg-tools-utils.cc +--- a/src/abg-tools-utils.cc ++++ b/src/abg-tools-utils.cc @@ -690,7 +690,8 @@ || string_ends_with(file_path, ".tlz") || string_ends_with(file_path, ".tar.Z") diff --git a/srcpkgs/libabigail/template b/srcpkgs/libabigail/template index 03906b43ac..ed30ffd85c 100644 --- a/srcpkgs/libabigail/template +++ b/srcpkgs/libabigail/template @@ -12,7 +12,6 @@ license="LGPL-3.0-or-later" homepage="https://www.sourceware.org/libabigail/" distfiles="http://mirrors.kernel.org/sourceware/${pkgname}/${pkgname}-${version}.tar.gz" checksum=86347c9f0a8666f263fd63f8c3fe4c4f9cb1bdb3ec4260ecbaf117d137e89787 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" musl-fts-devel"; LDFLAGS="-lfts" ;; diff --git a/srcpkgs/libabw/patches/boost.patch b/srcpkgs/libabw/patches/boost.patch index e11e791cfe..59720d3223 100644 --- a/srcpkgs/libabw/patches/boost.patch +++ b/srcpkgs/libabw/patches/boost.patch @@ -10,8 +10,8 @@ Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 5766f39..d12d8e2 100644 ---- src/lib/Makefile.am -+++ src/lib/Makefile.am +--- a/src/lib/Makefile.am ++++ b/src/lib/Makefile.am @@ -26,6 +26,7 @@ generated_files = \ $(top_builddir)/src/lib/tokens.h \ $(top_builddir)/src/lib/tokenhash.h diff --git a/srcpkgs/libabw/template b/srcpkgs/libabw/template index 3e0b95197e..e617508a0b 100644 --- a/srcpkgs/libabw/template +++ b/srcpkgs/libabw/template @@ -11,7 +11,6 @@ distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.t makedepends="librevenge-devel boost-devel libxml2-devel" hostmakedepends="automake libtool pkg-config perl gperf" checksum=e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed -patch_args=-Np0 CXXFLAGS="-Wno-deprecated-copy" diff --git a/srcpkgs/libaccounts-qt5/patches/cross.patch b/srcpkgs/libaccounts-qt5/patches/cross.patch index 61e5c9d054..c3265b7db9 100644 --- a/srcpkgs/libaccounts-qt5/patches/cross.patch +++ b/srcpkgs/libaccounts-qt5/patches/cross.patch @@ -1,5 +1,5 @@ ---- Accounts/AccountsQt5Config.cmake.in 2019-09-18 21:00:34.000000000 +0200 -+++ - 2020-04-26 23:54:46.522721966 +0200 +--- a/Accounts/AccountsQt5Config.cmake.in 2019-09-18 21:00:34.000000000 +0200 ++++ b/Accounts/AccountsQt5Config.cmake.in 2019-09-18 21:00:34.000000000 +0200 @@ -1,5 +1,20 @@ # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt diff --git a/srcpkgs/libaccounts-qt5/template b/srcpkgs/libaccounts-qt5/template index 98e0b0374d..73c98fb72b 100644 --- a/srcpkgs/libaccounts-qt5/template +++ b/srcpkgs/libaccounts-qt5/template @@ -13,7 +13,6 @@ license="LGPL-2.1-only" homepage="https://gitlab.com/accounts-sso/libaccounts-qt" distfiles="${homepage}/repository/archive.tar.gz?ref=VERSION_${version}>${pkgname}-${version}.tar.gz" checksum=286eb02f936853e32e610003a2a332a12524050d226707e7630b6a29bd3bdf66 -patch_args=-Np0 libaccounts-qt5-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libarchive/patches/filter-xz-enable-threads.patch b/srcpkgs/libarchive/patches/filter-xz-enable-threads.patch index 658b4718ab..c237db2697 100644 --- a/srcpkgs/libarchive/patches/filter-xz-enable-threads.patch +++ b/srcpkgs/libarchive/patches/filter-xz-enable-threads.patch @@ -2,8 +2,8 @@ Enable xz multithreaded compression by default. --xtraeme ---- libarchive/archive_write_add_filter_xz.c.orig 2016-05-04 09:49:31.262876338 +0200 -+++ libarchive/archive_write_add_filter_xz.c 2016-05-04 09:50:25.318811601 +0200 +--- a/libarchive/archive_write_add_filter_xz.c 2016-05-04 09:49:31.262876338 +0200 ++++ b/libarchive/archive_write_add_filter_xz.c 2016-05-04 09:50:25.318811601 +0200 @@ -152,7 +152,7 @@ common_setup(struct archive_write_filter } f->data = data; diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index ea4b7e8f63..605cac399d 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -18,7 +18,6 @@ license="BSD-2-Clause" homepage="http://www.libarchive.org/" distfiles="https://github.com/libarchive/libarchive/releases/download/${version}/libarchive-${version}.tar.gz" checksum=9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a -patch_args=-Np0 build_options="acl expat lzo lz4 ssl zstd" build_options_default="acl ssl lz4 zstd" diff --git a/srcpkgs/libatasmart/patches/libatasmart-strpool-cross-flags.patch b/srcpkgs/libatasmart/patches/libatasmart-strpool-cross-flags.patch index 82f7f30b94..89b91cca41 100644 --- a/srcpkgs/libatasmart/patches/libatasmart-strpool-cross-flags.patch +++ b/srcpkgs/libatasmart/patches/libatasmart-strpool-cross-flags.patch @@ -24,8 +24,8 @@ Signed-off-by: Peter Korsgaard diff --git a/strpool/Makefile.am b/strpool/Makefile.am index b041cea..5b335a5 100644 ---- strpool/Makefile.am -+++ strpool/Makefile.am +--- a/strpool/Makefile.am ++++ b/strpool/Makefile.am @@ -17,8 +17,8 @@ # . diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template index b79bd8661a..7714dcbfe3 100644 --- a/srcpkgs/libatasmart/template +++ b/srcpkgs/libatasmart/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="http://0pointer.de/blog/projects/being-smart.html" distfiles="http://0pointer.de/public/$pkgname-$version.tar.xz" checksum=61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libax25/patches/musl.patch b/srcpkgs/libax25/patches/musl.patch index f8143d4079..66f821ccfa 100644 --- a/srcpkgs/libax25/patches/musl.patch +++ b/srcpkgs/libax25/patches/musl.patch @@ -1,5 +1,5 @@ ---- daemon.bak 2016-01-16 20:34:52.682900674 -0600 -+++ daemon.c 2016-01-16 20:34:45.496900167 -0600 +--- a/daemon.bak 2016-01-16 20:34:52.682900674 -0600 ++++ b/daemon.c 2016-01-16 20:34:45.496900167 -0600 @@ -3,6 +3,7 @@ #include #include diff --git a/srcpkgs/libax25/template b/srcpkgs/libax25/template index 868268ce4a..e4de77e6b5 100644 --- a/srcpkgs/libax25/template +++ b/srcpkgs/libax25/template @@ -13,7 +13,6 @@ license="LGPL-2" homepage="http://www.linux-ax25.org/wiki/Libax25" distfiles="http://www.linux-ax25.org/pub/libax25/${wrksrc}.tar.gz" checksum=051bd736c3f3f3b242b3efea91af37f2e8d5afaebb5fe6e1df050bb1f6aeb986 -patch_args=-Np0 libax25-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libbsd/patches/musl.patch b/srcpkgs/libbsd/patches/musl.patch index a82343d83d..fc07cfb6e8 100644 --- a/srcpkgs/libbsd/patches/musl.patch +++ b/srcpkgs/libbsd/patches/musl.patch @@ -2,8 +2,8 @@ Source: maxice8 Upstream: no Reason: fixes compilation ---- src/flopen.c -+++ src/flopen.c +--- a/src/flopen.c ++++ b/src/flopen.c @@ -34,6 +34,7 @@ #include #include diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch index 0c0043d0d5..ada3a923c8 100644 --- a/srcpkgs/libbsd/patches/tests-musl.patch +++ b/srcpkgs/libbsd/patches/tests-musl.patch @@ -1,5 +1,5 @@ ---- test/fpurge.c -+++ test/fpurge.c +--- a/test/fpurge.c ++++ b/test/fpurge.c @@ -29,15 +29,11 @@ int main() diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index 28d3bc6226..aa36c7f4e0 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -10,7 +10,6 @@ license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause" homepage="https://libbsd.freedesktop.org/" distfiles="https://libbsd.freedesktop.org/releases/libbsd-${version}.tar.xz" checksum=ff95cf8184151dacae4247832f8d4ea8800fa127dbd15033ecfe839f285b42a1 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch b/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch index 246ae57982..da9d9e2dfd 100644 --- a/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch +++ b/srcpkgs/libcanberra/patches/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays.patch @@ -11,8 +11,8 @@ Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays: diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c index 67791f0..c1532ab 100644 ---- src/canberra-gtk-module.c -+++ src/canberra-gtk-module.c +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c @@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { guchar *data = NULL; gint ret = -1; @@ -51,8 +51,8 @@ index 67791f0..c1532ab 100644 diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c index 34446f5..08cb668 100644 ---- src/canberra-gtk.c -+++ src/canberra-gtk.c +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c @@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { guchar *data = NULL; gint ret = -1; diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index f853fb7e03..de049b68e0 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -16,7 +16,6 @@ license="LGPL-2.1-or-later" homepage="http://0pointer.de/lennart/projects/libcanberra/" distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-${version}.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-${version}.tar.xz" checksum=c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 -patch_args=-Np0 pre_configure() { autoreconf -if diff --git a/srcpkgs/libcap-ng/patches/pid_t-portability.patch b/srcpkgs/libcap-ng/patches/pid_t-portability.patch index 5fe5280c66..97ddeb2381 100644 --- a/srcpkgs/libcap-ng/patches/pid_t-portability.patch +++ b/srcpkgs/libcap-ng/patches/pid_t-portability.patch @@ -1,7 +1,7 @@ Make this build with musl, uid_t/pid_t are defined in . ---- utils/proc-llist.h.orig 2014-01-11 11:38:42.960868985 +0100 -+++ utils/proc-llist.h 2014-01-11 11:39:01.776988967 +0100 +--- a/utils/proc-llist.h 2014-01-11 11:38:42.960868985 +0100 ++++ b/utils/proc-llist.h 2014-01-11 11:39:01.776988967 +0100 @@ -24,6 +24,7 @@ #ifndef PROC_HEADER #define PROC_HEADER diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template index 7ea192957f..99eab8e614 100644 --- a/srcpkgs/libcap-ng/template +++ b/srcpkgs/libcap-ng/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://people.redhat.com/sgrubb/libcap-ng/" distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz" checksum=52c083b77c2b0d8449dee141f9c3eba76e6d4c5ad44ef05df25891126cb85ae9 -patch_args=-Np0 subpackages="libcap-ng-devel libcap-ng-progs" diff --git a/srcpkgs/libcap/patches/fix-missing-capsh.patch b/srcpkgs/libcap/patches/fix-missing-capsh.patch index 444604c68d..61420bbfb7 100644 --- a/srcpkgs/libcap/patches/fix-missing-capsh.patch +++ b/srcpkgs/libcap/patches/fix-missing-capsh.patch @@ -14,8 +14,8 @@ Signed-off-by: Andrew G. Morgan diff --git a/progs/Makefile b/progs/Makefile index 289186e..2289cf7 100644 ---- progs/Makefile -+++ progs/Makefile +--- a/progs/Makefile ++++ b/progs/Makefile @@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS) install: all diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index cadc03d056..ad68fc72ae 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -15,7 +15,6 @@ homepage="http://sites.google.com/site/fullycapable/" changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap" distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz" checksum=47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-" diff --git a/srcpkgs/libcec/patches/no-fqdn.patch b/srcpkgs/libcec/patches/no-fqdn.patch index 0aeea0b071..69fe1c458c 100644 --- a/srcpkgs/libcec/patches/no-fqdn.patch +++ b/srcpkgs/libcec/patches/no-fqdn.patch @@ -1,7 +1,7 @@ diff --git src/libcec/cmake/SetBuildInfo.cmake src/libcec/cmake/SetBuildInfo.cmake index 3402f9f..b121361 100644 ---- src/libcec/cmake/SetBuildInfo.cmake -+++ src/libcec/cmake/SetBuildInfo.cmake +--- a/src/libcec/cmake/SetBuildInfo.cmake ++++ b/src/libcec/cmake/SetBuildInfo.cmake @@ -40,7 +40,7 @@ else() # add host on which this was built to compile info find_program(HAVE_HOSTNAME_BIN hostname /bin /usr/bin /usr/local/bin) diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index c203167ef9..bf232fb89e 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/Pulse-Eight/libcec" distfiles="https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz" checksum=090696d7a4fb772d7acebbb06f91ab92e025531c7c91824046b9e4e71ecb3377 -patch_args=-Np0 build_options="rpi" diff --git a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch index 0aa1f906ff..bd083c2aad 100644 --- a/srcpkgs/libcgroup/patches/CVE-2018-14348.patch +++ b/srcpkgs/libcgroup/patches/CVE-2018-14348.patch @@ -1,5 +1,5 @@ ---- src/daemon/cgrulesengd.c -+++ src/daemon/cgrulesengd.c +--- a/src/daemon/cgrulesengd.c ++++ b/src/daemon/cgrulesengd.c @@ -889,9 +889,6 @@ } else if (pid > 0) { exit(EXIT_SUCCESS); diff --git a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch index 13be3795df..12ee0eeebc 100644 --- a/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch +++ b/srcpkgs/libcgroup/patches/api.c-fix-infinite-loop.patch @@ -11,8 +11,8 @@ to the next iteration. diff --git a/src/api.c b/src/api.c index d6c9d3a..ef796ac 100644 ---- src/api.c -+++ src/api.c +--- a/src/api.c ++++ b/src/api.c @@ -2775,13 +2775,17 @@ static struct cgroup_rule *cgroup_find_matching_rule_uid_gid(uid_t uid, /* Get the group data. */ sp = &(rule->username[1]); diff --git a/srcpkgs/libcgroup/patches/musl-decls.patch b/srcpkgs/libcgroup/patches/musl-decls.patch index eaebdb8936..eacf4e618d 100644 --- a/srcpkgs/libcgroup/patches/musl-decls.patch +++ b/srcpkgs/libcgroup/patches/musl-decls.patch @@ -1,8 +1,8 @@ In musl libc these macros are defined in the deprecated include file sys/cdefs.h ---- include/libcgroup.h 2014-01-13 15:05:56.000000000 +0100 -+++ include/libcgroup.h 2015-10-25 14:03:32.921207668 +0100 +--- a/include/libcgroup.h 2014-01-13 15:05:56.000000000 +0100 ++++ b/include/libcgroup.h 2015-10-25 14:03:32.921207668 +0100 @@ -16,6 +16,16 @@ #ifndef _LIBCGROUP_H #define _LIBCGROUP_H diff --git a/srcpkgs/libcgroup/patches/musl-strerror_r.patch b/srcpkgs/libcgroup/patches/musl-strerror_r.patch index eac640ba99..0f54e12b05 100644 --- a/srcpkgs/libcgroup/patches/musl-strerror_r.patch +++ b/srcpkgs/libcgroup/patches/musl-strerror_r.patch @@ -1,8 +1,8 @@ The musl libc strerror_r(3) semantics are different from GNU libc's if _GNU_SOURCE is defined. ---- src/api.c 2014-01-13 15:05:56.000000000 +0100 -+++ src/api.c 2015-10-25 14:09:18.690232596 +0100 +--- a/src/api.c 2014-01-13 15:05:56.000000000 +0100 ++++ b/src/api.c 2015-10-25 14:09:18.690232596 +0100 @@ -3332,8 +3332,16 @@ const char *cgroup_strerror(int code) diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template index 13b1318383..c9c19120e5 100644 --- a/srcpkgs/libcgroup/template +++ b/srcpkgs/libcgroup/template @@ -12,7 +12,6 @@ license="LGPL-2.1" homepage="http://libcg.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/libcg/${pkgname}-${version}.tar.bz2" checksum=e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) # Add musl-fts implementation diff --git a/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch index c82cf90056..cb03051e91 100644 --- a/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch +++ b/srcpkgs/libcmis/patches/no-include-cxx-headers-from-extern-c.patch @@ -1,7 +1,7 @@ FTBFS: /usr/include/c++/9.2/memory:146:1: error: template with C linkage ---- inc/libcmis-c/repository.h -+++ inc/libcmis-c/repository.h +--- a/inc/libcmis-c/repository.h ++++ b/inc/libcmis-c/repository.h @@ -28,12 +28,12 @@ #ifndef _REPOSITORY_H_ #define _REPOSITORY_H_ diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template index 9e2aa91195..fac133d5e4 100644 --- a/srcpkgs/libcmis/template +++ b/srcpkgs/libcmis/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1" homepage="https://github.com/tdf/libcmis" distfiles="https://github.com/tdf/libcmis/releases/download/v${version}/libcmis-${version}.tar.gz" checksum=ed6f681a48abbf3c2324564b17a180d21fa9503230e8708825e1ad80daee4f81 -patch_args=-Np0 CXXFLAGS="-Wno-deprecated" diff --git a/srcpkgs/libcprops/patches/musl.patch b/srcpkgs/libcprops/patches/musl.patch index 0ff6e0fb20..cf662f663f 100644 --- a/srcpkgs/libcprops/patches/musl.patch +++ b/srcpkgs/libcprops/patches/musl.patch @@ -1,5 +1,5 @@ ---- util.c.orig 2012-01-13 23:25:58.000000000 +0100 -+++ util.c 2018-05-26 20:14:12.290726591 +0200 +--- a/util.c 2012-01-13 23:25:58.000000000 +0100 ++++ b/util.c 2018-05-26 20:14:12.290726591 +0200 @@ -386,7 +386,7 @@ msg = "Invalid back reference to a subexpression."; break; diff --git a/srcpkgs/libcprops/template b/srcpkgs/libcprops/template index 2dc95f4e8a..3460841477 100644 --- a/srcpkgs/libcprops/template +++ b/srcpkgs/libcprops/template @@ -12,7 +12,6 @@ license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/cprops/${pkgname}-${version}.tar.bz2" checksum=3737772d2718a2c550adf4ca92cc492e613aa9200aae2bbaaf128d90f4ef67f2 nocross="autotools TRY_RUN checking for PTHREAD_MUTEX_RECURSIVE" -patch_args=-Np0 libcprops-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libdaemon/patches/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch b/srcpkgs/libdaemon/patches/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch index 27e544033a..c2ebc78046 100644 --- a/srcpkgs/libdaemon/patches/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch +++ b/srcpkgs/libdaemon/patches/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch @@ -3,8 +3,8 @@ instead of . This removes an error when building libdaemon against the musl C library. Signed-off-by: Jörg Krause ---- examples/testd.c 2014-08-30 00:27:08.359832977 +0200 -+++ examples/testd.c 2014-08-30 00:27:25.439832670 +0200 +--- a/examples/testd.c 2014-08-30 00:27:08.359832977 +0200 ++++ b/examples/testd.c 2014-08-30 00:27:25.439832670 +0200 @@ -23,7 +23,7 @@ #include #include diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template index 6d2bf53640..07fe35eaee 100644 --- a/srcpkgs/libdaemon/template +++ b/srcpkgs/libdaemon/template @@ -10,7 +10,6 @@ license="LGPL-2.1-or-later" homepage="http://0pointer.de/lennart/projects/$pkgname" distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libdaemon/libdaemon-${version}.tar.gz/509dc27107c21bcd9fbf2f95f5669563/libdaemon-${version}.tar.gz" checksum=fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 -patch_args=-Np0 libdaemon-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libdbus-c++/patches/cross-tools.patch b/srcpkgs/libdbus-c++/patches/cross-tools.patch index 818a6af45b..bfaa4b614d 100644 --- a/srcpkgs/libdbus-c++/patches/cross-tools.patch +++ b/srcpkgs/libdbus-c++/patches/cross-tools.patch @@ -1,5 +1,5 @@ ---- tools/Makefile.am 2018-03-18 17:20:02.221259868 +0100 -+++ tools/Makefile.am 2018-03-18 17:19:53.192259402 +0100 +--- a/tools/Makefile.am 2018-03-18 17:20:02.221259868 +0100 ++++ b/tools/Makefile.am 2018-03-18 17:19:53.192259402 +0100 @@ -1,6 +1,9 @@ # hacky, but ... diff --git a/srcpkgs/libdbus-c++/template b/srcpkgs/libdbus-c++/template index 91724cfdee..29b4a10986 100644 --- a/srcpkgs/libdbus-c++/template +++ b/srcpkgs/libdbus-c++/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" homepage="http://dbus-cplusplus.sourceforge.net/" distfiles="https://github.com/pkgw/dbus-cplusplus/releases/download/v${version}/libdbus-c---${version}.tar.gz" checksum=4f140668f2529ecbdce99afbb89f8a977aa47a36248d5f4943b3660316752ee8 -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" libdbus-c++-devel dbus-devel glib-devel" diff --git a/srcpkgs/libdill/patches/gcc9.patch b/srcpkgs/libdill/patches/gcc9.patch index fa3acac8fc..0690f10035 100644 --- a/srcpkgs/libdill/patches/gcc9.patch +++ b/srcpkgs/libdill/patches/gcc9.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix compilation for gcc 9.1.0 diff --git a/dns/dns.h b/dns/dns.h index 7eb3e7d6..dc88ab51 100644 ---- dns/dns.h -+++ dns/dns.h +--- a/dns/dns.h ++++ b/dns/dns.h @@ -496,7 +496,7 @@ size_t dns_rr_print(void *, size_t, struct dns_rr *, struct dns_packet *, int *) diff --git a/srcpkgs/libdill/template b/srcpkgs/libdill/template index 38ba343f1e..c641f17afb 100644 --- a/srcpkgs/libdill/template +++ b/srcpkgs/libdill/template @@ -10,7 +10,6 @@ license="MIT" homepage="http://libdill.org/" distfiles="https://github.com/sustrik/libdill/archive/${version}.tar.gz" checksum=ebba0e5b433ec123b74a57d49b89dfa673aa258e03e6a452959e556b4c4529b9 -patch_args=-Np0 pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" diff --git a/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch b/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch index a1ac62e882..3a8022e37e 100644 --- a/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch +++ b/srcpkgs/libdrm/patches/dont-build-noveau-tests.patch @@ -1,5 +1,5 @@ ---- tests/meson.build -+++ tests/meson.build +--- a/tests/meson.build ++++ b/tests/meson.build @@ -44,9 +44,9 @@ endif if with_etnaviv subdir('etnaviv') diff --git a/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch index 9df4a09b81..ca29ea7d95 100644 --- a/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch +++ b/srcpkgs/libdrm/patches/revert_set_fb_modifiers_flag.patch @@ -1,6 +1,6 @@ https://gitlab.freedesktop.org/mesa/drm/-/commit/40f73d0b0b3936ccadc693edc25aad70c1225766 ---- xf86drmMode.c 2021-04-07 16:54:11.000000000 +0300 -+++ xf86drmMode.c 2021-04-23 08:16:18.037479830 +0300 +--- a/xf86drmMode.c 2021-04-07 16:54:11.000000000 +0300 ++++ b/xf86drmMode.c 2021-04-23 08:16:18.037479830 +0300 @@ -292,2 +292 @@ drm_public int drmModeAddFB2WithModifier - if (modifier) { - f.flags |= DRM_MODE_FB_MODIFIERS; diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 21988cf5fc..ef96bcf5d1 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://dri.freedesktop.org/" distfiles="https://gitlab.freedesktop.org/mesa/drm/-/archive/libdrm-${version}/drm-libdrm-${version}.tar.gz" checksum=0ba5017cafd4b7ac885356403c20105d40efcd11271ebf75727c1a5599e4ed53 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in aarch64*) configure_args+=" -Dvc4=true";; diff --git a/srcpkgs/libeatmydata/patches/musl.patch b/srcpkgs/libeatmydata/patches/musl.patch index 801dbb9b65..5c71630196 100644 --- a/srcpkgs/libeatmydata/patches/musl.patch +++ b/srcpkgs/libeatmydata/patches/musl.patch @@ -2,8 +2,8 @@ In musl open64 is by default a #define to open. However, it provides compat symbols and we want this to explicitly use those. ---- libeatmydata/libeatmydata.c -+++ libeatmydata/libeatmydata.c +--- a/libeatmydata/libeatmydata.c ++++ b/libeatmydata/libeatmydata.c @@ -27,6 +27,11 @@ #include #include diff --git a/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch b/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch index 6f988b4a48..21dcb2e377 100644 --- a/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch +++ b/srcpkgs/libeatmydata/patches/remove-debian-specific-command.patch @@ -12,8 +12,8 @@ Signed-off-by: Stewart Smith diff --git eatmydata.in eatmydata.in index 40468db..e37f07c 100644 ---- eatmydata.in -+++ eatmydata.in +--- a/eatmydata.in ++++ b/eatmydata.in @@ -15,9 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . diff --git a/srcpkgs/libeatmydata/template b/srcpkgs/libeatmydata/template index 7470acc97f..3334ca236d 100644 --- a/srcpkgs/libeatmydata/template +++ b/srcpkgs/libeatmydata/template @@ -9,4 +9,3 @@ license="GPL-3.0-only" homepage="http://www.flamingspork.com/projects/libeatmydata/" distfiles="http://www.flamingspork.com/projects/libeatmydata/${pkgname}-${version}.tar.gz" checksum=bdd2d068b6b27cf47cd22aa4c5da43b3d4a05944cfe0ad1b0d843d360ed3a8dd -patch_args=-Np0 diff --git a/srcpkgs/libesmtp/patches/openssl.patch b/srcpkgs/libesmtp/patches/openssl.patch index 9244e39005..04214d21cc 100644 --- a/srcpkgs/libesmtp/patches/openssl.patch +++ b/srcpkgs/libesmtp/patches/openssl.patch @@ -1,5 +1,5 @@ ---- configure 2021-02-13 22:19:40.127583919 +0100 -+++ - 2021-02-13 22:25:30.535900276 +0100 +--- a/configure 2021-02-13 22:19:40.127583919 +0100 ++++ b/configure 2021-02-13 22:19:40.127583919 +0100 @@ -11896,9 +11896,9 @@ fi diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index 0b88cd4b50..6719b02479 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -12,7 +12,6 @@ homepage="http://brianstafford.info/libesmtp/" distfiles="https://sources.voidlinux.org/libesmtp-1.0.6/libesmtp-1.0.6.tar.bz2" #distfiles="http://brianstafford.info/libesmtp/libesmtp-${version}.tar.bz2" checksum=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b -patch_args=-Np0 libesmtp-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libetpan/patches/fix-musl.patch b/srcpkgs/libetpan/patches/fix-musl.patch index f6d18d7718..2571bab76f 100644 --- a/srcpkgs/libetpan/patches/fix-musl.patch +++ b/srcpkgs/libetpan/patches/fix-musl.patch @@ -19,8 +19,8 @@ clientid.c:66:38: diff --git a/src/low-level/imap/clientid.c b/src/low-level/imap/clientid.c index 1c34637..f28b616 100644 ---- src/low-level/imap/clientid.c -+++ src/low-level/imap/clientid.c +--- a/src/low-level/imap/clientid.c ++++ b/src/low-level/imap/clientid.c @@ -33,6 +33,8 @@ # include #endif diff --git a/srcpkgs/libetpan/patches/multilib.patch b/srcpkgs/libetpan/patches/multilib.patch index 0942bf70b4..75e18f7eeb 100644 --- a/srcpkgs/libetpan/patches/multilib.patch +++ b/srcpkgs/libetpan/patches/multilib.patch @@ -1,5 +1,5 @@ ---- libetpan-config.in.orig 2015-03-29 14:26:51.317434432 +0200 -+++ libetpan-config.in 2015-03-29 14:34:29.172407320 +0200 +--- a/libetpan-config.in 2015-03-29 14:26:51.317434432 +0200 ++++ b/libetpan-config.in 2015-03-29 14:34:29.172407320 +0200 @@ -47,8 +47,7 @@ echo $includedir ;; diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template index 9363e7ae26..fb6c96eb33 100644 --- a/srcpkgs/libetpan/template +++ b/srcpkgs/libetpan/template @@ -14,7 +14,6 @@ license="BSD-3-Clause" homepage="http://www.etpan.org/libetpan.html" distfiles="https://github.com/dinhviethoa/libetpan/archive/${version}.tar.gz" checksum=591f97d5102f600e668502fe1dd5a341e910a840d8ea62e689a3a79d8bfbac87 -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libevdevPlus/patches/time64.patch b/srcpkgs/libevdevPlus/patches/time64.patch index b0a0888e32..c8428ead1c 100644 --- a/srcpkgs/libevdevPlus/patches/time64.patch +++ b/srcpkgs/libevdevPlus/patches/time64.patch @@ -1,5 +1,5 @@ ---- InputEvent.hpp 2020-02-11 17:02:44.000000000 +0100 -+++ InputEvent.hpp 2020-12-11 16:56:14.324990733 +0100 +--- a/InputEvent.hpp 2020-02-11 17:02:44.000000000 +0100 ++++ b/InputEvent.hpp 2020-12-11 16:56:14.324990733 +0100 @@ -20,7 +20,7 @@ public: input_event event{}; diff --git a/srcpkgs/libevdevPlus/template b/srcpkgs/libevdevPlus/template index dec92cb4bf..cf693a6e77 100644 --- a/srcpkgs/libevdevPlus/template +++ b/srcpkgs/libevdevPlus/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://github.com/YukiWorkshop/libevdevPlus" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=c941b6b45f784c1e6c6f316f59256fabd604ac392db405cf7fd99de2686aaab0 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/libexecinfo/patches/01-execinfo.patch b/srcpkgs/libexecinfo/patches/01-execinfo.patch index d44280ae5b..da91ba0fe3 100644 --- a/srcpkgs/libexecinfo/patches/01-execinfo.patch +++ b/srcpkgs/libexecinfo/patches/01-execinfo.patch @@ -1,5 +1,5 @@ ---- execinfo.c.orig -+++ execinfo.c +--- a/execinfo.c ++++ b/execinfo.c @@ -69,7 +69,8 @@ char ** backtrace_symbols(void *const *buffer, int size) diff --git a/srcpkgs/libexecinfo/patches/02-makefile.patch b/srcpkgs/libexecinfo/patches/02-makefile.patch index 887ac6f909..24efcfc2dc 100644 --- a/srcpkgs/libexecinfo/patches/02-makefile.patch +++ b/srcpkgs/libexecinfo/patches/02-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -23,24 +23,25 @@ # SUCH DAMAGE. # diff --git a/srcpkgs/libexecinfo/patches/03-define-gnu-source.patch b/srcpkgs/libexecinfo/patches/03-define-gnu-source.patch index 0ba1fc1f7e..ac18f6eeb1 100644 --- a/srcpkgs/libexecinfo/patches/03-define-gnu-source.patch +++ b/srcpkgs/libexecinfo/patches/03-define-gnu-source.patch @@ -1,5 +1,5 @@ ---- execinfo.c.orig -+++ execinfo.c +--- a/execinfo.c ++++ b/execinfo.c @@ -26,6 +26,7 @@ * $Id: execinfo.c,v 1.3 2004/07/19 05:21:09 sobomax Exp $ */ @@ -8,15 +8,15 @@ #include #include #include ---- stacktraverse.c.orig -+++ stacktraverse.c +--- a/stacktraverse.c ++++ b/stacktraverse.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include #include "stacktraverse.h" ---- test.c.orig -+++ test.c +--- a/test.c ++++ b/test.c @@ -1,3 +1,4 @@ +#define _GNU_SOURCE #include diff --git a/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch b/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch index 041f4cae18..679e52e587 100644 --- a/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch +++ b/srcpkgs/libexecinfo/patches/libexecinfo_pc.patch @@ -12,7 +12,7 @@ diff --git a/libexecinfo.pc b/libexecinfo.pc new file mode 100644 index 0000000..dc61a97 --- /dev/null -+++ libexecinfo.pc ++++ b/libexecinfo.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} diff --git a/srcpkgs/libexecinfo/template b/srcpkgs/libexecinfo/template index 5fe7d6fa72..dde5820695 100644 --- a/srcpkgs/libexecinfo/template +++ b/srcpkgs/libexecinfo/template @@ -10,7 +10,6 @@ license="BSD-2-Clause" homepage="http://www.freshports.org/devel/libexecinfo" distfiles="http://distcache.freebsd.org/local-distfiles/itetcu/libexecinfo-${version}.tar.bz2" checksum=c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f -patch_args=-Np0 do_install() { vsed -e "/Version:/s@version@${version}@" -i libexecinfo.pc diff --git a/srcpkgs/libfetch/patches/soname.patch b/srcpkgs/libfetch/patches/soname.patch index 68e8008099..978035c878 100644 --- a/srcpkgs/libfetch/patches/soname.patch +++ b/srcpkgs/libfetch/patches/soname.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-02-16 10:55:42.669519299 +0100 -+++ Makefile 2015-02-16 10:58:21.278068828 +0100 +--- a/Makefile 2015-02-16 10:55:42.669519299 +0100 ++++ b/Makefile 2015-02-16 10:58:21.278068828 +0100 @@ -1,5 +1,7 @@ prefix = /usr DESTDIR = diff --git a/srcpkgs/libfetch/patches/use-ssl-pending.patch b/srcpkgs/libfetch/patches/use-ssl-pending.patch index 458f1d3812..2593a3b1b3 100644 --- a/srcpkgs/libfetch/patches/use-ssl-pending.patch +++ b/srcpkgs/libfetch/patches/use-ssl-pending.patch @@ -3,8 +3,8 @@ might happen due to OpenSSL buffering. Use SSL_pending(3) to make sure SSL_read(3) sucks in last buffered bytes. ---- common.c.orig 2013-01-13 17:12:06.434631196 +0100 -+++ common.c 2013-01-13 17:12:36.185921621 +0100 +--- a/common.c 2013-01-13 17:12:06.434631196 +0100 ++++ b/common.c 2013-01-13 17:12:36.185921621 +0100 @@ -529,6 +529,10 @@ fetch_read(conn_t *conn, char *buf, size fetch_syserr(); return (-1); diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index dc3eaad7a7..5522f74d61 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -10,7 +10,6 @@ license="BSD-3-Clause" homepage="https://www.NetBSD.org" distfiles="https://alpha.de.repo.voidlinux.org/distfiles/libfetch-${version}.tar.xz" checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722 -patch_args=-Np0 do_build() { make CC=$CC diff --git a/srcpkgs/libffado/patches/cross-build.patch b/srcpkgs/libffado/patches/cross-build.patch index 15aaee8b49..a666139470 100644 --- a/srcpkgs/libffado/patches/cross-build.patch +++ b/srcpkgs/libffado/patches/cross-build.patch @@ -1,5 +1,5 @@ ---- support/tools/SConscript.orig -+++ support/tools/SConscript +--- a/support/tools/SConscript ++++ b/support/tools/SConscript @@ -40,12 +40,12 @@ else: e.PrependUnique( LIBS=["expat"] ) @@ -15,8 +15,8 @@ if env['ENABLE_DICE']: e.Program( target = "ffado-set-nickname", source = "ffado-set-nickname.cpp" ) ---- SConstruct.orig -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -254,13 +254,6 @@ env['REQUIRE_LIBAVC']=0 @@ -31,8 +31,8 @@ # Check for pkg-config before using pkg-config to check for other dependencies. if not conf.CheckForPKGConfig(): print("\nThe program 'pkg-config' could not be found.\nEither you have to install the corresponding package first or make sure that PATH points to the right directions.") ---- SConstruct.orig -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -537,7 +537,7 @@ env.Alias( "install", env['libdir'] ) env.Alias( "install", env['includedir'] ) @@ -42,8 +42,8 @@ env.Alias( "install", env['bindir'] ) env.Alias( "install", env['mandir'] ) if env['BUILD_MIXER'] == 'true': ---- SConstruct.orig -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -395,12 +395,7 @@ # PyQT checks diff --git a/srcpkgs/libffado/patches/musl-sigval_t.patch b/srcpkgs/libffado/patches/musl-sigval_t.patch index 12068ca57b..7a626cf68a 100644 --- a/srcpkgs/libffado/patches/musl-sigval_t.patch +++ b/srcpkgs/libffado/patches/musl-sigval_t.patch @@ -1,7 +1,7 @@ diff --git src/libutil/PosixMessageQueue.h src/libutil/PosixMessageQueue.h index 05da300..c331c70 100644 ---- src/libutil/PosixMessageQueue.h -+++ src/libutil/PosixMessageQueue.h +--- a/src/libutil/PosixMessageQueue.h ++++ b/src/libutil/PosixMessageQueue.h @@ -115,7 +115,7 @@ public: private: diff --git a/srcpkgs/libffado/patches/musl-stdint_h.patch b/srcpkgs/libffado/patches/musl-stdint_h.patch index 1f47f23f49..62a707164e 100644 --- a/srcpkgs/libffado/patches/musl-stdint_h.patch +++ b/srcpkgs/libffado/patches/musl-stdint_h.patch @@ -1,7 +1,7 @@ Need to explicitly include stdint.h for musl libc. ---- libffado/ffado.h.in 2016-10-03 18:42:35.335302853 +0200 -+++ libffado/ffado.h.in 2016-10-03 18:43:56.999358778 +0200 +--- a/libffado/ffado.h.in 2016-10-03 18:42:35.335302853 +0200 ++++ b/libffado/ffado.h.in 2016-10-03 18:43:56.999358778 +0200 @@ -31,6 +31,7 @@ #define FFADO_MAX_NAME_LEN 256 diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 837d5443d9..cadd335b30 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -20,7 +20,6 @@ license="GPL-2.0-only, GPL-3.0-only" homepage="http://www.ffado.org" distfiles="http://www.ffado.org/files/libffado-${version}.tgz" checksum=a47178cdc8c0c91e91edbaabe23d19ca12a752cbcf81c27314adb27cc00d60f0 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" ;; diff --git a/srcpkgs/libffi/patches/libffi-race-condition.patch b/srcpkgs/libffi/patches/libffi-race-condition.patch index 4d401ebcff..3e3c98226a 100644 --- a/srcpkgs/libffi/patches/libffi-race-condition.patch +++ b/srcpkgs/libffi/patches/libffi-race-condition.patch @@ -12,8 +12,8 @@ Subject: [PATCH 1/2] dlmmap_locked always needs locking as it always modifies src/closures.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) ---- src/closures.c -+++ src/closures.c +--- a/src/closures.c ++++ b/src/closures.c @@ -568,16 +568,11 @@ MREMAP_DUP and prot at this point. */ } diff --git a/srcpkgs/libffi/patches/mips-soft-float.patch b/srcpkgs/libffi/patches/mips-soft-float.patch index 10dcb3f3f9..6697920c8d 100644 --- a/srcpkgs/libffi/patches/mips-soft-float.patch +++ b/srcpkgs/libffi/patches/mips-soft-float.patch @@ -1,5 +1,5 @@ ---- src/mips/o32.S 2019-10-31 15:49:54.000000000 +0100 -+++ src/mips/o32.S 2020-03-24 19:38:35.794316204 +0100 +--- a/src/mips/o32.S 2019-10-31 15:49:54.000000000 +0100 ++++ b/src/mips/o32.S 2020-03-24 19:38:35.794316204 +0100 @@ -281,10 +281,11 @@ li $13, 1 # FFI_O32 diff --git a/srcpkgs/libffi/patches/mips.sgidefs_h.patch b/srcpkgs/libffi/patches/mips.sgidefs_h.patch index b6324c8665..fbc4e238aa 100644 --- a/srcpkgs/libffi/patches/mips.sgidefs_h.patch +++ b/srcpkgs/libffi/patches/mips.sgidefs_h.patch @@ -1,5 +1,5 @@ ---- src/mips/ffitarget.h 2014-11-08 13:47:24.000000000 +0100 -+++ src/mips/ffitarget.h 2017-11-09 16:51:11.866848444 +0100 +--- a/src/mips/ffitarget.h 2014-11-08 13:47:24.000000000 +0100 ++++ b/src/mips/ffitarget.h 2017-11-09 16:51:11.866848444 +0100 @@ -42,7 +42,7 @@ #define _MIPS_SIM_NABI32 2 #define _MIPS_SIM_ABI64 3 diff --git a/srcpkgs/libffi/patches/no-toolexeclibdir.patch b/srcpkgs/libffi/patches/no-toolexeclibdir.patch index 7655af69a1..dccfc81111 100644 --- a/srcpkgs/libffi/patches/no-toolexeclibdir.patch +++ b/srcpkgs/libffi/patches/no-toolexeclibdir.patch @@ -1,5 +1,5 @@ ---- libffi.pc.in -+++ libffi.pc.in +--- a/libffi.pc.in ++++ b/libffi.pc.in @@ -1,11 +1,10 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/srcpkgs/libffi/patches/powerpc-fix-2.patch b/srcpkgs/libffi/patches/powerpc-fix-2.patch index 060fdb878f..300d958ddf 100644 --- a/srcpkgs/libffi/patches/powerpc-fix-2.patch +++ b/srcpkgs/libffi/patches/powerpc-fix-2.patch @@ -12,8 +12,8 @@ Fixes #536 diff --git a/src/powerpc/sysv.S b/src/powerpc/sysv.S index 1474ce70..df977342 100644 ---- src/powerpc/sysv.S -+++ src/powerpc/sysv.S +--- a/src/powerpc/sysv.S ++++ b/src/powerpc/sysv.S @@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV) bctrl diff --git a/srcpkgs/libffi/patches/powerpc-fix.patch b/srcpkgs/libffi/patches/powerpc-fix.patch index 108cfb1cb1..4e8383f968 100644 --- a/srcpkgs/libffi/patches/powerpc-fix.patch +++ b/srcpkgs/libffi/patches/powerpc-fix.patch @@ -1,7 +1,7 @@ diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h index 5ee2a70..8e2f2f0 100644 ---- src/powerpc/ffi_powerpc.h -+++ src/powerpc/ffi_powerpc.h +--- a/src/powerpc/ffi_powerpc.h ++++ b/src/powerpc/ffi_powerpc.h @@ -62,7 +62,7 @@ typedef _Float128 float128; #elif defined(__FLOAT128__) typedef __float128 float128; diff --git a/srcpkgs/libffi/patches/powerpc64-fix-2.patch b/srcpkgs/libffi/patches/powerpc64-fix-2.patch index 1eb5f33b3a..9c21e29c83 100644 --- a/srcpkgs/libffi/patches/powerpc64-fix-2.patch +++ b/srcpkgs/libffi/patches/powerpc64-fix-2.patch @@ -1,7 +1,7 @@ diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c index 7364770..4d50878 100644 ---- src/powerpc/ffi_linux64.c -+++ src/powerpc/ffi_linux64.c +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c @@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) { if (vecarg_count < NUM_VEC_ARG_REGISTERS64 diff --git a/srcpkgs/libffi/patches/powerpc64-fix.patch b/srcpkgs/libffi/patches/powerpc64-fix.patch index 20bfa7f733..10d7066e6f 100644 --- a/srcpkgs/libffi/patches/powerpc64-fix.patch +++ b/srcpkgs/libffi/patches/powerpc64-fix.patch @@ -1,7 +1,7 @@ diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c index de0d033..7364770 100644 ---- src/powerpc/ffi_linux64.c -+++ src/powerpc/ffi_linux64.c +--- a/src/powerpc/ffi_linux64.c ++++ b/src/powerpc/ffi_linux64.c @@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) if (next_arg.ul == gpr_end.ul) next_arg.ul = rest.ul; diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template index 13469f65f5..d79ef2afe2 100644 --- a/srcpkgs/libffi/template +++ b/srcpkgs/libffi/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://sourceware.org/libffi" distfiles="ftp://sourceware.org/pub/$pkgname/$pkgname-$version.tar.gz" checksum=72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch index 3784ccba86..0f90c77091 100644 --- a/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch +++ b/srcpkgs/libfprint/patches/fix-stderr-redefinition.patch @@ -1,5 +1,5 @@ ---- libfprint/nbis/include/bozorth.h.orig 2019-08-11 15:17:26.878344708 +0200 -+++ libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 +--- a/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:26.878344708 +0200 ++++ b/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 @@ -218,7 +218,9 @@ struct xytq_struct { /* Globals supporting command line options */ extern int verbose_threshold; diff --git a/srcpkgs/libfprint/template b/srcpkgs/libfprint/template index eef79d8277..9f32d0bea0 100644 --- a/srcpkgs/libfprint/template +++ b/srcpkgs/libfprint/template @@ -17,7 +17,6 @@ homepage="http://www.freedesktop.org/wiki/Software/fprint/" changelog="https://gitlab.freedesktop.org/libfprint/libfprint/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/v$version/libfprint-v$version.tar.bz2" checksum=d11acf183820812fd6a8cd808d58bbf197554bcc0f9119d4c873092ecd94ee29 -patch_args=-Np0 libfprint-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch index 3784ccba86..0f90c77091 100644 --- a/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch +++ b/srcpkgs/libfprint0/patches/fix-stderr-redefinition.patch @@ -1,5 +1,5 @@ ---- libfprint/nbis/include/bozorth.h.orig 2019-08-11 15:17:26.878344708 +0200 -+++ libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 +--- a/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:26.878344708 +0200 ++++ b/libfprint/nbis/include/bozorth.h 2019-08-11 15:17:10.303132150 +0200 @@ -218,7 +218,9 @@ struct xytq_struct { /* Globals supporting command line options */ extern int verbose_threshold; diff --git a/srcpkgs/libfprint0/template b/srcpkgs/libfprint0/template index 9f12b576fe..2d31deb97f 100644 --- a/srcpkgs/libfprint0/template +++ b/srcpkgs/libfprint0/template @@ -17,7 +17,6 @@ distfiles="https://gitlab.freedesktop.org/libfprint/libfprint/-/archive/V_${vers checksum=22777a1d202ef912395b94842ae6b531338c8d48a8a813616e846b1bc96c5ad9 provides="libfprint-${version}_${revision}" replaces="libfprint<=${version}_1" -patch_args=-Np0 post_install() { vmkdir usr/lib/udev/rules.d diff --git a/srcpkgs/libfreehand/patches/remove-extra-parens.patch b/srcpkgs/libfreehand/patches/remove-extra-parens.patch index 7099008aef..096fed7b17 100644 --- a/srcpkgs/libfreehand/patches/remove-extra-parens.patch +++ b/srcpkgs/libfreehand/patches/remove-extra-parens.patch @@ -1,5 +1,5 @@ ---- src/lib/FHCollector.cpp 2017-09-16 12:28:50.000000000 +0200 -+++ src/lib/FHCollector.cpp 2018-08-09 11:05:32.164697936 +0200 +--- a/src/lib/FHCollector.cpp 2017-09-16 12:28:50.000000000 +0200 ++++ b/src/lib/FHCollector.cpp 2018-08-09 11:05:32.164697936 +0200 @@ -1907,7 +1907,7 @@ textObjectProps.insert("svg:width", width); for (int i=0; i<4; ++i) // osnola: let assume that there is no padding diff --git a/srcpkgs/libfreehand/patches/umachine.patch b/srcpkgs/libfreehand/patches/umachine.patch index 61ab987df6..cd65b911b4 100644 --- a/srcpkgs/libfreehand/patches/umachine.patch +++ b/srcpkgs/libfreehand/patches/umachine.patch @@ -1,5 +1,5 @@ ---- src/lib/libfreehand_utils.cpp 2017-09-16 12:28:50.000000000 +0200 -+++ src/lib/libfreehand_utils.cpp 2020-06-27 12:18:04.687184906 +0200 +--- a/src/lib/libfreehand_utils.cpp 2017-09-16 12:28:50.000000000 +0200 ++++ b/src/lib/libfreehand_utils.cpp 2020-06-27 12:18:04.687184906 +0200 @@ -10,6 +10,8 @@ #include #include diff --git a/srcpkgs/libfreehand/template b/srcpkgs/libfreehand/template index c94cd8c453..10282b4bd0 100644 --- a/srcpkgs/libfreehand/template +++ b/srcpkgs/libfreehand/template @@ -11,7 +11,6 @@ license="MPL-2.0" homepage="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand" distfiles="http://dev-www.libreoffice.org/src/${pkgname}/${pkgname}-${version}.tar.xz" checksum=0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac -patch_args=-Np0 CXXFLAGS="-Wno-deprecated-copy" diff --git a/srcpkgs/libgadu/patches/musl-sys_types.h.diff b/srcpkgs/libgadu/patches/musl-sys_types.h.diff index db6650b098..1900d1cc92 100644 --- a/srcpkgs/libgadu/patches/musl-sys_types.h.diff +++ b/srcpkgs/libgadu/patches/musl-sys_types.h.diff @@ -1,5 +1,5 @@ ---- test/manual/lib/base64.c 2014-12-20 21:42:04.000000000 +0100 -+++ test/manual/lib/base64.c 2015-07-07 09:02:03.591897875 +0200 +--- a/test/manual/lib/base64.c 2014-12-20 21:42:04.000000000 +0100 ++++ b/test/manual/lib/base64.c 2015-07-07 09:02:03.591897875 +0200 @@ -18,6 +18,7 @@ #include diff --git a/srcpkgs/libgadu/template b/srcpkgs/libgadu/template index c90ab53f95..3775a273ca 100644 --- a/srcpkgs/libgadu/template +++ b/srcpkgs/libgadu/template @@ -12,7 +12,6 @@ license="LGPL-2.1-only" homepage="https://www.wasilczyk.pl/en/projects/libgadu/" distfiles="https://github.com/wojtekka/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=f53e703d7ad93ce222dbf7fc0cec77f62813af38817a3678e799e91f1c69c94d -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch index 3fe5d7fda9..968edeb32c 100644 --- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch +++ b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch @@ -10,8 +10,8 @@ Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012) diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp index 10a4f96f0ee..ebcac4010ce 100644 ---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig -+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp +--- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp ++++ b/frmts/jpeg2000/jpeg2000_vsil_io.cpp @@ -94,13 +94,24 @@ * File stream object. \******************************************************************************/ @@ -40,8 +40,8 @@ index 10a4f96f0ee..ebcac4010ce 100644 diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp index a5a6b258ed9..bd1e7763186 100644 ---- frmts/jpeg2000/jpeg2000dataset.cpp -+++ frmts/jpeg2000/jpeg2000dataset.cpp +--- a/frmts/jpeg2000/jpeg2000dataset.cpp ++++ b/frmts/jpeg2000/jpeg2000dataset.cpp @@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage() for ( iBand = 0; iBand < nBands; iBand++ ) { diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch index 40d0b4ec52..643eac882f 100644 --- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch +++ b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch @@ -9,8 +9,8 @@ Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844) diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp index 3e668ffe503..2d3f4e46876 100644 ---- frmts/jpeg2000/jpeg2000dataset.cpp -+++ frmts/jpeg2000/jpeg2000dataset.cpp +--- a/frmts/jpeg2000/jpeg2000dataset.cpp ++++ b/frmts/jpeg2000/jpeg2000dataset.cpp @@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage() /* the JP2 boxes match the ones of the code stream */ if (nBands != 0) diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template index 246109c38c..72c96ff676 100644 --- a/srcpkgs/libgdal/template +++ b/srcpkgs/libgdal/template @@ -17,7 +17,6 @@ homepage="http://www.gdal.org/" distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz" checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277 subpackages="libgdal-devel libgdal-tools" -patch_args=-Np0 if [ -z "$CROSS_BUILD" ]; then makedepends+=" hdf5-devel" diff --git a/srcpkgs/libgfshare/patches/cross.patch b/srcpkgs/libgfshare/patches/cross.patch index 1c5ba1b224..35b101e8c5 100644 --- a/srcpkgs/libgfshare/patches/cross.patch +++ b/srcpkgs/libgfshare/patches/cross.patch @@ -1,5 +1,5 @@ ---- Makefile.am.orig 2015-06-01 18:48:30.000000000 +0000 -+++ Makefile.am 2017-10-09 16:55:49.722491139 +0000 +--- a/Makefile.am 2015-06-01 18:48:30.000000000 +0000 ++++ b/Makefile.am 2017-10-09 16:55:49.722491139 +0000 @@ -19,8 +19,6 @@ include_HEADERS = include/libgfshare.h diff --git a/srcpkgs/libgfshare/template b/srcpkgs/libgfshare/template index 74c7044cd8..db61775707 100644 --- a/srcpkgs/libgfshare/template +++ b/srcpkgs/libgfshare/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://git.gitano.org.uk/libgfshare.git" distfiles="http://www.digital-scurf.org/files/libgfshare/libgfshare-${version}.tar.bz2" checksum=86f602860133c828356b7cf7b8c319ba9b27adf70a624fe32275ba1ed268331f -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libgit2-glib/patches/meson-vapi-link.patch b/srcpkgs/libgit2-glib/patches/meson-vapi-link.patch index 768dd4c57a..3c90222aac 100644 --- a/srcpkgs/libgit2-glib/patches/meson-vapi-link.patch +++ b/srcpkgs/libgit2-glib/patches/meson-vapi-link.patch @@ -1,5 +1,5 @@ ---- meson_vapi_link.py.orig 2020-08-22 14:36:38.509123984 +0700 -+++ meson_vapi_link.py 2020-08-22 14:37:05.199021653 +0700 +--- a/meson_vapi_link.py 2020-08-22 14:36:38.509123984 +0700 ++++ b/meson_vapi_link.py 2020-08-22 14:37:05.199021653 +0700 @@ -4,7 +4,7 @@ import subprocess import sys diff --git a/srcpkgs/libgit2-glib/template b/srcpkgs/libgit2-glib/template index 21f2430ff9..00e6439339 100644 --- a/srcpkgs/libgit2-glib/template +++ b/srcpkgs/libgit2-glib/template @@ -14,7 +14,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/GNOME/libgit2-glib" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=22dccc7aa9ff6f29edf50352b17d58c3f9289ba1cfa7952f70d7feb48676f10c -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/libglade/patches/libglade-gmodule.patch b/srcpkgs/libglade/patches/libglade-gmodule.patch index 353088fa45..f4dbd5ceef 100644 --- a/srcpkgs/libglade/patches/libglade-gmodule.patch +++ b/srcpkgs/libglade/patches/libglade-gmodule.patch @@ -1,5 +1,5 @@ ---- configure.in.orig -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl libxml-2.0 >= required_libxml_version dnl atk >= required_atk_version dnl diff --git a/srcpkgs/libglade/template b/srcpkgs/libglade/template index 5057e12b4d..f9bbef8cfb 100644 --- a/srcpkgs/libglade/template +++ b/srcpkgs/libglade/template @@ -14,7 +14,6 @@ homepage="http://www.jamesh.id.au/software/libglade/" distfiles="${GNOME_SITE}/$pkgname/2.6/$pkgname-$version.tar.bz2" checksum=64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec python_version=2 #unverified -patch_args=-Np0 # Register DTDs with xmlcatmgr. xml_entries="system http://glade.gnome.org/glade-2.0.dtd /usr/share/xml/libglade/glade-2.0.dtd" diff --git a/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch b/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch index 0ecf492e1c..8c84c489a5 100644 --- a/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch +++ b/srcpkgs/libglvnd/patches/musl-noasm-use-o0.patch @@ -14,8 +14,8 @@ stop happening. diff --git src/GLdispatch/vnd-glapi/meson.build src/GLdispatch/vnd-glapi/meson.build index 615cdff..94310b3 100644 ---- src/GLdispatch/vnd-glapi/meson.build -+++ src/GLdispatch/vnd-glapi/meson.build +--- a/src/GLdispatch/vnd-glapi/meson.build ++++ b/src/GLdispatch/vnd-glapi/meson.build @@ -35,8 +35,12 @@ else endif diff --git a/srcpkgs/libglvnd/template b/srcpkgs/libglvnd/template index e97629209e..2f6448cc97 100644 --- a/srcpkgs/libglvnd/template +++ b/srcpkgs/libglvnd/template @@ -13,7 +13,6 @@ license="custom:MIT-alike" homepage="https://gitlab.freedesktop.org/glvnd/libglvnd" distfiles="https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v${version}/libglvnd-v${version}.tar.gz" checksum=6332c27f4c792b09a3eb1d7ae18c2d6ff6a0acaf3a746489caf859e659fca2f7 -patch_args=-Np0 provides="libGL-7.11_1 libEGL-7.11_1 libGLES-7.11_1" replaces="libGL>=0 libEGL>=0 libGLES>=0" diff --git a/srcpkgs/libgme/patches/ppc-musl.patch b/srcpkgs/libgme/patches/ppc-musl.patch index 220b257679..4a9268efbe 100644 --- a/srcpkgs/libgme/patches/ppc-musl.patch +++ b/srcpkgs/libgme/patches/ppc-musl.patch @@ -4,8 +4,8 @@ covered by __LITTLE_ENDIAN__/__BIG_ENDIAN__ (which is specified as a part of the ELFv2 ABI itself to be always present). Glibc was not broken because it has its own check before that. ---- gme/blargg_endian.h -+++ gme/blargg_endian.h +--- a/gme/blargg_endian.h ++++ b/gme/blargg_endian.h @@ -36,7 +36,7 @@ #endif diff --git a/srcpkgs/libgme/template b/srcpkgs/libgme/template index 338848b520..30394ff338 100644 --- a/srcpkgs/libgme/template +++ b/srcpkgs/libgme/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="https://bitbucket.org/mpyne/game-music-emu/wiki/Home" distfiles="https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-${version}.tar.xz" checksum=aba34e53ef0ec6a34b58b84e28bf8cfbccee6585cebca25333604c35db3e051d -patch_args=-Np0 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then CXXFLAGS="-DMSB_FIRST=1" diff --git a/srcpkgs/libgpod/patches/0001-323-Segmentation-fault-when-opening-ipod.patch b/srcpkgs/libgpod/patches/0001-323-Segmentation-fault-when-opening-ipod.patch index b16d0601ed..727f18b370 100644 --- a/srcpkgs/libgpod/patches/0001-323-Segmentation-fault-when-opening-ipod.patch +++ b/srcpkgs/libgpod/patches/0001-323-Segmentation-fault-when-opening-ipod.patch @@ -13,8 +13,8 @@ Content-Transfer-Encoding: 8bit diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 4cc771a..1e85476 100644 ---- src/itdb_itunesdb.c -+++ src/itdb_itunesdb.c +--- a/src/itdb_itunesdb.c ++++ b/src/itdb_itunesdb.c @@ -1156,6 +1156,7 @@ static gboolean playcounts_plist_read (FImport *fimp, GValue *plist_data) GHashTable *pc_dict, *track_dict; GValue *to_parse; diff --git a/srcpkgs/libgpod/patches/libgpod-0.8.2-pkgconfig_overlinking.patch b/srcpkgs/libgpod/patches/libgpod-0.8.2-pkgconfig_overlinking.patch index e3a0f9bb4c..2b737a4654 100644 --- a/srcpkgs/libgpod/patches/libgpod-0.8.2-pkgconfig_overlinking.patch +++ b/srcpkgs/libgpod/patches/libgpod-0.8.2-pkgconfig_overlinking.patch @@ -1,5 +1,5 @@ ---- libgpod-1.0.pc.in.pkgconfig_overlinking 2011-04-15 03:37:34.000000000 -0500 -+++ libgpod-1.0.pc.in 2012-08-10 13:53:00.294631805 -0500 +--- a/libgpod-1.0.pc.in.pkgconfig_overlinking 2011-04-15 03:37:34.000000000 -0500 ++++ b/libgpod-1.0.pc.in 2012-08-10 13:53:00.294631805 -0500 @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libgpod Description: A library to manipulate songs and playlists stored on an ipod diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index 89f4bfd7fc..8e547f1f9e 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -12,7 +12,6 @@ license="LGPL-2.1-only" homepage="http://www.gtkpod.org/libgpod/" distfiles="${SOURCEFORGE_SITE}/gtkpod/$pkgname-$version.tar.bz2" checksum=638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d -patch_args=-Np0 post_patch() { vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/g' diff --git a/srcpkgs/libgsm/patches/gsm-1.0.12-64bit.patch b/srcpkgs/libgsm/patches/gsm-1.0.12-64bit.patch index 1fde542ae9..07bd43d56c 100644 --- a/srcpkgs/libgsm/patches/gsm-1.0.12-64bit.patch +++ b/srcpkgs/libgsm/patches/gsm-1.0.12-64bit.patch @@ -1,5 +1,5 @@ ---- inc/private.h 2006-04-26 22:17:01.000000000 +0300 -+++ inc/private.h 2007-08-19 12:23:02.000000000 +0300 +--- a/inc/private.h 2006-04-26 22:17:01.000000000 +0300 ++++ b/inc/private.h 2007-08-19 12:23:02.000000000 +0300 @@ -10,10 +10,10 @@ #define PRIVATE_H diff --git a/srcpkgs/libgsm/patches/gsm-1.0.12-memcpy.patch b/srcpkgs/libgsm/patches/gsm-1.0.12-memcpy.patch index 0521cfe68f..a08d2c82df 100644 --- a/srcpkgs/libgsm/patches/gsm-1.0.12-memcpy.patch +++ b/srcpkgs/libgsm/patches/gsm-1.0.12-memcpy.patch @@ -1,5 +1,5 @@ ---- src/code.c 2006-04-26 22:16:50.000000000 +0300 -+++ src/code.c 2007-08-19 12:18:01.000000000 +0300 +--- a/src/code.c 2006-04-26 22:16:50.000000000 +0300 ++++ b/src/code.c 2007-08-19 12:18:01.000000000 +0300 @@ -8,6 +8,7 @@ #include "config.h" diff --git a/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch b/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch index 90d94da4ed..b5b6d9bcb7 100644 --- a/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch +++ b/srcpkgs/libgsm/patches/gsm-1.0.13-shared.patch @@ -1,5 +1,5 @@ ---- Makefile 2006-04-26 22:14:26.000000000 +0300 -+++ Makefile 2009-09-08 14:50:02.000000000 +0300 +--- a/Makefile 2006-04-26 22:14:26.000000000 +0300 ++++ b/Makefile 2009-09-08 14:50:02.000000000 +0300 @@ -96,7 +96,7 @@ # Other tools diff --git a/srcpkgs/libgsm/template b/srcpkgs/libgsm/template index 55da1bc027..1d7cc0a0dc 100644 --- a/srcpkgs/libgsm/template +++ b/srcpkgs/libgsm/template @@ -9,7 +9,6 @@ short_desc="GSM 06.10 lossy speech compression" maintainer="Orphaned " license="custom" checksum=04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 -patch_args=-Np0 do_build() { make CC=$CC LD=$CC AR=$AR CCFLAGS="$CFLAGS -c -DNeedFunctionPrototypes=1" diff --git a/srcpkgs/libguestfs/patches/conf.patch b/srcpkgs/libguestfs/patches/conf.patch index 6e59e74a90..ef2f5c709a 100644 --- a/srcpkgs/libguestfs/patches/conf.patch +++ b/srcpkgs/libguestfs/patches/conf.patch @@ -1,5 +1,5 @@ ---- configure 2021-01-06 11:07:19.837834801 +0100 -+++ - 2021-02-01 21:59:49.975607517 +0100 +--- a/configure 2021-01-06 11:07:19.837834801 +0100 ++++ b/configure 2021-01-06 11:07:19.837834801 +0100 @@ -63266,7 +63266,7 @@ else as_fn_error $? "/etc/os-release not available, please specify the distro using --with-distro=DISTRO" "$LINENO" 5 diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 4f0b0283a0..81afe313d2 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -23,7 +23,6 @@ license=" GPL-2.0-or-later" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz" checksum=72b7dcdd32da1c17c932cf5a0a70b3bd68bc93e94828ad66a539f2e616adb025 -patch_args=-Np0 conf_files="etc/libguestfs-tools.conf etc/xdg/virt-builder/repos.d/libguestfs.conf diff --git a/srcpkgs/libieee1284/patches/musl.patch b/srcpkgs/libieee1284/patches/musl.patch index a3b79df1c0..fcf8d707af 100644 --- a/srcpkgs/libieee1284/patches/musl.patch +++ b/srcpkgs/libieee1284/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/access_io.c.orig 2005-03-11 18:55:41.000000000 +0100 -+++ src/access_io.c 2015-05-31 11:14:36.635234600 +0200 +--- a/src/access_io.c 2005-03-11 18:55:41.000000000 +0100 ++++ b/src/access_io.c 2015-05-31 11:14:36.635234600 +0200 @@ -47,7 +47,7 @@ #include "parport.h" #include "ppdev.h" @@ -18,8 +18,8 @@ #include "io.h" ---- include/config.h.in -+++ include/config.h.in +--- a/include/config.h.in ++++ b/include/config.h.in @@ -39,9 +39,13 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H diff --git a/srcpkgs/libieee1284/template b/srcpkgs/libieee1284/template index d24ad9c780..885772156e 100644 --- a/srcpkgs/libieee1284/template +++ b/srcpkgs/libieee1284/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://cyberelk.net/tim/libieee1284" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.bz2" checksum=7730de107782e5d2b071bdcb5b06a44da74856f00ef4a9be85d1ba4806a38f1a -patch_args=-Np0 libieee1284-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libimobiledevice/patches/python3.patch b/srcpkgs/libimobiledevice/patches/python3.patch index dbe0d1281f..74e17ddd4b 100644 --- a/srcpkgs/libimobiledevice/patches/python3.patch +++ b/srcpkgs/libimobiledevice/patches/python3.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix for Python 3 diff --git cython/debugserver.pxi cython/debugserver.pxi index ddbe0667..42430113 100644 ---- cython/debugserver.pxi -+++ cython/debugserver.pxi +--- a/cython/debugserver.pxi ++++ b/cython/debugserver.pxi @@ -43,14 +43,13 @@ cdef class DebugServerError(BaseError): BaseError.__init__(self, *args, **kwargs) diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index 19285ba975..a8bb2d08e0 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -13,7 +13,6 @@ homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/libimobiledevice/master/NEWS" distfiles="https://github.com/libimobiledevice/libimobiledevice/archive/${version}.tar.gz" checksum=acbfb73eabee162e64c0d9de207d71c0a5f47c40cd5ad32a5097f734328ce10a -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args="ac_cv_sys_file_offset_bits=yes ac_cv_sys_large_file=yes" diff --git a/srcpkgs/libindicator/patches/gtk+3.patch b/srcpkgs/libindicator/patches/gtk+3.patch index 352a245af5..200609d58a 100644 --- a/srcpkgs/libindicator/patches/gtk+3.patch +++ b/srcpkgs/libindicator/patches/gtk+3.patch @@ -1,5 +1,5 @@ ---- libindicator/indicator-image-helper.c.bck 2017-06-14 03:46:33.174214553 -0400 -+++ libindicator/indicator-image-helper.c 2017-06-14 03:47:00.594494305 -0400 +--- a/libindicator/indicator-image-helper.c.bck 2017-06-14 03:46:33.174214553 -0400 ++++ b/libindicator/indicator-image-helper.c 2017-06-14 03:47:00.594494305 -0400 @@ -69,7 +69,7 @@ GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); diff --git a/srcpkgs/libindicator/template b/srcpkgs/libindicator/template index abe8951a83..1ad0e5f9c6 100644 --- a/srcpkgs/libindicator/template +++ b/srcpkgs/libindicator/template @@ -12,7 +12,6 @@ license="GPL-3" homepage="https://launchpad.net/libindicator" distfiles="https://launchpad.net/libindicator/${version%.*}/${version}/+download/libindicator-${version}.tar.gz" checksum=b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f -patch_args=-Np0 CFLAGS="-Wno-deprecated-declarations" # Avoid errors for macros deprecated since glib-2.58 */ diff --git a/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch b/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch index ded98ddf0d..493c4becc6 100644 --- a/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch +++ b/srcpkgs/libiodbc/patches/musl-remove-wchar_t-check.patch @@ -1,6 +1,6 @@ diff -Naur iODBC-3.52.8.orig/include/sqltypes.h iODBC-3.52.8/include/sqltypes.h ---- include/sqltypes.h 2012-03-27 05:15:02.000000000 -0400 -+++ include/sqltypes.h 2015-07-18 14:05:24.514478508 -0400 +--- a/include/sqltypes.h 2012-03-27 05:15:02.000000000 -0400 ++++ b/include/sqltypes.h 2015-07-18 14:05:24.514478508 -0400 @@ -399,19 +399,7 @@ typedef unsigned short SQLWCHAR; #else diff --git a/srcpkgs/libiodbc/template b/srcpkgs/libiodbc/template index fec82642e7..85f0286a90 100644 --- a/srcpkgs/libiodbc/template +++ b/srcpkgs/libiodbc/template @@ -12,7 +12,6 @@ license="LGPL-2.1" homepage="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" distfiles="${SOURCEFORGE_SITE}/iodbc/${pkgname}-${version}.tar.gz" checksum=51c5ff3a7d9a54202486cb77a3514e0e379a135beefcd5d12b96d1901f9dfb62 -patch_args=-Np0 post_install() { rm -rf ${DESTDIR}/usr/share/libiodbc diff --git a/srcpkgs/libixion/patches/nullptr_t.patch b/srcpkgs/libixion/patches/nullptr_t.patch index e030577768..604ea07593 100644 --- a/srcpkgs/libixion/patches/nullptr_t.patch +++ b/srcpkgs/libixion/patches/nullptr_t.patch @@ -1,5 +1,5 @@ ---- src/libixion/model_context.cpp 2020-08-28 23:23:48.000000000 +0200 -+++ src/libixion/model_context.cpp 2021-03-01 16:14:44.955570528 +0100 +--- a/src/libixion/model_context.cpp 2020-08-28 23:23:48.000000000 +0200 ++++ b/src/libixion/model_context.cpp 2021-03-01 16:14:44.955570528 +0100 @@ -17,7 +17,7 @@ namespace ixion { diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template index 52f55031e1..60a21b07ac 100644 --- a/srcpkgs/libixion/template +++ b/srcpkgs/libixion/template @@ -12,7 +12,6 @@ homepage="https://gitlab.com/ixion/ixion/" distfiles="http://kohei.us/files/ixion/src/${pkgname}-${version}.tar.xz" checksum=426c643b3c346d546027c0226619abb2e59848e94470b9b5aa6365e26125089f replaces="libixion11>=0" -patch_args=-Np0 libixion-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmad/patches/CVE-2017-8372.patch b/srcpkgs/libmad/patches/CVE-2017-8372.patch index 2c4e428f3d..06689ea8f0 100644 --- a/srcpkgs/libmad/patches/CVE-2017-8372.patch +++ b/srcpkgs/libmad/patches/CVE-2017-8372.patch @@ -26,8 +26,8 @@ stream->md_len bytes. If stream->md_len is larger than the data we need from the previous frame (si.main_data_begin) it still wouldn't fit in the buffer, so just keep the data that we need. ---- layer3.c -+++ layer3.c +--- a/layer3.c ++++ b/layer3.c @@ -2608,6 +2608,11 @@ int mad_layer_III(struct mad_stream *str next_md_begin = 0; diff --git a/srcpkgs/libmad/patches/CVE-2017-8374.patch b/srcpkgs/libmad/patches/CVE-2017-8374.patch index 93a04df54c..bf14b0fe6c 100644 --- a/srcpkgs/libmad/patches/CVE-2017-8374.patch +++ b/srcpkgs/libmad/patches/CVE-2017-8374.patch @@ -6,8 +6,8 @@ There are various cases where it attemps to read past the end of the buffer using mad_bit_read(). Most functions didn't even know the size of the buffer they were reading from. ---- bit.c -+++ bit.c +--- a/bit.c ++++ b/bit.c @@ -138,6 +138,9 @@ unsigned long mad_bit_read(struct mad_bi { register unsigned long value; @@ -18,8 +18,8 @@ they were reading from. if (bitptr->left == CHAR_BIT) bitptr->cache = *bitptr->byte; ---- frame.c -+++ frame.c +--- a/frame.c ++++ b/frame.c @@ -120,11 +120,18 @@ static int decode_header(struct mad_header *header, struct mad_stream *stream) { @@ -81,8 +81,8 @@ they were reading from. ptr = stream->next_frame = stream->this_frame + 1; goto sync; } ---- layer12.c -+++ layer12.c +--- a/layer12.c ++++ b/layer12.c @@ -72,10 +72,18 @@ mad_fixed_t const linear_table[14] = { * DESCRIPTION: decode one requantized Layer I sample from a bitstream */ @@ -337,8 +337,8 @@ they were reading from. for (ch = 0; ch < nch; ++ch) { for (s = 0; s < 3; ++s) { ---- layer3.c -+++ layer3.c +--- a/layer3.c ++++ b/layer3.c @@ -598,7 +598,8 @@ enum mad_error III_sideinfo(struct mad_b static unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr, diff --git a/srcpkgs/libmad/patches/amd64-64bit.diff b/srcpkgs/libmad/patches/amd64-64bit.diff index a34da4db32..fe43d48deb 100644 --- a/srcpkgs/libmad/patches/amd64-64bit.diff +++ b/srcpkgs/libmad/patches/amd64-64bit.diff @@ -1,5 +1,5 @@ ---- configure.ac 2008-03-07 20:33:05.000000000 +0000 -+++ configure.ac 2008-03-07 20:33:31.000000000 +0000 +--- a/configure.ac 2008-03-07 20:33:05.000000000 +0000 ++++ b/configure.ac 2008-03-07 20:33:31.000000000 +0000 @@ -233,6 +233,7 @@ then case "$host" in diff --git a/srcpkgs/libmad/patches/libmad.patch b/srcpkgs/libmad/patches/libmad.patch index 74ffbb9f2c..22eeadfe7f 100644 --- a/srcpkgs/libmad/patches/libmad.patch +++ b/srcpkgs/libmad/patches/libmad.patch @@ -1,5 +1,5 @@ ---- Makefile.am 2004-02-17 02:02:03.000000000 +0000 -+++ Makefile.am 2005-08-25 12:08:04.000000000 +0000 +--- a/Makefile.am 2004-02-17 02:02:03.000000000 +0000 ++++ b/Makefile.am 2005-08-25 12:08:04.000000000 +0000 @@ -33,9 +33,12 @@ minimad_INCLUDES = minimad_LDADD = libmad.la @@ -14,8 +14,8 @@ exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h \ synth.h decoder.h ---- Makefile.in 2004-02-17 02:33:23.000000000 +0000 -+++ Makefile.in 2005-08-25 12:09:34.000000000 +0000 +--- a/Makefile.in 2004-02-17 02:33:23.000000000 +0000 ++++ b/Makefile.in 2005-08-25 12:09:34.000000000 +0000 @@ -14,6 +14,8 @@ @SET_MAKE@ @@ -99,8 +99,8 @@ uninstall-info: uninstall-info-recursive ---- mad.pc.in 1970-01-01 00:00:00.000000000 +0000 -+++ mad.pc.in 2005-08-25 12:08:04.000000000 +0000 +--- a/mad.pc.in 1970-01-01 00:00:00.000000000 +0000 ++++ b/mad.pc.in 2005-08-25 12:08:04.000000000 +0000 @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ diff --git a/srcpkgs/libmad/patches/mips-mode_di.patch b/srcpkgs/libmad/patches/mips-mode_di.patch index 911183a3a2..c9ec1aa0c5 100644 --- a/srcpkgs/libmad/patches/mips-mode_di.patch +++ b/srcpkgs/libmad/patches/mips-mode_di.patch @@ -1,5 +1,5 @@ ---- fixed.h 2004-02-17 03:02:03.000000000 +0100 -+++ fixed.h 2017-12-03 21:02:42.248609296 +0100 +--- a/fixed.h 2004-02-17 03:02:03.000000000 +0100 ++++ b/fixed.h 2017-12-03 21:02:42.248609296 +0100 @@ -299,6 +299,16 @@ # elif defined(FPM_MIPS) diff --git a/srcpkgs/libmad/patches/optimize.diff b/srcpkgs/libmad/patches/optimize.diff index 0a845c455d..73dc02d6d1 100644 --- a/srcpkgs/libmad/patches/optimize.diff +++ b/srcpkgs/libmad/patches/optimize.diff @@ -1,5 +1,5 @@ ---- configure.ac 2008-03-07 20:31:23.000000000 +0000 -+++ configure.ac 2008-03-07 20:34:26.000000000 +0000 +--- a/configure.ac 2008-03-07 20:31:23.000000000 +0000 ++++ b/configure.ac 2008-03-07 20:34:26.000000000 +0000 @@ -124,71 +124,7 @@ if test "$GCC" = yes diff --git a/srcpkgs/libmad/template b/srcpkgs/libmad/template index 02d40edf5a..b61acb3d8f 100644 --- a/srcpkgs/libmad/template +++ b/srcpkgs/libmad/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://www.underbit.com/products/mad/" distfiles="${SOURCEFORGE_SITE}/mad/$pkgname-$version.tar.gz" checksum=bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 -patch_args=-Np0 pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac diff --git a/srcpkgs/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch b/srcpkgs/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch index 7660615781..7e85c64057 100644 --- a/srcpkgs/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch +++ b/srcpkgs/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch @@ -1,6 +1,6 @@ diff -up build-aux/ltmain.sh ---- build-aux/ltmain.sh 2013-12-03 16:36:53.222107642 +0100 -+++ build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 +--- a/build-aux/ltmain.sh 2013-12-03 16:36:53.222107642 +0100 ++++ b/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 @@ -5664,6 +5664,15 @@ func_mode_link () *" $arg "*) ;; * ) func_append new_inherited_linker_flags " $arg" ;; diff --git a/srcpkgs/libmemcached/patches/memflush.patch b/srcpkgs/libmemcached/patches/memflush.patch index 67cc841192..6644c8353e 100644 --- a/srcpkgs/libmemcached/patches/memflush.patch +++ b/srcpkgs/libmemcached/patches/memflush.patch @@ -1,5 +1,5 @@ ---- ./clients/memflush.cc -+++ ./clients/memflush.cc +--- a/clients/memflush.cc ++++ b/clients/memflush.cc @@ -39,7 +39,7 @@ { options_parse(argc, argv); diff --git a/srcpkgs/libmemcached/patches/musl-fixes.patch b/srcpkgs/libmemcached/patches/musl-fixes.patch index 3c63bba219..923d6733a8 100644 --- a/srcpkgs/libmemcached/patches/musl-fixes.patch +++ b/srcpkgs/libmemcached/patches/musl-fixes.patch @@ -1,7 +1,7 @@ diff --git libhashkit/fnv_64.cc libhashkit/fnv_64.cc index 68e4dd0..88bbace 100644 ---- libhashkit/fnv_64.cc -+++ libhashkit/fnv_64.cc +--- a/libhashkit/fnv_64.cc ++++ b/libhashkit/fnv_64.cc @@ -37,6 +37,9 @@ @@ -14,8 +14,8 @@ index 68e4dd0..88bbace 100644 diff --git libhashkit/has.cc libhashkit/has.cc index 843e32e..7dbadc3 100644 ---- libhashkit/has.cc -+++ libhashkit/has.cc +--- a/libhashkit/has.cc ++++ b/libhashkit/has.cc @@ -37,6 +37,9 @@ @@ -28,8 +28,8 @@ index 843e32e..7dbadc3 100644 { diff --git libtest/cmdline.cc libtest/cmdline.cc index 29a22de..161c646 100644 ---- libtest/cmdline.cc -+++ libtest/cmdline.cc +--- a/libtest/cmdline.cc ++++ b/libtest/cmdline.cc @@ -61,7 +61,7 @@ using namespace libtest; #include #include diff --git a/srcpkgs/libmemcached/template b/srcpkgs/libmemcached/template index 7365c00db9..c39630b669 100644 --- a/srcpkgs/libmemcached/template +++ b/srcpkgs/libmemcached/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://libmemcached.org/libMemcached.html" distfiles="http://launchpad.net/${pkgname}/1.0/${version}/+download/${pkgname}-${version}.tar.gz" checksum=e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/libmill/patches/gcc9.patch b/srcpkgs/libmill/patches/gcc9.patch index fa3acac8fc..0690f10035 100644 --- a/srcpkgs/libmill/patches/gcc9.patch +++ b/srcpkgs/libmill/patches/gcc9.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix compilation for gcc 9.1.0 diff --git a/dns/dns.h b/dns/dns.h index 7eb3e7d6..dc88ab51 100644 ---- dns/dns.h -+++ dns/dns.h +--- a/dns/dns.h ++++ b/dns/dns.h @@ -496,7 +496,7 @@ size_t dns_rr_print(void *, size_t, struct dns_rr *, struct dns_packet *, int *) diff --git a/srcpkgs/libmill/template b/srcpkgs/libmill/template index 5df89def69..5bde0ee212 100644 --- a/srcpkgs/libmill/template +++ b/srcpkgs/libmill/template @@ -10,7 +10,6 @@ license="MIT" homepage="http://libmill.org/" distfiles="https://github.com/sustrik/libmill/archive/${version}.tar.gz" checksum=ff6903cd05f45c4cc050921d03201a93d2723ab59c480eb924f8f1ca8c6f0614 -patch_args=-Np0 pre_configure() { export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=?/}" diff --git a/srcpkgs/libmilter/patches/enabled-shared-library.patch b/srcpkgs/libmilter/patches/enabled-shared-library.patch index a2629cb293..915c5155bd 100644 --- a/srcpkgs/libmilter/patches/enabled-shared-library.patch +++ b/srcpkgs/libmilter/patches/enabled-shared-library.patch @@ -2,7 +2,7 @@ diff --git devtools/M4/UNIX/milterlibrary.m4 devtools/M4/UNIX/milterlibrary.m4 new file mode 100644 index 0000000..5b13615 --- /dev/null -+++ devtools/M4/UNIX/milterlibrary.m4 ++++ b/devtools/M4/UNIX/milterlibrary.m4 @@ -0,0 +1,39 @@ +divert(-1) +# @@ -45,8 +45,8 @@ index 0000000..5b13615 +COPTS+= confCCOPTS_SO diff --git libmilter/Makefile.m4 libmilter/Makefile.m4 index 0ad4501..8ee339b 100644 ---- libmilter/Makefile.m4 -+++ libmilter/Makefile.m4 +--- a/libmilter/Makefile.m4 ++++ b/libmilter/Makefile.m4 @@ -9,7 +9,7 @@ define(`confMT', `true') SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail') PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ') diff --git a/srcpkgs/libmilter/patches/glibc230.patch b/srcpkgs/libmilter/patches/glibc230.patch index d56c07c4a4..8c4f0db4a9 100644 --- a/srcpkgs/libmilter/patches/glibc230.patch +++ b/srcpkgs/libmilter/patches/glibc230.patch @@ -7,8 +7,8 @@ Source: openSUSE sendmail/conf.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) ---- libmilter/sm_gethost.c -+++ libmilter/sm_gethost.c 2019-09-28 07:27:46.512228011 +0000 +--- a/libmilter/sm_gethost.c ++++ b/libmilter/sm_gethost.c 2019-09-28 07:27:46.512228011 +0000 @@ -51,18 +51,20 @@ sm_getipnodebyname(name, family, flags, { bool resv6 = true; @@ -32,8 +32,8 @@ Source: openSUSE /* the function is supposed to return only the requested family */ if (h != NULL && h->h_addrtype != family) { ---- sendmail/conf.c -+++ sendmail/conf.c 2019-09-28 07:28:39.103245002 +0000 +--- a/sendmail/conf.c ++++ b/sendmail/conf.c 2019-09-28 07:28:39.103245002 +0000 @@ -4242,18 +4242,20 @@ sm_getipnodebyname(name, family, flags, # else /* HAS_GETHOSTBYNAME2 */ diff --git a/srcpkgs/libmilter/patches/musl-fix.patch b/srcpkgs/libmilter/patches/musl-fix.patch index d3490381b9..d4b37be0b6 100644 --- a/srcpkgs/libmilter/patches/musl-fix.patch +++ b/srcpkgs/libmilter/patches/musl-fix.patch @@ -1,7 +1,7 @@ diff --git devtools/OS/Linux devtools/OS/Linux index bc02f82..9dc3862 100644 ---- devtools/OS/Linux -+++ devtools/OS/Linux +--- a/devtools/OS/Linux ++++ b/devtools/OS/Linux @@ -9,7 +9,6 @@ define(`confSM_OS_HEADER', `sm_os_linux') define(`confMANROOT', `/usr/man/man') define(`confLIBS', `-ldl') diff --git a/srcpkgs/libmilter/patches/thread-stacksize.patch b/srcpkgs/libmilter/patches/thread-stacksize.patch index 0881abdfd9..9993adfece 100644 --- a/srcpkgs/libmilter/patches/thread-stacksize.patch +++ b/srcpkgs/libmilter/patches/thread-stacksize.patch @@ -11,8 +11,8 @@ looks sufficient and makes opendkim stop crashing. Fixes https://bugs.alpinelinux.org/issues/6360 ---- libmilter/libmilter.h -+++ libmilter/libmilter.h +--- a/libmilter/libmilter.h ++++ b/libmilter/libmilter.h @@ -127,10 +127,10 @@ # define MI_SOCK_READ(s, b, l) read(s, b, l) # define MI_SOCK_READ_FAIL(x) ((x) < 0) @@ -26,8 +26,8 @@ Fixes https://bugs.alpinelinux.org/issues/6360 typedef pthread_mutex_t smutex_t; # define smutex_init(mp) (pthread_mutex_init(mp, NULL) == 0) # define smutex_destroy(mp) (pthread_mutex_destroy(mp) == 0) ---- libmilter/main.c -+++ libmilter/main.c +--- a/libmilter/main.c ++++ b/libmilter/main.c @@ -16,6 +16,12 @@ #include #include diff --git a/srcpkgs/libmilter/template b/srcpkgs/libmilter/template index d5ca00bb6a..f51b61430c 100644 --- a/srcpkgs/libmilter/template +++ b/srcpkgs/libmilter/template @@ -12,7 +12,6 @@ license="Sendmail" homepage="https://www.milter.org/developers/api/" distfiles="ftp://ftp.mirrorservice.org/sites/ftp.sendmail.org/pub/${_pkgname}/${_pkgname}.${_version}.tar.gz" checksum=24f94b5fd76705f15897a78932a5f2439a32b1a2fdc35769bb1a5f5d9b4db439 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/libmirage/patches/girpath.patch b/srcpkgs/libmirage/patches/girpath.patch index 70e9a73dc5..9bbefee235 100644 --- a/srcpkgs/libmirage/patches/girpath.patch +++ b/srcpkgs/libmirage/patches/girpath.patch @@ -9,8 +9,8 @@ breaks when used with destdir So replace a useless substitute (we don't use a non-standard prefix) with a useful one ---- cmake/GObjectIntrospection.cmake 2019-02-11 02:04:33.574070141 +0100 -+++ cmake/GObjectIntrospection.cmake 2019-02-11 02:05:26.556485411 +0100 +--- a/cmake/GObjectIntrospection.cmake 2019-02-11 02:04:33.574070141 +0100 ++++ b/cmake/GObjectIntrospection.cmake 2019-02-11 02:05:26.556485411 +0100 @@ -44,8 +44,8 @@ _pkg_config_variable(girdir GIR_GIRDIR) _pkg_config_variable(typelibdir GIR_TYPELIBDIR) diff --git a/srcpkgs/libmirage/template b/srcpkgs/libmirage/template index c3c66f1cf3..283a27e223 100644 --- a/srcpkgs/libmirage/template +++ b/srcpkgs/libmirage/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="http://cdemu.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/cdemu/libmirage-${version}.tar.xz" checksum=d50d97e15f180f99fddcdf388b0d9fec073fb8fe080ba6c69cd3674214141139 -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/libmowgli/patches/aarch64.patch b/srcpkgs/libmowgli/patches/aarch64.patch index b945c5864f..6d552f79ef 100644 --- a/srcpkgs/libmowgli/patches/aarch64.patch +++ b/srcpkgs/libmowgli/patches/aarch64.patch @@ -1,5 +1,5 @@ ---- src/libmowgli/platform/cacheline.c.orig -+++ src/libmowgli/platform/cacheline.c +--- a/src/libmowgli/platform/cacheline.c ++++ b/src/libmowgli/platform/cacheline.c @@ -32,7 +32,7 @@ void mowgli_cacheline_bootstrap(void) diff --git a/srcpkgs/libmowgli/patches/fix-memory-leak.patch b/srcpkgs/libmowgli/patches/fix-memory-leak.patch index 0ac657c109..237cf95c71 100644 --- a/srcpkgs/libmowgli/patches/fix-memory-leak.patch +++ b/srcpkgs/libmowgli/patches/fix-memory-leak.patch @@ -16,8 +16,8 @@ Valgrind. diff --git a/src/libmowgli/dns/evloop_res.c b/src/libmowgli/dns/evloop_res.c index c8c7775..88757aa 100644 ---- src/libmowgli/dns/evloop_res.c -+++ src/libmowgli/dns/evloop_res.c +--- a/src/libmowgli/dns/evloop_res.c ++++ b/src/libmowgli/dns/evloop_res.c @@ -194,6 +194,7 @@ mowgli_dns_evloop_destroy(mowgli_dns_t *dns) mowgli_timer_destroy(state->eventloop, state->timeout_resolver_timer); diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template index 80f8da745b..cf17648a4b 100644 --- a/srcpkgs/libmowgli/template +++ b/srcpkgs/libmowgli/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/atheme/libmowgli-2" distfiles="https://github.com/atheme/libmowgli-2/archive/v${version}.tar.gz" checksum=b7faab2fb9f46366a52b51443054a2ed4ecdd04774c65754bf807c5e9bdda477 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch index 4428386c51..3bb9bead42 100644 --- a/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch +++ b/srcpkgs/libmp4v2/patches/gcc7-fix-char_ptr.patch @@ -1,5 +1,5 @@ ---- src/rtphint.cpp 2012-05-21 00:11:53.000000000 +0200 -+++ src/rtphint.cpp 2017-05-20 19:33:12.524731466 +0200 +--- a/src/rtphint.cpp 2012-05-21 00:11:53.000000000 +0200 ++++ b/src/rtphint.cpp 2017-05-20 19:33:12.524731466 +0200 @@ -339,7 +339,7 @@ pSlash = strchr(pSlash, '/'); if (pSlash != NULL) { diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template index ef8115e385..674b6ee304 100644 --- a/srcpkgs/libmp4v2/template +++ b/srcpkgs/libmp4v2/template @@ -11,7 +11,6 @@ homepage="http://code.google.com/p/mp4v2/" license="MPL-1.1" distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${wrksrc}.tar.bz2" checksum=0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338 -patch_args=-Np0 CXXFLAGS="-Wno-narrowing" diff --git a/srcpkgs/libmpd/patches/fix-build.patch b/srcpkgs/libmpd/patches/fix-build.patch index 7b931e6584..5f4d866445 100644 --- a/srcpkgs/libmpd/patches/fix-build.patch +++ b/srcpkgs/libmpd/patches/fix-build.patch @@ -1,5 +1,5 @@ ---- src/libmpd-internal.h.orig 2015-11-05 15:05:11.982772276 +0100 -+++ src/libmpd-internal.h 2015-11-05 15:05:32.845719672 +0100 +--- a/src/libmpd-internal.h 2015-11-05 15:05:11.982772276 +0100 ++++ b/src/libmpd-internal.h 2015-11-05 15:05:32.845719672 +0100 @@ -20,6 +20,10 @@ #ifndef __MPD_INTERNAL_LIB_ #define __MPD_INTERNAL_LIB_ diff --git a/srcpkgs/libmpd/template b/srcpkgs/libmpd/template index 65647c6d70..608057b023 100644 --- a/srcpkgs/libmpd/template +++ b/srcpkgs/libmpd/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" distfiles="http://download.sarine.nl/Programs/gmpc/${version%.*}/${pkgname}-${version}.tar.gz" checksum=fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 -patch_args=-Np0 libmpd-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libmspub/patches/fix-MSPUBMetaData_cstdint.patch b/srcpkgs/libmspub/patches/fix-MSPUBMetaData_cstdint.patch index a53c836f15..c583248cd3 100644 --- a/srcpkgs/libmspub/patches/fix-MSPUBMetaData_cstdint.patch +++ b/srcpkgs/libmspub/patches/fix-MSPUBMetaData_cstdint.patch @@ -1,5 +1,5 @@ ---- src/lib/MSPUBMetaData.h 2018-02-28 12:54:49.000000000 +0100 -+++ src/lib/MSPUBMetaData.h 2020-09-09 00:57:50.806188126 +0200 +--- a/src/lib/MSPUBMetaData.h 2018-02-28 12:54:49.000000000 +0100 ++++ b/src/lib/MSPUBMetaData.h 2020-09-09 00:57:50.806188126 +0200 @@ -10,6 +10,7 @@ #ifndef INCLUDED_MSPUBMETADATA_H #define INCLUDED_MSPUBMETADATA_H diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template index c74bfdaf9b..5c96ba4070 100644 --- a/srcpkgs/libmspub/template +++ b/srcpkgs/libmspub/template @@ -11,7 +11,6 @@ license="GPL-3" homepage="http://cgit.freedesktop.org/libreoffice/libmspub/commit/" distfiles="https://dev-www.libreoffice.org/src/${pkgname}-${version}.tar.xz" checksum=ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba -patch_args=-Np0 libmspub-devel_package() { depends="libmspub>=${version}_${revision} $makedepends" diff --git a/srcpkgs/libmygpo-qt/patches/fix-cflags.patch b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch index 9940b6fc43..e601bf3350 100644 --- a/srcpkgs/libmygpo-qt/patches/fix-cflags.patch +++ b/srcpkgs/libmygpo-qt/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) -Wwrite-strings -Wpacked -Wformat-security -Wmissing-format-attribute -Wold-style-cast -Woverloaded-virtual -Wnon-virtual-dtor -Wall -Wextra diff --git a/srcpkgs/libmygpo-qt/template b/srcpkgs/libmygpo-qt/template index 676772f69a..1014491ae2 100644 --- a/srcpkgs/libmygpo-qt/template +++ b/srcpkgs/libmygpo-qt/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/gpodder/libmygpo-qt" distfiles="https://github.com/gpodder/libmygpo-qt/archive/${version}.tar.gz" checksum=2eab976efbbdd39bae1b436e7dcd2ddffd35241432094f29b69308840a938459 -patch_args=-Np0 libmygpo-qt-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libmygui/patches/0001-OIS.patch b/srcpkgs/libmygui/patches/0001-OIS.patch index dbf8382a80..eaee573e40 100644 --- a/srcpkgs/libmygui/patches/0001-OIS.patch +++ b/srcpkgs/libmygui/patches/0001-OIS.patch @@ -1,5 +1,5 @@ ---- Common/Input/OIS/InputManager.h 2015-01-26 16:32:35.000000000 +0100 -+++ Common/Input/OIS/InputManager.h2 2017-04-15 14:45:38.090187301 +0200 +--- a/Common/Input/OIS/InputManager.h 2015-01-26 16:32:35.000000000 +0100 ++++ b/Common/Input/OIS/InputManager.h2 2017-04-15 14:45:38.090187301 +0200 @@ -8,7 +8,7 @@ #define INPUT_MANAGER_H_ diff --git a/srcpkgs/libmygui/template b/srcpkgs/libmygui/template index 30627cf63f..902ad67b0d 100644 --- a/srcpkgs/libmygui/template +++ b/srcpkgs/libmygui/template @@ -13,7 +13,6 @@ license="MIT" homepage="http://mygui.info" distfiles="https://github.com/MyGUI/mygui/archive/MyGUI${version}.tar.gz" checksum=d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42 -patch_args=-Np0 libmygui-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libnet/patches/musl-build-fix.patch b/srcpkgs/libnet/patches/musl-build-fix.patch index 3bdff22be2..27e46bb944 100644 --- a/srcpkgs/libnet/patches/musl-build-fix.patch +++ b/srcpkgs/libnet/patches/musl-build-fix.patch @@ -9,8 +9,8 @@ Subject: [PATCH] libnet-structure-musl-fix diff --git a/include/libnet/libnet-structures.h b/include/libnet/libnet-structures.h index 6084caa..34fffc6 100644 ---- include/libnet/libnet-structures.h -+++ include/libnet/libnet-structures.h +--- a/include/libnet/libnet-structures.h ++++ b/include/libnet/libnet-structures.h @@ -49,9 +49,9 @@ struct libnet_port_list_chain /* libnet statistics structure */ struct libnet_stats diff --git a/srcpkgs/libnet/template b/srcpkgs/libnet/template index 5454c3b925..d38ed97b34 100644 --- a/srcpkgs/libnet/template +++ b/srcpkgs/libnet/template @@ -9,7 +9,6 @@ license="GPL-3.0-only" homepage="https://github.com/sam-github/libnet" distfiles="https://github.com/sam-github/libnet/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7 -patch_args=-Np0 libnet-devel_package() { depends="${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/libnetfilter_log/patches/sys-types.patch b/srcpkgs/libnetfilter_log/patches/sys-types.patch index 617472d782..1662636cc6 100644 --- a/srcpkgs/libnetfilter_log/patches/sys-types.patch +++ b/srcpkgs/libnetfilter_log/patches/sys-types.patch @@ -6,8 +6,8 @@ Subject: Add include needed for integer type definition. diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h index 6b0d3b0..a1331de 100644 ---- include/libnetfilter_log/libnetfilter_log.h -+++ include/libnetfilter_log/libnetfilter_log.h +--- a/include/libnetfilter_log/libnetfilter_log.h ++++ b/include/libnetfilter_log/libnetfilter_log.h @@ -9,6 +9,7 @@ #ifndef __LIBNETFILTER_LOG_H #define __LIBNETFILTER_LOG_H diff --git a/srcpkgs/libnetfilter_log/patches/sys-types2.patch b/srcpkgs/libnetfilter_log/patches/sys-types2.patch index 8f35c79015..e211453ecf 100644 --- a/srcpkgs/libnetfilter_log/patches/sys-types2.patch +++ b/srcpkgs/libnetfilter_log/patches/sys-types2.patch @@ -1,7 +1,7 @@ diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h index 8a4ae2a..0994b4a 100644 ---- include/libnetfilter_log/libipulog.h -+++ include/libnetfilter_log/libipulog.h +--- a/include/libnetfilter_log/libipulog.h ++++ b/include/libnetfilter_log/libipulog.h @@ -5,6 +5,8 @@ #include #include diff --git a/srcpkgs/libnetfilter_log/template b/srcpkgs/libnetfilter_log/template index d926f53b27..f2b85ead2e 100644 --- a/srcpkgs/libnetfilter_log/template +++ b/srcpkgs/libnetfilter_log/template @@ -11,7 +11,6 @@ homepage="http://www.netfilter.org/projects/libnetfilter_log/index.html" short_desc="A userspace library providing interface to packets that have been logged by the kernel packet filter" distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2" checksum=74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21 -patch_args=-Np0 pre_configure() { sed -i 's/u_int\([0-9]*\)_t/uint\1_t/' utils/* src/* include/libnetfilter_log/* diff --git a/srcpkgs/libnfc/patches/fix-musl.patch b/srcpkgs/libnfc/patches/fix-musl.patch index e2a3a000f5..f382c15930 100644 --- a/srcpkgs/libnfc/patches/fix-musl.patch +++ b/srcpkgs/libnfc/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- libnfc/buses/spi.c.orig 2015-09-02 23:53:39.609374047 +0200 -+++ libnfc/buses/spi.c 2015-09-02 23:53:44.994373644 +0200 +--- a/libnfc/buses/spi.c 2015-09-02 23:53:39.609374047 +0200 ++++ b/libnfc/buses/spi.c 2015-09-02 23:53:44.994373644 +0200 @@ -51,6 +51,7 @@ #include #include diff --git a/srcpkgs/libnfc/template b/srcpkgs/libnfc/template index 96841d882d..7737dad569 100644 --- a/srcpkgs/libnfc/template +++ b/srcpkgs/libnfc/template @@ -13,7 +13,6 @@ homepage="http://nfc-tools.org/" distfiles="https://github.com/nfc-tools/libnfc/archive/libnfc-${version}.tar.gz" checksum=0ab7d9b41442e7edc2af7c54630396edc73ce51128aa28a5c6e4135dc5595495 CFLAGS="-D_GNU_SOURCE" -patch_args=-Np0 pre_configure() { sed -i "s|MODE=\"0664\", GROUP=\"plugdev\"|TAG+=\"uaccess\"|g" contrib/udev/93-pn53x.rules diff --git a/srcpkgs/libnfs/patches/fix-musl.patch b/srcpkgs/libnfs/patches/fix-musl.patch index fe6de52594..18a3657c64 100644 --- a/srcpkgs/libnfs/patches/fix-musl.patch +++ b/srcpkgs/libnfs/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- include/nfsc/libnfs.h -+++ include/nfsc/libnfs.h +--- a/include/nfsc/libnfs.h ++++ b/include/nfsc/libnfs.h @@ -24,6 +24,7 @@ #define _LIBNFS_H_ diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template index 792a882d68..f1e27dd15f 100644 --- a/srcpkgs/libnfs/template +++ b/srcpkgs/libnfs/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/sahlberg/libnfs" distfiles="https://github.com/sahlberg/libnfs/archive/${pkgname}-${version}.tar.gz" checksum=6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libnih/patches/musl.patch b/srcpkgs/libnih/patches/musl.patch index bcd88e0947..f8e68665f6 100644 --- a/srcpkgs/libnih/patches/musl.patch +++ b/srcpkgs/libnih/patches/musl.patch @@ -6,8 +6,8 @@ Date: Sun Oct 28 01:59:05 2018 -0700 diff --git nih/signal.c nih/signal.c index a241df9..6a263fa 100644 ---- nih/signal.c -+++ nih/signal.c +--- a/nih/signal.c ++++ b/nih/signal.c @@ -87,7 +87,9 @@ static const SignalName signal_names[] = { { SIGSTKFLT, "STKFLT" }, #endif diff --git a/srcpkgs/libnih/template b/srcpkgs/libnih/template index ae28525b18..52ebfddc9b 100644 --- a/srcpkgs/libnih/template +++ b/srcpkgs/libnih/template @@ -14,7 +14,6 @@ license="GPL-2.0-only" homepage="https://github.com/keybuk/${pkgname}" distfiles="${homepage}/archive/${_commit}.tar.gz" checksum=bd1ce78c9e4808fd02e06edaf581eb2b70fa43d7baae051848dfdbaf5b4d1a1c -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/libnl/patches/fix-includes.patch b/srcpkgs/libnl/patches/fix-includes.patch index f898bf740b..8e36b4982b 100644 --- a/srcpkgs/libnl/patches/fix-includes.patch +++ b/srcpkgs/libnl/patches/fix-includes.patch @@ -1,5 +1,5 @@ ---- lib/netfilter/log.c -+++ lib/netfilter/log.c +--- a/lib/netfilter/log.c ++++ b/lib/netfilter/log.c @@ -18,6 +18,7 @@ * @{ */ @@ -8,8 +8,8 @@ #include #include ---- include/netlink/netlink.h -+++ include/netlink/netlink.h +--- a/include/netlink/netlink.h ++++ b/include/netlink/netlink.h @@ -12,11 +12,11 @@ #ifndef NETLINK_NETLINK_H_ #define NETLINK_NETLINK_H_ diff --git a/srcpkgs/libnl/patches/fix-strerror_r.patch b/srcpkgs/libnl/patches/fix-strerror_r.patch index d088f1ee00..7dc6831525 100644 --- a/srcpkgs/libnl/patches/fix-strerror_r.patch +++ b/srcpkgs/libnl/patches/fix-strerror_r.patch @@ -1,5 +1,5 @@ ---- lib/fib_lookup/lookup.c -+++ lib/fib_lookup/lookup.c +--- a/lib/fib_lookup/lookup.c ++++ b/lib/fib_lookup/lookup.c @@ -124,7 +124,7 @@ static int result_dump_brief(struct nl_object *obj, struct nl_dump_params *p) { @@ -21,8 +21,8 @@ return line; } ---- lib/handlers.c -+++ lib/handlers.c +--- a/lib/handlers.c ++++ b/lib/handlers.c @@ -136,8 +136,8 @@ FILE *ofd = arg ? arg : stderr; char buf[256]; @@ -34,8 +34,8 @@ print_header_content(ofd, &e->msg); fprintf(ofd, "\n"); ---- lib/msg.c -+++ lib/msg.c +--- a/lib/msg.c ++++ b/lib/msg.c @@ -961,9 +961,9 @@ struct nlmsgerr *err = nlmsg_data(hdr); char buf[256]; diff --git a/srcpkgs/libnl/patches/libnl-1.1-flags.patch b/srcpkgs/libnl/patches/libnl-1.1-flags.patch index 966aa11c95..2e0a4be33c 100644 --- a/srcpkgs/libnl/patches/libnl-1.1-flags.patch +++ b/srcpkgs/libnl/patches/libnl-1.1-flags.patch @@ -1,5 +1,5 @@ ---- lib/Makefile.orig 2008-01-14 16:48:45.000000000 +0100 -+++ lib/Makefile 2009-05-26 09:47:42.000000000 +0200 +--- a/lib/Makefile 2008-01-14 16:48:45.000000000 +0100 ++++ b/lib/Makefile 2009-05-26 09:47:42.000000000 +0200 @@ -48,7 +48,7 @@ $(OUT_SLIB): ../Makefile.opts $(OBJ) diff --git a/srcpkgs/libnl/template b/srcpkgs/libnl/template index 6b2f6cbe39..ab8c03352d 100644 --- a/srcpkgs/libnl/template +++ b/srcpkgs/libnl/template @@ -9,7 +9,6 @@ license="LGPL-2.1-only" maintainer="Orphaned " distfiles="http://www.infradead.org/~tgr/libnl/files/libnl-${version}.tar.gz" checksum=4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 -patch_args=-Np0 libnl-devel_package() { depends="libnl>=${version}_${revision}" diff --git a/srcpkgs/libogre/patches/musl_str_l.patch b/srcpkgs/libogre/patches/musl_str_l.patch index ad658a94f8..8ccfee439f 100644 --- a/srcpkgs/libogre/patches/musl_str_l.patch +++ b/srcpkgs/libogre/patches/musl_str_l.patch @@ -1,5 +1,5 @@ ---- OgreMain/include/OgreString.h.orig 2018-04-17 09:04:05.425658306 +0200 -+++ OgreMain/include/OgreString.h 2018-04-17 09:14:39.457143961 +0200 +--- a/OgreMain/include/OgreString.h 2018-04-17 09:04:05.425658306 +0200 ++++ b/OgreMain/include/OgreString.h 2018-04-17 09:14:39.457143961 +0200 @@ -76,6 +76,11 @@ namespace __gnu_cxx # define strtol_l(ptr, end, base, l) strtol(ptr, end, base) #endif diff --git a/srcpkgs/libogre/template b/srcpkgs/libogre/template index e362172683..df60f7b4f5 100644 --- a/srcpkgs/libogre/template +++ b/srcpkgs/libogre/template @@ -17,7 +17,6 @@ license="MIT" homepage="http://www.ogre3d.org" distfiles="https://github.com/OGRECave/ogre/archive/v$version.tar.gz" checksum=028e7d0bbfce8fd254e1102666b07b7cbb9379321e88885d82feee5e061342aa -patch_args=-Np0 pre_configure() { if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then diff --git a/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch b/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch index 59e35e39e4..971b926874 100644 --- a/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch +++ b/srcpkgs/libomxil-bellagio/patches/fedora-fixes.patch @@ -3,8 +3,8 @@ Link explicitly against omxil-bellagio so that ld.so can find the reference. Signed-off-by: Qais Yousef ---- src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 -+++ src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 +--- a/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 ++++ b/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 @@ -3,7 +3,7 @@ omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h @@ -20,8 +20,8 @@ Signed-off-by: Qais Yousef Index: bellagio-0.9.3/src/Makefile.am =================================================================== ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ -I$(top_srcdir)/include @@ -35,8 +35,8 @@ segfault. Use i as the index instead. Signed-off-by: Qais Yousef ---- src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 -+++ src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 +--- a/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 ++++ b/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 @@ -485,7 +485,6 @@ OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { omx_base_component_PrivateType* omx_base_component_Private; @@ -70,8 +70,8 @@ Signed-off-by: Qais Yousef OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch src/base/omx_base_component.c | 54 ++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 25 deletions(-) ---- src/base/omx_base_component.c -+++ src/base/omx_base_component.c +--- a/src/base/omx_base_component.c ++++ b/src/base/omx_base_component.c @@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( return OMX_ErrorBadParameter; } @@ -146,8 +146,8 @@ Signed-off-by: Qais Yousef DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent); return err; diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am ---- Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 -+++ Makefile.am 2012-04-23 13:46:15.410823381 +0200 +--- a/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 ++++ b/Makefile.am 2012-04-23 13:46:15.410823381 +0200 @@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libomxil-bellagio.pc @@ -157,8 +157,8 @@ diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makef ChangeLog \ TODO diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c ---- src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 -+++ src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 +--- a/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 ++++ b/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 @@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx } fptr(stComponents); @@ -176,8 +176,8 @@ diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9. for (i = 0; i #include @@ -9,8 +9,8 @@ #include #endif #endif ---- JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 -+++ JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-12-12 14:58:35.988986030 +0100 +--- a/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 ++++ b/JuceLibraryCode/modules/juce_core/system/juce_SystemStats.cpp 2016-12-12 14:58:35.988986030 +0100 @@ -134,6 +134,8 @@ } } @@ -20,8 +20,8 @@ #else void* stack[128]; int frames = backtrace (stack, numElementsInArray (stack)); ---- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 -+++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-12-12 15:07:35.046607788 +0100 +--- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 ++++ b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-12-12 15:07:35.046607788 +0100 @@ -142,8 +142,15 @@ return result; } diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template index 6df0d294f8..56c330eafc 100644 --- a/srcpkgs/libopenshot-audio/template +++ b/srcpkgs/libopenshot-audio/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/OpenShot/libopenshot-audio" distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz" checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/libosinfo/patches/meson-force-cross.patch b/srcpkgs/libosinfo/patches/meson-force-cross.patch index f96de11dff..ca974d4f54 100644 --- a/srcpkgs/libosinfo/patches/meson-force-cross.patch +++ b/srcpkgs/libosinfo/patches/meson-force-cross.patch @@ -1,7 +1,7 @@ # upsteam: https://gitlab.com/libosinfo/libosinfo/merge_requests/36 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -29,7 +29,7 @@ # gobject introspection diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index 52283fceec..e9210c52f0 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -20,7 +20,6 @@ homepage="https://libosinfo.org/" changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS" distfiles="https://gitlab.com/libosinfo/libosinfo/-/archive/v${version}/libosinfo-v${version}.tar.gz" checksum=7270d7a54f4ea46b21163aa1704caf69a5e8ed980434dac6b9951588cae62ea7 -patch_args=-Np0 build_options="gtk_doc gir vala" desc_option_gtk_doc="Build GTK API docs" diff --git a/srcpkgs/libostree/patches/gir-cross.patch b/srcpkgs/libostree/patches/gir-cross.patch index a2d280a7b7..3039f63b45 100644 --- a/srcpkgs/libostree/patches/gir-cross.patch +++ b/srcpkgs/libostree/patches/gir-cross.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -2702,9 +2702,6 @@ $(am__append_40) $(am__append_43) $(am__append_45) EXTRA_libostree_1_la_DEPENDENCIES = $(symbol_files) diff --git a/srcpkgs/libostree/patches/musl-fixes.patch b/srcpkgs/libostree/patches/musl-fixes.patch index adc3418592..6eb0119bf1 100644 --- a/srcpkgs/libostree/patches/musl-fixes.patch +++ b/srcpkgs/libostree/patches/musl-fixes.patch @@ -1,5 +1,5 @@ ---- config.h.in.orig -+++ config.h.in +--- a/config.h.in ++++ b/config.h.in @@ -154,3 +154,13 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index bb03d1c7c3..96ce246431 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -20,7 +20,6 @@ homepage="https://ostree.readthedocs.io/en/latest/" changelog="https://github.com/ostreedev/ostree/releases" distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz" checksum=854008e7c71d44f6b3670f0e9b8500db0f08ff8b297d0b30a7cb9a66f34c5d7c -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/libowfat/patches/fix-cross.patch b/srcpkgs/libowfat/patches/fix-cross.patch index 66a8e1c8b2..a5deaf00c7 100644 --- a/srcpkgs/libowfat/patches/fix-cross.patch +++ b/srcpkgs/libowfat/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2016-10-05 08:28:54.631977409 +0200 -+++ Makefile 2016-10-05 08:29:11.588976745 +0200 +--- a/Makefile 2016-10-05 08:28:54.631977409 +0200 ++++ b/Makefile 2016-10-05 08:29:11.588976745 +0200 @@ -40,7 +40,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall @@ -9,8 +9,8 @@ # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2 ---- GNUmakefile.orig 2016-10-05 09:02:43.606897920 +0200 -+++ GNUmakefile 2016-10-05 09:02:54.656897487 +0200 +--- a/GNUmakefile 2016-10-05 09:02:43.606897920 +0200 ++++ b/GNUmakefile 2016-10-05 09:02:54.656897487 +0200 @@ -39,7 +39,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall diff --git a/srcpkgs/libowfat/patches/fix-glibc.patch b/srcpkgs/libowfat/patches/fix-glibc.patch index 3122cb8c6b..e1f507539a 100644 --- a/srcpkgs/libowfat/patches/fix-glibc.patch +++ b/srcpkgs/libowfat/patches/fix-glibc.patch @@ -1,7 +1,7 @@ diff --git a/io/iob_send.c b/io/iob_send.c index 10a6e8c..81c2763 100644 ---- io/iob_send.c -+++ io/iob_send.c +--- a/io/iob_send.c ++++ b/io/iob_send.c @@ -122,6 +122,14 @@ int64 iob_send(int64 s,io_batch* b) { #include "io_internal.h" #include "iob_internal.h" diff --git a/srcpkgs/libowfat/template b/srcpkgs/libowfat/template index 3ab028281e..95c7e9a812 100644 --- a/srcpkgs/libowfat/template +++ b/srcpkgs/libowfat/template @@ -10,7 +10,6 @@ license="GPL-2" homepage="https://www.fefe.de/libowfat/" distfiles="https://www.fefe.de/${pkgname}/${pkgname}-${version}.tar.xz" checksum=f4b9b3d9922dc25bc93adedf9e9ff8ddbebaf623f14c8e7a5f2301bfef7998c1 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch index dec87939c7..57ec166c89 100644 --- a/srcpkgs/libportal/patches/optional_docs.patch +++ b/srcpkgs/libportal/patches/optional_docs.patch @@ -10,8 +10,8 @@ Subject: [PATCH] build: Make docs building optional diff --git a/meson.build b/meson.build index 3ca0fb3..49fa112 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -25,7 +25,9 @@ top_inc = include_directories('.') libportal_inc = include_directories('libportal') @@ -25,8 +25,8 @@ index 3ca0fb3..49fa112 100644 endif diff --git a/meson_options.txt b/meson_options.txt index f138e4f..8501dc9 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -1,3 +1,4 @@ option('build-portal-test', type: 'boolean', value: false, description : 'Build the portal-test application') diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index 9dee4f8c0d..48211c3767 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -12,7 +12,6 @@ license="LGPL-2.0-or-later" homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" checksum=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7 -patch_args=-Np0 build_options="gtk_doc" diff --git a/srcpkgs/libproxy/patches/libproxy-0.4.7-unistd.patch b/srcpkgs/libproxy/patches/libproxy-0.4.7-unistd.patch index db6216846a..b5c067f7c7 100644 --- a/srcpkgs/libproxy/patches/libproxy-0.4.7-unistd.patch +++ b/srcpkgs/libproxy/patches/libproxy-0.4.7-unistd.patch @@ -1,5 +1,5 @@ ---- libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027 +0000 -+++ libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 +--- a/libproxy/url.cpp 2012-02-28 21:05:15.572948027 +0000 ++++ b/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000 @@ -27,6 +27,7 @@ #define close _close #endif @@ -8,8 +8,8 @@ #include // For memcpy() #include // For int/string conversion (using stringstream) #include // For sscanf() ---- libproxy/modules/config_sysconfig.cpp.orig 2012-02-28 21:06:01.552943358 +0000 -+++ libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 +--- a/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:06:01.552943358 +0000 ++++ b/libproxy/modules/config_sysconfig.cpp 2012-02-28 21:11:21.429953982 +0000 @@ -18,6 +18,7 @@ ******************************************************************************/ @@ -18,8 +18,8 @@ #include #include #include ---- libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28 21:06:11.637943033 +0000 -+++ libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 +--- a/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:06:11.637943033 +0000 ++++ b/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28 21:11:46.560961409 +0000 @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ @@ -28,8 +28,8 @@ #include // ? #include "../extension_pacrunner.hpp" ---- libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28 21:06:29.615943614 +0000 -+++ libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 +--- a/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:06:29.615943614 +0000 ++++ b/libproxy/modules/pacrunner_webkit.cpp 2012-02-28 21:12:35.530965553 +0000 @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ******************************************************************************/ diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template index c678d6e838..d610300703 100644 --- a/srcpkgs/libproxy/template +++ b/srcpkgs/libproxy/template @@ -13,7 +13,6 @@ homepage="http://github.com/libproxy/libproxy" license="LGPL-2.1" distfiles="https://github.com/libproxy/libproxy/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0 -patch_args=-Np0 libproxy-devel_package() { depends="libproxy>=${version}_${revision}" diff --git a/srcpkgs/libpurple-steam/patches/fix-makefile.patch b/srcpkgs/libpurple-steam/patches/fix-makefile.patch index 117c18df0c..96f473bcfb 100644 --- a/srcpkgs/libpurple-steam/patches/fix-makefile.patch +++ b/srcpkgs/libpurple-steam/patches/fix-makefile.patch @@ -1,7 +1,7 @@ diff --git steam-mobile/Makefile steam-mobile/Makefile index 853f107..5d5c0be 100644 ---- steam-mobile/Makefile -+++ steam-mobile/Makefile +--- a/steam-mobile/Makefile ++++ b/steam-mobile/Makefile @@ -1,17 +1,35 @@ +CC ?= gcc +CFLAGS = -Wall -I. -fPIC -pipe diff --git a/srcpkgs/libpurple-steam/template b/srcpkgs/libpurple-steam/template index 844f7e3b71..06c8cc8336 100644 --- a/srcpkgs/libpurple-steam/template +++ b/srcpkgs/libpurple-steam/template @@ -1,5 +1,4 @@ # Template file for 'libpurple-steam' -patch_args=-Np0 pkgname="libpurple-steam" version="1.6.1" diff --git a/srcpkgs/libratbag/patches/fix-usage-of-error.patch b/srcpkgs/libratbag/patches/fix-usage-of-error.patch index 0171359370..97dbc67dd1 100644 --- a/srcpkgs/libratbag/patches/fix-usage-of-error.patch +++ b/srcpkgs/libratbag/patches/fix-usage-of-error.patch @@ -2,8 +2,8 @@ Source: maxice8 Upstream: No, but feel free Reason: removes usage of non-portable of error.h ---- tools/hidpp10-dump-page.c -+++ tools/hidpp10-dump-page.c +--- a/tools/hidpp10-dump-page.c ++++ b/tools/hidpp10-dump-page.c @@ -23,7 +23,7 @@ #include @@ -22,8 +22,8 @@ Reason: removes usage of non-portable of error.h hidpp_device_init(&base, fd); dev = hidpp10_device_new(&base, HIDPP_WIRED_DEVICE_IDX, HIDPP10_PROFILE_UNKNOWN, 5); ---- tools/hidpp20-dump-page.c -+++ tools/hidpp20-dump-page.c +--- a/tools/hidpp20-dump-page.c ++++ b/tools/hidpp20-dump-page.c @@ -23,7 +23,7 @@ #include @@ -48,8 +48,8 @@ Reason: removes usage of non-portable of error.h hidpp20_onboard_profiles_get_profiles_desc(dev, &info); ---- tools/hidpp20-reset.c -+++ tools/hidpp20-reset.c +--- a/tools/hidpp20-reset.c ++++ b/tools/hidpp20-reset.c @@ -23,7 +23,7 @@ #include diff --git a/srcpkgs/libratbag/template b/srcpkgs/libratbag/template index b1acd757fa..370d670157 100644 --- a/srcpkgs/libratbag/template +++ b/srcpkgs/libratbag/template @@ -16,7 +16,6 @@ license="MIT" homepage="https://github.com/libratbag/libratbag" distfiles="https://github.com/libratbag/libratbag/archive/v${version}.tar.gz" checksum=9e6ad8d54daef8cc0f44784bdde9bf5a3879d8a66d11e0b990b87266f81f7329 -patch_args=-Np0 post_install() { vsv ratbagd diff --git a/srcpkgs/libreadline8/patches/accept-ncursesw.patch b/srcpkgs/libreadline8/patches/accept-ncursesw.patch index cf61c3be36..f4759f3c7d 100644 --- a/srcpkgs/libreadline8/patches/accept-ncursesw.patch +++ b/srcpkgs/libreadline8/patches/accept-ncursesw.patch @@ -11,8 +11,8 @@ Subject: [PATCH] add support for using ncursesw pkg-config library diff --git aclocal.m4 aclocal.m4 index 1413267..16775a9 100644 ---- aclocal.m4 -+++ aclocal.m4 +--- a/aclocal.m4 ++++ b/aclocal.m4 @@ -981,6 +981,9 @@ TERMCAP_DEP= elif test $bash_cv_termcap_lib = libncurses; then TERMCAP_LIB=-lncurses @@ -25,8 +25,8 @@ index 1413267..16775a9 100644 TERMCAP_DEP= diff --git configure configure index c9b7ade..7d7bce0 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -6328,6 +6328,9 @@ TERMCAP_DEP= elif test $bash_cv_termcap_lib = libncurses; then TERMCAP_LIB=-lncurses @@ -47,8 +47,8 @@ index c9b7ade..7d7bce0 100755 esac diff --git configure.ac configure.ac index b73e37b..db788a6 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -202,6 +202,7 @@ case "$TERMCAP_LIB" in -ltinfo) TERMCAP_PKG_CONFIG_LIB=tinfo ;; -lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;; diff --git a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch index 15eadf1524..45548e5fb9 100644 --- a/srcpkgs/libreadline8/patches/no-rpath-and-link.patch +++ b/srcpkgs/libreadline8/patches/no-rpath-and-link.patch @@ -11,8 +11,8 @@ Subject: [PATCH] drop rpath and link against the termcap library diff --git configure configure index 7d7bce0..eff4e76 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then $as_echo_n "checking configuration for building shared libraries... " >&6; } eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` @@ -30,8 +30,8 @@ index 7d7bce0..eff4e76 100755 diff --git configure.ac configure.ac index db788a6..9ac3eef 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then AC_MSG_CHECKING(configuration for building shared libraries) eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}` @@ -49,8 +49,8 @@ index db788a6..9ac3eef 100644 AC_SUBST(SHOBJ_CFLAGS) diff --git support/shobj-conf support/shobj-conf index 7920f1b..7ac9c9f 100644 ---- support/shobj-conf -+++ support/shobj-conf +--- a/support/shobj-conf ++++ b/support/shobj-conf @@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) SHOBJ_LD='${CC}' SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' diff --git a/srcpkgs/libreadline8/template b/srcpkgs/libreadline8/template index 44245746df..dbac03c676 100644 --- a/srcpkgs/libreadline8/template +++ b/srcpkgs/libreadline8/template @@ -15,7 +15,6 @@ license="GPL-3.0-or-later" homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html" distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz" checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 -patch_args=-Np0 post_patch() { cd ${wrksrc} diff --git a/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch b/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch index d77b541251..7cc1ce2d19 100644 --- a/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch +++ b/srcpkgs/libreoffice/patches/0003-configure_ac-libc-version.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: This test fails for Musl libc and we know we have a working libc ---- configure.ac 2020-01-23 00:14:16.000000000 +0100 -+++ configure.ac 2020-01-30 00:23:00.859196125 +0100 +--- a/configure.ac 2020-01-23 00:14:16.000000000 +0100 ++++ b/configure.ac 2020-01-30 00:23:00.859196125 +0100 @@ -10233,18 +10233,10 @@ AC_SUBST(LIBNUMBERTEXT_CFLAGS) diff --git a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch index eabf413b86..2c121c8ad2 100644 --- a/srcpkgs/libreoffice/patches/fix-vlc-backend.patch +++ b/srcpkgs/libreoffice/patches/fix-vlc-backend.patch @@ -5,8 +5,8 @@ diff --git include/vcl/sysdata.hxx include/vcl/sysdata.hxx index 63b7c810de3d..0cd0e037c823 100644 ---- include/vcl/sysdata.hxx -+++ include/vcl/sysdata.hxx +--- a/include/vcl/sysdata.hxx ++++ b/include/vcl/sysdata.hxx @@ -73,9 +73,8 @@ struct VCL_DLLPUBLIC SystemEnvData // however, the GTK3 vclplug wants to store pointers in here! sal_IntPtr aShellWindow; // the window of the frame's shell diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 2c19e2ec70..f08066f129 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -5,7 +5,6 @@ revision=1 build_style=meta make_build_target="build-nocheck" nocross="Several dependencies are nocross=yes" -patch_args=-Np0 hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip wget zip python3-setuptools diff --git a/srcpkgs/libretro-mupen64plus-rpi/patches/rpi.patch b/srcpkgs/libretro-mupen64plus-rpi/patches/rpi.patch index 8d16c94433..708e870b50 100644 --- a/srcpkgs/libretro-mupen64plus-rpi/patches/rpi.patch +++ b/srcpkgs/libretro-mupen64plus-rpi/patches/rpi.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -99,7 +99,7 @@ else ifneq (,$(findstring rpi,$(platform))) GL_LIB := -lGLESv2 else @@ -9,8 +9,8 @@ GL_LIB := -L/opt/vc/lib -lbrcmGLESv2 EGL_LIB := -lbrcmEGL INCFLAGS += -I/opt/vc/include -I/opt/vc/include/interface/vcos -I/opt/vc/include/interface/vcos/pthreads ---- libretro-common/include/glsm/glsm.h -+++ libretro-common/include/glsm/glsm.h +--- a/libretro-common/include/glsm/glsm.h ++++ b/libretro-common/include/glsm/glsm.h @@ -32,8 +32,8 @@ RETRO_BEGIN_DECLS diff --git a/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch b/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch index d38027bbd2..87dd9e9818 100644 --- a/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch +++ b/srcpkgs/libretro-mupen64plus-rpi/patches/string.patch @@ -1,5 +1,5 @@ ---- GLideN64/src/ShaderUtils.h 2019-05-31 19:25:22.000000000 +0200 -+++ GLideN64/src/ShaderUtils.h 2021-03-02 14:30:43.395732704 +0100 +--- a/GLideN64/src/ShaderUtils.h 2019-05-31 19:25:22.000000000 +0200 ++++ b/GLideN64/src/ShaderUtils.h 2021-03-02 14:30:43.395732704 +0100 @@ -1,6 +1,7 @@ #ifndef SHADER_UTILS_H #define SHADER_UTILS_H diff --git a/srcpkgs/libretro-mupen64plus-rpi/patches/types.patch b/srcpkgs/libretro-mupen64plus-rpi/patches/types.patch index 423ed76f40..c5b65bcaf0 100644 --- a/srcpkgs/libretro-mupen64plus-rpi/patches/types.patch +++ b/srcpkgs/libretro-mupen64plus-rpi/patches/types.patch @@ -1,6 +1,6 @@ This is needed to build on armv6/7 musl. ---- mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c -+++ mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c +--- a/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c ++++ b/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c @@ -25,12 +25,8 @@ #include #include @@ -14,8 +14,8 @@ This is needed to build on armv6/7 musl. #ifdef __cplusplus extern "C" { #endif ---- mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c -+++ mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c +--- a/mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c ++++ b/mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c @@ -24,10 +24,7 @@ #include #include diff --git a/srcpkgs/libretro-mupen64plus-rpi/template b/srcpkgs/libretro-mupen64plus-rpi/template index 2bf1f3af3e..47752ab573 100644 --- a/srcpkgs/libretro-mupen64plus-rpi/template +++ b/srcpkgs/libretro-mupen64plus-rpi/template @@ -14,7 +14,6 @@ homepage="http://www.libretro.com/" distfiles="https://github.com/libretro/mupen64plus-libretro/archive/${_gitrev}.tar.gz" checksum=947abfb1d5ff34d6b22fecfb2df02bd3759fde3f4a0e5d238f65ec7e97d964d4 conflicts="ĺibretro-mupen64plus>=0" -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/libretro-mupen64plus/patches/add-string.patch b/srcpkgs/libretro-mupen64plus/patches/add-string.patch index 5d69eee3ac..9f277a379f 100644 --- a/srcpkgs/libretro-mupen64plus/patches/add-string.patch +++ b/srcpkgs/libretro-mupen64plus/patches/add-string.patch @@ -1,5 +1,5 @@ ---- GLideN64/src/ShaderUtils.h 2019-05-31 19:25:22.000000000 +0200 -+++ GLideN64/src/ShaderUtils.h 2020-09-24 17:12:36.260736024 +0200 +--- a/GLideN64/src/ShaderUtils.h 2019-05-31 19:25:22.000000000 +0200 ++++ b/GLideN64/src/ShaderUtils.h 2020-09-24 17:12:36.260736024 +0200 @@ -3,6 +3,7 @@ #include "OpenGL.h" diff --git a/srcpkgs/libretro-mupen64plus/patches/gl-typedefs.patch b/srcpkgs/libretro-mupen64plus/patches/gl-typedefs.patch index eccef9cca7..154b62af6c 100644 --- a/srcpkgs/libretro-mupen64plus/patches/gl-typedefs.patch +++ b/srcpkgs/libretro-mupen64plus/patches/gl-typedefs.patch @@ -1,5 +1,5 @@ ---- libretro-common/include/glsm/glsm.h -+++ libretro-common/include/glsm/glsm.h +--- a/libretro-common/include/glsm/glsm.h ++++ b/libretro-common/include/glsm/glsm.h @@ -32,8 +32,8 @@ RETRO_BEGIN_DECLS diff --git a/srcpkgs/libretro-mupen64plus/patches/types.patch b/srcpkgs/libretro-mupen64plus/patches/types.patch index 423ed76f40..c5b65bcaf0 100644 --- a/srcpkgs/libretro-mupen64plus/patches/types.patch +++ b/srcpkgs/libretro-mupen64plus/patches/types.patch @@ -1,6 +1,6 @@ This is needed to build on armv6/7 musl. ---- mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c -+++ mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c +--- a/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c ++++ b/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c @@ -25,12 +25,8 @@ #include #include @@ -14,8 +14,8 @@ This is needed to build on armv6/7 musl. #ifdef __cplusplus extern "C" { #endif ---- mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c -+++ mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c +--- a/mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c ++++ b/mupen64plus-core/src/r4300/new_dynarec/new_dynarec_64.c @@ -24,10 +24,7 @@ #include #include diff --git a/srcpkgs/libretro-mupen64plus/template b/srcpkgs/libretro-mupen64plus/template index 66259516c7..81adcec5d6 100644 --- a/srcpkgs/libretro-mupen64plus/template +++ b/srcpkgs/libretro-mupen64plus/template @@ -13,7 +13,6 @@ homepage="http://www.libretro.com/" distfiles="https://github.com/libretro/mupen64plus-libretro/archive/${_gitrev}.tar.gz" checksum=947abfb1d5ff34d6b22fecfb2df02bd3759fde3f4a0e5d238f65ec7e97d964d4 conflicts="ĺibretro-mupen64plus-rpi>=0" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686*) hostmakedepends+=" nasm";; diff --git a/srcpkgs/librtas/patches/fix-endian_h.patch b/srcpkgs/librtas/patches/fix-endian_h.patch index c27a3a1dc9..e9e1d89f23 100644 --- a/srcpkgs/librtas/patches/fix-endian_h.patch +++ b/srcpkgs/librtas/patches/fix-endian_h.patch @@ -1,5 +1,5 @@ ---- librtas_src/librtas.h 2018-06-15 01:49:01.000000000 +0200 -+++ librtas_src/librtas.h 2019-03-19 15:35:14.839592813 +0100 +--- a/librtas_src/librtas.h 2018-06-15 01:49:01.000000000 +0200 ++++ b/librtas_src/librtas.h 2019-03-19 15:35:14.839592813 +0100 @@ -27,6 +27,7 @@ #include #include @@ -8,8 +8,8 @@ #define RTAS_KERNEL_INT -1001 /* No Kernel Interface to Firmware */ #define RTAS_KERNEL_IMP -1002 /* No Kernel Implementation of Function */ ---- librtasevent_src/librtasevent.h 2018-06-15 01:49:01.000000000 +0200 -+++ librtasevent_src/librtasevent.h 2019-03-19 15:37:53.055600976 +0100 +--- a/librtasevent_src/librtasevent.h 2018-06-15 01:49:01.000000000 +0200 ++++ b/librtasevent_src/librtasevent.h 2019-03-19 15:37:53.055600976 +0100 @@ -49,6 +49,7 @@ #include diff --git a/srcpkgs/librtas/template b/srcpkgs/librtas/template index f7d9c0411d..65951b25fe 100644 --- a/srcpkgs/librtas/template +++ b/srcpkgs/librtas/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/ibm-power-utilities/librtas" distfiles="https://github.com/ibm-power-utilities/librtas/archive/v${version}.tar.gz" checksum=b47b2a6f140347ac265e2c66ddf68293f6cdcc7c0c9a78c6e21ff52846465415 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/libscrypt/patches/makefile.patch b/srcpkgs/libscrypt/patches/makefile.patch index 759ac275c4..550f37e287 100644 --- a/srcpkgs/libscrypt/patches/makefile.patch +++ b/srcpkgs/libscrypt/patches/makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -6,7 +6,7 @@ CC?=gcc diff --git a/srcpkgs/libscrypt/template b/srcpkgs/libscrypt/template index debdb6e9c4..f3777bab08 100644 --- a/srcpkgs/libscrypt/template +++ b/srcpkgs/libscrypt/template @@ -9,7 +9,6 @@ license="2-clause-BSD" homepage="https://github.com/technion/" distfiles="https://github.com/technion/${pkgname}/archive/v${version}.tar.gz" checksum=68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch index a899439cdf..58b766a0ec 100644 --- a/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch +++ b/srcpkgs/libsearpc/patches/01-glib-include-kludge.patch @@ -2,8 +2,8 @@ include searpc-client.h inside one. See https://github.com/haiwen/libsearpc/pull/57. This is the easy fix, needed until upstream fixes the problem. ---- lib/searpc-client.h~ 2020-06-18 05:23:11.000000000 +0200 -+++ lib/searpc-client.h 2021-04-10 15:48:09.994005146 +0200 +--- a/lib/searpc-client.h~ 2020-06-18 05:23:11.000000000 +0200 ++++ b/lib/searpc-client.h 2021-04-10 15:48:09.994005146 +0200 @@ -7,8 +7,14 @@ #define LIBSEARPC_API #endif diff --git a/srcpkgs/libsearpc/template b/srcpkgs/libsearpc/template index 8d527de8c2..22fbb7987d 100644 --- a/srcpkgs/libsearpc/template +++ b/srcpkgs/libsearpc/template @@ -17,7 +17,6 @@ homepage="https://seafile.com" distfiles="https://github.com/haiwen/libsearpc/archive/${_gitrev}.tar.gz" checksum=2a58894cefbc1d7398581fc58103261688c93a9cf63f11afc5e92142ed948c00 python_version=3 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/libselinux/patches/fts.patch b/srcpkgs/libselinux/patches/fts.patch index c3df41d485..255254c60b 100644 --- a/srcpkgs/libselinux/patches/fts.patch +++ b/srcpkgs/libselinux/patches/fts.patch @@ -1,7 +1,7 @@ diff --git utils/Makefile utils/Makefile index 3615063..3c1be17 100644 ---- utils/Makefile -+++ utils/Makefile +--- a/utils/Makefile ++++ b/utils/Makefile @@ -47,6 +47,8 @@ override CFLAGS += -I../include -D_GNU_SOURCE $(DISABLE_FLAGS) $(PCRE_CFLAGS) override LDFLAGS += -L../src override LDLIBS += -lselinux diff --git a/srcpkgs/libselinux/template b/srcpkgs/libselinux/template index ec31b411ef..fdd8d63993 100644 --- a/srcpkgs/libselinux/template +++ b/srcpkgs/libselinux/template @@ -13,7 +13,6 @@ license="GPL-2.0-only" homepage="https://www.nsa.gov/what-we-do/research/selinux/" distfiles="https://github.com/SELinuxProject/selinux/releases/download/20191204/${pkgname}-${version}.tar.gz" checksum=2ea2b30f671dae9d6b1391cbe8fb2ce5d36a3ee4fb1cd3c32f0d933c31b82433 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-fts-devel" diff --git a/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch b/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch index 133f087c63..36de041b5a 100644 --- a/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch +++ b/srcpkgs/libsigrokdecode/patches/0001-configure.ac-Add-support-for-Python-3.9.patch @@ -9,8 +9,8 @@ Subject: [PATCH] configure.ac: Add support for Python 3.9. diff --git configure.ac configure.ac index f9958b3..2917cb3 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -100,7 +100,7 @@ SR_PKG_CHECK_SUMMARY([srd_pkglibs_summary]) # first, since usually only that variant will add "-lpython3.8". # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build diff --git a/srcpkgs/libsigrokdecode/template b/srcpkgs/libsigrokdecode/template index a06923caee..8be3b73637 100644 --- a/srcpkgs/libsigrokdecode/template +++ b/srcpkgs/libsigrokdecode/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://sigrok.org/" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0 -patch_args=-Np0 pre_configure() { autoreconf diff --git a/srcpkgs/libsigsegv/patches/ppc-musl.patch b/srcpkgs/libsigsegv/patches/ppc-musl.patch index fa04a36f2e..3dc99089ad 100644 --- a/srcpkgs/libsigsegv/patches/ppc-musl.patch +++ b/srcpkgs/libsigsegv/patches/ppc-musl.patch @@ -1,7 +1,7 @@ This fixes build on 32-bit ppc with musl. ---- src/fault-linux-powerpc.h -+++ src/fault-linux-powerpc.h +--- a/src/fault-linux-powerpc.h ++++ b/src/fault-linux-powerpc.h @@ -29,9 +29,8 @@ #if defined(__powerpc64__) || defined(_ARCH_PPC64) /* 64-bit */ # define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1] diff --git a/srcpkgs/libsigsegv/template b/srcpkgs/libsigsegv/template index 977989a1db..13352c58bc 100644 --- a/srcpkgs/libsigsegv/template +++ b/srcpkgs/libsigsegv/template @@ -10,7 +10,6 @@ homepage="https://www.gnu.org/software/libsigsegv/" distfiles="https://ftpmirror.gnu.org/libsigsegv/libsigsegv-${version}.tar.gz" checksum=3ae1af359eebaa4ffc5896a1aee3568c052c99879316a1ab57f8fe1789c390b6 configure_args="--enable-shared" -patch_args=-Np0 post_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/libsmbios/patches/fix-musl.patch b/srcpkgs/libsmbios/patches/fix-musl.patch index f4006ab004..925af50978 100644 --- a/srcpkgs/libsmbios/patches/fix-musl.patch +++ b/srcpkgs/libsmbios/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- src/libsmbios_c/smi/smi_linux.c.orig 2019-02-07 22:09:34.240465062 +0100 -+++ src/libsmbios_c/smi/smi_linux.c 2019-02-07 22:09:41.937466022 +0100 +--- a/src/libsmbios_c/smi/smi_linux.c 2019-02-07 22:09:34.240465062 +0100 ++++ b/src/libsmbios_c/smi/smi_linux.c 2019-02-07 22:09:41.937466022 +0100 @@ -28,6 +28,7 @@ #include #include // flock @@ -8,8 +8,8 @@ #include // public ---- src/libsmbios_c/common/platform/linux.h.orig 2019-02-07 22:17:16.671522730 +0100 -+++ src/libsmbios_c/common/platform/linux.h 2019-02-07 22:17:36.932525256 +0100 +--- a/src/libsmbios_c/common/platform/linux.h 2019-02-07 22:17:16.671522730 +0100 ++++ b/src/libsmbios_c/common/platform/linux.h 2019-02-07 22:17:36.932525256 +0100 @@ -1,3 +1,23 @@ +#if !defined(__GLIBC__) && !defined(LL_IO) +#define LL_IO diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template index fbd3633b48..9984372885 100644 --- a/srcpkgs/libsmbios/template +++ b/srcpkgs/libsmbios/template @@ -16,7 +16,6 @@ checksum=36c36a0f6b59190d6b4fef11696886e4511091929a5eb7ae7cf5fea0c32d3f58 # explicitly list the subpackages to make sure they are installed in the # right order: subpackages="libsmbios-devel python3-libsmbios libsmbios-utils" -patch_args=-Np0 archs="i686* x86_64*" diff --git a/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch b/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch index 1b25a7ea58..850aae51fe 100644 --- a/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch +++ b/srcpkgs/libspnav/patches/OO.Makefile.fix-liblinks.patch @@ -1,8 +1,8 @@ Fix link generation of .so files Source: https://git.archlinux.org/svntogit/packages.git/plain/trunk/Makefile.patch?h=packages/libspnav ---- Makefile.in~ 2015-01-10 09:08:35.043417955 +0000 -+++ Makefile.in 2015-01-10 09:09:00.833315269 +0000 +--- a/Makefile.in~ 2015-01-10 09:08:35.043417955 +0000 ++++ b/Makefile.in 2015-01-10 09:09:00.833315269 +0000 @@ -54,8 +54,8 @@ cp $(lib_so) $(DESTDIR)$(PREFIX)/$(libdir)/$(lib_so) [ -n "$(soname)" ] && \ diff --git a/srcpkgs/libspnav/template b/srcpkgs/libspnav/template index af3966aa1f..df35072b24 100644 --- a/srcpkgs/libspnav/template +++ b/srcpkgs/libspnav/template @@ -11,7 +11,6 @@ license="GPL-3" homepage="http://spacenav.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/spacenav/${pkgname}-${version}.tar.gz" checksum=7ae4d7bb7f6a5dda28b487891e01accc856311440f582299760dace6ee5f1f93 -patch_args=-Np0 do_build() { make CC="${CC}" AR="${AR}" diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch index bdd2fb6c0b..39122128a3 100644 --- a/srcpkgs/libssh/patches/fix-includes.patch +++ b/srcpkgs/libssh/patches/fix-includes.patch @@ -1,5 +1,5 @@ ---- include/libssh/libssh.h -+++ include/libssh/libssh.h +--- a/include/libssh/libssh.h ++++ b/include/libssh/libssh.h @@ -57,6 +57,7 @@ typedef unsigned long long uint64_t; typedef int mode_t; diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index 9c3194a779..9b57379bfc 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" homepage="https://www.libssh.org/" distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.gz" checksum=df65d6054554e8ff5458628808ce8d68b928175f4fefa1c833582b9568491e64 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args="-DHAVE_GLOB=0" ;; diff --git a/srcpkgs/libtecla/patches/fix-destdir.patch b/srcpkgs/libtecla/patches/fix-destdir.patch index 5334bba717..5454bd87da 100644 --- a/srcpkgs/libtecla/patches/fix-destdir.patch +++ b/srcpkgs/libtecla/patches/fix-destdir.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -15,10 +15,10 @@ prefix=@prefix@ diff --git a/srcpkgs/libtecla/patches/musl-build.patch b/srcpkgs/libtecla/patches/musl-build.patch index 37f241fc65..41e7b628b3 100644 --- a/srcpkgs/libtecla/patches/musl-build.patch +++ b/srcpkgs/libtecla/patches/musl-build.patch @@ -1,5 +1,5 @@ ---- Makefile.rules.orig -+++ Makefile.rules +--- a/Makefile.rules ++++ b/Makefile.rules @@ -165,5 +165,5 @@ # Include file dependencies. #----------------------------------------------------------------------- diff --git a/srcpkgs/libtecla/template b/srcpkgs/libtecla/template index ee59c9c336..7055a50a63 100644 --- a/srcpkgs/libtecla/template +++ b/srcpkgs/libtecla/template @@ -11,7 +11,6 @@ license="MIT/X11" homepage="http://www.astro.caltech.edu/~mcs/tecla" distfiles="${homepage}/${pkgname}-${version}.tar.gz" checksum=f2757cc55040859fcf8f59a0b7b26e0184a22bece44ed9568a4534a478c1ee1a -patch_args=-Np0 post_install() { vlicense LICENSE.TERMS LICENSE diff --git a/srcpkgs/libticables2/patches/ppc64le.patch b/srcpkgs/libticables2/patches/ppc64le.patch index e8dc42ceda..009fb9a61f 100644 --- a/srcpkgs/libticables2/patches/ppc64le.patch +++ b/srcpkgs/libticables2/patches/ppc64le.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -159,7 +159,7 @@ case "$host" in mips-*-linux-*) ARCH="-D__MIPS__ -D__LINUX__" ;; mipsel-*-linux-*) ARCH="-D__MIPS__ -D__LINUX__" ;; diff --git a/srcpkgs/libticables2/template b/srcpkgs/libticables2/template index 9472884937..17f06ace97 100644 --- a/srcpkgs/libticables2/template +++ b/srcpkgs/libticables2/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://www.ticalc.org" distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" checksum=0c6fb6516e72ccab081ddb3aecceff694ed93aec689ddd2edba9c7c7406c4522 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" gettext-devel" diff --git a/srcpkgs/libtool/patches/0001-trailingslash.patch b/srcpkgs/libtool/patches/0001-trailingslash.patch index 11cebfad3c..1914f57ef6 100644 --- a/srcpkgs/libtool/patches/0001-trailingslash.patch +++ b/srcpkgs/libtool/patches/0001-trailingslash.patch @@ -13,8 +13,8 @@ Nitin A Kamble Adapted to libtool-2.4.6 file build-aux/ltmain.in Jürgen Buchmüller ---- build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 -+++ build-aux/ltmain.in 2015-10-20 13:35:03.265959290 +0200 +--- a/build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 ++++ b/build-aux/ltmain.in 2015-10-20 13:35:03.265959290 +0200 @@ -2363,8 +2363,15 @@ func_append dir "$objdir" @@ -32,8 +32,8 @@ Jürgen Buchmüller # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that ---- build-aux/ltmain.sh 2015-02-15 17:15:12.000000000 +0100 -+++ build-aux/ltmain.sh 2015-10-20 23:26:41.674142100 +0200 +--- a/build-aux/ltmain.sh 2015-02-15 17:15:12.000000000 +0100 ++++ b/build-aux/ltmain.sh 2015-10-20 23:26:41.674142100 +0200 @@ -4275,8 +4275,15 @@ func_append dir "$objdir" diff --git a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch index 4a6048ca6f..960873c04e 100644 --- a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch +++ b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch @@ -11,8 +11,8 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html Adapted to libtool-2.4.6 configure files and line numbers Jürgen Buchmüller ---- configure 2015-02-15 17:14:34.000000000 +0100 -+++ configure 2015-10-20 13:25:12.684906339 +0200 +--- a/configure 2015-02-15 17:14:34.000000000 +0100 ++++ b/configure 2015-10-20 13:25:12.684906339 +0200 @@ -824,7 +824,7 @@ enable_fast_install with_aix_soname @@ -70,8 +70,8 @@ Jürgen Buchmüller as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac ---- libltdl/configure 2015-02-15 17:15:15.000000000 +0100 -+++ libltdl/configure 2015-10-20 13:26:45.747914683 +0200 +--- a/libltdl/configure 2015-02-15 17:15:15.000000000 +0100 ++++ b/libltdl/configure 2015-10-20 13:26:45.747914683 +0200 @@ -775,7 +775,7 @@ with_aix_soname enable_dependency_tracking @@ -129,8 +129,8 @@ Jürgen Buchmüller as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac ---- tests/testsuite 2015-02-15 17:15:25.000000000 +0100 -+++ tests/testsuite 2015-10-20 14:29:41.455253215 +0200 +--- a/tests/testsuite 2015-02-15 17:15:25.000000000 +0100 ++++ b/tests/testsuite 2015-10-20 14:29:41.455253215 +0200 @@ -49296,7 +49296,7 @@ @@ -212,8 +212,8 @@ Jürgen Buchmüller AC_SUBST([sysroot]) AC_OUTPUT(Makefile) _ATEOF ---- tests/sysroot.at 2015-01-16 19:52:04.000000000 +0100 -+++ tests/sysroot.at 2015-10-20 14:29:57.731254674 +0200 +--- a/tests/sysroot.at 2015-01-16 19:52:04.000000000 +0100 ++++ b/tests/sysroot.at 2015-10-20 14:29:57.731254674 +0200 @@ -64,7 +64,7 @@ done]) @@ -241,8 +241,8 @@ Jürgen Buchmüller AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) ---- m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100 -+++ m4/libtool.m4 2015-10-20 15:40:04.020631813 +0200 +--- a/m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100 ++++ b/m4/libtool.m4 2015-10-20 15:40:04.020631813 +0200 @@ -1245,29 +1245,29 @@ # _LT_WITH_SYSROOT # ---------------- diff --git a/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch b/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch index 78f37b880d..a0ad989f6d 100644 --- a/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch +++ b/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch @@ -8,8 +8,8 @@ i.e. when lt_sysroot is not set, it will still behave the same and add Adapted to libtool-2.4.6 build-aux/ltmain.in Jürgen Buchmüller ---- build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 -+++ build-aux/ltmain.in 2015-10-20 13:40:29.959988582 +0200 +--- a/build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 ++++ b/build-aux/ltmain.in 2015-10-20 13:40:29.959988582 +0200 @@ -6456,7 +6456,7 @@ fi else diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template index 1eafc55f90..b9972df703 100644 --- a/srcpkgs/libtool/template +++ b/srcpkgs/libtool/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://www.gnu.org/software/libtool" distfiles="${GNU_SITE}/libtool/$pkgname-$version.tar.xz" checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f -patch_args=-Np0 pre_configure() { touch aclocal.m4 libltdl/aclocal.m4 Makefile.am libltdl/Makefile.am Makefile.in libltdl/Makefile.in diff --git a/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch index b22379dad2..10b526fe45 100644 --- a/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch +++ b/srcpkgs/libtorrent/patches/fix-sysroot-handling.patch @@ -1,7 +1,7 @@ --sysroot should be enough. ---- scripts/common.m4.orig 2014-02-02 11:58:17.361448885 +0100 -+++ scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 +--- a/scripts/common.m4 2014-02-02 11:58:17.361448885 +0100 ++++ b/scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 @@ -63,8 +63,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [ else AC_MSG_RESULT($withval) diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index c358b89ebf..cadf0f5bb1 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/rakshasa/libtorrent" distfiles="https://github.com/rakshasa/libtorrent/archive/v${version}.tar.gz" checksum=0f6c2e7ffd3a1723ab47fdac785ec40f85c0a5b5a42c1d002272205b988be722 -patch_args=-Np0 # https://github.com/rakshasa/rtorrent/issues/156 case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/libu2f-host/patches/disable-help2man.patch b/srcpkgs/libu2f-host/patches/disable-help2man.patch index 587d25e14b..10434020f1 100644 --- a/srcpkgs/libu2f-host/patches/disable-help2man.patch +++ b/srcpkgs/libu2f-host/patches/disable-help2man.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig 2016-10-05 16:33:16.220820872 +0200 -+++ src/Makefile.am 2016-10-05 16:33:49.713822600 +0200 +--- a/src/Makefile.am 2016-10-05 16:33:16.220820872 +0200 ++++ b/src/Makefile.am 2016-10-05 16:33:49.713822600 +0200 @@ -31,12 +31,3 @@ BUILT_SOURCES = cmdline.c cmdline.h diff --git a/srcpkgs/libu2f-host/patches/lowercase-boolean.patch b/srcpkgs/libu2f-host/patches/lowercase-boolean.patch index aa3b8deed8..24b31b4f86 100644 --- a/srcpkgs/libu2f-host/patches/lowercase-boolean.patch +++ b/srcpkgs/libu2f-host/patches/lowercase-boolean.patch @@ -1,5 +1,5 @@ ---- u2f-host/u2fmisc.c 2019-05-15 07:54:11.000000000 -0400 -+++ u2f-host/u2fmisc.c 2020-05-31 11:19:24.305252337 -0400 +--- a/u2f-host/u2fmisc.c 2019-05-15 07:54:11.000000000 -0400 ++++ b/u2f-host/u2fmisc.c 2020-05-31 11:19:24.305252337 -0400 @@ -19,6 +19,7 @@ #include "internal.h" diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index e8a14e5d4f..c2cd5b754d 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -15,7 +15,6 @@ homepage="https://developers.yubico.com/libu2f-host/" #changelog="https://raw.githubusercontent.com/Yubico/libu2f-host/master/NEWS" distfiles="https://github.com/Yubico/libu2f-host/archive/libu2f-host-${version}.tar.gz" checksum=45937c6c04349f865d9f047d3a68cc50ea24e9085d18ac2c7d31fa38eb749303 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libu2f-server/patches/lowercase-boolean.patch b/srcpkgs/libu2f-server/patches/lowercase-boolean.patch index cfa7584633..93b0f612d7 100644 --- a/srcpkgs/libu2f-server/patches/lowercase-boolean.patch +++ b/srcpkgs/libu2f-server/patches/lowercase-boolean.patch @@ -1,5 +1,5 @@ ---- u2f-server/core.c 2018-01-04 09:21:38.000000000 -0500 -+++ u2f-server/core.c 2020-05-31 11:24:48.986906605 -0400 +--- a/u2f-server/core.c 2018-01-04 09:21:38.000000000 -0500 ++++ b/u2f-server/core.c 2020-05-31 11:24:48.986906605 -0400 @@ -32,6 +32,7 @@ #include #include diff --git a/srcpkgs/libu2f-server/patches/no-help2man.patch b/srcpkgs/libu2f-server/patches/no-help2man.patch index 46393cb441..be8561bd23 100644 --- a/srcpkgs/libu2f-server/patches/no-help2man.patch +++ b/srcpkgs/libu2f-server/patches/no-help2man.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2018-01-31 21:22:40.957541567 -0800 -+++ configure.ac 2018-01-31 21:23:27.838559722 -0800 +--- a/configure.ac 2018-01-31 21:22:40.957541567 -0800 ++++ b/configure.ac 2018-01-31 21:23:27.838559722 -0800 @@ -49,15 +49,6 @@ LT_INIT([win32-dll]) diff --git a/srcpkgs/libu2f-server/patches/src-no-help.patch b/srcpkgs/libu2f-server/patches/src-no-help.patch index 919a3623a1..5222f9988c 100644 --- a/srcpkgs/libu2f-server/patches/src-no-help.patch +++ b/srcpkgs/libu2f-server/patches/src-no-help.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig 2018-01-31 21:34:44.725821832 -0800 -+++ src/Makefile.am 2018-01-31 21:35:32.885840481 -0800 +--- a/src/Makefile.am 2018-01-31 21:34:44.725821832 -0800 ++++ b/src/Makefile.am 2018-01-31 21:35:32.885840481 -0800 @@ -40,24 +40,6 @@ BUILT_SOURCES = cmdline.c cmdline.h MAINTAINERCLEANFILES = $(BUILT_SOURCES) diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 334b9bbe75..661fc93453 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -12,7 +12,6 @@ license="BSD" homepage="https://developers.yubico.com/libu2f-server/" distfiles="https://github.com/Yubico/libu2f-server/archive/libu2f-server-${version}.tar.gz" checksum=6551109e692c9c4fea61e99f1cd8377e8e54e3033e421cc191da6d673311c860 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch index e049a1b8b1..7957782121 100644 --- a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch +++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch @@ -23,8 +23,8 @@ Fixes: #203 diff --git a/configure.ac b/configure.ac index 8aa3d17..731b711 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils], AM_CONDITIONAL([UTILS], [test x$utils = xtrue]) diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template index d5440d9b96..04b2608684 100644 --- a/srcpkgs/libucl/template +++ b/srcpkgs/libucl/template @@ -12,7 +12,6 @@ license="BSD-2-Clause" homepage="https://github.com/vstakhov/libucl" distfiles="https://github.com/vstakhov/libucl/archive/${version}.tar.gz" checksum=a6397e179672f0e8171a0f9a2cfc37e01432b357fd748b13f4394436689d24ef -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/libuninum/patches/fix-unicode.patch b/srcpkgs/libuninum/patches/fix-unicode.patch index 5e4828987a..3c10621ef7 100644 --- a/srcpkgs/libuninum/patches/fix-unicode.patch +++ b/srcpkgs/libuninum/patches/fix-unicode.patch @@ -1,5 +1,5 @@ ---- uninum.c.orig -+++ uninum.c +--- a/uninum.c ++++ b/uninum.c @@ -35,11 +35,11 @@ */ @@ -17,8 +17,8 @@ #define UNINUM ---- unicode.h.orig -+++ unicode.h +--- a/unicode.h ++++ b/unicode.h @@ -1,8 +1,10 @@ -typedef unsigned long UTF32; /* at least 32 bits */ -typedef unsigned short UTF16; /* at least 16 bits */ diff --git a/srcpkgs/libuninum/template b/srcpkgs/libuninum/template index d2278fa245..e66a1df67e 100644 --- a/srcpkgs/libuninum/template +++ b/srcpkgs/libuninum/template @@ -10,7 +10,6 @@ license="LGPL-2.1-only" homepage="http://billposer.org/Software/libuninum.html" distfiles="http://billposer.org/Software/Downloads/libuninum-${version}.tar.bz2" checksum=e704983c3c00e9b76bd836b8b83ce31bfe4eb1752eee8be123cf97c1275076ea -patch_args=-Np0 libuninum-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch index 5309f45b2f..734a60e2f7 100644 --- a/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch +++ b/srcpkgs/libunique/patches/gcc7-fix-char_ptr.patch @@ -1,5 +1,5 @@ ---- unique/uniqueapp.c 2011-06-14 14:26:26.000000000 +0200 -+++ unique/uniqueapp.c 2017-05-20 19:27:59.043332852 +0200 +--- a/unique/uniqueapp.c 2011-06-14 14:26:26.000000000 +0200 ++++ b/unique/uniqueapp.c 2017-05-20 19:27:59.043332852 +0200 @@ -175,7 +175,7 @@ { gchar *id; diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template index 316b811bfb..db488533ac 100644 --- a/srcpkgs/libunique/template +++ b/srcpkgs/libunique/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Attic/LibUnique" distfiles="${GNOME_SITE}/${pkgname}/3.0/${pkgname}-${version}.tar.bz2" checksum=50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d -patch_args=-Np0 # Package build options build_options="gir" diff --git a/srcpkgs/libunwind/patches/mips-musl.patch b/srcpkgs/libunwind/patches/mips-musl.patch index 6dac3d0789..c7e4ef9051 100644 --- a/srcpkgs/libunwind/patches/mips-musl.patch +++ b/srcpkgs/libunwind/patches/mips-musl.patch @@ -1,5 +1,5 @@ ---- src/mips/getcontext.S.orig -+++ src/mips/getcontext.S +--- a/src/mips/getcontext.S ++++ b/src/mips/getcontext.S @@ -24,7 +24,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/srcpkgs/libunwind/patches/mips-read_write_s32.patch b/srcpkgs/libunwind/patches/mips-read_write_s32.patch index d61d4b2cb5..e6921d49dd 100644 --- a/srcpkgs/libunwind/patches/mips-read_write_s32.patch +++ b/srcpkgs/libunwind/patches/mips-read_write_s32.patch @@ -1,5 +1,5 @@ ---- include/tdep-mips/libunwind_i.h 2020-11-10 17:14:01.000000000 +0100 -+++ include/tdep-mips/libunwind_i.h 2021-01-11 22:12:16.993539625 +0100 +--- a/include/tdep-mips/libunwind_i.h 2020-11-10 17:14:01.000000000 +0100 ++++ b/include/tdep-mips/libunwind_i.h 2021-01-11 22:12:16.993539625 +0100 @@ -148,9 +148,10 @@ static inline int read_s32 (struct dwarf_cursor *c, unw_word_t addr, unw_word_t *val) diff --git a/srcpkgs/libunwind/patches/mips-registers.patch b/srcpkgs/libunwind/patches/mips-registers.patch index 8ed549f2ce..62ba597301 100644 --- a/srcpkgs/libunwind/patches/mips-registers.patch +++ b/srcpkgs/libunwind/patches/mips-registers.patch @@ -1,7 +1,7 @@ Hardcoded according to _MIPS_SIM _ABIO32 (-mabi=32)! ---- src/coredump/_UCD_access_reg_linux.c.orig -+++ src/coredump/_UCD_access_reg_linux.c +--- a/src/coredump/_UCD_access_reg_linux.c ++++ b/src/coredump/_UCD_access_reg_linux.c @@ -49,37 +49,37 @@ #if defined(UNW_TARGET_MIPS) static const uint8_t remap_regs[] = diff --git a/srcpkgs/libunwind/patches/ppc32-musl.patch b/srcpkgs/libunwind/patches/ppc32-musl.patch index d5ceb41adc..dc4e894a6b 100644 --- a/srcpkgs/libunwind/patches/ppc32-musl.patch +++ b/srcpkgs/libunwind/patches/ppc32-musl.patch @@ -1,5 +1,5 @@ ---- src/ppc32/Ginit.c -+++ src/ppc32/Ginit.c +--- a/src/ppc32/Ginit.c ++++ b/src/ppc32/Ginit.c @@ -48,12 +48,12 @@ uc_addr (ucontext_t *uc, int reg) void *addr; @@ -24,8 +24,8 @@ } return addr; } ---- src/ppc32/ucontext_i.h -+++ src/ppc32/ucontext_i.h +--- a/src/ppc32/ucontext_i.h ++++ b/src/ppc32/ucontext_i.h @@ -42,87 +42,93 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ //#define MQ_IDX 36 #define LINK_IDX 36 diff --git a/srcpkgs/libunwind/patches/ppc64-musl.patch b/srcpkgs/libunwind/patches/ppc64-musl.patch index 1ff08338d3..e3f4848871 100644 --- a/srcpkgs/libunwind/patches/ppc64-musl.patch +++ b/srcpkgs/libunwind/patches/ppc64-musl.patch @@ -1,5 +1,5 @@ ---- src/ptrace/_UPT_reg_offset.c -+++ src/ptrace/_UPT_reg_offset.c +--- a/src/ptrace/_UPT_reg_offset.c ++++ b/src/ptrace/_UPT_reg_offset.c @@ -32,6 +32,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ # include #endif diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template index 808d89e498..d4819ce54a 100644 --- a/srcpkgs/libunwind/template +++ b/srcpkgs/libunwind/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://www.nongnu.org/libunwind/" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version/rc/-rc}.tar.gz" checksum=90337653d92d4a13de590781371c604f9031cdb50520366aa1e3a91e1efb1017 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/libusb-compat/patches/fix-musl.patch b/srcpkgs/libusb-compat/patches/fix-musl.patch index 52e098d991..9075b11c6b 100644 --- a/srcpkgs/libusb-compat/patches/fix-musl.patch +++ b/srcpkgs/libusb-compat/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- libusb/usb.h.orig 2015-08-19 15:49:18.184304924 +0200 -+++ libusb/usb.h 2015-08-19 15:49:36.210303575 +0200 +--- a/libusb/usb.h 2015-08-19 15:49:18.184304924 +0200 ++++ b/libusb/usb.h 2015-08-19 15:49:36.210303575 +0200 @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template index 05585a0ad5..016d5753f1 100644 --- a/srcpkgs/libusb-compat/template +++ b/srcpkgs/libusb-compat/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="http://libusb.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/libusb/$pkgname-$version.tar.bz2" checksum=404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a -patch_args=-Np0 libusb-compat-devel_package() { depends="libusb-devel ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch index 41b78b7348..b891a79ba5 100644 --- a/srcpkgs/libusb/patches/fix-descriptor-parsing.patch +++ b/srcpkgs/libusb/patches/fix-descriptor-parsing.patch @@ -1,5 +1,5 @@ ---- libusb/os/linux_usbfs.c -+++ libusb/os/linux_usbfs.c +--- a/libusb/os/linux_usbfs.c ++++ b/libusb/os/linux_usbfs.c @@ -641,7 +641,12 @@ static int seek_to_next_config(struct libusb_context *ctx, uint8_t *buffer, size_t len) { diff --git a/srcpkgs/libusb/patches/portability-fixes.patch b/srcpkgs/libusb/patches/portability-fixes.patch index 2f58447426..39ff1e3772 100644 --- a/srcpkgs/libusb/patches/portability-fixes.patch +++ b/srcpkgs/libusb/patches/portability-fixes.patch @@ -1,5 +1,5 @@ ---- libusb/io.c.orig 2014-01-11 16:34:55.811463881 +0100 -+++ libusb/io.c 2014-01-11 16:35:26.138281377 +0100 +--- a/libusb/io.c 2014-01-11 16:34:55.811463881 +0100 ++++ b/libusb/io.c 2014-01-11 16:35:26.138281377 +0100 @@ -34,6 +34,13 @@ #include #endif diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template index 6ec291f077..8c5ff6054e 100644 --- a/srcpkgs/libusb/template +++ b/srcpkgs/libusb/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://libusb.info" distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2" checksum=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a -patch_args=-Np0 libusb-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/libusbmuxd/patches/musl.patch b/srcpkgs/libusbmuxd/patches/musl.patch index 91b660de85..f3d3ee896f 100644 --- a/srcpkgs/libusbmuxd/patches/musl.patch +++ b/srcpkgs/libusbmuxd/patches/musl.patch @@ -1,7 +1,7 @@ diff --git tools/inetcat.c tools/inetcat.c index b306a47..74bb91b 100644 ---- tools/inetcat.c -+++ tools/inetcat.c +--- a/tools/inetcat.c ++++ b/tools/inetcat.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template index 192aa8b4a0..e3ae03e51b 100644 --- a/srcpkgs/libusbmuxd/template +++ b/srcpkgs/libusbmuxd/template @@ -12,7 +12,6 @@ homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/libusbmuxd/master/NEWS" distfiles="https://github.com/libimobiledevice/libusbmuxd/archive/${version}.tar.gz" checksum=8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libuv/patches/disable-fs-chown.patch b/srcpkgs/libuv/patches/disable-fs-chown.patch index 893d09edfa..c77326e2d6 100644 --- a/srcpkgs/libuv/patches/disable-fs-chown.patch +++ b/srcpkgs/libuv/patches/disable-fs-chown.patch @@ -1,5 +1,5 @@ ---- test/test-list.h.orig 2021-03-02 21:59:17.718832425 +1100 -+++ test/test-list.h 2021-03-02 21:59:41.809157112 +1100 +--- a/test/test-list.h 2021-03-02 21:59:17.718832425 +1100 ++++ b/test/test-list.h 2021-03-02 21:59:41.809157112 +1100 @@ -344,7 +344,7 @@ #ifdef _WIN32 TEST_DECLARE (fs_unlink_archive_readonly) diff --git a/srcpkgs/libuv/patches/disable-setuid-test.patch b/srcpkgs/libuv/patches/disable-setuid-test.patch index 9dbd6bcee6..4d9fd034b6 100644 --- a/srcpkgs/libuv/patches/disable-setuid-test.patch +++ b/srcpkgs/libuv/patches/disable-setuid-test.patch @@ -1,5 +1,5 @@ ---- test/test-list.h.orig 2021-03-02 21:59:17.718832425 +1100 -+++ test/test-list.h 2021-03-02 22:05:18.359833402 +1100 +--- a/test/test-list.h 2021-03-02 21:59:17.718832425 +1100 ++++ b/test/test-list.h 2021-03-02 22:05:18.359833402 +1100 @@ -305,8 +305,8 @@ TEST_DECLARE (spawn_and_kill_with_std) TEST_DECLARE (spawn_and_ping) diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template index 24938fe4bc..76a36863f4 100644 --- a/srcpkgs/libuv/template +++ b/srcpkgs/libuv/template @@ -13,7 +13,6 @@ distfiles="https://github.com/libuv/libuv/archive/v${version}.tar.gz" checksum=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa # the tests fail when run as root and as such break in the CI containers make_check="extended" -patch_args=-Np0 LDFLAGS="-pthread" diff --git a/srcpkgs/libva-vdpau-driver/patches/CreateSurfaceFromV4L2Buf.patch b/srcpkgs/libva-vdpau-driver/patches/CreateSurfaceFromV4L2Buf.patch index eff03eee4e..7c67fb0e64 100644 --- a/srcpkgs/libva-vdpau-driver/patches/CreateSurfaceFromV4L2Buf.patch +++ b/srcpkgs/libva-vdpau-driver/patches/CreateSurfaceFromV4L2Buf.patch @@ -7,8 +7,8 @@ vdpau_video.h:274:1: note: previous declaration of 'vdpau_CreateSurfaceFromV4L2B | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git src/vdpau_video.c src/vdpau_video.c index 41d4573..937de19 100644 ---- src/vdpau_video.c -+++ src/vdpau_video.c +--- a/src/vdpau_video.c ++++ b/src/vdpau_video.c @@ -927,8 +927,10 @@ VAStatus vdpau_CreateSurfaceFromV4L2Buf( VADriverContextP ctx, @@ -22,8 +22,8 @@ index 41d4573..937de19 100644 { diff --git src/vdpau_video.h src/vdpau_video.h index 667a6d7..9ba654f 100644 ---- src/vdpau_video.h -+++ src/vdpau_video.h +--- a/src/vdpau_video.h ++++ b/src/vdpau_video.h @@ -274,8 +274,10 @@ VAStatus vdpau_CreateSurfaceFromV4L2Buf( VADriverContextP ctx, diff --git a/srcpkgs/libva-vdpau-driver/patches/fix-aarch64-musl.patch b/srcpkgs/libva-vdpau-driver/patches/fix-aarch64-musl.patch index 60cf9cfc8b..d8ca0b726f 100644 --- a/srcpkgs/libva-vdpau-driver/patches/fix-aarch64-musl.patch +++ b/srcpkgs/libva-vdpau-driver/patches/fix-aarch64-musl.patch @@ -4,8 +4,8 @@ utils.c:108:20: error: storage size of 'tv' isn't known ^~ diff --git a/src/utils.c b/src/utils.c index 1dac15c..3e2fa6a 100644 ---- src/utils.c -+++ src/utils.c +--- a/src/utils.c ++++ b/src/utils.c @@ -21,6 +21,7 @@ #include "sysdeps.h" #include "utils.h" diff --git a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch index 0d68ab2abc..74caee3483 100644 --- a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch +++ b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch @@ -13,8 +13,8 @@ Signed-off-by: Xiang, Haihao diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c index 899888b..610e7cd 100644 ---- src/vdpau_dump.c -+++ src/vdpau_dump.c +--- a/src/vdpau_dump.c ++++ b/src/vdpau_dump.c @@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type) _(VAEncSequenceParameterBufferType); _(VAEncPictureParameterBufferType); diff --git a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-glext-missing-definition.patch index 221b9608fe..b56d268343 100644 --- a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-glext-missing-definition.patch +++ b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-glext-missing-definition.patch @@ -1,5 +1,5 @@ ---- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100 -+++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100 +--- a/src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100 ++++ b/src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100 @@ -48,6 +48,13 @@ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int); #endif diff --git a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch index f858144016..ab3a479986 100644 --- a/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch +++ b/srcpkgs/libva-vdpau-driver/patches/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch @@ -1,5 +1,5 @@ ---- src/vdpau_decode.c -+++ src/vdpau_decode.c +--- a/src/vdpau_decode.c ++++ b/src/vdpau_decode.c @@ -1289,7 +1289,7 @@ driver_data, obj_context->vdp_decoder, diff --git a/srcpkgs/libva-vdpau-driver/template b/srcpkgs/libva-vdpau-driver/template index 82104939cf..391ba5296f 100644 --- a/srcpkgs/libva-vdpau-driver/template +++ b/srcpkgs/libva-vdpau-driver/template @@ -11,4 +11,3 @@ license="GPL-2.0-only" homepage="http://freedesktop.org/wiki/Software/vaapi" distfiles="${FREEDESKTOP_SITE}/vaapi/releases/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 -patch_args=-Np0 diff --git a/srcpkgs/libvdpau/patches/dlclose.patch b/srcpkgs/libvdpau/patches/dlclose.patch index d405d4d3b7..aaf4223de8 100644 --- a/srcpkgs/libvdpau/patches/dlclose.patch +++ b/srcpkgs/libvdpau/patches/dlclose.patch @@ -4,8 +4,8 @@ From Frugalware: it triggers a glibc bug where elf dynamically loaded libraries are freed before the library constructor is ever called ---- src/vdpau_wrapper.c 2013-01-24 18:55:06.000000000 -0600 -+++ src/vdpau_wrapper.c 2013-07-15 20:14:40.221679876 -0500 +--- a/src/vdpau_wrapper.c 2013-01-24 18:55:06.000000000 -0600 ++++ b/src/vdpau_wrapper.c 2013-07-15 20:14:40.221679876 -0500 @@ -47,7 +47,7 @@ #if defined(__GNUC__) diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template index 81fa6d3144..8b1c817cfd 100644 --- a/srcpkgs/libvdpau/template +++ b/srcpkgs/libvdpau/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://freedesktop.org/wiki/Software/VDPAU/" distfiles="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/libvdpau-${version}.tar.gz" checksum=240dd8f9ec08de707529917677827ba12e13b9fc299eeb3af13ea05e7fc74aba -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/libvidstab/patches/fix-cflags.patch b/srcpkgs/libvidstab/patches/fix-cflags.patch index 51c357efb1..71b900058d 100644 --- a/srcpkgs/libvidstab/patches/fix-cflags.patch +++ b/srcpkgs/libvidstab/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -25,7 +25,7 @@ else() set(LIBSUFFIX "") endif() @@ -13,8 +13,8 @@ Index: CMakeLists.txt ### ORC is not used in any active code at the moment ### Index: tests/CMakeLists.txt =================================================================== ---- tests/CMakeLists.txt.orig -+++ tests/CMakeLists.txt +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT option(USE_OMP "use parallelization use OMP" ON) @@ -26,8 +26,8 @@ Index: tests/CMakeLists.txt add_definitions( -DUSE_ORC ${ORC_DEFINITIONS}) Index: transcode/CMakeLists.txt =================================================================== ---- transcode/CMakeLists.txt.orig -+++ transcode/CMakeLists.txt +--- a/transcode/CMakeLists.txt ++++ b/transcode/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT set(TRANSCODE_ROOT ../../transcode) diff --git a/srcpkgs/libvidstab/template b/srcpkgs/libvidstab/template index acd85fc894..6d28468873 100644 --- a/srcpkgs/libvidstab/template +++ b/srcpkgs/libvidstab/template @@ -11,7 +11,6 @@ license="GPL-2" homepage="http://public.hronopik.de/vid.stab/" distfiles="https://github.com/georgmartius/vid.stab/archive/v${version}.tar.gz" checksum=14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb -patch_args=-Np0 pre_configure() { sed -i -e 's/include (FindSSE)//' CMakeLists.txt diff --git a/srcpkgs/libvirt-glib/patches/fix-cross.diff b/srcpkgs/libvirt-glib/patches/fix-cross.diff index 9ce7da845c..c4d77ae59e 100644 --- a/srcpkgs/libvirt-glib/patches/fix-cross.diff +++ b/srcpkgs/libvirt-glib/patches/fix-cross.diff @@ -1,5 +1,5 @@ ---- meson.build.orig 2021-04-05 19:05:59.233949995 +0200 -+++ meson.build 2021-04-05 19:06:10.010949599 +0200 +--- a/meson.build 2021-04-05 19:05:59.233949995 +0200 ++++ b/meson.build 2021-04-05 19:06:10.010949599 +0200 @@ -61,7 +61,7 @@ includedir = join_paths(prefix, get_opti # gobject introspection diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index 568e921d99..032188df7f 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -16,7 +16,6 @@ homepage="https://libvirt.org" distfiles="http://libvirt.org/sources/glib/${pkgname}-${version}.tar.xz" checksum=8423f7069daa476307321d1c11e2ecc285340cd32ca9fc05207762843edeacbd replaces="libvirt-glib-python>=0" -patch_args=-Np0 build_options="doc gir vala" build_options_default="gir vala" diff --git a/srcpkgs/libwm/patches/wm-reg-event.patch b/srcpkgs/libwm/patches/wm-reg-event.patch index ca21171868..16676a8377 100644 --- a/srcpkgs/libwm/patches/wm-reg-event.patch +++ b/srcpkgs/libwm/patches/wm-reg-event.patch @@ -2,8 +2,8 @@ Upstream is dead and they haven't made a new release with this in it. diff --git libwm.c libwm.c index 247326d..b9e689a 100644 ---- libwm.c -+++ libwm.c +--- a/libwm.c ++++ b/libwm.c @@ -344,3 +344,12 @@ wm_set_focus(xcb_window_t wid) xcb_flush(conn); return 1; @@ -19,8 +19,8 @@ index 247326d..b9e689a 100644 +} diff --git wm.h wm.h index dce6279..c6b93e2 100644 ---- wm.h -+++ wm.h +--- a/wm.h ++++ b/wm.h @@ -185,4 +185,10 @@ int wm_resize(xcb_window_t wid, int mode, int w, int h); */ int wm_restack(xcb_window_t wid, uint32_t mode); diff --git a/srcpkgs/libwm/template b/srcpkgs/libwm/template index e88e7eb4a5..df29afde53 100644 --- a/srcpkgs/libwm/template +++ b/srcpkgs/libwm/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/wmutils/libwm" distfiles="https://github.com/wmutils/libwm/archive/v${version}.tar.gz" checksum=db80ef40d6b105f046c1d0bc138470b3e23e7bd1000afc3163d9e62f403f0f6a -patch_args=-Np0 diff --git a/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch b/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch index fcb029f420..b052cd0276 100644 --- a/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch +++ b/srcpkgs/libwmf/patches/01_player.c-integer-overflow-cve-2006-3376.patch @@ -1,5 +1,5 @@ ---- src/player.c -+++ src/player.c +--- a/src/player.c ++++ b/src/player.c @@ -23,6 +23,7 @@ #include diff --git a/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch b/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch index 3066f8ab17..2333265a3f 100644 --- a/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch +++ b/srcpkgs/libwmf/patches/02_font.c-always-check-generated-fontmap.patch @@ -1,5 +1,5 @@ ---- src/font.c -+++ src/font.c +--- a/src/font.c ++++ b/src/font.c @@ -422,7 +422,6 @@ fontmap_data->FD.FI = 0; diff --git a/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch b/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch index 01f9a787b3..8087a6cd18 100644 --- a/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch +++ b/srcpkgs/libwmf/patches/03_font.c-compare-fonts-by-name.patch @@ -1,5 +1,5 @@ ---- src/font.c -+++ src/font.c +--- a/src/font.c ++++ b/src/font.c @@ -199,7 +199,7 @@ unsigned int i = 0; diff --git a/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch b/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch index 01f0dd2795..ce1459fbb4 100644 --- a/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch +++ b/srcpkgs/libwmf/patches/04_gd-gd_clip.c-use-after-free-cve-2009-1364.patch @@ -1,5 +1,5 @@ ---- src/extra/gd/gd_clip.c -+++ src/extra/gd/gd_clip.c +--- a/src/extra/gd/gd_clip.c ++++ b/src/extra/gd/gd_clip.c @@ -70,6 +70,7 @@ { more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle)); if (more == 0) return; diff --git a/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch b/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch index 26b44ef76c..c8f9d1ca6b 100644 --- a/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch +++ b/srcpkgs/libwmf/patches/CVE-2015-0848_CVE-2015-4588_CVE-2015-4695_CVE-2015-4696.patch @@ -1,5 +1,5 @@ ---- src/player/meta.h -+++ src/player/meta.h +--- a/src/player/meta.h ++++ b/src/player/meta.h @@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API, objects = P->objects; @@ -66,8 +66,8 @@ if (i == NUM_OBJECTS (API)) { WMF_ERROR (API,"Object out of range!"); ---- src/ipa/ipa.h -+++ src/ipa/ipa.h +--- a/src/ipa/ipa.h ++++ b/src/ipa/ipa.h @@ -48,7 +48,7 @@ static int ReadBlobByte (BMPS static unsigned short ReadBlobLSBShort (BMPSource*); static unsigned long ReadBlobLSBLong (BMPSource*); @@ -77,8 +77,8 @@ static void ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*); static int ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int); static void SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int); ---- src/ipa/ipa/bmp.h -+++ src/ipa/ipa/bmp.h +--- a/src/ipa/ipa/bmp.h ++++ b/src/ipa/ipa/bmp.h @@ -859,7 +859,7 @@ static long TellBlob (BMPSource* src) % % diff --git a/srcpkgs/libwmf/patches/CVE-2016-9011.patch b/srcpkgs/libwmf/patches/CVE-2016-9011.patch index 5955784c2d..3e5c100d13 100644 --- a/srcpkgs/libwmf/patches/CVE-2016-9011.patch +++ b/srcpkgs/libwmf/patches/CVE-2016-9011.patch @@ -1,5 +1,5 @@ ---- src/player.c -+++ src/player.c +--- a/src/player.c ++++ b/src/player.c @@ -140,7 +140,30 @@ return (API->err); } diff --git a/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch b/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch index 4b67ceaa8f..98bfab461c 100644 --- a/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch +++ b/srcpkgs/libwmf/patches/fix-gdk-pixbuf-loaders-location.patch @@ -2,8 +2,8 @@ Source: Debian https://sources.debian.org/src/libwmf/0.2.8.4-12/debian/patches/0 Upstream: Unknown Reason: Install gdk-pixbuf-loader into correct location ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -745,7 +745,7 @@ GDK_PIXBUF_DIR="" if test $LIBWMF_BUILDSTYLE != lite; then PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template index c427559b43..938d07c5e6 100644 --- a/srcpkgs/libwmf/template +++ b/srcpkgs/libwmf/template @@ -17,7 +17,6 @@ homepage="http://wvware.sourceforge.net/libwmf.html" license="LGPL-2.1" distfiles="${SOURCEFORGE_SITE}/wvware/${pkgname}-${version}.tar.gz" checksum=5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libxdg-basedir/patches/overflow-bug.patch b/srcpkgs/libxdg-basedir/patches/overflow-bug.patch index 1b7d6501a0..d336693d5d 100644 --- a/srcpkgs/libxdg-basedir/patches/overflow-bug.patch +++ b/srcpkgs/libxdg-basedir/patches/overflow-bug.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Overflow bug diff --git a/src/basedir.c b/src/basedir.c index 68ab879..1a2a8c4 100644 ---- src/basedir.c -+++ src/basedir.c +--- a/src/basedir.c ++++ b/src/basedir.c @@ -574,7 +574,7 @@ static char * xdgGetRelativeHome(const char *envname, const char *relativefallba unsigned int homelen; if (!(home = xdgGetEnv("HOME"))) diff --git a/srcpkgs/libxdg-basedir/template b/srcpkgs/libxdg-basedir/template index f572dd6294..f9cc8880c4 100644 --- a/srcpkgs/libxdg-basedir/template +++ b/srcpkgs/libxdg-basedir/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://github.com/devnev/libxdg-basedir" distfiles="https://github.com/devnev/libxdg-basedir/archive/libxdg-basedir-${version}.tar.gz" checksum=1c2b0032a539033313b5be2e48ddd0ae94c84faf21d93956d53562eef4614868 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch index 46acb48878..d78548c31d 100644 --- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch +++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch @@ -2,8 +2,8 @@ Source: maxice8 Upstream: no Reason: removes creation of fuzzing infrastructure which isn't included in the distfiles ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -670,12 +670,6 @@ message('valgrind not found, disabling valgrind test setup') endif diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template index 26668752a0..3cfefeb295 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -15,7 +15,6 @@ license="MIT" homepage="https://xkbcommon.org/" distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz" checksum=e1b79838256549d72f42c824f720b4f14603374cfbe5587942e35a0cbb13ff9e -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/libxml2-python/patches/py39compat.patch b/srcpkgs/libxml2-python/patches/py39compat.patch index c5dbfabbaa..5613047179 100644 --- a/srcpkgs/libxml2-python/patches/py39compat.patch +++ b/srcpkgs/libxml2-python/patches/py39compat.patch @@ -1,5 +1,5 @@ ---- python/libxml.c.orig 2020-10-07 14:41:45.226029584 -0400 -+++ python/libxml.c 2020-10-07 14:42:58.965113111 -0400 +--- a/python/libxml.c 2020-10-07 14:41:45.226029584 -0400 ++++ b/python/libxml.c 2020-10-07 14:42:58.965113111 -0400 @@ -294,7 +294,7 @@ lenread = PyBytes_Size(ret); data = PyBytes_AsString(ret); @@ -18,8 +18,8 @@ #if PY_VERSION_HEX >= 0x03030000 Py_ssize_t size; const char *tmp; ---- python/types.c.orig 2020-10-07 14:41:49.393034304 -0400 -+++ python/types.c 2020-10-07 14:42:23.496072934 -0400 +--- a/python/types.c 2020-10-07 14:41:49.393034304 -0400 ++++ b/python/types.c 2020-10-07 14:42:23.496072934 -0400 @@ -602,16 +602,16 @@ if (obj == NULL) { return (NULL); diff --git a/srcpkgs/libxml2-python/patches/python3-utf8.patch b/srcpkgs/libxml2-python/patches/python3-utf8.patch index 46a834b6fa..947cb31808 100644 --- a/srcpkgs/libxml2-python/patches/python3-utf8.patch +++ b/srcpkgs/libxml2-python/patches/python3-utf8.patch @@ -2,8 +2,8 @@ Description: work around libxml2 python3 handling of UTF-8 encoded messages Author: Jan Matejek Source: https://bugzilla.opensuse.org/show_bug.cgi?id=1065270 ---- python/libxml.c -+++ python/libxml.c +--- a/python/libxml.c ++++ b/python/libxml.c @@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU PyObject *message; PyObject *result; diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template index dca8e06333..4208519dac 100644 --- a/srcpkgs/libxml2-python/template +++ b/srcpkgs/libxml2-python/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://www.xmlsoft.org/" distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz" checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f -patch_args=-Np0 post_patch() { if [ "${CROSS_BUILD}" ]; then diff --git a/srcpkgs/libxml2/patches/CVE-2019-20388.patch b/srcpkgs/libxml2/patches/CVE-2019-20388.patch index e1582f299d..b0fee2ef01 100644 --- a/srcpkgs/libxml2/patches/CVE-2019-20388.patch +++ b/srcpkgs/libxml2/patches/CVE-2019-20388.patch @@ -18,8 +18,8 @@ Signed-off-by: Zhipeng Xie diff --git a/xmlschemas.c b/xmlschemas.c index 301c8449..39d92182 100644 ---- xmlschemas.c -+++ xmlschemas.c +--- a/xmlschemas.c ++++ b/xmlschemas.c @@ -28090,7 +28090,6 @@ xmlSchemaPreRun(xmlSchemaValidCtxtPtr vctxt) { vctxt->nberrors = 0; vctxt->depth = -1; diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index b45761f66b..c334f505ed 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -15,7 +15,6 @@ license="MIT" homepage="http://www.xmlsoft.org/" distfiles="http://xmlsoft.org/sources/${pkgname}-${version}.tar.gz" checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libxo/patches/fix-musl.patch b/srcpkgs/libxo/patches/fix-musl.patch index fd544686e6..d9e2c4ad78 100644 --- a/srcpkgs/libxo/patches/fix-musl.patch +++ b/srcpkgs/libxo/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- libxo/xo_syslog.c -+++ libxo/xo_syslog.c +--- a/libxo/xo_syslog.c ++++ b/libxo/xo_syslog.c @@ -58,7 +58,6 @@ #include #include diff --git a/srcpkgs/libxo/template b/srcpkgs/libxo/template index 0990f737af..fb0ae8cb85 100644 --- a/srcpkgs/libxo/template +++ b/srcpkgs/libxo/template @@ -10,7 +10,6 @@ license="BSD-2-Clause" homepage="https://juniper.github.io/libxo/libxo-manual.html" distfiles="https://github.com/Juniper/libxo/releases/download/${version}/libxo-${version}.tar.gz" checksum=aa842d9374bc0c640d9526abdeb6f1dc75c1a14e892eafd3c9e0ee2e8dfc1c43 -patch_args=-Np0 case $XBPS_TARGET_MACHINE in *-musl) diff --git a/srcpkgs/libzim/patches/execinfo.patch b/srcpkgs/libzim/patches/execinfo.patch index 7e25dc32fd..f3a1234562 100644 --- a/srcpkgs/libzim/patches/execinfo.patch +++ b/srcpkgs/libzim/patches/execinfo.patch @@ -1,5 +1,5 @@ ---- src/debug.h 2018-03-27 11:19:24.000000000 +0200 -+++ - 2018-03-29 14:57:52.942545918 +0200 +--- a/src/debug.h 2018-03-27 11:19:24.000000000 +0200 ++++ b/src/debug.h 2018-03-27 11:19:24.000000000 +0200 @@ -24,7 +24,7 @@ # define ASSERT(left, operator, right) (void(0)) #else diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template index bac5a114bb..fe3c531098 100644 --- a/srcpkgs/libzim/template +++ b/srcpkgs/libzim/template @@ -15,7 +15,6 @@ changelog="https://github.com/openzim/libzim/blob/${version}/ChangeLog" distfiles="https://github.com/openzim/libzim/archive/${version}.tar.gz" checksum=984d2f3881c507c9f0212dc2bc1b808d25cdeef6a62043f9211fcb78a231a986 replaces="libzim-tools>=0" -patch_args=-Np0 build_options="xapian zlib zstd" build_options_default="xapian zlib zstd" diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/conf.patch b/srcpkgs/lightdm-webkit2-greeter/patches/conf.patch index c9fa0c8116..ac0e5fffb5 100644 --- a/srcpkgs/lightdm-webkit2-greeter/patches/conf.patch +++ b/srcpkgs/lightdm-webkit2-greeter/patches/conf.patch @@ -1,5 +1,5 @@ ---- data/lightdm-webkit2-greeter.conf 2018-06-26 15:29:27.461313219 +0200 -+++ data/lightdm-webkit2-greeter.conf 2018-06-26 18:58:13.649378103 +0200 +--- a/data/lightdm-webkit2-greeter.conf 2018-06-26 15:29:27.461313219 +0200 ++++ b/data/lightdm-webkit2-greeter.conf 2018-06-26 18:58:13.649378103 +0200 @@ -18,7 +18,7 @@ secure_mode = true time_format = LT diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/musl.patch b/srcpkgs/lightdm-webkit2-greeter/patches/musl.patch index f0d24eb739..1cbb3f5211 100644 --- a/srcpkgs/lightdm-webkit2-greeter/patches/musl.patch +++ b/srcpkgs/lightdm-webkit2-greeter/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/webkit2-extension.c 2017-04-24 19:51:30.000000000 +0000 -+++ - 2018-06-23 12:27:53.459279693 +0000 +--- a/src/webkit2-extension.c 2017-04-24 19:51:30.000000000 +0000 ++++ b/src/webkit2-extension.c 2017-04-24 19:51:30.000000000 +0000 @@ -1846,7 +1846,7 @@ return result; } diff --git a/srcpkgs/lightdm-webkit2-greeter/patches/void.patch b/srcpkgs/lightdm-webkit2-greeter/patches/void.patch index 6c87d04f48..5eb5d7eeb8 100644 --- a/srcpkgs/lightdm-webkit2-greeter/patches/void.patch +++ b/srcpkgs/lightdm-webkit2-greeter/patches/void.patch @@ -1,5 +1,5 @@ ---- themes/meson.build 2017-04-24 21:51:30.000000000 +0200 -+++ - 2018-06-26 19:02:25.482098621 +0200 +--- a/themes/meson.build 2017-04-24 21:51:30.000000000 +0200 ++++ b/themes/meson.build 2017-04-24 21:51:30.000000000 +0200 @@ -1,5 +1,5 @@ install_subdir('_vendor', install_dir : get_option('with-theme-dir')) @@ -8,8 +8,8 @@ install_subdir('simple', install_dir : get_option('with-theme-dir')) diff -ur themes/antergos/css/style.css themes/void/css/style.css ---- themes/antergos/css/style.css 2018-06-23 14:29:28.000000000 +0200 -+++ themes/void/css/style.css 2018-06-26 16:26:33.210703621 +0200 +--- a/themes/antergos/css/style.css 2018-06-23 14:29:28.000000000 +0200 ++++ b/themes/void/css/style.css 2018-06-26 16:26:33.210703621 +0200 @@ -204,6 +204,7 @@ right: -2px; position: fixed; diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template index 376d8eb4c6..da5786768d 100644 --- a/srcpkgs/lightdm-webkit2-greeter/template +++ b/srcpkgs/lightdm-webkit2-greeter/template @@ -15,7 +15,6 @@ homepage="https://github.com/Antergos/web-greeter" distfiles="https://github.com/Antergos/web-greeter/archive/${version}.tar.gz" checksum=f3223db35d0efaae76b2157f312dd10979c133f5a85add8fc75fd66ecb3186e3 conf_files="/etc/lightdm/lightdm-webkit2-greeter.conf" -patch_args=-Np0 post_extract() { mv themes/antergos themes/void diff --git a/srcpkgs/lightdm/patches/musl-language.patch b/srcpkgs/lightdm/patches/musl-language.patch index f08965c6f2..b0d1ad19b0 100644 --- a/srcpkgs/lightdm/patches/musl-language.patch +++ b/srcpkgs/lightdm/patches/musl-language.patch @@ -1,5 +1,5 @@ ---- liblightdm-gobject/language.c.orig -+++ liblightdm-gobject/language.c +--- a/liblightdm-gobject/language.c ++++ b/liblightdm-gobject/language.c @@ -210,6 +210,7 @@ if (!priv->name) diff --git a/srcpkgs/lightdm/patches/musl-updwtmpx.patch b/srcpkgs/lightdm/patches/musl-updwtmpx.patch index d96f518cdc..7ed3965945 100644 --- a/srcpkgs/lightdm/patches/musl-updwtmpx.patch +++ b/srcpkgs/lightdm/patches/musl-updwtmpx.patch @@ -1,5 +1,5 @@ ---- src/session-child.c.orig -+++ src/session-child.c +--- a/src/session-child.c ++++ b/src/session-child.c @@ -194,7 +194,7 @@ /* GNU provides this but we can't rely on that so let's make our own version */ diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index cf14f96c4b..b2fed5ac3c 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -14,7 +14,6 @@ homepage="https://github.com/CanonicalLtd/lightdm" changelog="https://raw.githubusercontent.com/CanonicalLtd/lightdm/master/NEWS" distfiles="https://github.com/CanonicalLtd/lightdm/releases/download/${version}/lightdm-${version}.tar.xz" checksum=a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95 -patch_args=-Np0 hostmakedepends="pkg-config intltool itstool $(vopt_if gir 'gobject-introspection vala')" makedepends="dbus-glib-devel libxklavier-devel libxml2-devel diff --git a/srcpkgs/lighttpd/patches/020-meson-zstd.patch b/srcpkgs/lighttpd/patches/020-meson-zstd.patch index 0cd481de9b..647bf7f98b 100644 --- a/srcpkgs/lighttpd/patches/020-meson-zstd.patch +++ b/srcpkgs/lighttpd/patches/020-meson-zstd.patch @@ -10,8 +10,8 @@ Signed-off-by: Glenn Strauss diff --git meson_options.txt meson_options.txt index 51bea44d..f6687159 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -148,6 +148,11 @@ option('with_zlib', value: true, description: 'with deflate-support for mod_deflate [default: on]', diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index d52c74622b..7ae82aecfc 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -21,7 +21,6 @@ license="BSD-3-Clause" homepage="https://lighttpd.net" distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz" checksum=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5 -patch_args=-Np0 conf_files="/etc/lighttpd/lighttpd.conf" system_accounts="_${pkgname}" diff --git a/srcpkgs/lightzone/patches/ppc.patch b/srcpkgs/lightzone/patches/ppc.patch index b5ab841d69..a04396f6cf 100644 --- a/srcpkgs/lightzone/patches/ppc.patch +++ b/srcpkgs/lightzone/patches/ppc.patch @@ -1,7 +1,7 @@ Fixes bad macro checks, breaking altivec build. ---- lightcrafts/jnisrc/jai/bilateralFilter_sse.c -+++ lightcrafts/jnisrc/jai/bilateralFilter_sse.c +--- a/lightcrafts/jnisrc/jai/bilateralFilter_sse.c ++++ b/lightcrafts/jnisrc/jai/bilateralFilter_sse.c @@ -188,7 +188,7 @@ static inline void reset_denormals(csr_context oldMXCSR) { #endif // defined(__i386__) || defined(__x86_64__) diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template index ca214c9327..13242f01cc 100644 --- a/srcpkgs/lightzone/template +++ b/srcpkgs/lightzone/template @@ -19,7 +19,6 @@ skip_extraction="ivy-${_ivy_version}.jar" # JNI binaries are not PIE nopie=yes replaces="lightzone-bin>=0" -patch_args=-Np0 do_build() { mkdir -p lightcrafts/lib diff --git a/srcpkgs/lilo/patches/remove___GLIBC__.patch b/srcpkgs/lilo/patches/remove___GLIBC__.patch index 4bffb96c63..75dc3e167c 100644 --- a/srcpkgs/lilo/patches/remove___GLIBC__.patch +++ b/srcpkgs/lilo/patches/remove___GLIBC__.patch @@ -1,5 +1,5 @@ ---- src/lilo.c -+++ src/lilo.c +--- a/src/lilo.c ++++ b/src/lilo.c @@ -182,7 +182,6 @@ extern int has_partitions_beta(dev_t dev); /* defined in geometry.c */ printf("Without"); #endif diff --git a/srcpkgs/lilo/template b/srcpkgs/lilo/template index bc8f1699d5..f42a9eb5f5 100644 --- a/srcpkgs/lilo/template +++ b/srcpkgs/lilo/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="http://www.joonet.de/lilo" distfiles="${DEBIAN_SITE}/main/l/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=e158f19de4560c935ebe0507c21b79bff17618b9230d8076fe8c5fff9fdbd5b1 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/lilyterm/patches/lilyterm-musl.patch b/srcpkgs/lilyterm/patches/lilyterm-musl.patch index 5cd2fe6401..27ec2e01f7 100644 --- a/srcpkgs/lilyterm/patches/lilyterm-musl.patch +++ b/srcpkgs/lilyterm/patches/lilyterm-musl.patch @@ -1,7 +1,7 @@ diff --git src/profile.c src/profile.c index 3de9fb5..b7dc71f 100644 ---- src/profile.c -+++ src/profile.c +--- a/src/profile.c ++++ b/src/profile.c @@ -2974,12 +2974,8 @@ GString *save_user_settings(GtkWidget *widget, struct Window *win_data) // g_debug("save_user_settings(): profile = %s", profile); diff --git a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch index 69b8a8f3c5..6f0b826bf2 100644 --- a/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch +++ b/srcpkgs/lilyterm/patches/no-empty-environment-variables.patch @@ -1,7 +1,7 @@ diff --git src/notebook.c src/notebook.c index eb4d973..0789a33 100644 ---- src/notebook.c -+++ src/notebook.c +--- a/src/notebook.c ++++ b/src/notebook.c @@ -158,13 +158,13 @@ struct Page *add_page(struct Window *win_data, #ifdef ENABLE_SET_EMULATION # ifdef SAFEMODE diff --git a/srcpkgs/lilyterm/template b/srcpkgs/lilyterm/template index deadaa80f3..31bc2ad9dc 100644 --- a/srcpkgs/lilyterm/template +++ b/srcpkgs/lilyterm/template @@ -16,7 +16,6 @@ distfiles="https://github.com/Tetralet/LilyTerm/archive/$_githash.tar.gz" conf_files="/etc/lilyterm.conf" checksum=e777122cb4db0c75b893368aa5a3ae7de1bdfe27e1efb8fad8f9c19acb0a802e CFLAGS="-Wno-deprecated-declarations" -patch_args=-Np0 post_patch() { vsed -i -e '/LDFLAGS.*BINARY/s/$/ -lX11/' \ diff --git a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch b/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch index 5f0c0a200d..2b4c83d3ff 100644 --- a/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch +++ b/srcpkgs/linphone-desktop/patches/74f50933fd4eb3bdb29d9a766b249eb7c88c0bdd.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Avoid to reduce window if it is already maximized diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 199d8c9a..5a50057c 100644 ---- linphone-app/src/app/App.cpp -+++ linphone-app/src/app/App.cpp +--- a/linphone-app/src/app/App.cpp ++++ b/linphone-app/src/app/App.cpp @@ -405,7 +405,11 @@ void App::smartShowWindow (QQuickWindow *window) { if (!window) return; diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template index 5526b11c72..3991291c0b 100644 --- a/srcpkgs/linphone-desktop/template +++ b/srcpkgs/linphone-desktop/template @@ -19,7 +19,6 @@ checksum=a9c520851ec40ebd6bc28b5ebc0e4d2b5f62ef3b53e5d60bb241c0b2bd56ad62 replaces="linphone-gui>=0" CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\"" -patch_args=-Np0 linphone-gui_package() { short_desc+=" - (transitional dummy package)" diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch index 356419f862..dd03c910c7 100644 --- a/srcpkgs/linssid/patches/project.patch +++ b/srcpkgs/linssid/patches/project.patch @@ -1,5 +1,5 @@ ---- linssid-app/linssid-app.pro -+++ linssid-app/linssid-app.pro +--- a/linssid-app/linssid-app.pro ++++ b/linssid-app/linssid-app.pro @@ -5,7 +5,7 @@ CONFIG -= debug_and_release app_bundle lib_bundle -CONFIG += release diff --git a/srcpkgs/linssid/patches/time64.patch b/srcpkgs/linssid/patches/time64.patch index 2fc66069d8..b7d72c6f10 100644 --- a/srcpkgs/linssid/patches/time64.patch +++ b/srcpkgs/linssid/patches/time64.patch @@ -1,5 +1,5 @@ ---- linssid-app/MainForm.cpp 2018-06-23 18:36:57.000000000 +0200 -+++ linssid-app/MainForm.cpp 2021-02-13 00:46:29.112580143 +0100 +--- a/linssid-app/MainForm.cpp 2018-06-23 18:36:57.000000000 +0200 ++++ b/linssid-app/MainForm.cpp 2021-02-13 00:46:29.112580143 +0100 @@ -81,8 +81,8 @@ int cenChan; // center channel in 40/80/160 MHz bandwidths string vendor; @@ -26,8 +26,8 @@ bool MainForm::firstScan; // do we need to get sudo privileges? string MainForm::chan24Freq[15] { ---- linssid-app/MainForm.h 2018-06-23 18:34:52.000000000 +0200 -+++ linssid-app/MainForm.h 2021-02-13 00:48:01.969756452 +0100 +--- a/linssid-app/MainForm.h 2018-06-23 18:34:52.000000000 +0200 ++++ b/linssid-app/MainForm.h 2021-02-13 00:48:01.969756452 +0100 @@ -86,9 +86,9 @@ static int maxTableIndex; static int numVendors; diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template index 6cfe9177df..3347f193c3 100644 --- a/srcpkgs/linssid/template +++ b/srcpkgs/linssid/template @@ -12,7 +12,6 @@ license="GPL-3.0-only" homepage="https://sourceforge.net/projects/linssid/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=57301ee93f708f2512316668bf4e718502f37f21a5e93b68fc604a9032e3e49c -patch_args=-Np0 pre_configure() { sed -e "s%/usr/include%${XBPS_CROSS_BASE}&%g" -i linssid-app/linssid-app.pro diff --git a/srcpkgs/linux-tools/patches/musl.patch b/srcpkgs/linux-tools/patches/musl.patch index d43f29ae2e..57ca91cae2 100644 --- a/srcpkgs/linux-tools/patches/musl.patch +++ b/srcpkgs/linux-tools/patches/musl.patch @@ -1,5 +1,5 @@ ---- tools/include/uapi/linux/perf_event.h.orig -+++ tools/include/uapi/linux/perf_event.h +--- a/tools/include/uapi/linux/perf_event.h ++++ b/tools/include/uapi/linux/perf_event.h @@ -14,6 +14,7 @@ #ifndef _UAPI_LINUX_PERF_EVENT_H #define _UAPI_LINUX_PERF_EVENT_H @@ -8,8 +8,8 @@ #include #include #include ---- tools/power/x86/turbostat/turbostat.c.orig -+++ tools/power/x86/turbostat/turbostat.c +--- a/tools/power/x86/turbostat/turbostat.c ++++ b/tools/power/x86/turbostat/turbostat.c @@ -43,7 +43,8 @@ #include #include @@ -19,8 +19,8 @@ char *proc_stat = "/proc/stat"; FILE *outf; ---- tools/thermal/tmon/tmon.h.orig -+++ tools/thermal/tmon/tmon.h +--- a/tools/thermal/tmon/tmon.h ++++ b/tools/thermal/tmon/tmon.h @@ -19,6 +19,9 @@ #ifndef TMON_H #define TMON_H diff --git a/srcpkgs/linux-tools/patches/ppc-bpf.patch b/srcpkgs/linux-tools/patches/ppc-bpf.patch index 251047b6c2..b5fb75084a 100644 --- a/srcpkgs/linux-tools/patches/ppc-bpf.patch +++ b/srcpkgs/linux-tools/patches/ppc-bpf.patch @@ -1,7 +1,7 @@ https://www.mail-archive.com/netdev@vger.kernel.org/msg364272.html ---- tools/include/uapi/linux/types.h -+++ tools/include/uapi/linux/types.h +--- a/tools/include/uapi/linux/types.h ++++ b/tools/include/uapi/linux/types.h @@ -20,4 +20,10 @@ typedef __u32 __bitwise __wsum; #define __aligned_be64 __be64 __attribute__((aligned(8))) #define __aligned_le64 __le64 __attribute__((aligned(8))) diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index a57726ab00..f28f2b17ac 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -18,7 +18,6 @@ homepage="https://www.kernel.org" distfiles="${KERNEL_SITE}/kernel/v5.x/linux-${version}.tar.xz" checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec python_version=3 -patch_args=-Np0 subpackages="cpupower freefall libcpupower libcpupower-devel libusbip libusbip-devel perf tmon usbip" diff --git a/srcpkgs/linux-vt-setcolors/patches/8.diff b/srcpkgs/linux-vt-setcolors/patches/8.diff index dcbda45499..56d98ace67 100644 --- a/srcpkgs/linux-vt-setcolors/patches/8.diff +++ b/srcpkgs/linux-vt-setcolors/patches/8.diff @@ -1,7 +1,7 @@ diff --git Makefile Makefile index 7a9cc3e..ad5ad1d 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,7 +1,8 @@ PREFIX=/usr/local +CFLAGS=-Wall diff --git a/srcpkgs/linux-vt-setcolors/template b/srcpkgs/linux-vt-setcolors/template index e46c87d3c5..fa3f7681b7 100644 --- a/srcpkgs/linux-vt-setcolors/template +++ b/srcpkgs/linux-vt-setcolors/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://github.com/EvanPurkhiser/linux-vt-setcolors" distfiles="https://github.com/EvanPurkhiser/linux-vt-setcolors/archive/v${version}.tar.gz" checksum=ccad9aac5732faab749e8f6f6b40746ce44afec5633374aa77c8e3ac2a8eef42 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/linux4.4/patches/ia32-sysexit.patch b/srcpkgs/linux4.4/patches/ia32-sysexit.patch index a76827606a..9951f4188e 100644 --- a/srcpkgs/linux4.4/patches/ia32-sysexit.patch +++ b/srcpkgs/linux4.4/patches/ia32-sysexit.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: work around a bug in binutils 2.34 w/ the sysexit instruction ---- arch/x86/kernel/Makefile 2020-02-05 14:03:47.000000000 +0100 -+++ arch/x86/kernel/Makefile 2020-02-15 23:07:43.816785356 +0100 +--- a/arch/x86/kernel/Makefile 2020-02-05 14:03:47.000000000 +0100 ++++ b/arch/x86/kernel/Makefile 2020-02-15 23:07:43.816785356 +0100 @@ -21,6 +21,7 @@ KASAN_SANITIZE_dumpstack_$(BITS).o := n diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index 152619d3eb..db6cf3d38e 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -13,7 +13,6 @@ checksum="401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 7fe0edc77e6ba8d41035488402a2f05c58a64c101cb5556ea0f6e229dc306eed" skip_extraction="patch-${version}.xz" python_version=2 #unverified -patch_args=-Np0 nocross=yes nodebug=yes diff --git a/srcpkgs/liquid-dsp/patches/define-soname.patch b/srcpkgs/liquid-dsp/patches/define-soname.patch index e8646362c4..425ea08ead 100644 --- a/srcpkgs/liquid-dsp/patches/define-soname.patch +++ b/srcpkgs/liquid-dsp/patches/define-soname.patch @@ -7,8 +7,8 @@ Last-Update: 2016-12-11 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: git/makefile.in =================================================================== ---- makefile.in 2017-10-28 20:23:47.395786766 +0200 -+++ makefile.in 2017-10-28 20:23:47.391786768 +0200 +--- a/makefile.in 2017-10-28 20:23:47.395786766 +0200 ++++ b/makefile.in 2017-10-28 20:23:47.391786768 +0200 @@ -1167,7 +1167,7 @@ $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS) @@ -28,8 +28,8 @@ Index: git/makefile.in @echo "---------------------------------------------------------" Index: git/configure.ac =================================================================== ---- configure.ac 2017-10-28 20:23:47.395786766 +0200 -+++ configure.ac 2017-10-28 20:23:47.391786768 +0200 +--- a/configure.ac 2017-10-28 20:23:47.395786766 +0200 ++++ b/configure.ac 2017-10-28 20:23:47.391786768 +0200 @@ -242,7 +242,7 @@ REBIND="" ;; diff --git a/srcpkgs/liquid-dsp/patches/fix-make-install.patch b/srcpkgs/liquid-dsp/patches/fix-make-install.patch index 21705fc9eb..61048e6fd9 100644 --- a/srcpkgs/liquid-dsp/patches/fix-make-install.patch +++ b/srcpkgs/liquid-dsp/patches/fix-make-install.patch @@ -1,7 +1,7 @@ Index: makefile.in =================================================================== ---- makefile.in.orig -+++ makefile.in +--- a/makefile.in ++++ b/makefile.in @@ -47,10 +47,10 @@ VERSION := @PACKAGE_VERSION@ BUGREPORT := @PACKAGE_BUGREPORT@ diff --git a/srcpkgs/liquid-dsp/patches/ppc64.patch b/srcpkgs/liquid-dsp/patches/ppc64.patch index b75482f778..1f7da1729b 100644 --- a/srcpkgs/liquid-dsp/patches/ppc64.patch +++ b/srcpkgs/liquid-dsp/patches/ppc64.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -195,7 +195,7 @@ else src/dotprod/src/dotprod_rrrf.av.o \ src/dotprod/src/dotprod_crcf.av.o \ @@ -9,8 +9,8 @@ armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) # assume neon instructions are NOT available MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ ---- src/dotprod/src/dotprod_crcf.av.c -+++ src/dotprod/src/dotprod_crcf.av.c +--- a/src/dotprod/src/dotprod_crcf.av.c ++++ b/src/dotprod/src/dotprod_crcf.av.c @@ -26,6 +26,7 @@ #include @@ -37,8 +37,8 @@ // sum the resulting array //*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; ---- src/dotprod/src/dotprod_rrrf.av.c -+++ src/dotprod/src/dotprod_rrrf.av.c +--- a/src/dotprod/src/dotprod_rrrf.av.c ++++ b/src/dotprod/src/dotprod_rrrf.av.c @@ -26,6 +26,7 @@ #include diff --git a/srcpkgs/liquid-dsp/template b/srcpkgs/liquid-dsp/template index aec6f7222b..432adac62c 100644 --- a/srcpkgs/liquid-dsp/template +++ b/srcpkgs/liquid-dsp/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://liquidsdr.org/" distfiles="https://github.com/jgaeddert/liquid-dsp/archive/v${version}.tar.gz" checksum=e3f66ce72a3b5d74eea5ccffb049c62c422c91b0ab92d6dbbef21af3c3bfec73 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/liquidwar/patches/liquidwar-5.6.4-underlink.patch b/srcpkgs/liquidwar/patches/liquidwar-5.6.4-underlink.patch index 2bc53e0cac..d80e349bf1 100644 --- a/srcpkgs/liquidwar/patches/liquidwar-5.6.4-underlink.patch +++ b/srcpkgs/liquidwar/patches/liquidwar-5.6.4-underlink.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 -+++ src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 +--- a/src/Makefile.in.old 2011-06-22 07:45:05.756127862 +0200 ++++ b/src/Makefile.in 2011-06-22 07:46:00.681613957 +0200 @@ -223,7 +223,7 @@ EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) else diff --git a/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch b/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch index f19b653951..8190e9bb50 100644 --- a/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch +++ b/srcpkgs/liquidwar/patches/liquidwar-5.6.5-ovflfix.patch @@ -1,5 +1,5 @@ ---- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 -+++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 +--- a/src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 ++++ b/src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 @@ -100,12 +100,12 @@ data->privacy = privacy; diff --git a/srcpkgs/liquidwar/template b/srcpkgs/liquidwar/template index 5ef7aa9a49..69bc87d1b1 100644 --- a/srcpkgs/liquidwar/template +++ b/srcpkgs/liquidwar/template @@ -15,7 +15,6 @@ homepage="http://www.ufoot.org/liquidwar" distfiles="http://www.ufoot.org/download/${pkgname}/v5/${version}/${pkgname}-${version}.tar.gz" checksum=dad0aa84dd416cad055421ed9b40df39efae78d3df759c0583c64c54f7f2ff5f nocross="run build artifarts" -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/litecoin/patches/dequeu.patch b/srcpkgs/litecoin/patches/dequeu.patch index 7c3cc4c4bb..4c9bd48760 100644 --- a/srcpkgs/litecoin/patches/dequeu.patch +++ b/srcpkgs/litecoin/patches/dequeu.patch @@ -1,5 +1,5 @@ ---- src/httpserver.cpp 2019-04-08 09:28:20.000000000 +0200 -+++ - 2020-01-10 22:25:06.201575595 +0100 +--- a/src/httpserver.cpp 2019-04-08 09:28:20.000000000 +0200 ++++ b/src/httpserver.cpp 2019-04-08 09:28:20.000000000 +0200 @@ -17,6 +17,7 @@ #include #include diff --git a/srcpkgs/litecoin/patches/qt5.15.patch b/srcpkgs/litecoin/patches/qt5.15.patch index 76583ef2cd..df05c397c4 100644 --- a/srcpkgs/litecoin/patches/qt5.15.patch +++ b/srcpkgs/litecoin/patches/qt5.15.patch @@ -1,5 +1,5 @@ ---- src/qt/trafficgraphwidget.cpp 2019-04-08 09:28:20.000000000 +0200 -+++ - 2020-07-05 18:16:25.715900083 +0200 +--- a/src/qt/trafficgraphwidget.cpp 2019-04-08 09:28:20.000000000 +0200 ++++ b/src/qt/trafficgraphwidget.cpp 2019-04-08 09:28:20.000000000 +0200 @@ -6,6 +6,7 @@ #include #include diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 3837c269d3..fc91bb89f1 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://www.litecoin.org/" distfiles="https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz" checksum=2d67cba11adc5890b9698ccddeb68dd3c2ff6af19bf3ed0f1c719348b914042f -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools protobuf" diff --git a/srcpkgs/lltag/patches/fix_flac_tracknumber_reading.patch b/srcpkgs/lltag/patches/fix_flac_tracknumber_reading.patch index 78c3a3accd..2b1f3f67dc 100644 --- a/srcpkgs/lltag/patches/fix_flac_tracknumber_reading.patch +++ b/srcpkgs/lltag/patches/fix_flac_tracknumber_reading.patch @@ -1,7 +1,7 @@ diff --git lib/Lltag/FLAC.pm lib/Lltag/FLAC.pm index 8c0186d..5c571a6 100644 ---- lib/Lltag/FLAC.pm -+++ lib/Lltag/FLAC.pm +--- a/lib/Lltag/FLAC.pm ++++ b/lib/Lltag/FLAC.pm @@ -23,8 +23,9 @@ sub read_tags { if $status ; @output = map { diff --git a/srcpkgs/lltag/template b/srcpkgs/lltag/template index 565369c9a9..c540ae3dde 100644 --- a/srcpkgs/lltag/template +++ b/srcpkgs/lltag/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="http://bgoglin.free.fr/lltag/" distfiles="https://github.com/bgoglin/lltag/archive/lltag-${version}.tar.gz" checksum=e24c88866d89f90c11bcf89d9d1b4e8af78f486f1f7454a28210b10b8af17252 -patch_args=-Np0 diff --git a/srcpkgs/llvm11/template b/srcpkgs/llvm11/template index 98b0af1bd1..6204f1e8e3 100644 --- a/srcpkgs/llvm11/template +++ b/srcpkgs/llvm11/template @@ -26,7 +26,6 @@ checksum=" 913f68c898dfb4a03b397c5e11c6a2f39d0f22ed7665c9cefa87a34423a72469" lib32disabled=yes python_version=3 -patch_args=-Np0 post_patch() { # patches diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template index c4ed10574d..38937f6856 100644 --- a/srcpkgs/llvm12/template +++ b/srcpkgs/llvm12/template @@ -56,7 +56,6 @@ checksum=" eb1b7022a247332114985ed155a8fb632c28ce7c35a476e2c0caf865150f167d" lib32disabled=yes python_version=3 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" diff --git a/srcpkgs/lmdb/patches/soname.patch b/srcpkgs/lmdb/patches/soname.patch index fefa3b1c43..e86f2d54db 100644 --- a/srcpkgs/lmdb/patches/soname.patch +++ b/srcpkgs/lmdb/patches/soname.patch @@ -1,5 +1,5 @@ ---- libraries/liblmdb/Makefile.orig 2017-01-02 10:53:29.945926753 +0000 -+++ libraries/liblmdb/Makefile 2017-01-02 10:55:01.005931451 +0000 +--- a/libraries/liblmdb/Makefile 2017-01-02 10:53:29.945926753 +0000 ++++ b/libraries/liblmdb/Makefile 2017-01-02 10:55:01.005931451 +0000 @@ -26,6 +26,8 @@ CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) LDLIBS = diff --git a/srcpkgs/lmdb/template b/srcpkgs/lmdb/template index f2900a390a..14509699fc 100644 --- a/srcpkgs/lmdb/template +++ b/srcpkgs/lmdb/template @@ -9,7 +9,6 @@ license="OLDAP-2.8" homepage="http://symas.com/mdb/" distfiles="https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz" checksum=22054926b426c66d8f2bc22071365df6e35f3aacf19ad943bc6167d4cae3bebb -patch_args=-Np0 do_build() { cd libraries/liblmdb diff --git a/srcpkgs/lmms/patches/cross.patch b/srcpkgs/lmms/patches/cross.patch index 96625e27e3..23f2c12869 100644 --- a/srcpkgs/lmms/patches/cross.patch +++ b/srcpkgs/lmms/patches/cross.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2017-12-19 18:24:15.000000000 +0100 -+++ - 2018-03-26 13:34:55.333893020 +0200 +--- a/CMakeLists.txt 2017-12-19 18:24:15.000000000 +0100 ++++ b/CMakeLists.txt 2017-12-19 18:24:15.000000000 +0100 @@ -498,12 +498,12 @@ LIST(SORT LMMS_INCLUDES) @@ -15,8 +15,8 @@ ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION) ENDIF(WIN32 OR WIN64) ---- CMakeLists.txt 2018-03-26 13:35:11.477353707 +0200 -+++ - 2018-03-26 13:36:43.608724836 +0200 +--- a/CMakeLists.txt 2018-03-26 13:35:11.477353707 +0200 ++++ b/CMakeLists.txt 2018-03-26 13:35:11.477353707 +0200 @@ -506,7 +506,7 @@ ELSE(WIN32 OR WIN64 OR CMAKE_CROSSCOMPILING) ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp) diff --git a/srcpkgs/lmms/patches/ecm.patch b/srcpkgs/lmms/patches/ecm.patch index c4d0ea7916..5f21bad190 100644 --- a/srcpkgs/lmms/patches/ecm.patch +++ b/srcpkgs/lmms/patches/ecm.patch @@ -1,5 +1,5 @@ ---- src/3rdparty/qt5-x11embed/CMakeLists.txt 2017-11-06 19:24:12.000000000 +0100 -+++ - 2018-03-24 12:39:30.109268924 +0100 +--- a/src/3rdparty/qt5-x11embed/CMakeLists.txt 2017-11-06 19:24:12.000000000 +0100 ++++ b/src/3rdparty/qt5-x11embed/CMakeLists.txt 2017-11-06 19:24:12.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) project(qt5-x11embed) diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template index a07507954e..15b67a8f22 100644 --- a/srcpkgs/lmms/template +++ b/srcpkgs/lmms/template @@ -19,7 +19,6 @@ license="GPL-2.0-or-later" homepage="https://lmms.io/" distfiles="https://github.com/LMMS/lmms/releases/download/v${version}/lmms_${version}.tar.xz" checksum=b185507fb64ecfd8e31145135b58ab244b637f9efc09c4176caf70aa3cbaae1e -patch_args=-Np0 build_options="sndio" build_options_default="sndio" diff --git a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch index 7bbe769a47..fcff330f36 100644 --- a/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch +++ b/srcpkgs/log4cxx/patches/100-bugfix-LOGCXX-284.patch @@ -4,8 +4,8 @@ ## All lines beginning with `## DP:' are a description of the patch. ## DP: Fixes build error on AIX with xlc_r ---- src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700 -+++ src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700 +--- a/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-03-31 15:33:09.000000000 -0700 ++++ b/src/test/cpp/helpers/datetimedateformattestcase.cpp 2008-07-17 06:49:43.000000000 -0700 @@ -181,7 +181,7 @@ // output the using STL // diff --git a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch index 6a77145e23..0cf96b67ae 100644 --- a/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch +++ b/srcpkgs/log4cxx/patches/150-bugfix-LOGCXX-365.patch @@ -6,8 +6,8 @@ Applied-Upstream: commit 954335 Last-Update: 2014-03-14 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334 -+++ src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335 +--- a/src/test/cpp/util/filter.h 2010/06/14 00:24:42 954334 ++++ b/src/test/cpp/util/filter.h 2010/06/14 00:30:43 954335 @@ -31,7 +31,7 @@ #define BASIC_PAT "\\[0x[0-9A-F]*] (FATAL|ERROR|WARN|INFO|DEBUG)" #define ISO8601_PAT "[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\}" diff --git a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch index 8ef348f5e6..cfa0c2f531 100644 --- a/srcpkgs/log4cxx/patches/170-gcc6-fix.patch +++ b/srcpkgs/log4cxx/patches/170-gcc6-fix.patch @@ -7,8 +7,8 @@ Applied-Upstream: yes, targeted version 0.11.0 Last-Update: 2016-07-01 (DebCamp16) --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- src/main/cpp/locationinfo.cpp -+++ src/main/cpp/locationinfo.cpp +--- a/src/main/cpp/locationinfo.cpp ++++ b/src/main/cpp/locationinfo.cpp @@ -148,7 +148,7 @@ if (lineNumber == -1 && fileName == NA && methodName == NA_METHOD) { os.writeNull(p); @@ -27,8 +27,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ char* line = p.itoa(lineNumber); // // construct Java-like fullInfo (replace "::" with ".") ---- src/main/cpp/loggingevent.cpp -+++ src/main/cpp/loggingevent.cpp +--- a/src/main/cpp/loggingevent.cpp ++++ b/src/main/cpp/loggingevent.cpp @@ -236,7 +236,7 @@ @@ -47,8 +47,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } void LoggingEvent::write(helpers::ObjectOutputStream& os, Pool& p) const { ---- src/main/cpp/objectoutputstream.cpp -+++ src/main/cpp/objectoutputstream.cpp +--- a/src/main/cpp/objectoutputstream.cpp ++++ b/src/main/cpp/objectoutputstream.cpp @@ -36,8 +36,8 @@ objectHandle(0x7E0000), classDescriptions(new ClassDescriptionMap()) diff --git a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch index 16563115f5..71b71467a1 100644 --- a/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch +++ b/srcpkgs/log4cxx/patches/180-gcc-fix-testsuite.patch @@ -3,8 +3,8 @@ Author: Tobias Frost Last-Update: 2016-10-23 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- src/test/cpp/xml/domtestcase.cpp -+++ src/test/cpp/xml/domtestcase.cpp +--- a/src/test/cpp/xml/domtestcase.cpp ++++ b/src/test/cpp/xml/domtestcase.cpp @@ -190,7 +190,7 @@ DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); diff --git a/srcpkgs/log4cxx/patches/missing-includes.patch b/srcpkgs/log4cxx/patches/missing-includes.patch index d4534428e8..a63bffd95c 100644 --- a/srcpkgs/log4cxx/patches/missing-includes.patch +++ b/srcpkgs/log4cxx/patches/missing-includes.patch @@ -1,6 +1,6 @@ diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp ---- src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200 -+++ src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200 +--- a/src/examples/cpp/console.cpp 2008-04-01 00:34:52.000000000 +0200 ++++ b/src/examples/cpp/console.cpp 2008-05-06 05:40:52.000000000 +0200 @@ -15,7 +15,10 @@ * limitations under the License. */ @@ -14,8 +14,8 @@ diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cx #include #include diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp ---- src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200 -+++ src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200 +--- a/src/main/cpp/inputstreamreader.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ b/src/main/cpp/inputstreamreader.cpp 2008-05-06 05:32:31.000000000 +0200 @@ -21,6 +21,8 @@ #include #include @@ -26,8 +26,8 @@ diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache- using namespace log4cxx::helpers; diff -Naur src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp ---- src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200 -+++ src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200 +--- a/src/main/cpp/socketoutputstream.cpp 2008-04-01 00:34:09.000000000 +0200 ++++ b/src/main/cpp/socketoutputstream.cpp 2008-05-06 05:35:55.000000000 +0200 @@ -20,6 +20,8 @@ #include #include diff --git a/srcpkgs/log4cxx/template b/srcpkgs/log4cxx/template index 2e64c18f71..269147155f 100644 --- a/srcpkgs/log4cxx/template +++ b/srcpkgs/log4cxx/template @@ -11,7 +11,6 @@ homepage="https://logging.apache.org/log4cxx/" distfiles="http://apache.osuosl.org/logging/log4cxx/${version}/apache-log4cxx-${version}.tar.gz" checksum=0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c wrksrc="apache-${pkgname}-${version}" -patch_args=-Np0 log4cxx-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/loksh/patches/ncursesw.patch b/srcpkgs/loksh/patches/ncursesw.patch index b0427cb365..fba456aa16 100644 --- a/srcpkgs/loksh/patches/ncursesw.patch +++ b/srcpkgs/loksh/patches/ncursesw.patch @@ -1,5 +1,5 @@ ---- meson.build.orig 2020-05-22 20:21:50.457744069 -0700 -+++ meson.build 2020-05-22 20:46:43.193735356 -0700 +--- a/meson.build 2020-05-22 20:21:50.457744069 -0700 ++++ b/meson.build 2020-05-22 20:46:43.193735356 -0700 @@ -5,7 +5,7 @@ c_args = ['-D_GNU_SOURCE', '-DEMACS', '-DVI', '-Wno-format-security', '-Wno-pointer-sign'] deps = [] diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template index 54c65566e1..327ac3a758 100644 --- a/srcpkgs/loksh/template +++ b/srcpkgs/loksh/template @@ -12,7 +12,6 @@ homepage="https://github.com/dimkr/loksh" distfiles="https://github.com/dimkr/loksh/releases/download/${version}/loksh-${version}.tar.xz" checksum=1633048cd5f1270c5fa28ab49d9cb9f7e8305ab6880601b0c15b88ecb92450f9 register_shell="/bin/loksh" -patch_args=-Np0 alternatives=" ksh:ksh:/usr/bin/loksh diff --git a/srcpkgs/loudmouth/patches/enable-ipv6.patch b/srcpkgs/loudmouth/patches/enable-ipv6.patch index 3e45e94ed4..0552ff1d06 100644 --- a/srcpkgs/loudmouth/patches/enable-ipv6.patch +++ b/srcpkgs/loudmouth/patches/enable-ipv6.patch @@ -6,15 +6,15 @@ Date: Wed Sep 26 22:31:36 2018 +0200 diff --git a/KNOWN_BUGS b/KNOWN_BUGS index 79d94f9..8e93843 100644 ---- KNOWN_BUGS -+++ KNOWN_BUGS +--- a/KNOWN_BUGS ++++ b/KNOWN_BUGS @@ -1,2 +1 @@ -No IPv6 Support Currently Leak Resolver Objects Due To Messy Allocation Path diff --git a/loudmouth/lm-old-socket.c b/loudmouth/lm-old-socket.c index eb7b31c..ab44f76 100644 ---- loudmouth/lm-old-socket.c -+++ loudmouth/lm-old-socket.c +--- a/loudmouth/lm-old-socket.c ++++ b/loudmouth/lm-old-socket.c @@ -20,6 +20,7 @@ #include @@ -132,8 +132,8 @@ index eb7b31c..ab44f76 100644 /* FIXME: Need to have a way to only get srv reply and then decide if the diff --git a/loudmouth/lm-resolver.c b/loudmouth/lm-resolver.c index b9d7762..c44204b 100644 ---- loudmouth/lm-resolver.c -+++ loudmouth/lm-resolver.c +--- a/loudmouth/lm-resolver.c ++++ b/loudmouth/lm-resolver.c @@ -390,7 +390,6 @@ lm_resolver_results_get_next (LmResolver *resolver) priv = GET_PRIV (resolver); diff --git a/srcpkgs/loudmouth/patches/fix-nonce_nul.patch b/srcpkgs/loudmouth/patches/fix-nonce_nul.patch index 853bf856d9..e679a4b6f1 100644 --- a/srcpkgs/loudmouth/patches/fix-nonce_nul.patch +++ b/srcpkgs/loudmouth/patches/fix-nonce_nul.patch @@ -1,5 +1,5 @@ ---- loudmouth/lm-sasl.c 2016-02-13 12:16:45.000000000 +0100 -+++ loudmouth/lm-sasl.c 2017-11-12 14:55:20.995838985 +0100 +--- a/loudmouth/lm-sasl.c 2016-02-13 12:16:45.000000000 +0100 ++++ b/loudmouth/lm-sasl.c 2017-11-12 14:55:20.995838985 +0100 @@ -529,7 +529,7 @@ } diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 6dedbb71f7..4178683d5d 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/mcabber/loudmouth" distfiles="https://github.com/mcabber/${pkgname}/archive/${version}.tar.gz" checksum=12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 -patch_args=-Np0 CFLAGS+=" -Wno-deprecated-declarations" diff --git a/srcpkgs/lrzsz/patches/symlinks.patch b/srcpkgs/lrzsz/patches/symlinks.patch index ac50052e17..f29349840b 100644 --- a/srcpkgs/lrzsz/patches/symlinks.patch +++ b/srcpkgs/lrzsz/patches/symlinks.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig 2013-03-18 13:25:04.431274094 +0100 -+++ src/Makefile.in 2013-03-18 13:25:30.533766161 +0100 +--- a/src/Makefile.in 2013-03-18 13:25:04.431274094 +0100 ++++ b/src/Makefile.in 2013-03-18 13:25:30.533766161 +0100 @@ -282,7 +282,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ diff --git a/srcpkgs/lrzsz/template b/srcpkgs/lrzsz/template index 98b4e7fb1c..e90aaeba3a 100644 --- a/srcpkgs/lrzsz/template +++ b/srcpkgs/lrzsz/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="http://ohse.de/uwe/software/lrzsz.html" distfiles="http://ohse.de/uwe/releases/$pkgname-$version.tar.gz" checksum=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 -patch_args=-Np0 diff --git a/srcpkgs/lshw/patches/fix-lshw_sgml.patch b/srcpkgs/lshw/patches/fix-lshw_sgml.patch index 10516ea702..e3ad560b0b 100644 --- a/srcpkgs/lshw/patches/fix-lshw_sgml.patch +++ b/srcpkgs/lshw/patches/fix-lshw_sgml.patch @@ -1,5 +1,5 @@ ---- src/lshw.sgml 2016-04-22 21:49:30.000000000 +0200 -+++ src/lshw.sgml 2016-05-07 05:54:39.106562357 +0200 +--- a/src/lshw.sgml 2016-04-22 21:49:30.000000000 +0200 ++++ b/src/lshw.sgml 2016-05-07 05:54:39.106562357 +0200 @@ -1,4 +1,4 @@ - + diff --git a/srcpkgs/lshw/patches/musl-basename.patch b/srcpkgs/lshw/patches/musl-basename.patch index c8cee61ba5..a91a24833b 100644 --- a/srcpkgs/lshw/patches/musl-basename.patch +++ b/srcpkgs/lshw/patches/musl-basename.patch @@ -1,7 +1,7 @@ For musl libc declare a macro version of basename(3). ---- src/core/sysfs.cc 2016-05-07 05:36:45.771620396 +0200 -+++ src/core/sysfs.cc 2016-05-07 05:37:33.265617827 +0200 +--- a/src/core/sysfs.cc 2016-05-07 05:36:45.771620396 +0200 ++++ b/src/core/sysfs.cc 2016-05-07 05:37:33.265617827 +0200 @@ -19,6 +19,10 @@ __ID("@(#) $Id$"); diff --git a/srcpkgs/lshw/patches/musl-long_bits.patch b/srcpkgs/lshw/patches/musl-long_bits.patch index e67df9ddc6..6980bb4774 100644 --- a/srcpkgs/lshw/patches/musl-long_bits.patch +++ b/srcpkgs/lshw/patches/musl-long_bits.patch @@ -5,8 +5,8 @@ no reason to use sysconf(3) here, word size isn't a runtime property. diff --git src/core/abi.cc src/core/abi.cc index adff7b5..76c664c 100644 ---- src/core/abi.cc -+++ src/core/abi.cc +--- a/src/core/abi.cc ++++ b/src/core/abi.cc @@ -20,9 +20,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); bool scan_abi(hwNode & system) { diff --git a/srcpkgs/lshw/template b/srcpkgs/lshw/template index 88a5887251..6ba1bb44a9 100644 --- a/srcpkgs/lshw/template +++ b/srcpkgs/lshw/template @@ -16,7 +16,6 @@ license="GPL-2.0-only" homepage="https://ezix.org/project/wiki/HardwareLiSter" distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz" checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80 -patch_args=-Np0 post_patch() { vsed -i src/Makefile src/gui/Makefile \ diff --git a/srcpkgs/ltrace/patches/musl-ppc.patch b/srcpkgs/ltrace/patches/musl-ppc.patch index 8fca019675..24a765e1bc 100644 --- a/srcpkgs/ltrace/patches/musl-ppc.patch +++ b/srcpkgs/ltrace/patches/musl-ppc.patch @@ -1,5 +1,5 @@ ---- sysdeps/linux-gnu/ppc/regs.c -+++ sysdeps/linux-gnu/ppc/regs.c +--- a/sysdeps/linux-gnu/ppc/regs.c ++++ b/sysdeps/linux-gnu/ppc/regs.c @@ -27,7 +27,9 @@ #include #include @@ -24,8 +24,8 @@ } void * ---- sysdeps/linux-gnu/ppc/trace.c -+++ sysdeps/linux-gnu/ppc/trace.c +--- a/sysdeps/linux-gnu/ppc/trace.c ++++ b/sysdeps/linux-gnu/ppc/trace.c @@ -24,6 +24,7 @@ #include "config.h" diff --git a/srcpkgs/ltrace/template b/srcpkgs/ltrace/template index 4a44438964..a26e64e3c7 100644 --- a/srcpkgs/ltrace/template +++ b/srcpkgs/ltrace/template @@ -13,7 +13,6 @@ homepage="http://ltrace.org" license="GPL-2" distfiles="https://github.com/dkogan/ltrace/archive/${_githash}.tar.gz" checksum=4aecf69e4a33331aed1e50ce4907e73a98cbccc4835febc3473863474304d547 -patch_args=-Np0 CFLAGS="-Wno-error -D_GNU_SOURCE" diff --git a/srcpkgs/lttng-tools/patches/musl-ino_t.patch b/srcpkgs/lttng-tools/patches/musl-ino_t.patch index ca3007a1f5..a43cc08f09 100644 --- a/srcpkgs/lttng-tools/patches/musl-ino_t.patch +++ b/srcpkgs/lttng-tools/patches/musl-ino_t.patch @@ -1,5 +1,5 @@ ---- tests/utils/testapp/gen-ust-events-ns/tp.h -+++ tests/utils/testapp/gen-ust-events-ns/tp.h +--- a/tests/utils/testapp/gen-ust-events-ns/tp.h ++++ b/tests/utils/testapp/gen-ust-events-ns/tp.h @@ -12,6 +12,7 @@ #define _TRACEPOINT_TP_H diff --git a/srcpkgs/lttng-tools/template b/srcpkgs/lttng-tools/template index b1ed6c1ad5..96d4061584 100644 --- a/srcpkgs/lttng-tools/template +++ b/srcpkgs/lttng-tools/template @@ -15,7 +15,6 @@ checksum=d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a500dea1 # tests timeout make_check=no system_groups="tracing" -patch_args=-Np0 lttng-tools-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/lua51-luasocket/patches/luasocket-arch.patch b/srcpkgs/lua51-luasocket/patches/luasocket-arch.patch index 87f029a420..baeaf83173 100644 --- a/srcpkgs/lua51-luasocket/patches/luasocket-arch.patch +++ b/srcpkgs/lua51-luasocket/patches/luasocket-arch.patch @@ -1,5 +1,5 @@ ---- config.orig 2007-10-15 08:21:05.000000000 +0400 -+++ config 2007-10-15 12:22:16.000000000 +0400 +--- a/config 2007-10-15 08:21:05.000000000 +0400 ++++ b/config 2007-10-15 12:22:16.000000000 +0400 @@ -30,8 +30,8 @@ # #INSTALL_TOP_SHARE=/usr/local/share/lua/5.0 diff --git a/srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch b/srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch index 08bf98613d..bc75bd6941 100644 --- a/srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch +++ b/srcpkgs/lua51-luasocket/patches/luasocket-unixsocket.patch @@ -1,5 +1,5 @@ ---- makefile 2007-10-15 04:21:05.000000000 +0000 -+++ makefile 2011-03-09 12:00:54.000000000 +0000 +--- a/makefile 2007-10-15 04:21:05.000000000 +0000 ++++ b/makefile 2011-03-09 12:00:54.000000000 +0000 @@ -10,6 +10,8 @@ INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime @@ -18,8 +18,8 @@ #------ # End of makefile ---- src/makefile 2007-10-15 04:21:05.000000000 +0000 -+++ src/makefile 2011-03-09 12:02:25.000000000 +0000 +--- a/src/makefile 2007-10-15 04:21:05.000000000 +0000 ++++ b/src/makefile 2011-03-09 12:02:25.000000000 +0000 @@ -47,7 +47,7 @@ usocket.o \ unix.o diff --git a/srcpkgs/lua51-luasocket/template b/srcpkgs/lua51-luasocket/template index 58efbb3ff6..63a505b4ec 100644 --- a/srcpkgs/lua51-luasocket/template +++ b/srcpkgs/lua51-luasocket/template @@ -12,7 +12,6 @@ license="MIT" homepage="http://w3.impa.br/~diego/software/luasocket/" distfiles="http://luaforge.net/frs/download.php/2664/luasocket-${version}.tar.gz" checksum=4fd9c775cfd98841299851e29b30176caf289370fea1ff1e00bb67c2d6842ca6 -patch_args=-Np0 do_build() { make CC=$CC LD=$CC LUAINC=-I${XBPS_CROSS_BASE}/usr/include/lua5.1 ${makejobs} diff --git a/srcpkgs/lua51/patches/CVE-2014-5461.patch b/srcpkgs/lua51/patches/CVE-2014-5461.patch index 622c8c6b8c..e2efe1de00 100644 --- a/srcpkgs/lua51/patches/CVE-2014-5461.patch +++ b/srcpkgs/lua51/patches/CVE-2014-5461.patch @@ -1,8 +1,8 @@ Security fix for CVE-2014-5461, http://openwall.com/lists/oss-security/2014/08/27/2 ---- src/ldo.c.orig Tue Sep 9 15:32:24 2014 -+++ src/ldo.c Tue Sep 9 15:33:46 2014 +--- a/src/ldo.c Tue Sep 9 15:32:24 2014 ++++ b/src/ldo.c Tue Sep 9 15:33:46 2014 @@ -217,7 +217,7 @@ static StkId adjust_varargs (lua_State *L, Proto *p, i int nvar = actual - nfixargs; /* number of extra arguments */ lua_assert(p->is_vararg & VARARG_HASARG); diff --git a/srcpkgs/lua51/patches/lua-5.1-cflags.diff b/srcpkgs/lua51/patches/lua-5.1-cflags.diff index 9944da56ce..cb2b8d68a9 100644 --- a/srcpkgs/lua51/patches/lua-5.1-cflags.diff +++ b/srcpkgs/lua51/patches/lua-5.1-cflags.diff @@ -1,5 +1,5 @@ ---- src/Makefile 2006-02-16 16:45:09.000000000 +0100 -+++ src/Makefile 2006-03-01 14:55:29.000000000 +0100 +--- a/src/Makefile 2006-02-16 16:45:09.000000000 +0100 ++++ b/src/Makefile 2006-03-01 14:55:29.000000000 +0100 @@ -8,7 +8,8 @@ PLAT= none diff --git a/srcpkgs/lua51/patches/lua-arch.patch b/srcpkgs/lua51/patches/lua-arch.patch index 431b855e93..949001fef1 100644 --- a/srcpkgs/lua51/patches/lua-arch.patch +++ b/srcpkgs/lua51/patches/lua-arch.patch @@ -1,5 +1,5 @@ ---- etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 -+++ etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 +--- a/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 ++++ b/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 @@ -8,6 +8,6 @@ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' @@ -8,8 +8,8 @@ INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include INSTALL_LIB= ${prefix}/lib ---- src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 -+++ src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 +--- a/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 ++++ b/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 @@ -94,7 +94,7 @@ ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" @@ -19,8 +19,8 @@ #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #define LUA_PATH_DEFAULT \ ---- src/Makefile 2008-01-19 20:37:58.000000000 +0100 -+++ src/Makefile 2012-02-23 18:26:43.000000000 +0100 +--- a/src/Makefile 2008-01-19 20:37:58.000000000 +0100 ++++ b/src/Makefile 2012-02-23 18:26:43.000000000 +0100 @@ -23,6 +23,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris @@ -50,8 +50,8 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ---- Makefile 2008-08-12 02:40:48.000000000 +0200 -+++ Makefile 2012-02-23 19:06:32.000000000 +0100 +--- a/Makefile 2008-08-12 02:40:48.000000000 +0200 ++++ b/Makefile 2012-02-23 19:06:32.000000000 +0100 @@ -53,7 +53,7 @@ all: $(PLAT) diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template index d57fdad05f..7aad299f07 100644 --- a/srcpkgs/lua51/template +++ b/srcpkgs/lua51/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-$version.tar.gz" checksum=2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 -patch_args=-Np0 alternatives=" lua:lua:/usr/bin/lua5.1 diff --git a/srcpkgs/lua52/patches/liblua.so.patch b/srcpkgs/lua52/patches/liblua.so.patch index 6677d24cc8..60d0f08667 100644 --- a/srcpkgs/lua52/patches/liblua.so.patch +++ b/srcpkgs/lua52/patches/liblua.so.patch @@ -1,5 +1,5 @@ ---- Makefile 2012-05-17 16:05:54.000000000 +0200 -+++ Makefile 2012-09-12 22:39:07.162748096 +0200 +--- a/Makefile 2012-05-17 16:05:54.000000000 +0200 ++++ b/Makefile 2012-09-12 22:39:07.162748096 +0200 @@ -52,7 +52,7 @@ all: $(PLAT) @@ -9,8 +9,8 @@ test: dummy src/lua -v ---- src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 -+++ src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 +--- a/src/luaconf.h 2012-05-11 16:14:42.000000000 +0200 ++++ b/src/luaconf.h 2012-09-12 22:40:27.986622772 +0200 @@ -100,7 +100,7 @@ #else /* }{ */ @@ -20,8 +20,8 @@ #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR #define LUA_PATH_DEFAULT \ ---- src/Makefile 2012-03-09 17:32:16.000000000 +0100 -+++ src/Makefile 2012-09-12 22:38:08.591386896 +0200 +--- a/src/Makefile 2012-03-09 17:32:16.000000000 +0100 ++++ b/src/Makefile 2012-09-12 22:38:08.591386896 +0200 @@ -29,6 +29,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris diff --git a/srcpkgs/lua52/template b/srcpkgs/lua52/template index a8406f18d6..f53cb345eb 100644 --- a/srcpkgs/lua52/template +++ b/srcpkgs/lua52/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-$version.tar.gz" checksum=b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b -patch_args=-Np0 alternatives=" lua:lua:/usr/bin/lua5.2 diff --git a/srcpkgs/lua53/patches/liblua.so.patch b/srcpkgs/lua53/patches/liblua.so.patch index f2b3d62222..ab2bb6f847 100644 --- a/srcpkgs/lua53/patches/liblua.so.patch +++ b/srcpkgs/lua53/patches/liblua.so.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) @@ -9,8 +9,8 @@ test: dummy src/lua -v ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -29,6 +29,7 @@ MYOBJS= PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris @@ -41,8 +41,8 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ---- src/luaconf.h -+++ src/luaconf.h +--- a/src/luaconf.h ++++ b/src/luaconf.h @@ -175,7 +175,7 @@ #else /* }{ */ diff --git a/srcpkgs/lua53/template b/srcpkgs/lua53/template index ac63a8bc15..7a923690a5 100644 --- a/srcpkgs/lua53/template +++ b/srcpkgs/lua53/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" checksum=0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac -patch_args=-Np0 alternatives=" lua:lua:/usr/bin/lua5.3 diff --git a/srcpkgs/lua54-lgi/patches/lua54.patch b/srcpkgs/lua54-lgi/patches/lua54.patch index d4e2ba364f..e266a683dd 100644 --- a/srcpkgs/lua54-lgi/patches/lua54.patch +++ b/srcpkgs/lua54-lgi/patches/lua54.patch @@ -1,5 +1,5 @@ ---- lgi/callable.c -+++ lgi/callable.c +--- a/lgi/callable.c ++++ b/lgi/callable.c @@ -1233,7 +1233,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg) } else diff --git a/srcpkgs/lua54-lgi/template b/srcpkgs/lua54-lgi/template index 9be201629b..abae56cc43 100644 --- a/srcpkgs/lua54-lgi/template +++ b/srcpkgs/lua54-lgi/template @@ -14,7 +14,6 @@ license="MIT" homepage="https://github.com/pavouk/lgi" distfiles="https://github.com/pavouk/lgi/archive/$version.tar.gz" checksum=cfc4105482b4730b3a40097c9d9e7e35c46df2fb255370bdeb2f45a886548c4f -patch_args=-Np0 # requires X11 do_check() { diff --git a/srcpkgs/lua54-lualdap/patches/lua54.patch b/srcpkgs/lua54-lualdap/patches/lua54.patch index 733d72a78a..134ac84993 100644 --- a/srcpkgs/lua54-lualdap/patches/lua54.patch +++ b/srcpkgs/lua54-lualdap/patches/lua54.patch @@ -1,5 +1,5 @@ ---- src/compat-5.3.h -+++ src/compat-5.3.h +--- a/src/compat-5.3.h ++++ b/src/compat-5.3.h @@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname, diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template index d5379fc6e5..386222ce0c 100644 --- a/srcpkgs/lua54-lualdap/template +++ b/srcpkgs/lua54-lualdap/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://github.com/lualdap/lualdap" distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz" checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc -patch_args=-Np0 post_patch() { cd ${wrksrc} diff --git a/srcpkgs/lua54/patches/liblua.so.patch b/srcpkgs/lua54/patches/liblua.so.patch index fbe7b39a4e..972c794dd5 100644 --- a/srcpkgs/lua54/patches/liblua.so.patch +++ b/srcpkgs/lua54/patches/liblua.so.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -52,7 +52,7 @@ R= $V.0 all: $(PLAT) @@ -9,8 +9,8 @@ install: dummy cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -33,6 +33,7 @@ CMCFLAGS= -Os PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris @@ -40,8 +40,8 @@ $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ---- src/luaconf.h -+++ src/luaconf.h +--- a/src/luaconf.h ++++ b/src/luaconf.h @@ -227,7 +227,7 @@ #else /* }{ */ diff --git a/srcpkgs/lua54/template b/srcpkgs/lua54/template index 1b46963997..1abbe11246 100644 --- a/srcpkgs/lua54/template +++ b/srcpkgs/lua54/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://www.lua.org" distfiles="https://www.lua.org/ftp/lua-${version}.tar.gz" checksum=f8612276169e3bfcbcfb8f226195bfc6e466fe13042f1076cbde92b7ec96bbfb -patch_args=-Np0 alternatives=" lua:lua:/usr/bin/lua5.4 diff --git a/srcpkgs/luakit/patches/Makefile.patch b/srcpkgs/luakit/patches/Makefile.patch index ff79bf5ba4..c1a5293e87 100644 --- a/srcpkgs/luakit/patches/Makefile.patch +++ b/srcpkgs/luakit/patches/Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2018-12-30 16:13:10.512451500 -0600 -+++ Makefile 2018-12-30 16:15:27.507448741 -0600 +--- a/Makefile 2018-12-30 16:13:10.512451500 -0600 ++++ b/Makefile 2018-12-30 16:15:27.507448741 -0600 @@ -17,7 +17,7 @@ # Must be kept in sync with doc/docgen.ld DOC_SRCS = $(filter-out lib/markdown.lua lib/lousy/init.lua,$(shell for d in doc/luadoc lib common/clib; do find $$d -type f; done)) tests/lib.lua diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index aa089acc9d..4fa00bb757 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -14,7 +14,6 @@ homepage="https://luakit.github.io/" changelog="https://github.com/luakit/luakit/blob/develop/CHANGELOG.md" distfiles="https://github.com/luakit/luakit/archive/${version}.tar.gz" checksum=c7026b4f0bdfa44f43798b80f87548d3e7ad56f5b923fc43b9c712bf18496095 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/lumina/patches/mandir.patch b/srcpkgs/lumina/patches/mandir.patch index b9c0743d67..9b9ce50a1e 100644 --- a/srcpkgs/lumina/patches/mandir.patch +++ b/srcpkgs/lumina/patches/mandir.patch @@ -1,5 +1,5 @@ ---- src-qt5/OS-detect.pri.orig 2017-07-05 20:02:49.727200592 +0200 -+++ src-qt5/OS-detect.pri 2017-07-05 20:03:10.463911159 +0200 +--- a/src-qt5/OS-detect.pri 2017-07-05 20:02:49.727200592 +0200 ++++ b/src-qt5/OS-detect.pri 2017-07-05 20:03:10.463911159 +0200 @@ -94,7 +94,7 @@ isEmpty(L_SHAREDIR){ L_SHAREDIR = $${PREFIX}/share } isEmpty(L_INCLUDEDIR){ L_INCLUDEDIR = $${PREFIX}/include } diff --git a/srcpkgs/lumina/template b/srcpkgs/lumina/template index b2451f5dc9..ed7ef97adf 100644 --- a/srcpkgs/lumina/template +++ b/srcpkgs/lumina/template @@ -16,7 +16,6 @@ homepage="https://github.com/lumina-desktop/lumina" distfiles="https://github.com/lumina-desktop/lumina/archive/v${version}.tar.gz" checksum=f3512fca4d05e3cf3a6ac106f0f16c9618bda9fa546f1d23ffb0eab9a5ce7c8a replaces="lumina-git>=0" -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/lvm2/patches/fix-stdio-usage.patch b/srcpkgs/lvm2/patches/fix-stdio-usage.patch index 9238c3a0d4..c480918611 100644 --- a/srcpkgs/lvm2/patches/fix-stdio-usage.patch +++ b/srcpkgs/lvm2/patches/fix-stdio-usage.patch @@ -1,7 +1,7 @@ diff --git lib/commands/toolcontext.c lib/commands/toolcontext.c index 95fb343..5baea40 100644 ---- lib/commands/toolcontext.c -+++ lib/commands/toolcontext.c +--- a/lib/commands/toolcontext.c ++++ b/lib/commands/toolcontext.c @@ -1869,7 +1869,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, /* FIXME Make this configurable? */ reset_lvm_errno(1); @@ -22,8 +22,8 @@ index 95fb343..5baea40 100644 if (is_valid_fd(STDIN_FILENO) && diff --git tools/lvmcmdline.c tools/lvmcmdline.c index 0840c65..9503922 100644 ---- tools/lvmcmdline.c -+++ tools/lvmcmdline.c +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c @@ -3109,7 +3109,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); diff --git a/srcpkgs/lvm2/patches/mlockall-default-config.patch b/srcpkgs/lvm2/patches/mlockall-default-config.patch index d741df2e0e..c68498b8c7 100644 --- a/srcpkgs/lvm2/patches/mlockall-default-config.patch +++ b/srcpkgs/lvm2/patches/mlockall-default-config.patch @@ -1,5 +1,5 @@ ---- ./lib/config/defaults.h.orig 2017-04-27 18:16:05.879936377 +0200 -+++ ./lib/config/defaults.h 2017-04-27 18:16:35.141849047 +0200 +--- a/lib/config/defaults.h 2017-04-27 18:16:05.879936377 +0200 ++++ b/lib/config/defaults.h 2017-04-27 18:16:35.141849047 +0200 @@ -55,7 +55,11 @@ #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3 #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10 diff --git a/srcpkgs/lvm2/patches/portability.patch b/srcpkgs/lvm2/patches/portability.patch index 6adf1b4259..dcc1399517 100644 --- a/srcpkgs/lvm2/patches/portability.patch +++ b/srcpkgs/lvm2/patches/portability.patch @@ -3,8 +3,8 @@ Portability fixes: - Use fcntl.h for O_RDONLY and friends. - Only use mallinfo with glibc. ---- libdaemon/server/daemon-server.c 2014-11-29 00:07:42.000000000 +0100 -+++ libdaemon/server/daemon-server.c 2014-12-28 08:22:40.985928408 +0100 +--- a/libdaemon/server/daemon-server.c 2014-11-29 00:07:42.000000000 +0100 ++++ b/libdaemon/server/daemon-server.c 2014-12-28 08:22:40.985928408 +0100 @@ -14,6 +14,7 @@ #include "daemon-server.h" #include "daemon-log.h" @@ -14,8 +14,8 @@ Portability fixes: #include #include ---- lib/mm/memlock.c.orig 2016-06-07 08:00:46.557058318 +0200 -+++ lib/mm/memlock.c 2016-06-07 08:01:25.453505793 +0200 +--- a/lib/mm/memlock.c 2016-06-07 08:00:46.557058318 +0200 ++++ b/lib/mm/memlock.c 2016-06-07 08:01:25.453505793 +0200 @@ -150,7 +150,7 @@ static void _touch_memory(void *mem, siz static void _allocate_memory(void) diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index b04e9a0d46..b7d287577c 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -24,7 +24,6 @@ conf_files="/etc/lvm/*.conf /etc/lvm/profile/*" make_dirs=" /etc/lvm/archive 0755 root root /etc/lvm/backup 0755 root root" -patch_args=-Np0 case $XBPS_TARGET_MACHINE in *-musl) configure_args+=" --enable-static_link";; diff --git a/srcpkgs/lwipv6/patches/endian.patch b/srcpkgs/lwipv6/patches/endian.patch index 525d147b77..d1f4183755 100644 --- a/srcpkgs/lwipv6/patches/endian.patch +++ b/srcpkgs/lwipv6/patches/endian.patch @@ -2,8 +2,8 @@ Source: Debian This fixes build on big endian. ---- lwip-v6/src/include/ipv6/lwip/inet.h -+++ lwip-v6/src/include/ipv6/lwip/inet.h +--- a/lwip-v6/src/include/ipv6/lwip/inet.h ++++ b/lwip-v6/src/include/ipv6/lwip/inet.h @@ -52,6 +52,8 @@ #ifndef __LWIP_INET_H__ #define __LWIP_INET_H__ diff --git a/srcpkgs/lwipv6/patches/linux-headers-5.10.patch b/srcpkgs/lwipv6/patches/linux-headers-5.10.patch index 93213d1012..22e67344d7 100644 --- a/srcpkgs/lwipv6/patches/linux-headers-5.10.patch +++ b/srcpkgs/lwipv6/patches/linux-headers-5.10.patch @@ -1,5 +1,5 @@ ---- lwip-v6/src/include/lwip/sockets.h -+++ lwip-v6/src/include/lwip/sockets.h +--- a/lwip-v6/src/include/lwip/sockets.h ++++ b/lwip-v6/src/include/lwip/sockets.h @@ -58,6 +58,7 @@ #include #include diff --git a/srcpkgs/lwipv6/patches/musl.patch b/srcpkgs/lwipv6/patches/musl.patch index 59c126fb51..00dbe1b8bf 100644 --- a/srcpkgs/lwipv6/patches/musl.patch +++ b/srcpkgs/lwipv6/patches/musl.patch @@ -1,5 +1,5 @@ ---- lwip-v6/src/include/lwip/if.h.orig -+++ lwip-v6/src/include/lwip/if.h +--- a/lwip-v6/src/include/lwip/if.h ++++ b/lwip-v6/src/include/lwip/if.h @@ -183,18 +183,14 @@ # define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) /* not right */ #endif /* Misc. */ @@ -23,8 +23,8 @@ +extern void if_freenameindex (struct if_nameindex *__ptr); #endif /* net/if.h */ ---- lwip-v6/src/include/lwip/sockets.h.orig -+++ lwip-v6/src/include/lwip/sockets.h +--- a/lwip-v6/src/include/lwip/sockets.h ++++ b/lwip-v6/src/include/lwip/sockets.h @@ -479,8 +479,6 @@ this large value the readv/writev call will not fail because of this. */ #define UIO_MAXIOV 1024 diff --git a/srcpkgs/lwipv6/template b/srcpkgs/lwipv6/template index 441fe3e7e9..66ce29f506 100644 --- a/srcpkgs/lwipv6/template +++ b/srcpkgs/lwipv6/template @@ -11,7 +11,6 @@ homepage="http://wiki.v2.cs.unibo.it/wiki/index.php/LWIPV6" distfiles="${SOURCEFORGE_SITE}/view-os/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" checksum=4ad9415c0bf9a2aca0aa858ac1601c20d7c04b5d051d000d4a03eb1eeb0ed05a CPPFLAGS='-DGNU_SOURCE -D__USE_MISC -D__caddr_t=caddr_t' -patch_args=-Np0 lwipv6-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/lxappearance/patches/fix-wayland.patch b/srcpkgs/lxappearance/patches/fix-wayland.patch index 0c31d935a2..b878c1f055 100644 --- a/srcpkgs/lxappearance/patches/fix-wayland.patch +++ b/srcpkgs/lxappearance/patches/fix-wayland.patch @@ -6,8 +6,8 @@ Date: Mon Feb 15 19:45:23 2021 +0100 diff --git src/lxappearance.c src/lxappearance.c index a4b7db3..b6441ae 100644 ---- src/lxappearance.c -+++ src/lxappearance.c +--- a/src/lxappearance.c ++++ b/src/lxappearance.c @@ -86,6 +86,10 @@ static gboolean check_lxde_dbus() static void check_lxsession() diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template index f1475690dc..7fcaad225f 100644 --- a/srcpkgs/lxappearance/template +++ b/srcpkgs/lxappearance/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="http://lxde.org/" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38 -patch_args=-Np0 build_options="gtk3 dbus" build_options_default="dbus gtk3" diff --git a/srcpkgs/lxdm/patches/default-config.patch b/srcpkgs/lxdm/patches/default-config.patch index e6c0a769a5..4aa0717431 100644 --- a/srcpkgs/lxdm/patches/default-config.patch +++ b/srcpkgs/lxdm/patches/default-config.patch @@ -1,5 +1,5 @@ ---- data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200 -+++ data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200 +--- a/data/lxdm.conf.in 2013-08-30 17:56:16.097006000 +0200 ++++ b/data/lxdm.conf.in 2013-09-04 01:54:12.942117085 +0200 @@ -23,7 +23,7 @@ [server] @@ -18,8 +18,8 @@ ## if show bottom pane bottom_pane=1 ---- data/lxdm.in 2013-08-30 17:56:16.097006000 +0200 -+++ data/lxdm.in 2013-09-04 01:57:56.950799946 +0200 +--- a/data/lxdm.in 2013-08-30 17:56:16.097006000 +0200 ++++ b/data/lxdm.in 2013-09-04 01:57:56.950799946 +0200 @@ -1,21 +1,13 @@ #!/bin/sh @@ -44,8 +44,8 @@ if [ -n "$DEFAULT_WM" ]; then PREFERRED=$DEFAULT_WM fi ---- data/Xsession 2013-08-30 17:56:16.097006000 +0200 -+++ data/Xsession 2013-09-04 01:58:19.941348762 +0200 +--- a/data/Xsession 2013-08-30 17:56:16.097006000 +0200 ++++ b/data/Xsession 2013-09-04 01:58:19.941348762 +0200 @@ -9,6 +9,8 @@ LXSESSION=/usr/bin/startlxde fi diff --git a/srcpkgs/lxdm/patches/execinfo.patch b/srcpkgs/lxdm/patches/execinfo.patch index 521a04188e..b2d979049a 100644 --- a/srcpkgs/lxdm/patches/execinfo.patch +++ b/srcpkgs/lxdm/patches/execinfo.patch @@ -1,5 +1,5 @@ ---- configure.ac 2011-11-16 22:27:33.624019150 +0100 -+++ configure.ac 2011-11-16 22:29:49.537310486 +0100 +--- a/configure.ac 2011-11-16 22:27:33.624019150 +0100 ++++ b/configure.ac 2011-11-16 22:29:49.537310486 +0100 @@ -23,7 +23,7 @@ # Checks for header files. @@ -9,8 +9,8 @@ # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_PID_T ---- src/lxdm.c 2011-11-16 22:27:33.617019240 +0100 -+++ src/lxdm.c 2011-11-16 22:29:19.030694008 +0100 +--- a/src/lxdm.c 2011-11-16 22:27:33.617019240 +0100 ++++ b/src/lxdm.c 2011-11-16 22:29:19.030694008 +0100 @@ -52,7 +52,9 @@ #include #include diff --git a/srcpkgs/lxdm/patches/fix-msghdr-usage.patch b/srcpkgs/lxdm/patches/fix-msghdr-usage.patch index ec53327058..77c25c5fc8 100644 --- a/srcpkgs/lxdm/patches/fix-msghdr-usage.patch +++ b/srcpkgs/lxdm/patches/fix-msghdr-usage.patch @@ -1,5 +1,5 @@ ---- src/lxcom.c 2013-10-04 10:40:08.000000000 -0300 -+++ src/lxcom.c 2014-07-18 11:21:22.734631159 -0300 +--- a/src/lxcom.c 2013-10-04 10:40:08.000000000 -0300 ++++ b/src/lxcom.c 2014-07-18 11:21:22.734631159 -0300 @@ -116,12 +116,20 @@ char buf[4096]; char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024]; diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template index 86684d3b51..55ae9b5356 100644 --- a/srcpkgs/lxdm/template +++ b/srcpkgs/lxdm/template @@ -23,7 +23,6 @@ license="GPL-3.0-or-later" homepage="https://lxde.org" distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz" checksum=4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch b/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch index c319f26181..aea1ddad2e 100644 --- a/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch +++ b/srcpkgs/lxpanel/patches/10-devproc-lxpanel.patch @@ -1,5 +1,5 @@ ---- plugins/netstat/devproc.c 2015-07-14 11:07:22.000000000 +0200 -+++ plugins/netstat/devproc.c 2017-02-09 21:01:08.348058591 +0100 +--- a/plugins/netstat/devproc.c 2015-07-14 11:07:22.000000000 +0200 ++++ b/plugins/netstat/devproc.c 2017-02-09 21:01:08.348058591 +0100 @@ -27,6 +27,8 @@ #include #include diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template index 3f3f3f2f98..6dff9ac554 100644 --- a/srcpkgs/lxpanel/template +++ b/srcpkgs/lxpanel/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="http://lxde.org/" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=1e318f57d7e36b61c23a504d03d2430c78dad142c1804451061f1b3ea5441ee8 -patch_args=-Np0 lib32disabled=yes diff --git a/srcpkgs/lzf/patches/Makefile_in-DISTDIR.patch b/srcpkgs/lzf/patches/Makefile_in-DISTDIR.patch index 237b7f886a..d9c615f367 100644 --- a/srcpkgs/lzf/patches/Makefile_in-DISTDIR.patch +++ b/srcpkgs/lzf/patches/Makefile_in-DISTDIR.patch @@ -1,5 +1,5 @@ ---- Makefile.in 2011-02-07 17:37:51.000000000 +0100 -+++ Makefile.in 2020-09-06 17:34:21.695515951 +0200 +--- a/Makefile.in 2011-02-07 17:37:51.000000000 +0100 ++++ b/Makefile.in 2020-09-06 17:34:21.695515951 +0200 @@ -37,12 +37,12 @@ $(RANLIB) $@ diff --git a/srcpkgs/lzf/template b/srcpkgs/lzf/template index b8457facdc..1d4e437dc1 100644 --- a/srcpkgs/lzf/template +++ b/srcpkgs/lzf/template @@ -11,7 +11,6 @@ license="BSD-2-Clause" homepage="http://software.schmorp.de/pkg/liblzf.html" distfiles="http://dist.schmorp.de/liblzf/lib${pkgname}-${version}.tar.gz" checksum=9c5de01f7b9ccae40c3f619d26a7abec9986c06c36d260c179cedd04b89fb46a -patch_args=-Np0 pre_configure() { autoreconf -fi