From 1ddfe9abba69dfbdcd604d371da36085fec10e4e Mon Sep 17 00:00:00 2001 From: PktSurf Date: Wed, 23 Feb 2022 23:21:55 +0530 Subject: [PATCH] * Fixed indentation in base/docbook build file * Replaced patch command with applypatch function in multiple build files in base, xorg, gtk, extra and xfce sections --- base/alsa-lib/alsa-lib.SMBuild | 2 +- base/argp-standalone/argp-standalone.SMBuild | 4 +-- base/attr/attr.SMBuild | 2 +- base/bash-completion/bash-completion.SMBuild | 2 +- base/boost/boost.SMBuild | 2 +- base/bubblewrap/bubblewrap.SMBuild | 2 +- base/busybox/busybox.SMBuild | 8 +++--- base/bzip2/bzip2.SMBuild | 2 +- base/ca-certificates/ca-certificates.SMBuild | 2 +- base/clang/clang.SMBuild | 4 +-- base/coreutils/coreutils.SMBuild | 2 +- base/crda/crda.SMBuild | 4 +-- base/db/db.SMBuild | 2 +- base/dcron/dcron.SMBuild | 8 +++--- .../desktop-file-utils.SMBuild | 2 +- base/docbook/docbook.SMBuild | 16 +++++------ base/file/file.SMBuild | 4 +-- base/findutils/findutils.SMBuild | 4 +-- base/gdb/gdb.SMBuild | 8 +++--- base/giflib/giflib.SMBuild | 2 +- base/gloox/gloox.SMBuild | 2 +- base/gyp/gyp.SMBuild | 10 +++---- base/id3lib/id3lib.SMBuild | 12 ++++---- base/intltool/intltool.SMBuild | 2 +- base/iptables/iptables.SMBuild | 2 +- base/kernel-headers/kernel-headers.SMBuild | 2 +- base/kmod/kmod.SMBuild | 2 +- base/less/less.SMBuild | 4 +-- base/libdaemon/libdaemon.SMBuild | 2 +- base/libical/libical.SMBuild | 2 +- base/libid3tag/libid3tag.SMBuild | 2 +- base/libkate/libkate.SMBuild | 2 +- base/libnfnetlink/libnfnetlink.SMBuild | 2 +- base/libtheora/libtheora.SMBuild | 2 +- base/libtirpc/libtirpc.SMBuild | 2 +- base/libxml2/libxml2.SMBuild | 4 +-- base/libxslt/libxslt.SMBuild | 4 +-- base/llvm/llvm.SMBuild | 8 +++--- base/lua53/lua53.SMBuild | 2 +- base/lvm/lvm.SMBuild | 8 +++--- base/m4/m4.SMBuild | 4 +-- base/mandoc/mandoc.SMBuild | 10 +++---- base/mlocate/mlocate.SMBuild | 2 +- base/ninja/ninja.SMBuild | 2 +- base/parted/parted.SMBuild | 2 +- base/pciutils/pciutils.SMBuild | 2 +- base/procps-ng/procps-ng.SMBuild | 2 +- base/python3/python3.SMBuild | 10 +++---- base/ruby/ruby.SMBuild | 4 +-- base/rust/rust.SMBuild | 28 +++++++++---------- base/signify/signify.SMBuild | 2 +- base/sysklogd/sysklogd.SMBuild | 4 +-- base/syslinux/syslinux.SMBuild | 2 +- base/tar/tar.SMBuild | 4 +-- base/util-linux/util-linux.SMBuild | 2 +- base/zstd/zstd.SMBuild | 2 +- extra/abiword/abiword.SMBuild | 4 +-- extra/ace/ace.SMBuild | 2 +- extra/bluez/bluez.SMBuild | 4 +-- extra/dia/dia.SMBuild | 6 ++-- extra/fceux/fceux.SMBuild | 4 +-- extra/gftp/gftp.SMBuild | 8 +++--- extra/gimp/gimp.SMBuild | 2 +- extra/gnuchess/gnuchess.SMBuild | 2 +- extra/gtypist/gtypist.SMBuild | 2 +- extra/iotop/iotop.SMBuild | 2 +- extra/mupdf/mupdf.SMBuild | 4 +-- extra/sdl/sdl.SMBuild | 4 +-- extra/sdl2/sdl2.SMBuild | 2 +- extra/spacefm/spacefm.SMBuild | 2 +- extra/v4l-utils/v4l-utils.SMBuild | 4 +-- .../adwaita-icon-theme.SMBuild | 2 +- gtk/cairo/cairo.SMBuild | 4 +-- gtk/gtk2/gtk2.SMBuild | 4 +-- gtk/gtkspell/gtkspell.SMBuild | 2 +- gtk/harfbuzz/harfbuzz.SMBuild | 2 +- gtk/libunique/libunique.SMBuild | 2 +- gtk/openjpeg/openjpeg.SMBuild | 2 +- gtk/pango/pango.SMBuild | 2 +- xfce/xfce4-settings/xfce4-settings.SMBuild | 2 +- xorg/dbus/dbus.SMBuild | 2 +- .../libomxil-bellagio.SMBuild | 2 +- xorg/mesa/mesa.SMBuild | 8 +++--- xorg/terminus-font/terminus-font.SMBuild | 2 +- xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild | 2 +- .../xf86-video-intel/xf86-video-intel.SMBuild | 2 +- 86 files changed, 166 insertions(+), 166 deletions(-) diff --git a/base/alsa-lib/alsa-lib.SMBuild b/base/alsa-lib/alsa-lib.SMBuild index 417eefa..6918fe2 100755 --- a/base/alsa-lib/alsa-lib.SMBuild +++ b/base/alsa-lib/alsa-lib.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/remove-test.patch + applypatch $srcdir/remove-test.patch ./configure \ --prefix="" \ diff --git a/base/argp-standalone/argp-standalone.SMBuild b/base/argp-standalone/argp-standalone.SMBuild index 1209afe..2d36ff9 100755 --- a/base/argp-standalone/argp-standalone.SMBuild +++ b/base/argp-standalone/argp-standalone.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/gnu89-inline.patch - patch -p1 < $srcdir/001-throw-in-funcdef.patch + applypatch $srcdir/gnu89-inline.patch + applypatch $srcdir/001-throw-in-funcdef.patch ./configure \ --prefix="" \ diff --git a/base/attr/attr.SMBuild b/base/attr/attr.SMBuild index 29aee60..170de17 100755 --- a/base/attr/attr.SMBuild +++ b/base/attr/attr.SMBuild @@ -16,7 +16,7 @@ build() { sed -i 's@-o $(PKG_USER) -g $(PKG_GROUP)@@' include/buildmacros sed -i 's@CHOWN=_chown@CHOWN=true@' include/install-sh - patch -p1 < $srcdir/attr-cdefs.patch + applypatch $srcdir/attr-cdefs.patch make clean diff --git a/base/bash-completion/bash-completion.SMBuild b/base/bash-completion/bash-completion.SMBuild index ccbc5e1..a84fbeb 100755 --- a/base/bash-completion/bash-completion.SMBuild +++ b/base/bash-completion/bash-completion.SMBuild @@ -15,7 +15,7 @@ build() { fixbuilddirpermissions # Thank you slackware - patch -p1 < $srcdir/fixup-sh-script-completions.diff + applypatch $srcdir/fixup-sh-script-completions.diff ./configure \ --prefix="" \ diff --git a/base/boost/boost.SMBuild b/base/boost/boost.SMBuild index 6de9969..b6317e6 100755 --- a/base/boost/boost.SMBuild +++ b/base/boost/boost.SMBuild @@ -13,7 +13,7 @@ build() { cd "$app"_"$version" chown -R root.root . - patch -p1 < $srcdir/boost-execinfo.patch + applypatch $srcdir/boost-execinfo.patch unset CXX # Also symlink -gcc-6.3.0 to gcc-6.3.0 and -g++ to g++-6.3.0 diff --git a/base/bubblewrap/bubblewrap.SMBuild b/base/bubblewrap/bubblewrap.SMBuild index 5e9ec36..9a2b953 100755 --- a/base/bubblewrap/bubblewrap.SMBuild +++ b/base/bubblewrap/bubblewrap.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/realpath-workaround.patch + applypatch $srcdir/realpath-workaround.patch ./configure \ --prefix="" \ diff --git a/base/busybox/busybox.SMBuild b/base/busybox/busybox.SMBuild index b433d20..70adb74 100755 --- a/base/busybox/busybox.SMBuild +++ b/base/busybox/busybox.SMBuild @@ -15,10 +15,10 @@ build() { fixbuilddirpermissions # taken from sabotage linux - patch -p1 < $srcdir/busybox-blowfish.patch - patch -p1 < $srcdir/busybox-fdisk-sector-size.patch - patch -p1 < $srcdir/busybox-libbb-make-unicode-printable.patch - patch -p1 < $srcdir/busybox-ping.patch + applypatch $srcdir/busybox-blowfish.patch + applypatch $srcdir/busybox-fdisk-sector-size.patch + applypatch $srcdir/busybox-libbb-make-unicode-printable.patch + applypatch $srcdir/busybox-ping.patch cp $srcdir/busybox.config .config make CC="$CC" diff --git a/base/bzip2/bzip2.SMBuild b/base/bzip2/bzip2.SMBuild index b091dd0..76c5fba 100755 --- a/base/bzip2/bzip2.SMBuild +++ b/base/bzip2/bzip2.SMBuild @@ -16,7 +16,7 @@ build() { # Taken from sabotage - patch -p1 < $srcdir/bzip2-flags.patch + applypatch $srcdir/bzip2-flags.patch sed -i 's@$(PREFIX)@$(DESTDIR)$(PREFIX)@g' Makefile sed -i 's@$(PREFIX)/man@$(PREFIX)/share/man@g' Makefile diff --git a/base/ca-certificates/ca-certificates.SMBuild b/base/ca-certificates/ca-certificates.SMBuild index 9c00aaf..2472a9e 100755 --- a/base/ca-certificates/ca-certificates.SMBuild +++ b/base/ca-certificates/ca-certificates.SMBuild @@ -14,7 +14,7 @@ build() { fixbuilddirpermissions # Patch to remove incompatible arguments from run-parts - patch -p1 < $srcdir/fixup_update-ca-certificates.diff + applypatch $srcdir/fixup_update-ca-certificates.diff # Update to certdata.txt from $srcdir: xzcat $srcdir/certdata-${version}.txt.xz > mozilla/certdata.txt diff --git a/base/clang/clang.SMBuild b/base/clang/clang.SMBuild index dc45a47..fff44a8 100755 --- a/base/clang/clang.SMBuild +++ b/base/clang/clang.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version".src" fixbuilddirpermissions - patch -p1 < $srcdir/10-add-musl-triples.patch - patch -p1 < $srcdir/30-fix-python-shebangs.patch + applypatch $srcdir/10-add-musl-triples.patch + applypatch $srcdir/30-fix-python-shebangs.patch unset CFLAGS CXXFLAGS diff --git a/base/coreutils/coreutils.SMBuild b/base/coreutils/coreutils.SMBuild index 44f3652..6a3a0d3 100755 --- a/base/coreutils/coreutils.SMBuild +++ b/base/coreutils/coreutils.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/ls.patch + applypatch $srcdir/ls.patch FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$CFLAGS -static" \ diff --git a/base/crda/crda.SMBuild b/base/crda/crda.SMBuild index c4b3c90..af3374c 100755 --- a/base/crda/crda.SMBuild +++ b/base/crda/crda.SMBuild @@ -14,9 +14,9 @@ build() { fixbuilddirpermissions # Thank you alpine linux - patch -p1 < $srcdir/01-Makefile-dont-run-ldconfig.patch + applypatch $srcdir/01-Makefile-dont-run-ldconfig.patch # Thank you arch linux - patch -p1 < $srcdir/crda-4.14-python-3.patch + applypatch $srcdir/crda-4.14-python-3.patch # Disable -Werror, just in case sed -i 's@-Werror@@g' Makefile diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild index 5e0a79e..96a4412 100755 --- a/base/db/db.SMBuild +++ b/base/db/db.SMBuild @@ -20,7 +20,7 @@ build() { db_atomic=x86/gcc-assembly fi - patch -p1 < $srcdir/bdb-configure.patch + applypatch $srcdir/bdb-configure.patch cd build_unix diff --git a/base/dcron/dcron.SMBuild b/base/dcron/dcron.SMBuild index d2f0760..f456faf 100755 --- a/base/dcron/dcron.SMBuild +++ b/base/dcron/dcron.SMBuild @@ -14,10 +14,10 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/0002-README-var-spool-cron-crontabs-root.patch - patch -p1 < $srcdir/0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch - patch -p1 < $srcdir/0007-Update-main.c.patch - patch -p1 < $srcdir/crontab.c.O_EXCL.diff + applypatch $srcdir/0002-README-var-spool-cron-crontabs-root.patch + applypatch $srcdir/0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch + applypatch $srcdir/0007-Update-main.c.patch + applypatch $srcdir/crontab.c.O_EXCL.diff make PREFIX="" BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root diff --git a/base/desktop-file-utils/desktop-file-utils.SMBuild b/base/desktop-file-utils/desktop-file-utils.SMBuild index 08309c3..00248f1 100755 --- a/base/desktop-file-utils/desktop-file-utils.SMBuild +++ b/base/desktop-file-utils/desktop-file-utils.SMBuild @@ -14,7 +14,7 @@ build() { fixbuilddirpermissions # Thank you slackware - patch -p1 < $srcdir/desktop-file-utils.quiet.warnings.diff + applypatch $srcdir/desktop-file-utils.quiet.warnings.diff ./configure \ --prefix="" \ diff --git a/base/docbook/docbook.SMBuild b/base/docbook/docbook.SMBuild index dd6cd7a..e79d17f 100755 --- a/base/docbook/docbook.SMBuild +++ b/base/docbook/docbook.SMBuild @@ -12,17 +12,17 @@ build() { mkandenterbuilddir rm -rf $app-$version -tar xf $srcdir/docbook-xml-$DOCBOOKV.tar.?z* -cd docbook-xml-$DOCBOOKV + tar xf $srcdir/docbook-xml-$DOCBOOKV.tar.?z* + cd docbook-xml-$DOCBOOKV fixbuilddirpermissions -XML_CATALOG="$pkg/etc/xml/catalog" -XML_DOCBOOK="$pkg/etc/xml/docbook" + XML_CATALOG="$pkg/etc/xml/catalog" + XML_DOCBOOK="$pkg/etc/xml/docbook" -cd docbook-4.5 + cd docbook-4.5 -install -d -m755 "$pkg"/share/xml/docbook/xml-dtd-4.5 -install -d -m755 "$pkg"/etc/xml + install -d -m755 "$pkg"/share/xml/docbook/xml-dtd-4.5 + install -d -m755 "$pkg"/etc/xml #rm -rf /etc/xml chown -R root:root . @@ -128,7 +128,7 @@ cd docbook-xsl-nons-$XSLV fixbuilddirpermissions -patch -p1 < $srcdir/non-recursive-string-subst.patch +applypatch $srcdir/non-recursive-string-subst.patch install -v -m755 -d "$pkg"/share/xml/docbook/xsl-stylesheets-"$XSLV" diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild index c8ad26c..ee15972 100755 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/file.etc.file.diff - patch -p1 < $srcdir/file.short.diff + applypatch $srcdir/file.etc.file.diff + applypatch $srcdir/file.short.diff # linking against libseccomp causes weird "Bad system call" issues CFLAGS="--std=c99" \ diff --git a/base/findutils/findutils.SMBuild b/base/findutils/findutils.SMBuild index d16e92e..aa14211 100755 --- a/base/findutils/findutils.SMBuild +++ b/base/findutils/findutils.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/findutils.no.default.options.warnings.diff - patch -p1 < $srcdir/mountlist.c.patch + applypatch $srcdir/findutils.no.default.options.warnings.diff + applypatch $srcdir/mountlist.c.patch LDFLAGS="-static" \ ./configure \ diff --git a/base/gdb/gdb.SMBuild b/base/gdb/gdb.SMBuild index 43c8453..4c6e50f 100755 --- a/base/gdb/gdb.SMBuild +++ b/base/gdb/gdb.SMBuild @@ -15,10 +15,10 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/100-musl_fix.patch - patch -p1 < $srcdir/110-shared_libgcc.patch - patch -p1 < $srcdir/120-sigprocmask-invalid-call.patch - patch -p1 < $srcdir/130-uclibc-fix.patch + applypatch $srcdir/100-musl_fix.patch + applypatch $srcdir/110-shared_libgcc.patch + applypatch $srcdir/120-sigprocmask-invalid-call.patch + applypatch $srcdir/130-uclibc-fix.patch ./configure \ --prefix="" \ diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild index 12d4d61..909a3ae 100755 --- a/base/giflib/giflib.SMBuild +++ b/base/giflib/giflib.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/giflib-5.1.9-fix-missing-quantize-API-symbols.patch + applypatch $srcdir/giflib-5.1.9-fix-missing-quantize-API-symbols.patch make make install DESTDIR=$pkg PREFIX="/" diff --git a/base/gloox/gloox.SMBuild b/base/gloox/gloox.SMBuild index 5ed3cf4..22b6cfe 100755 --- a/base/gloox/gloox.SMBuild +++ b/base/gloox/gloox.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/gloox-musl.patch + applypatch $srcdir/gloox-musl.patch ./configure \ --prefix="" \ diff --git a/base/gyp/gyp.SMBuild b/base/gyp/gyp.SMBuild index 21abe50..cec2378 100755 --- a/base/gyp/gyp.SMBuild +++ b/base/gyp/gyp.SMBuild @@ -13,11 +13,11 @@ tar xf $srcdir/$app-$version"_caa60026".tar.?z* cd $app-$version"_caa60026" fixbuilddirpermissions - patch -p1 < $srcdir/gyp-fix-cmake.patch - patch -p1 < $srcdir/gyp-ninja-build.patch - patch -p1 < $srcdir/gyp-python3.patch - patch -p1 < $srcdir/gyp-python38.patch - patch -p1 < $srcdir/gyp-python39.patch + applypatch $srcdir/gyp-fix-cmake.patch + applypatch $srcdir/gyp-ninja-build.patch + applypatch $srcdir/gyp-python3.patch + applypatch $srcdir/gyp-python38.patch + applypatch $srcdir/gyp-python39.patch python3 setup.py install --prefix="" --root="$pkg" diff --git a/base/id3lib/id3lib.SMBuild b/base/id3lib/id3lib.SMBuild index 4eb09b0..d31b8e7 100755 --- a/base/id3lib/id3lib.SMBuild +++ b/base/id3lib/id3lib.SMBuild @@ -14,12 +14,12 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/10-fix-compilation-with-cpp-headers.patch - patch -p1 < $srcdir/30-fix-utf16.patch - patch -p1 < $srcdir/50-remove-outdated-check.patch - patch -p1 < $srcdir/60-id3lib-missing-nullpointer-check.patch - patch -p1 < $srcdir/61-fix_vbr_stack_smash.patch - patch -p1 < $srcdir/CVE-2007-4460.patch + applypatch $srcdir/10-fix-compilation-with-cpp-headers.patch + applypatch $srcdir/30-fix-utf16.patch + applypatch $srcdir/50-remove-outdated-check.patch + applypatch $srcdir/60-id3lib-missing-nullpointer-check.patch + applypatch $srcdir/61-fix_vbr_stack_smash.patch + applypatch $srcdir/CVE-2007-4460.patch libtoolize -fc aclocal diff --git a/base/intltool/intltool.SMBuild b/base/intltool/intltool.SMBuild index d941e7a..230e2bc 100755 --- a/base/intltool/intltool.SMBuild +++ b/base/intltool/intltool.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/intltool-regex-warning.patch + applypatch $srcdir/intltool-regex-warning.patch ./configure \ --prefix="" diff --git a/base/iptables/iptables.SMBuild b/base/iptables/iptables.SMBuild index 1e3384c..d33bee8 100755 --- a/base/iptables/iptables.SMBuild +++ b/base/iptables/iptables.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/iptables-1.4.14-musl-fixes.patch + applypatch $srcdir/iptables-1.4.14-musl-fixes.patch ./configure \ --prefix="" \ diff --git a/base/kernel-headers/kernel-headers.SMBuild b/base/kernel-headers/kernel-headers.SMBuild index dc279fa..ecf2a81 100755 --- a/base/kernel-headers/kernel-headers.SMBuild +++ b/base/kernel-headers/kernel-headers.SMBuild @@ -14,7 +14,7 @@ build() { cd linux-headers-$version fixbuilddirpermissions - patch -p1 < $srcdir/ptrace.h.patch + applypatch $srcdir/ptrace.h.patch make ARCH="$ARCH" prefix="/" DESTDIR=$pkg install cp -r generic/include $pkg/ diff --git a/base/kmod/kmod.SMBuild b/base/kmod/kmod.SMBuild index 6d84982..8a2a4e7 100755 --- a/base/kmod/kmod.SMBuild +++ b/base/kmod/kmod.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/strndupa.patch + applypatch $srcdir/strndupa.patch ./configure \ --prefix="" \ diff --git a/base/less/less.SMBuild b/base/less/less.SMBuild index 4a7e51a..f8b6c4f 100755 --- a/base/less/less.SMBuild +++ b/base/less/less.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/less.patch - patch -p1 < $srcdir/less-implicit.patch + applypatch $srcdir/less.patch + applypatch $srcdir/less-implicit.patch ./configure \ --prefix="" \ diff --git a/base/libdaemon/libdaemon.SMBuild b/base/libdaemon/libdaemon.SMBuild index 0cd0313..89f7f37 100755 --- a/base/libdaemon/libdaemon.SMBuild +++ b/base/libdaemon/libdaemon.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch + applypatch $srcdir/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch ./configure \ --prefix="" \ diff --git a/base/libical/libical.SMBuild b/base/libical/libical.SMBuild index 840bf20..42d82d1 100755 --- a/base/libical/libical.SMBuild +++ b/base/libical/libical.SMBuild @@ -15,7 +15,7 @@ build() { fixbuilddirpermissions # Thanks gentoo linux - patch -p1 < $srcdir/icu-68.patch + applypatch $srcdir/icu-68.patch mkdir -p smbuild && cd smbuild cmake .. \ diff --git a/base/libid3tag/libid3tag.SMBuild b/base/libid3tag/libid3tag.SMBuild index 12f889a..2efa6cb 100755 --- a/base/libid3tag/libid3tag.SMBuild +++ b/base/libid3tag/libid3tag.SMBuild @@ -13,7 +13,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/CVE-2008-2109.patch + applypatch $srcdir/CVE-2008-2109.patch ./configure \ --prefix="" \ diff --git a/base/libkate/libkate.SMBuild b/base/libkate/libkate.SMBuild index 5fcb982..c681aa5 100755 --- a/base/libkate/libkate.SMBuild +++ b/base/libkate/libkate.SMBuild @@ -13,7 +13,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/libkate-0.4.1-no-libfl.patch + applypatch $srcdir/libkate-0.4.1-no-libfl.patch libtoolize --copy --force aclocal diff --git a/base/libnfnetlink/libnfnetlink.SMBuild b/base/libnfnetlink/libnfnetlink.SMBuild index c98de2b..0c6be31 100755 --- a/base/libnfnetlink/libnfnetlink.SMBuild +++ b/base/libnfnetlink/libnfnetlink.SMBuild @@ -13,7 +13,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/musl-fix-includes.patch + applypatch $srcdir/musl-fix-includes.patch ./configure \ --prefix="" \ diff --git a/base/libtheora/libtheora.SMBuild b/base/libtheora/libtheora.SMBuild index 61d126d..c62de67 100755 --- a/base/libtheora/libtheora.SMBuild +++ b/base/libtheora/libtheora.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/libpng16.patch + applypatch $srcdir/libpng16.patch ./configure \ --prefix="" \ diff --git a/base/libtirpc/libtirpc.SMBuild b/base/libtirpc/libtirpc.SMBuild index 5be897c..0d92ce0 100755 --- a/base/libtirpc/libtirpc.SMBuild +++ b/base/libtirpc/libtirpc.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/soname-suffix.patch + applypatch $srcdir/soname-suffix.patch ./configure \ --prefix="" \ diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild index 468359f..a635f65 100755 --- a/base/libxml2/libxml2.SMBuild +++ b/base/libxml2/libxml2.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/libxml2-2.9.8-python3-unicode-errors.patch - patch -p1 < $srcdir/revert-Make-xmlFreeNodeList-non-recursive.patch + applypatch $srcdir/libxml2-2.9.8-python3-unicode-errors.patch + applypatch $srcdir/revert-Make-xmlFreeNodeList-non-recursive.patch ./configure \ --prefix="" \ diff --git a/base/libxslt/libxslt.SMBuild b/base/libxslt/libxslt.SMBuild index 9ed12b5..e537c72 100755 --- a/base/libxslt/libxslt.SMBuild +++ b/base/libxslt/libxslt.SMBuild @@ -15,8 +15,8 @@ build() { fixbuilddirpermissions # Thank you Arch Linux - patch -p1 < $srcdir/0001-Make-generate-id-deterministic.patch - patch -p1 < $srcdir/0002-Fix-manpage.patch + applypatch $srcdir/0001-Make-generate-id-deterministic.patch + applypatch $srcdir/0002-Fix-manpage.patch ./configure \ --prefix="" \ diff --git a/base/llvm/llvm.SMBuild b/base/llvm/llvm.SMBuild index c432bbd..99e81a6 100755 --- a/base/llvm/llvm.SMBuild +++ b/base/llvm/llvm.SMBuild @@ -13,10 +13,10 @@ build() { cd $app-"$version".src fixbuilddirpermissions - patch -p1 < $srcdir/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch - patch -p1 < $srcdir/fix-LLVMConfig-cmake-install-prefix.patch - patch -p1 < $srcdir/fix-memory-mf_exec-on-aarch64.patch - patch -p1 < $srcdir/python3-test.patch + applypatch $srcdir/0001-Disable-dynamic-lib-tests-for-musl-s-dlclose-is-noop.patch + applypatch $srcdir/fix-LLVMConfig-cmake-install-prefix.patch + applypatch $srcdir/fix-memory-mf_exec-on-aarch64.patch + applypatch $srcdir/python3-test.patch # We don't need our optimisations for small builds unset CFLAGS CXXFLAGS diff --git a/base/lua53/lua53.SMBuild b/base/lua53/lua53.SMBuild index 6417c1f..5c50cfe 100755 --- a/base/lua53/lua53.SMBuild +++ b/base/lua53/lua53.SMBuild @@ -14,7 +14,7 @@ build() { cd lua-$version fixbuilddirpermissions - patch -p1 < $srcdir/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch + applypatch $srcdir/CVE-2019-6706-use-after-free-lua_upvaluejoin.patch eval $(sed -ne '/^\(V\|R\)= /s, ,,p' Makefile) diff --git a/base/lvm/lvm.SMBuild b/base/lvm/lvm.SMBuild index 88ea469..4f4055a 100755 --- a/base/lvm/lvm.SMBuild +++ b/base/lvm/lvm.SMBuild @@ -14,10 +14,10 @@ build() { cd LVM"$version" fixbuilddirpermissions - patch -p1 < $srcdir/fix-stdio-usage.patch - patch -p1 < $srcdir/mallinfo.patch - patch -p1 < $srcdir/lvm2-mlockall-config.patch - patch -p1 < $srcdir/lvm2-libdir-config.patch + applypatch $srcdir/fix-stdio-usage.patch + applypatch $srcdir/mallinfo.patch + applypatch $srcdir/lvm2-mlockall-config.patch + applypatch $srcdir/lvm2-libdir-config.patch ./configure \ --prefix="" \ diff --git a/base/m4/m4.SMBuild b/base/m4/m4.SMBuild index 0e680e9..bbe1a6c 100755 --- a/base/m4/m4.SMBuild +++ b/base/m4/m4.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/disable-mbrtowc-test.patch - patch -p1 < $srcdir/localename-test-fix.patch + applypatch $srcdir/disable-mbrtowc-test.patch + applypatch $srcdir/localename-test-fix.patch ./configure \ --prefix="" diff --git a/base/mandoc/mandoc.SMBuild b/base/mandoc/mandoc.SMBuild index f630c6c..20ca9e1 100755 --- a/base/mandoc/mandoc.SMBuild +++ b/base/mandoc/mandoc.SMBuild @@ -14,11 +14,11 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/main.c.patch - patch -p1 < $srcdir/fix-tbl-segfault.patch - patch -p1 < $srcdir/shared-libmandoc.patch - patch -p1 < $srcdir/simplify-compat.patch - patch -p1 < $srcdir/outdated-warn-disable.patch + applypatch $srcdir/main.c.patch + applypatch $srcdir/fix-tbl-segfault.patch + applypatch $srcdir/shared-libmandoc.patch + applypatch $srcdir/simplify-compat.patch + applypatch $srcdir/outdated-warn-disable.patch cp $srcdir/configure.local configure.local diff --git a/base/mlocate/mlocate.SMBuild b/base/mlocate/mlocate.SMBuild index 649c8a9..ad6e882 100755 --- a/base/mlocate/mlocate.SMBuild +++ b/base/mlocate/mlocate.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/01-fortify-source-compat.patch + applypatch $srcdir/01-fortify-source-compat.patch sed -i '/^groupname /s/mlocate/locate/' Makefile.in autoreconf -vif diff --git a/base/ninja/ninja.SMBuild b/base/ninja/ninja.SMBuild index 70a8805..3a0ded9 100755 --- a/base/ninja/ninja.SMBuild +++ b/base/ninja/ninja.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/posix-fix.patch + applypatch $srcdir/posix-fix.patch python ./configure.py --bootstrap diff --git a/base/parted/parted.SMBuild b/base/parted/parted.SMBuild index 753b84c..8ac60ce 100755 --- a/base/parted/parted.SMBuild +++ b/base/parted/parted.SMBuild @@ -15,7 +15,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/parted-3.2-xfs.patch + applypatch $srcdir/parted-3.2-xfs.patch CFLAGS="-D_GNU_SOURCE -Dloff_t=off_t $CFLAGS -include sys/sysmacros.h" \ ./configure \ diff --git a/base/pciutils/pciutils.SMBuild b/base/pciutils/pciutils.SMBuild index 90c245a..50151ed 100755 --- a/base/pciutils/pciutils.SMBuild +++ b/base/pciutils/pciutils.SMBuild @@ -15,7 +15,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/pciutils-pread.patch + applypatch $srcdir/pciutils-pread.patch make CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PREAD -fPIC" \ LDFLAGS="-llzma" \ diff --git a/base/procps-ng/procps-ng.SMBuild b/base/procps-ng/procps-ng.SMBuild index 5833663..2ffaca9 100755 --- a/base/procps-ng/procps-ng.SMBuild +++ b/base/procps-ng/procps-ng.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/procps-ng-netbsd-curses.patch + applypatch $srcdir/procps-ng-netbsd-curses.patch STRIP=false \ CPPFLAGS="$CFLAGS -DGLOB_TILDE=0 -DAF_INET6=10 -DAF_INET=2" \ diff --git a/base/python3/python3.SMBuild b/base/python3/python3.SMBuild index 09b7607..0acfbc4 100755 --- a/base/python3/python3.SMBuild +++ b/base/python3/python3.SMBuild @@ -15,11 +15,11 @@ build() { cd "Python-$version" fixbuilddirpermissions - patch -p1 < $srcdir/fix-xattrs-glibc.patch - patch -p1 < $srcdir/musl-find_library.patch - patch -p1 < $srcdir/python3-includedirs.patch - patch -p1 < $srcdir/python3-pathsearch.patch - patch -p1 < $srcdir/python3-sysconfig-prefix.patch + applypatch $srcdir/fix-xattrs-glibc.patch + applypatch $srcdir/musl-find_library.patch + applypatch $srcdir/python3-includedirs.patch + applypatch $srcdir/python3-pathsearch.patch + applypatch $srcdir/python3-sysconfig-prefix.patch sed -i -e "s|^#.* /usr/local/bin/python|#!/bin/python3|" Lib/cgi.py find . -name '*.py' -exec \ diff --git a/base/ruby/ruby.SMBuild b/base/ruby/ruby.SMBuild index 791f463..c7662a8 100755 --- a/base/ruby/ruby.SMBuild +++ b/base/ruby/ruby.SMBuild @@ -15,8 +15,8 @@ build() { fixbuilddirpermissions # Thanks sabotage - patch -p1 < $srcdir/ruby-test_insns-lower-recursion-depth.patch - patch -p1 < $srcdir/ruby-rubygems-avoid-platform-specific-gems.patch + applypatch $srcdir/ruby-test_insns-lower-recursion-depth.patch + applypatch $srcdir/ruby-rubygems-avoid-platform-specific-gems.patch unset CFLAGS CXXFLAGS CPPFLAGS diff --git a/base/rust/rust.SMBuild b/base/rust/rust.SMBuild index 2950fa7..594b66c 100755 --- a/base/rust/rust.SMBuild +++ b/base/rust/rust.SMBuild @@ -31,20 +31,20 @@ build() { cd ../../ fi - patch -p1 < $srcdir/0001-Fix-LLVM-build.patch - patch -p1 < $srcdir/00016-do-not-copy-libunwind.patch - patch -p1 < $srcdir/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch - patch -p1 < $srcdir/0003-Require-static-native-libraries-when-linking-static-.patch - patch -p1 < $srcdir/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch - patch -p1 < $srcdir/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch - patch -p1 < $srcdir/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch - patch -p1 < $srcdir/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch - patch -p1 < $srcdir/0008-Ignore-broken-and-non-applicable-tests.patch - patch -p1 < $srcdir/0009-Link-stage2-tools-dynamically-to-libstd.patch - patch -p1 < $srcdir/0010-Move-debugger-scripts-to-usr-share-rust.patch - patch -p1 < $srcdir/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch - patch -p1 < $srcdir/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch - patch -p1 < $srcdir/disable_miri.patch + applypatch $srcdir/0001-Fix-LLVM-build.patch + applypatch $srcdir/00016-do-not-copy-libunwind.patch + applypatch $srcdir/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch + applypatch $srcdir/0003-Require-static-native-libraries-when-linking-static-.patch + applypatch $srcdir/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch + applypatch $srcdir/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch + applypatch $srcdir/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch + applypatch $srcdir/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch + applypatch $srcdir/0008-Ignore-broken-and-non-applicable-tests.patch + applypatch $srcdir/0009-Link-stage2-tools-dynamically-to-libstd.patch + applypatch $srcdir/0010-Move-debugger-scripts-to-usr-share-rust.patch + applypatch $srcdir/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch + applypatch $srcdir/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch + applypatch $srcdir/disable_miri.patch clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json diff --git a/base/signify/signify.SMBuild b/base/signify/signify.SMBuild index f62990e..c4a9edb 100755 --- a/base/signify/signify.SMBuild +++ b/base/signify/signify.SMBuild @@ -30,7 +30,7 @@ build() { cd .. PKG_CONFIG_PATH="$pkg_CONFIG_PATH:$LIBBSDPATH/lib/pkgconfig" - patch -p1 < $srcdir/sha2.h.patch + applypatch $srcdir/sha2.h.patch make CC="$CC -static" \ CFLAGS="-I$LIBBSDPATH/include" LDFLAGS="-L$LIBBSDPATH/lib" make install PREFIX="" DESTDIR=$pkg diff --git a/base/sysklogd/sysklogd.SMBuild b/base/sysklogd/sysklogd.SMBuild index 0592472..693a017 100755 --- a/base/sysklogd/sysklogd.SMBuild +++ b/base/sysklogd/sysklogd.SMBuild @@ -15,8 +15,8 @@ build() { fixbuilddirpermissions # Use memmove() instead of strcpy() in syslogd.c - patch -p1 --verbose < $srcdir/use_memmove_not_strcpy.diff - patch -p1 < $srcdir/fix-includes.patch + applypatch $srcdir/use_memmove_not_strcpy.diff + applypatch $srcdir/fix-includes.patch sleep 1 make all syslog_tst CC="$CC -static" diff --git a/base/syslinux/syslinux.SMBuild b/base/syslinux/syslinux.SMBuild index 4c0f646..a177fde 100755 --- a/base/syslinux/syslinux.SMBuild +++ b/base/syslinux/syslinux.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/syslinux6-ext4_fix_64bit_feature.patch + applypatch $srcdir/syslinux6-ext4_fix_64bit_feature.patch # We don't use sbin sed -i 's,/sbin,/bin,' syslinux.spec mk/syslinux.mk diff --git a/base/tar/tar.SMBuild b/base/tar/tar.SMBuild index e4fbccf..7f275f8 100755 --- a/base/tar/tar.SMBuild +++ b/base/tar/tar.SMBuild @@ -15,7 +15,7 @@ build() { tar xf $srcdir/tar-1.13.tar.?z cd tar-1.13 - patch -p1 < $srcdir/tar-1.13.bzip2.diff + applypatch $srcdir/tar-1.13.bzip2.diff cp -p --verbose /usr/share/libtool/build-aux/config.{guess,sub} . fixbuilddirpermissions @@ -34,7 +34,7 @@ build() { fixbuilddirpermissions # The "A lone zero block at %s" messages also cause problems: - patch -p1 < $srcdir/tar.nolonezero.diff + applypatch $srcdir/tar.nolonezero.diff FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="-static" \ diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild index 8976d1b..d770272 100755 --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -15,7 +15,7 @@ build() { fixbuilddirpermissions # Thank you sabotage linux - patch -p1 < $srcdir/cal.patch + applypatch $srcdir/cal.patch CFLAGS="$CFLAGS -include sys/sysmacros.h" \ LDFLAGS="-lcurses -lterminfo" \ diff --git a/base/zstd/zstd.SMBuild b/base/zstd/zstd.SMBuild index e23574c..0df9c42 100755 --- a/base/zstd/zstd.SMBuild +++ b/base/zstd/zstd.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/zstd.dont.link.pzstd.to.static.libzstd.a.diff + applypatch $srcdir/zstd.dont.link.pzstd.to.static.libzstd.a.diff make make -C contrib/pzstd diff --git a/extra/abiword/abiword.SMBuild b/extra/abiword/abiword.SMBuild index 7984b78..d714da2 100755 --- a/extra/abiword/abiword.SMBuild +++ b/extra/abiword/abiword.SMBuild @@ -20,8 +20,8 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \ xslfo" - patch -p1 < $srcdir/enchant_checker.cpp.patch - patch -p1 < $srcdir/unixmouse.diff + applypatch $srcdir/enchant_checker.cpp.patch + applypatch $srcdir/unixmouse.diff ./configure \ --prefix="" \ diff --git a/extra/ace/ace.SMBuild b/extra/ace/ace.SMBuild index b6fd29f..cb31193 100755 --- a/extra/ace/ace.SMBuild +++ b/extra/ace/ace.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/ace14_fixes.patch + applypatch $srcdir/ace14_fixes.patch LDFLAGS="-lpng -lz -lm" \ ./configure \ diff --git a/extra/bluez/bluez.SMBuild b/extra/bluez/bluez.SMBuild index 1ae1ca6..015fbf1 100755 --- a/extra/bluez/bluez.SMBuild +++ b/extra/bluez/bluez.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/bluez-5.30-obexd_without_systemd-1.patch - [ "$ARCH" = "aarch64" ] && patch -p1 < $srcdir/bluez-5.40-rpi-fixes.patch + applypatch $srcdir/bluez-5.30-obexd_without_systemd-1.patch + [ "$ARCH" = "aarch64" ] && applypatch $srcdir/bluez-5.40-rpi-fixes.patch sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} autoreconf -vif diff --git a/extra/dia/dia.SMBuild b/extra/dia/dia.SMBuild index c633350..7f1be4d 100755 --- a/extra/dia/dia.SMBuild +++ b/extra/dia/dia.SMBuild @@ -14,9 +14,9 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/CVE-2019-19451.patch - patch -p1 < $srcdir/dia-unregister-import.patch - patch -p1 < $srcdir/isinf.patch + applypatch $srcdir/CVE-2019-19451.patch + applypatch $srcdir/dia-unregister-import.patch + applypatch $srcdir/isinf.patch ./configure \ --prefix="" \ diff --git a/extra/fceux/fceux.SMBuild b/extra/fceux/fceux.SMBuild index 7430f10..319cb25 100755 --- a/extra/fceux/fceux.SMBuild +++ b/extra/fceux/fceux.SMBuild @@ -19,8 +19,8 @@ build() { # though zlib is there. # g++ is needed in /bin or /usr/bin else midway compile will fail. - patch -p1 < $srcdir/ioapi.patch - patch -p1 < $srcdir/scons-python3.patch + applypatch $srcdir/ioapi.patch + applypatch $srcdir/scons-python3.patch sed -i \ -e "s|symbols', 1|symbols', 0|" \ diff --git a/extra/gftp/gftp.SMBuild b/extra/gftp/gftp.SMBuild index 3f1f3ab..afe70b1 100755 --- a/extra/gftp/gftp.SMBuild +++ b/extra/gftp/gftp.SMBuild @@ -14,10 +14,10 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/gftp.glibc-2.30.diff - patch -p1 < $srcdir/gftp.expand.path.sigsegv.diff - patch -p1 < $srcdir/gftp.desktop.diff - patch -p1 < $srcdir/fsplib.h.patch + applypatch $srcdir/gftp.glibc-2.30.diff + applypatch $srcdir/gftp.expand.path.sigsegv.diff + applypatch $srcdir/gftp.desktop.diff + applypatch $srcdir/fsplib.h.patch ./configure \ --prefix="" \ diff --git a/extra/gimp/gimp.SMBuild b/extra/gimp/gimp.SMBuild index 0a3ed59..f00efd9 100755 --- a/extra/gimp/gimp.SMBuild +++ b/extra/gimp/gimp.SMBuild @@ -20,7 +20,7 @@ build() { # credits: sabotage linux - patch -p1 < $srcdir/gimp-toolbox-wilber.patch + applypatch $srcdir/gimp-toolbox-wilber.patch sed -i 's@^[[:space:]]*-I$(includedir)@@' $(find . -name Makefile.in) sed -i 's@^libgimpui = .*$@libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la@' $(find plug-ins/ -name Makefile.in) printf '#!/bin/sh\necho -lfreetype -I/usr/include/freetype2\n' > freetype-config diff --git a/extra/gnuchess/gnuchess.SMBuild b/extra/gnuchess/gnuchess.SMBuild index b4f08b1..ce2bcb2 100755 --- a/extra/gnuchess/gnuchess.SMBuild +++ b/extra/gnuchess/gnuchess.SMBuild @@ -44,7 +44,7 @@ build() { cd xboard-$XBOARDVER fixbuilddirpermissions - patch -p1 < $srcdir/xboard.conf.diff + applypatch $srcdir/xboard.conf.diff ./configure \ --prefix="" \ diff --git a/extra/gtypist/gtypist.SMBuild b/extra/gtypist/gtypist.SMBuild index fe3c35d..c04a085 100755 --- a/extra/gtypist/gtypist.SMBuild +++ b/extra/gtypist/gtypist.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/ncurses.patch + applypatch $srcdir/ncurses.patch autoreconf -vif CFLAGS="$CFLAGS -D_GNU_SOURCE" \ diff --git a/extra/iotop/iotop.SMBuild b/extra/iotop/iotop.SMBuild index f8ab494..4bc7863 100755 --- a/extra/iotop/iotop.SMBuild +++ b/extra/iotop/iotop.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/fix-python.patch + applypatch $srcdir/fix-python.patch python3 setup.py build python3 setup.py install --prefix="" --root=$pkg diff --git a/extra/mupdf/mupdf.SMBuild b/extra/mupdf/mupdf.SMBuild index da48698..74e583e 100755 --- a/extra/mupdf/mupdf.SMBuild +++ b/extra/mupdf/mupdf.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version-source fixbuilddirpermissions - patch -p1 < $srcdir/shared-lib.patch - patch -p1 < $srcdir/fix-big-endian.patch + applypatch $srcdir/shared-lib.patch + applypatch $srcdir/fix-big-endian.patch # We use system libraries, not the ones that come with the mupdf source for library in curl freeglut freetype harfbuzz jbig2dec \ diff --git a/extra/sdl/sdl.SMBuild b/extra/sdl/sdl.SMBuild index 5b0a9e8..307eef7 100755 --- a/extra/sdl/sdl.SMBuild +++ b/extra/sdl/sdl.SMBuild @@ -14,8 +14,8 @@ build() { cd SDL-$version fixbuilddirpermissions - patch -p1 < $srcdir/grabnotviewable.patch - patch -p1 < $srcdir/xdata32.patch + applypatch $srcdir/grabnotviewable.patch + applypatch $srcdir/xdata32.patch ./configure \ --prefix="" \ diff --git a/extra/sdl2/sdl2.SMBuild b/extra/sdl2/sdl2.SMBuild index e186448..5626a19 100755 --- a/extra/sdl2/sdl2.SMBuild +++ b/extra/sdl2/sdl2.SMBuild @@ -14,7 +14,7 @@ build() { cd SDL2-$version fixbuilddirpermissions - patch -p1 < $srcdir/khronos.patch + applypatch $srcdir/khronos.patch mkdir -p smbuild && cd smbuild cmake .. \ diff --git a/extra/spacefm/spacefm.SMBuild b/extra/spacefm/spacefm.SMBuild index 5b7ae33..a0b8c41 100755 --- a/extra/spacefm/spacefm.SMBuild +++ b/extra/spacefm/spacefm.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/spacefm-include-sysmacros.patch + applypatch $srcdir/spacefm-include-sysmacros.patch ./configure \ --prefix="" \ diff --git a/extra/v4l-utils/v4l-utils.SMBuild b/extra/v4l-utils/v4l-utils.SMBuild index b708786..bba898d 100755 --- a/extra/v4l-utils/v4l-utils.SMBuild +++ b/extra/v4l-utils/v4l-utils.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/getsubopt.patch - patch -p1 < $srcdir/types.patch + applypatch $srcdir/getsubopt.patch + applypatch $srcdir/types.patch CFLAGS="$CFLAGS -D__off_t=off_t" \ LIBS="-largp" \ diff --git a/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild b/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild index 232c145..199888a 100755 --- a/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild +++ b/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/inherit-hicolor-theme.diff + applypatch $srcdir/inherit-hicolor-theme.diff ./configure \ --prefix="" \ diff --git a/gtk/cairo/cairo.SMBuild b/gtk/cairo/cairo.SMBuild index 4beffdd..9581008 100755 --- a/gtk/cairo/cairo.SMBuild +++ b/gtk/cairo/cairo.SMBuild @@ -14,8 +14,8 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/CVE-2018-19876.patch - patch -p1 < $srcdir/musl-stacksize.patch + applypatch $srcdir/CVE-2018-19876.patch + applypatch $srcdir/musl-stacksize.patch autoreconf -vif diff --git a/gtk/gtk2/gtk2.SMBuild b/gtk/gtk2/gtk2.SMBuild index beb3fd4..9261518 100755 --- a/gtk/gtk2/gtk2.SMBuild +++ b/gtk/gtk2/gtk2.SMBuild @@ -15,8 +15,8 @@ build() { fixbuilddirpermissions autoreconf - patch -p1 < $srcdir/gtk2-fixdso.patch - patch -p1 < $srcdir/xid-collision-debug.patch + applypatch $srcdir/gtk2-fixdso.patch + applypatch $srcdir/xid-collision-debug.patch ./configure \ --prefix="" \ diff --git a/gtk/gtkspell/gtkspell.SMBuild b/gtk/gtkspell/gtkspell.SMBuild index 149a229..047fa04 100755 --- a/gtk/gtkspell/gtkspell.SMBuild +++ b/gtk/gtkspell/gtkspell.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/enchant-2.diff + applypatch $srcdir/enchant-2.diff CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \ ./configure \ diff --git a/gtk/harfbuzz/harfbuzz.SMBuild b/gtk/harfbuzz/harfbuzz.SMBuild index 33bfbea..95dd569 100755 --- a/gtk/harfbuzz/harfbuzz.SMBuild +++ b/gtk/harfbuzz/harfbuzz.SMBuild @@ -16,7 +16,7 @@ build() { # https://github.com/harfbuzz/harfbuzz/issues/2555 # https://github.com/harfbuzz/harfbuzz/commit/bb37df76949802214323d7cd5454cd19bfb73a00 - patch -p1 < $srcdir/harfbuzz-old-gcc-header.patch + applypatch $srcdir/harfbuzz-old-gcc-header.patch ./configure \ --prefix="" \ diff --git a/gtk/libunique/libunique.SMBuild b/gtk/libunique/libunique.SMBuild index cc406b5..72441ad 100755 --- a/gtk/libunique/libunique.SMBuild +++ b/gtk/libunique/libunique.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/libunique-1.1.6-G_CONST_RETURN.patch + applypatch $srcdir/libunique-1.1.6-G_CONST_RETURN.patch CFLAGS="$CFLAGS -Wno-deprecated-declarations" \ CXXFLAGS="$CFLAGS" \ diff --git a/gtk/openjpeg/openjpeg.SMBuild b/gtk/openjpeg/openjpeg.SMBuild index 769f817..d64c625 100755 --- a/gtk/openjpeg/openjpeg.SMBuild +++ b/gtk/openjpeg/openjpeg.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/openjpeg2-remove-thirdparty.patch + applypatch $srcdir/openjpeg2-remove-thirdparty.patch mkdir smbuild && cd smbuild cmake .. \ diff --git a/gtk/pango/pango.SMBuild b/gtk/pango/pango.SMBuild index 026bbd1..6d86451 100755 --- a/gtk/pango/pango.SMBuild +++ b/gtk/pango/pango.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/CVE-2019-1010238.patch + applypatch $srcdir/CVE-2019-1010238.patch touch pango/s-enum-types-h touch pango/s-enum-types-c diff --git a/xfce/xfce4-settings/xfce4-settings.SMBuild b/xfce/xfce4-settings/xfce4-settings.SMBuild index cc22697..b89bcd5 100755 --- a/xfce/xfce4-settings/xfce4-settings.SMBuild +++ b/xfce/xfce4-settings/xfce4-settings.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/default-xsettings-xml.patch + applypatch $srcdir/default-xsettings-xml.patch ./configure \ --prefix="" \ diff --git a/xorg/dbus/dbus.SMBuild b/xorg/dbus/dbus.SMBuild index 739a867..8fb7a0b 100755 --- a/xorg/dbus/dbus.SMBuild +++ b/xorg/dbus/dbus.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/dbus-allow-root-globally.diff + applypatch $srcdir/dbus-allow-root-globally.diff ./configure \ --prefix="" \ diff --git a/xorg/libomxil-bellagio/libomxil-bellagio.SMBuild b/xorg/libomxil-bellagio/libomxil-bellagio.SMBuild index c0abfbc..5af84df 100755 --- a/xorg/libomxil-bellagio/libomxil-bellagio.SMBuild +++ b/xorg/libomxil-bellagio/libomxil-bellagio.SMBuild @@ -15,7 +15,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/fedora-fixes.patch + applypatch $srcdir/fedora-fixes.patch sed -e 's/-Werror//' -i configure.ac autoreconf -vif diff --git a/xorg/mesa/mesa.SMBuild b/xorg/mesa/mesa.SMBuild index a3a2599..e9d71dd 100755 --- a/xorg/mesa/mesa.SMBuild +++ b/xorg/mesa/mesa.SMBuild @@ -14,10 +14,10 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/add-use-elf-tls.patch - patch -p1 < $srcdir/adjust-cache-deflate-buffer.patch - patch -p1 < $srcdir/disable-rgb10-by-default.patch - patch -p1 < $srcdir/musl-fix-includes.patch + applypatch $srcdir/add-use-elf-tls.patch + applypatch $srcdir/adjust-cache-deflate-buffer.patch + applypatch $srcdir/disable-rgb10-by-default.patch + applypatch $srcdir/musl-fix-includes.patch export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700" diff --git a/xorg/terminus-font/terminus-font.SMBuild b/xorg/terminus-font/terminus-font.SMBuild index 40a18de..d6b0a95 100755 --- a/xorg/terminus-font/terminus-font.SMBuild +++ b/xorg/terminus-font/terminus-font.SMBuild @@ -13,7 +13,7 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version - patch -p1 < $srcdir/terminus-font.Makefile.paths.diff + applypatch $srcdir/terminus-font.Makefile.paths.diff fixbuilddirpermissions make diff --git a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild index b23dc84..92389d3 100755 --- a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild +++ b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild @@ -14,7 +14,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/musl-macros.patch + applypatch $srcdir/musl-macros.patch ./configure \ --prefix="" \ diff --git a/xorg/xf86-video-intel/xf86-video-intel.SMBuild b/xorg/xf86-video-intel/xf86-video-intel.SMBuild index 4a20bf9..99854e8 100755 --- a/xorg/xf86-video-intel/xf86-video-intel.SMBuild +++ b/xorg/xf86-video-intel/xf86-video-intel.SMBuild @@ -16,7 +16,7 @@ build() { cd $app-$version fixbuilddirpermissions - patch -p1 < $srcdir/git.patch + applypatch $srcdir/git.patch autoreconf -vif