From 3353bf4722ecbefce513b009a8b5e35dac66edcb 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/x*: 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 ``` --- .../patches/patch-src_sslhelper_c.patch | 4 ++-- srcpkgs/x11vnc/patches/time64.patch | 4 ++-- srcpkgs/x11vnc/template | 1 - srcpkgs/x265/patches/x265-pic.patch | 4 ++-- srcpkgs/x265/template | 1 - srcpkgs/x42-plugins/patches/fix-cross.patch | 4 ++-- srcpkgs/x42-plugins/template | 1 - .../patches/cross-config.cmake.patch | 4 ++-- srcpkgs/xapian-core/template | 1 - .../xar/patches/configure_disable_rpath.patch | 4 ++-- srcpkgs/xar/patches/ext2.patch | 4 ++-- srcpkgs/xar/patches/openssl1.1.patch | 4 ++-- srcpkgs/xar/template | 1 - srcpkgs/xautolock/patches/fix-restart.patch | 4 ++-- .../xautolock/patches/fix-wait_status.patch | 4 ++-- srcpkgs/xautolock/template | 1 - srcpkgs/xava/patches/broken-cmake.patch | 4 ++-- srcpkgs/xava/template | 1 - srcpkgs/xbindkeys/patches/cross.patch | 4 ++-- srcpkgs/xbindkeys/template | 1 - .../0001-Update-SConstruct-to-python3.patch | 4 ++-- ...0003-Updating-python-code-to-python3.patch | 12 +++++----- srcpkgs/xboxdrv/patches/time64.patch | 4 ++-- srcpkgs/xboxdrv/template | 1 - srcpkgs/xcolorsel/patches/xcolorsel.patch | 24 +++++++++---------- srcpkgs/xcolorsel/template | 1 - srcpkgs/xdg-dbus-proxy/patches/musl.patch | 4 ++-- srcpkgs/xdg-dbus-proxy/template | 1 - .../xdg-settings-not-sh-compatible.patch | 4 ++-- srcpkgs/xdg-utils/template | 1 - .../patches/fix-configure-cross.patch | 4 ++-- srcpkgs/xerces-c/template | 1 - .../patches/fix-time64.patch | 4 ++-- srcpkgs/xf86-input-mtrack/template | 1 - .../patches/fix-input_event-time.patch | 4 ++-- srcpkgs/xf86-input-synaptics/template | 1 - .../patches/null-deref-exa.patch | 4 ++-- srcpkgs/xf86-video-ati/template | 1 - .../patches/no-vbe-non-x86.patch | 12 +++++----- srcpkgs/xf86-video-cirrus/template | 1 - srcpkgs/xf86-video-fbdev/patches/cross.patch | 4 ++-- srcpkgs/xf86-video-fbdev/template | 1 - .../patches/fix-compilation.patch | 4 ++-- srcpkgs/xf86-video-fbturbo-sunxi/template | 1 - srcpkgs/xf86-video-fbturbo/patches/gcc8.patch | 4 ++-- srcpkgs/xf86-video-fbturbo/template | 1 - .../xf86-video-intel/patches/O_CLOEXEC.patch | 4 ++-- .../patches/gcc-8.2.0-force_inline.patch | 8 +++---- srcpkgs/xf86-video-intel/template | 1 - ...id-including-VBE-paths-when-not-used.patch | 4 ++-- ...e-Include-xorg-server.h-before-exa.h.patch | 4 ++-- .../patches/0003-Fix-debugging-traces.patch | 4 ++-- .../0004-Fix-compositing-rotation.patch | 4 ++-- srcpkgs/xf86-video-mach64/template | 1 - srcpkgs/xf86-video-mga/patches/cross.patch | 4 ++-- .../patches/no-vbe-non-x86.patch | 8 +++---- srcpkgs/xf86-video-mga/template | 1 - .../xf86-video-r128/patches/fix-non-x86.patch | 8 +++---- srcpkgs/xf86-video-r128/template | 1 - srcpkgs/xf86-video-vmware/patches/gcc82.patch | 12 +++++----- srcpkgs/xf86-video-vmware/template | 1 - .../xfce4-power-manager/patches/void.patch | 8 +++---- srcpkgs/xfce4-power-manager/template | 1 - .../xfig/patches/xfig-3.2.5-urwfonts.patch | 4 ++-- srcpkgs/xfig/template | 1 - .../xfsprogs/patches/00-patch-for-mips.diff | 4 ++-- srcpkgs/xfsprogs/template | 1 - .../xinetd/patches/fix-CVE-2013-4342.patch | 4 ++-- srcpkgs/xinetd/patches/musl.patch | 4 ++-- srcpkgs/xinetd/template | 1 - .../06_move_serverauthfile_into_tmp.diff | 4 ++-- srcpkgs/xinit/patches/fs25361.patch | 4 ++-- srcpkgs/xinit/template | 1 - srcpkgs/xkblayout-state/patches/make.patch | 4 ++-- srcpkgs/xkblayout-state/template | 1 - srcpkgs/xload/patches/fix-musl.patch | 4 ++-- srcpkgs/xload/template | 1 - srcpkgs/xlunch/patches/ldflags.patch | 4 ++-- srcpkgs/xlunch/patches/musl.patch | 4 ++-- srcpkgs/xlunch/template | 1 - srcpkgs/xnots/patches/Add-aarch64.patch | 12 +++++----- srcpkgs/xnots/patches/compiler.patch | 8 +++---- srcpkgs/xnots/patches/inline.patch | 8 +++---- srcpkgs/xnots/template | 1 - srcpkgs/xnp2/patches/define_cplusplus.patch | 4 ++-- srcpkgs/xnp2/template | 1 - srcpkgs/xonotic/patches/musl-moncontrol.patch | 4 ++-- srcpkgs/xonotic/template | 1 - .../xorg-cf-files/patches/linuxconfig.patch | 8 +++---- srcpkgs/xorg-cf-files/template | 1 - .../xorg-server/patches/autoconfig-ati.patch | 4 ++-- .../xorg-server/patches/autoconfig-sis.patch | 4 ++-- .../xorg-server/patches/fix-libshadow-2.patch | 4 ++-- .../patches/fix-musl-input_event.patch | 8 +++---- ...t-on-probing-non-pci-platform-device.patch | 4 ++-- .../fix-serverconfigdir-location.patch | 4 ++-- .../patches/meson-fontrootdir.patch | 8 +++---- .../meson-install-xorg-wrap-script.patch | 4 ++-- srcpkgs/xorg-server/template | 1 - srcpkgs/xosview/patches/musl-fix.patch | 4 ++-- srcpkgs/xosview/template | 1 - .../xplanet/patches/fix-gcc6-nullptr.patch | 24 +++++++++---------- srcpkgs/xplanet/template | 1 - srcpkgs/xrick/patches/flags.patch | 4 ++-- srcpkgs/xrick/template | 1 - srcpkgs/xsane/patches/fix-png_jmpbuf.patch | 4 ++-- srcpkgs/xsane/patches/xdg-open.patch | 4 ++-- srcpkgs/xsane/template | 1 - srcpkgs/xsel/patches/strncpy.patch | 4 ++-- srcpkgs/xsel/template | 1 - srcpkgs/xseticon/patches/fix-makefile.patch | 4 ++-- srcpkgs/xseticon/template | 1 - srcpkgs/xsettingsd/patches/scons.patch | 4 ++-- srcpkgs/xsettingsd/template | 1 - srcpkgs/xst/patches/xrdb_cursor.patch | 4 ++-- srcpkgs/xst/template | 1 - .../patches/cmake-build-type-none.patch | 4 ++-- srcpkgs/xstarter/template | 1 - srcpkgs/xterm/patches/musl.patch | 4 ++-- srcpkgs/xterm/template | 1 - srcpkgs/xye/patches/fix-gcc6-narrowing.patch | 4 ++-- srcpkgs/xye/template | 1 - 122 files changed, 200 insertions(+), 249 deletions(-) diff --git a/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch b/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch index 1527b97418d..b3aace789d5 100644 --- a/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch +++ b/srcpkgs/x11vnc/patches/patch-src_sslhelper_c.patch @@ -1,8 +1,8 @@ $OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $ Index: src/sslhelper.c ---- src/sslhelper.c.orig -+++ src/sslhelper.c +--- a/src/sslhelper.c ++++ b/src/sslhelper.c @@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, in static int crl_callback(X509_STORE_CTX *callback_ctx) { const ASN1_INTEGER *revoked_serial; diff --git a/srcpkgs/x11vnc/patches/time64.patch b/srcpkgs/x11vnc/patches/time64.patch index 4b5b5dd4a68..d8a6280f6d5 100644 --- a/srcpkgs/x11vnc/patches/time64.patch +++ b/srcpkgs/x11vnc/patches/time64.patch @@ -1,5 +1,5 @@ ---- src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000 -+++ src/uinput.c 2020-01-24 04:49:39.479206612 +0000 +--- a/src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000 ++++ b/src/uinput.c 2020-01-24 04:49:39.479206612 +0000 @@ -710,6 +710,7 @@ static void ptr_move(int dx, int dy) { #ifdef UINPUT_OK diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index fabffd60962..4b8ff04a9eb 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -13,7 +13,6 @@ homepage="http://www.karlrunge.com/x11vnc/" changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS" distfiles="https://github.com/LibVNC/${pkgname}/archive/${version}.tar.gz" checksum=885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/x265/patches/x265-pic.patch b/srcpkgs/x265/patches/x265-pic.patch index ce9f755dbbe..117c155e575 100644 --- a/srcpkgs/x265/patches/x265-pic.patch +++ b/srcpkgs/x265/patches/x265-pic.patch @@ -1,5 +1,5 @@ ---- source/CMakeLists.txt.orig -+++ source/CMakeLists.txt +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt @@ -158,7 +162,7 @@ if(GCC) add_definitions(-D__STDC_LIMIT_MACROS=1) add_definitions(-std=gnu++98) diff --git a/srcpkgs/x265/template b/srcpkgs/x265/template index 974fad438b4..2b858bad487 100644 --- a/srcpkgs/x265/template +++ b/srcpkgs/x265/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="http://x265.org/" distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz" checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86 -patch_args=-Np0 build_options="altivec assembly" diff --git a/srcpkgs/x42-plugins/patches/fix-cross.patch b/srcpkgs/x42-plugins/patches/fix-cross.patch index 9d21dc74f50..cc2fb981ffc 100644 --- a/srcpkgs/x42-plugins/patches/fix-cross.patch +++ b/srcpkgs/x42-plugins/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- convoLV2/Makefile -+++ convoLV2/Makefile +--- a/convoLV2/Makefile ++++ b/convoLV2/Makefile @@ -76,9 +76,6 @@ ifneq ($(BUILDGTK), no) endif diff --git a/srcpkgs/x42-plugins/template b/srcpkgs/x42-plugins/template index e8aa6531adf..432739cded1 100644 --- a/srcpkgs/x42-plugins/template +++ b/srcpkgs/x42-plugins/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://x42-plugins.com" distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz" checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4 -patch_args=-Np0 pre_build() { export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG" diff --git a/srcpkgs/xapian-core/patches/cross-config.cmake.patch b/srcpkgs/xapian-core/patches/cross-config.cmake.patch index 4993b67d5a5..317e8dca202 100644 --- a/srcpkgs/xapian-core/patches/cross-config.cmake.patch +++ b/srcpkgs/xapian-core/patches/cross-config.cmake.patch @@ -1,5 +1,5 @@ ---- cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100 -+++ - 2019-05-15 15:59:12.059370469 +0200 +--- a/cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100 ++++ b/cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100 @@ -1,4 +1,14 @@ -SET(prefix "@prefix@") +get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template index 9473eb738d2..369cccb082f 100644 --- a/srcpkgs/xapian-core/template +++ b/srcpkgs/xapian-core/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://www.xapian.org/" distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz" checksum=196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 -patch_args=-Np0 # xapian-config needs the .la keep_libtool_archives=yes diff --git a/srcpkgs/xar/patches/configure_disable_rpath.patch b/srcpkgs/xar/patches/configure_disable_rpath.patch index 2a98028eb23..ea04251838d 100644 --- a/srcpkgs/xar/patches/configure_disable_rpath.patch +++ b/srcpkgs/xar/patches/configure_disable_rpath.patch @@ -1,5 +1,5 @@ ---- configure.orig 2012-08-23 16:25:41.891044934 +0200 -+++ configure 2012-08-23 16:25:47.690906017 +0200 +--- a/configure 2012-08-23 16:25:41.891044934 +0200 ++++ b/configure 2012-08-23 16:25:47.690906017 +0200 @@ -3277,7 +3277,7 @@ case "${host}" in CFLAGS="$CFLAGS" abi="elf" diff --git a/srcpkgs/xar/patches/ext2.patch b/srcpkgs/xar/patches/ext2.patch index 1a13d4e7ebc..ed6c4010959 100644 --- a/srcpkgs/xar/patches/ext2.patch +++ b/srcpkgs/xar/patches/ext2.patch @@ -1,5 +1,5 @@ ---- lib/ext2.c.orig -+++ lib/ext2.c +--- a/lib/ext2.c ++++ b/lib/ext2.c @@ -139,8 +139,10 @@ if(! (flags & ~EXT2_NOCOMPR_FL) ) x_addprop(f, "NoCompBlock"); diff --git a/srcpkgs/xar/patches/openssl1.1.patch b/srcpkgs/xar/patches/openssl1.1.patch index d718a3d4129..49a32fb7f89 100644 --- a/srcpkgs/xar/patches/openssl1.1.patch +++ b/srcpkgs/xar/patches/openssl1.1.patch @@ -2,8 +2,8 @@ Reason: The OpenSSL_add_all_ciphers api doesn't was removed in OpenSSL 1.1 so we just replace the check with something that exists in OpenSSL and LibreSSL --- ---- configure 2012-09-17 13:30:07.000000000 +0200 -+++ - 2021-02-03 16:20:59.395787656 +0100 +--- a/configure 2012-09-17 13:30:07.000000000 +0200 ++++ b/configure 2012-09-17 13:30:07.000000000 +0200 @@ -4878,9 +4878,9 @@ done diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index 4e3ca4b5477..79117d197a9 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="https://github.com/mackyle/xar" distfiles="https://github.com/downloads/mackyle/xar/${pkgname}-${version}.tar.gz" checksum=ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/xautolock/patches/fix-restart.patch b/srcpkgs/xautolock/patches/fix-restart.patch index 372b38d7551..c3b92b65a61 100644 --- a/srcpkgs/xautolock/patches/fix-restart.patch +++ b/srcpkgs/xautolock/patches/fix-restart.patch @@ -1,5 +1,5 @@ ---- src/message.c 2018-07-31 01:20:05.740344556 -0400 -+++ src/message.c 2018-07-31 01:16:33.521671009 -0400 +--- a/src/message.c 2018-07-31 01:20:05.740344556 -0400 ++++ b/src/message.c 2018-07-31 01:16:33.521671009 -0400 @@ -104,7 +104,7 @@ { XDeleteProperty (d, root, semaphore); diff --git a/srcpkgs/xautolock/patches/fix-wait_status.patch b/srcpkgs/xautolock/patches/fix-wait_status.patch index 87fb606ae52..cc40cb518b2 100644 --- a/srcpkgs/xautolock/patches/fix-wait_status.patch +++ b/srcpkgs/xautolock/patches/fix-wait_status.patch @@ -1,5 +1,5 @@ ---- src/engine.c 2007-12-28 18:15:26.000000000 +0100 -+++ src/engine.c 2017-01-25 14:48:00.087399865 +0100 +--- a/src/engine.c 2007-12-28 18:15:26.000000000 +0100 ++++ b/src/engine.c 2017-01-25 14:48:00.087399865 +0100 @@ -210,11 +210,7 @@ #else /* VMS */ if (lockerPid) diff --git a/srcpkgs/xautolock/template b/srcpkgs/xautolock/template index 676b1c5161e..673e57c9a78 100644 --- a/srcpkgs/xautolock/template +++ b/srcpkgs/xautolock/template @@ -10,7 +10,6 @@ license="GPL-2" homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/" distfiles="${homepage}/${pkgname}-${version}.tgz" checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2 -patch_args=-Np0 do_build() { CC=cc xmkmf diff --git a/srcpkgs/xava/patches/broken-cmake.patch b/srcpkgs/xava/patches/broken-cmake.patch index ea0775a84fe..56411aadd3d 100644 --- a/srcpkgs/xava/patches/broken-cmake.patch +++ b/srcpkgs/xava/patches/broken-cmake.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2020-08-27 15:31:42.000000000 +0700 -+++ CMakeLists.txt 2021-01-14 21:44:51.704505119 +0700 +--- a/CMakeLists.txt 2020-08-27 15:31:42.000000000 +0700 ++++ b/CMakeLists.txt 2021-01-14 21:44:51.704505119 +0700 @@ -10,19 +10,6 @@ option(SNDIO "SNDIO" ON) option(PORTAUDIO "PORTAUDIO" ON) diff --git a/srcpkgs/xava/template b/srcpkgs/xava/template index e4e7faa656a..fa16f119e24 100644 --- a/srcpkgs/xava/template +++ b/srcpkgs/xava/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://github.com/nikp123/xava" distfiles="https://github.com/nikp123/xava/archive/${version}.tar.gz" checksum=b38b810e4bfd71aff44f223b444ae4f158eb8d6428c5e9d42697343ccb5a19f9 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/xbindkeys/patches/cross.patch b/srcpkgs/xbindkeys/patches/cross.patch index fee7b8e0b53..86f7f2d448a 100644 --- a/srcpkgs/xbindkeys/patches/cross.patch +++ b/srcpkgs/xbindkeys/patches/cross.patch @@ -1,7 +1,7 @@ diff --git Makefile.in Makefile.in index 7bb5cba..e557452 100644 ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -205,8 +205,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall diff --git a/srcpkgs/xbindkeys/template b/srcpkgs/xbindkeys/template index ea2d1e8b303..54486843942 100644 --- a/srcpkgs/xbindkeys/template +++ b/srcpkgs/xbindkeys/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html" distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2 -patch_args=-Np0 diff --git a/srcpkgs/xboxdrv/patches/0001-Update-SConstruct-to-python3.patch b/srcpkgs/xboxdrv/patches/0001-Update-SConstruct-to-python3.patch index c33e9e1c909..accb4317fad 100644 --- a/srcpkgs/xboxdrv/patches/0001-Update-SConstruct-to-python3.patch +++ b/srcpkgs/xboxdrv/patches/0001-Update-SConstruct-to-python3.patch @@ -9,8 +9,8 @@ Subject: [PATCH 1/3] Update SConstruct to python3 diff --git SConstruct SConstruct index 4cd7970..54fa11f 100644 ---- SConstruct -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -15,7 +15,7 @@ def build_dbus_glue(target, source, env): "--mode=glib-server", "--prefix=" + env['DBUS_PREFIX'], source[0].get_path()], diff --git a/srcpkgs/xboxdrv/patches/0003-Updating-python-code-to-python3.patch b/srcpkgs/xboxdrv/patches/0003-Updating-python-code-to-python3.patch index a19f79c7e2b..139336affd9 100644 --- a/srcpkgs/xboxdrv/patches/0003-Updating-python-code-to-python3.patch +++ b/srcpkgs/xboxdrv/patches/0003-Updating-python-code-to-python3.patch @@ -11,8 +11,8 @@ Subject: [PATCH 3/3] Updating python code to python3 diff --git examples/responsecurve-generator.py examples/responsecurve-generator.py index c74e34d..942463b 100755 ---- examples/responsecurve-generator.py -+++ examples/responsecurve-generator.py +--- a/examples/responsecurve-generator.py ++++ b/examples/responsecurve-generator.py @@ -1,14 +1,14 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 @@ -44,8 +44,8 @@ index c74e34d..942463b 100755 # EOF # diff --git runxboxdrv/runxboxdrv runxboxdrv/runxboxdrv index 360c836..6983496 100755 ---- runxboxdrv/runxboxdrv -+++ runxboxdrv/runxboxdrv +--- a/runxboxdrv/runxboxdrv ++++ b/runxboxdrv/runxboxdrv @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 @@ -198,8 +198,8 @@ index 360c836..6983496 100755 def main(): diff --git xboxdrvctl xboxdrvctl index 4807a11..57177dc 100755 ---- xboxdrvctl -+++ xboxdrvctl +--- a/xboxdrvctl ++++ b/xboxdrvctl @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 diff --git a/srcpkgs/xboxdrv/patches/time64.patch b/srcpkgs/xboxdrv/patches/time64.patch index 80b7d1f13de..d2042d8b792 100644 --- a/srcpkgs/xboxdrv/patches/time64.patch +++ b/srcpkgs/xboxdrv/patches/time64.patch @@ -1,5 +1,5 @@ ---- src/linux_uinput.cpp 2015-11-09 11:19:35.000000000 +0100 -+++ src/linux_uinput.cpp 2020-12-06 17:53:41.472516394 +0100 +--- a/src/linux_uinput.cpp 2015-11-09 11:19:35.000000000 +0100 ++++ b/src/linux_uinput.cpp 2020-12-06 17:53:41.472516394 +0100 @@ -289,9 +289,12 @@ needs_sync = true; diff --git a/srcpkgs/xboxdrv/template b/srcpkgs/xboxdrv/template index 4f22555872a..2b4905d8890 100644 --- a/srcpkgs/xboxdrv/template +++ b/srcpkgs/xboxdrv/template @@ -13,7 +13,6 @@ homepage="https://xboxdrv.gitlab.io/" distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2" checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a python_version=3 -patch_args=-Np0 do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install diff --git a/srcpkgs/xcolorsel/patches/xcolorsel.patch b/srcpkgs/xcolorsel/patches/xcolorsel.patch index f8cacb9d2c6..d2ef2804c50 100644 --- a/srcpkgs/xcolorsel/patches/xcolorsel.patch +++ b/srcpkgs/xcolorsel/patches/xcolorsel.patch @@ -1,5 +1,5 @@ ---- RgbSink.c -+++ RgbSink.c +--- a/RgbSink.c ++++ b/RgbSink.c @@ -98,6 +99,12 @@ #endif /* LIB_X11R5 */ #endif /* LIB_X11R6 */ @@ -13,8 +13,8 @@ /* No resources */ /* No actions */ ---- RgbText.c -+++ RgbText.c +--- a/RgbText.c ++++ b/RgbText.c @@ -146,7 +146,7 @@ { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns), XtRString, (XtPointer) "30" }, @@ -24,8 +24,8 @@ { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), XtRString, (XtPointer) "3" }, { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), ---- RgbSrc.c -+++ RgbSrc.c +--- a/RgbSrc.c ++++ b/RgbSrc.c @@ -81,8 +81,14 @@ #include @@ -41,8 +41,8 @@ /* No resources */ /* No actions */ ---- Xcolorsel.ad -+++ Xcolorsel.ad +--- a/Xcolorsel.ad ++++ b/Xcolorsel.ad @@ -1,4 +1,6 @@ ! Standard layout: +Xcolorsel.width: 420 @@ -50,8 +50,8 @@ *.text.scrollHorizontal: WhenNeeded *.text.scrollVertical: WhenNeeded *.text.displayCaret: False ---- Imakefile -+++ Imakefile +--- a/Imakefile ++++ b/Imakefile @@ -82,9 +82,9 @@ DependTarget() @@ -64,8 +64,8 @@ purge: $(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz Xcolorsel.help: xcolorsel.man ---- Xcolorsel-color.ad -+++ Xcolorsel-color.ad +--- a/Xcolorsel-color.ad ++++ b/Xcolorsel-color.ad @@ -13,57 +13,57 @@ ! If this is the case you may also want to include the following ! (by removing the leading !) diff --git a/srcpkgs/xcolorsel/template b/srcpkgs/xcolorsel/template index d6551e23f24..f3efb02dc90 100644 --- a/srcpkgs/xcolorsel/template +++ b/srcpkgs/xcolorsel/template @@ -16,7 +16,6 @@ homepage="http://packages.debian.org/stable/x11/xcolorsel" distfiles="${DEBIAN_SITE}/main/x/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=ba0813af427dfab7dfbd9eaadbedd217d432f8141179ac43bb39393b1424f7a2 nocross=yes -patch_args=-Np0 do_configure() { xmkmf -a -DHasSELinux=0 -DUseConfDirForAppDefaults=0 diff --git a/srcpkgs/xdg-dbus-proxy/patches/musl.patch b/srcpkgs/xdg-dbus-proxy/patches/musl.patch index b0c01f4dc0d..76cad848eb1 100644 --- a/srcpkgs/xdg-dbus-proxy/patches/musl.patch +++ b/srcpkgs/xdg-dbus-proxy/patches/musl.patch @@ -1,5 +1,5 @@ ---- dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000 -+++ - 2019-08-25 19:41:33.423715619 +0000 +--- a/dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000 ++++ b/dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000 @@ -31,6 +31,16 @@ #include "flatpak-proxy.h" diff --git a/srcpkgs/xdg-dbus-proxy/template b/srcpkgs/xdg-dbus-proxy/template index 805d7404ab4..3d01f5e60b1 100644 --- a/srcpkgs/xdg-dbus-proxy/template +++ b/srcpkgs/xdg-dbus-proxy/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/flatpak/xdg-dbus-proxy" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" checksum=1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f -patch_args=-Np0 diff --git a/srcpkgs/xdg-utils/patches/xdg-settings-not-sh-compatible.patch b/srcpkgs/xdg-utils/patches/xdg-settings-not-sh-compatible.patch index bf9ed66c5db..996e078914c 100644 --- a/srcpkgs/xdg-utils/patches/xdg-settings-not-sh-compatible.patch +++ b/srcpkgs/xdg-utils/patches/xdg-settings-not-sh-compatible.patch @@ -1,8 +1,8 @@ xdg-settings uses the ${parameter:offset} substring expansion, which is not available in posix shell ---- scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200 -+++ - 2021-06-12 21:17:34.555007469 +0200 +--- a/scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200 ++++ b/scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template index fe7a9b7deb5..d4094a29212 100644 --- a/srcpkgs/xdg-utils/template +++ b/srcpkgs/xdg-utils/template @@ -13,7 +13,6 @@ homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/" #changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog" distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz" checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/xerces-c/patches/fix-configure-cross.patch b/srcpkgs/xerces-c/patches/fix-configure-cross.patch index 4f985987677..7608d142f71 100644 --- a/srcpkgs/xerces-c/patches/fix-configure-cross.patch +++ b/srcpkgs/xerces-c/patches/fix-configure-cross.patch @@ -3,8 +3,8 @@ make cross compiling possible again. The results are all true for glibc and musl libc, thus unconditionally add the corresponding defines via AC_DEFINE_UNQUOTED. ---- configure.ac 2017-08-06 20:09:44.000000000 +0200 -+++ configure.ac 2017-09-01 14:22:45.842676418 +0200 +--- a/configure.ac 2017-08-06 20:09:44.000000000 +0200 ++++ b/configure.ac 2017-09-01 14:22:45.842676418 +0200 @@ -174,69 +174,9 @@ ] ) diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template index ba0edf7c4a6..56f12c4aab0 100644 --- a/srcpkgs/xerces-c/template +++ b/srcpkgs/xerces-c/template @@ -12,7 +12,6 @@ license="Apache-2.0" homepage="http://xerces.apache.org/xerces-c/" distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2" checksum=45c2329e684405f2b8854ecbddfb8d5b055cdf0fe4d35736cc352c504989bbb6 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch index 9f14c89d469..6707b12eb8a 100644 --- a/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch +++ b/srcpkgs/xf86-input-mtrack/patches/fix-time64.patch @@ -1,5 +1,5 @@ ---- src/hwstate.c 2018-01-28 20:46:17.000000000 +0100 -+++ src/hwstate.c 2020-12-02 22:58:45.149335108 +0100 +--- a/src/hwstate.c 2018-01-28 20:46:17.000000000 +0100 ++++ b/src/hwstate.c 2020-12-02 22:58:45.149335108 +0100 @@ -41,7 +41,8 @@ if (!caps->has_abs[MTDEV_WIDTH_MINOR]) s->data[i].width_minor = s->data[i].width_major; diff --git a/srcpkgs/xf86-input-mtrack/template b/srcpkgs/xf86-input-mtrack/template index 852900101d5..0f78142030d 100644 --- a/srcpkgs/xf86-input-mtrack/template +++ b/srcpkgs/xf86-input-mtrack/template @@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org/" distfiles="https://github.com/p2rkw/${pkgname}/archive/v${version}.tar.gz" checksum=a976723720028832afd45bfcaab479f60833ff6f1c780be727d1791675dc14c4 lib32disabled=yes -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-input-synaptics/patches/fix-input_event-time.patch b/srcpkgs/xf86-input-synaptics/patches/fix-input_event-time.patch index af3b593e429..e584bf77497 100644 --- a/srcpkgs/xf86-input-synaptics/patches/fix-input_event-time.patch +++ b/srcpkgs/xf86-input-synaptics/patches/fix-input_event-time.patch @@ -1,5 +1,5 @@ ---- src/eventcomm.c 2018-05-29 05:18:45.000000000 +0200 -+++ src/eventcomm.c 2020-12-01 21:27:55.746811502 +0100 +--- a/src/eventcomm.c 2018-05-29 05:18:45.000000000 +0200 ++++ b/src/eventcomm.c 2020-12-01 21:27:55.746811502 +0100 @@ -575,9 +575,12 @@ ev->type = EV_SYN; ev->code = SYN_REPORT; diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 6d118bbe21e..1c9f2be0a93 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -14,7 +14,6 @@ homepage="http://www.x.org/" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576 lib32disabled=yes -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-video-ati/patches/null-deref-exa.patch b/srcpkgs/xf86-video-ati/patches/null-deref-exa.patch index 8900cfeec00..dd13e9b6087 100644 --- a/srcpkgs/xf86-video-ati/patches/null-deref-exa.patch +++ b/srcpkgs/xf86-video-ati/patches/null-deref-exa.patch @@ -42,8 +42,8 @@ Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539 diff --git a/src/radeon.h b/src/radeon.h index 2c913466..e4a2ba66 100644 ---- src/radeon.h -+++ src/radeon.h +--- a/src/radeon.h ++++ b/src/radeon.h @@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index a2715dcd512..fe251dff4b3 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://wiki.freedesktop.org/xorg" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 -patch_args=-Np0 lib32disabled=yes CFLAGS="-fcommon" diff --git a/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch index 46ee5637b1b..1908594fd22 100644 --- a/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch +++ b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch @@ -11,8 +11,8 @@ Subject: [PATCH] only attempt to use VBE on x86 diff --git src/alp_driver.c src/alp_driver.c index bd5e52f..f478eb5 100644 ---- src/alp_driver.c -+++ src/alp_driver.c +--- a/src/alp_driver.c ++++ b/src/alp_driver.c @@ -61,7 +61,9 @@ @@ -53,8 +53,8 @@ index bd5e52f..f478eb5 100644 pScrn->monitor = pScrn->confScreen->monitor; diff --git src/cir_driver.c src/cir_driver.c index 2df4a2e..d9c2f0c 100644 ---- src/cir_driver.c -+++ src/cir_driver.c +--- a/src/cir_driver.c ++++ b/src/cir_driver.c @@ -31,7 +31,9 @@ #include "alp.h" #include "lg.h" @@ -81,8 +81,8 @@ index 2df4a2e..d9c2f0c 100644 } diff --git src/lg_driver.c src/lg_driver.c index 589d14e..6bc3154 100644 ---- src/lg_driver.c -+++ src/lg_driver.c +--- a/src/lg_driver.c ++++ b/src/lg_driver.c @@ -51,7 +51,9 @@ /* Needed by the Shadow Framebuffer */ #include "shadowfb.h" diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 6c73923696f..f4f7c3a2f0a 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -13,7 +13,6 @@ license="MIT" maintainer="Orphaned " distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab -patch_args=-Np0 LDFLAGS="-Wl,-z,lazy" CFLAGS="-fcommon -Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label" diff --git a/srcpkgs/xf86-video-fbdev/patches/cross.patch b/srcpkgs/xf86-video-fbdev/patches/cross.patch index 583d912f6ea..51ae59dd100 100644 --- a/srcpkgs/xf86-video-fbdev/patches/cross.patch +++ b/srcpkgs/xf86-video-fbdev/patches/cross.patch @@ -1,7 +1,7 @@ This macro cannot be normally defined in cross. ---- src/fbdev.c 2019-04-30 17:41:01.660203681 +0200 -+++ src/fbdev.c 2019-04-30 17:41:07.756263574 +0200 +--- a/src/fbdev.c 2019-04-30 17:41:01.660203681 +0200 ++++ b/src/fbdev.c 2019-04-30 17:41:07.756263574 +0200 @@ -1010,7 +1010,6 @@ fPtr->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = FBDevCloseScreen; diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 297c1b4ca92..eafde10f3ea 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 lib32disabled=yes -patch_args=-Np0 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch b/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch index 6a5c2bc5c1c..5fad5cbcb13 100644 --- a/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch +++ b/srcpkgs/xf86-video-fbturbo-sunxi/patches/fix-compilation.patch @@ -1,5 +1,5 @@ ---- src/fbdev.c -+++ src/fbdev.c +--- a/src/fbdev.c ++++ b/src/fbdev.c @@ -1037,7 +1037,7 @@ fPtr->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = FBDevCloseScreen; diff --git a/srcpkgs/xf86-video-fbturbo-sunxi/template b/srcpkgs/xf86-video-fbturbo-sunxi/template index 386a536c824..3da5f84a572 100644 --- a/srcpkgs/xf86-video-fbturbo-sunxi/template +++ b/srcpkgs/xf86-video-fbturbo-sunxi/template @@ -13,7 +13,6 @@ maintainer="Orphaned " homepage="http://github.com/ssvb/xf86-video-fbturbo" distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f -patch_args=-Np0 archs="armv7l" conflicts="xf86-video-fbturbo>=0" diff --git a/srcpkgs/xf86-video-fbturbo/patches/gcc8.patch b/srcpkgs/xf86-video-fbturbo/patches/gcc8.patch index 47ba157bc47..0facdc87454 100644 --- a/srcpkgs/xf86-video-fbturbo/patches/gcc8.patch +++ b/srcpkgs/xf86-video-fbturbo/patches/gcc8.patch @@ -1,5 +1,5 @@ ---- src/fbdev.c.orig -+++ src/fbdev.c +--- a/src/fbdev.c ++++ b/src/fbdev.c @@ -1037,7 +1037,7 @@ fPtr->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = FBDevCloseScreen; diff --git a/srcpkgs/xf86-video-fbturbo/template b/srcpkgs/xf86-video-fbturbo/template index 2b6784ccb16..acfbff8c05d 100644 --- a/srcpkgs/xf86-video-fbturbo/template +++ b/srcpkgs/xf86-video-fbturbo/template @@ -9,7 +9,6 @@ license="MIT, GPL-2.0-or-later" homepage="http://github.com/ssvb/xf86-video-fbturbo" distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f -patch_args=-Np0 archs="armv6l* armv7l* aarch64*" hostmakedepends="pkg-config xorg-server-devel" diff --git a/srcpkgs/xf86-video-intel/patches/O_CLOEXEC.patch b/srcpkgs/xf86-video-intel/patches/O_CLOEXEC.patch index 7cefadad8cd..f5151e81c95 100644 --- a/srcpkgs/xf86-video-intel/patches/O_CLOEXEC.patch +++ b/srcpkgs/xf86-video-intel/patches/O_CLOEXEC.patch @@ -1,5 +1,5 @@ ---- src/sna/kgem.c.orig -+++ src/sna/kgem.c +--- a/src/sna/kgem.c ++++ b/src/sna/kgem.c @@ -37,6 +37,7 @@ #include #include diff --git a/srcpkgs/xf86-video-intel/patches/gcc-8.2.0-force_inline.patch b/srcpkgs/xf86-video-intel/patches/gcc-8.2.0-force_inline.patch index c2dc79d35df..805f243e9bc 100644 --- a/srcpkgs/xf86-video-intel/patches/gcc-8.2.0-force_inline.patch +++ b/srcpkgs/xf86-video-intel/patches/gcc-8.2.0-force_inline.patch @@ -1,5 +1,5 @@ ---- src/sna/sna_render_inline.h 2018-08-10 09:04:33.466268800 +0200 -+++ src/sna/sna_render_inline.h 2018-08-10 09:06:56.537276181 +0200 +--- a/src/sna/sna_render_inline.h 2018-08-10 09:04:33.466268800 +0200 ++++ b/src/sna/sna_render_inline.h 2018-08-10 09:06:56.537276181 +0200 @@ -1,6 +1,12 @@ #ifndef SNA_RENDER_INLINE_H #define SNA_RENDER_INLINE_H @@ -82,8 +82,8 @@ { union { uint32_t dw; ---- src/sna/gen4_vertex.c 2018-08-10 09:08:26.380280816 +0200 -+++ src/sna/gen4_vertex.c 2018-08-10 09:09:55.522285415 +0200 +--- a/src/sna/gen4_vertex.c 2018-08-10 09:08:26.380280816 +0200 ++++ b/src/sna/gen4_vertex.c 2018-08-10 09:09:55.522285415 +0200 @@ -308,7 +308,7 @@ #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ #define OUT_VERTEX_F(v) vertex_emit(sna, v) diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 77eb791f02d..2b589d00989 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -18,7 +18,6 @@ homepage="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/" distfiles="${homepage}/-/archive/master/xf86-video-intel-${_commit}.tar.gz" checksum=3cdcf2f84bddf9e9174a8413d8fc855dae893dbc53889329978dec62ee8f6e62 lib32disabled=yes -patch_args=-Np0 CFLAGS="-fcommon" LDFLAGS="-Wl,-z,lazy" diff --git a/srcpkgs/xf86-video-mach64/patches/0001-avoid-including-VBE-paths-when-not-used.patch b/srcpkgs/xf86-video-mach64/patches/0001-avoid-including-VBE-paths-when-not-used.patch index 1810a81f573..09ec3827da3 100644 --- a/srcpkgs/xf86-video-mach64/patches/0001-avoid-including-VBE-paths-when-not-used.patch +++ b/srcpkgs/xf86-video-mach64/patches/0001-avoid-including-VBE-paths-when-not-used.patch @@ -9,8 +9,8 @@ Subject: [PATCH xf86-video-mach64 1/4] avoid including VBE paths when not used diff --git src/atipreinit.c src/atipreinit.c index 96ec68f..be30141 100644 ---- src/atipreinit.c -+++ src/atipreinit.c +--- a/src/atipreinit.c ++++ b/src/atipreinit.c @@ -51,7 +51,9 @@ #include "atixv.h" #include "atiadjust.h" diff --git a/srcpkgs/xf86-video-mach64/patches/0002-configure-Include-xorg-server.h-before-exa.h.patch b/srcpkgs/xf86-video-mach64/patches/0002-configure-Include-xorg-server.h-before-exa.h.patch index 78048a409eb..8266e39d0d9 100644 --- a/srcpkgs/xf86-video-mach64/patches/0002-configure-Include-xorg-server.h-before-exa.h.patch +++ b/srcpkgs/xf86-video-mach64/patches/0002-configure-Include-xorg-server.h-before-exa.h.patch @@ -11,8 +11,8 @@ Fixes EXA detection spuriously failing with current xserver. diff --git configure.ac configure.ac index d3933b2..b8b722b 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -169,7 +169,8 @@ if test "x$EXA" = xyes; then SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" diff --git a/srcpkgs/xf86-video-mach64/patches/0003-Fix-debugging-traces.patch b/srcpkgs/xf86-video-mach64/patches/0003-Fix-debugging-traces.patch index 3d1bc10738a..377bf541242 100644 --- a/srcpkgs/xf86-video-mach64/patches/0003-Fix-debugging-traces.patch +++ b/srcpkgs/xf86-video-mach64/patches/0003-Fix-debugging-traces.patch @@ -10,8 +10,8 @@ Without this change, the compiler emits an error about pPict being undefined whe diff --git src/atimach64render.c src/atimach64render.c index 8d259fa..e4ddea8 100644 ---- src/atimach64render.c -+++ src/atimach64render.c +--- a/src/atimach64render.c ++++ b/src/atimach64render.c @@ -701,8 +701,8 @@ Mach64PrepareComposite break; } diff --git a/srcpkgs/xf86-video-mach64/patches/0004-Fix-compositing-rotation.patch b/srcpkgs/xf86-video-mach64/patches/0004-Fix-compositing-rotation.patch index d82c35034ec..126e57b2b92 100644 --- a/srcpkgs/xf86-video-mach64/patches/0004-Fix-compositing-rotation.patch +++ b/srcpkgs/xf86-video-mach64/patches/0004-Fix-compositing-rotation.patch @@ -15,8 +15,8 @@ each of the diagonally opposed corner vertices. diff --git src/atimach64render.c src/atimach64render.c index e4ddea8..e172546 100644 ---- src/atimach64render.c -+++ src/atimach64render.c +--- a/src/atimach64render.c ++++ b/src/atimach64render.c @@ -814,7 +814,10 @@ Mach64Composite float ooa; CARD32 col; diff --git a/srcpkgs/xf86-video-mach64/template b/srcpkgs/xf86-video-mach64/template index a084652f48c..51fb61f466c 100644 --- a/srcpkgs/xf86-video-mach64/template +++ b/srcpkgs/xf86-video-mach64/template @@ -16,7 +16,6 @@ lib32disabled=yes # fails at XORG_DRIVER_CHECK_EXT even though xorg-util-macros is on host nocross=yes LDFLAGS="-Wl,-z,lazy" -patch_args=-Np0 pre_configure() { autoreconf -if diff --git a/srcpkgs/xf86-video-mga/patches/cross.patch b/srcpkgs/xf86-video-mga/patches/cross.patch index e9de192256c..24c81002c3f 100644 --- a/srcpkgs/xf86-video-mga/patches/cross.patch +++ b/srcpkgs/xf86-video-mga/patches/cross.patch @@ -1,7 +1,7 @@ Remove some checks that break cross. ---- configure.ac 2019-04-30 17:00:37.796389608 +0200 -+++ configure.ac 2019-04-30 17:01:44.933049215 +0200 +--- a/configure.ac 2019-04-30 17:00:37.796389608 +0200 ++++ b/configure.ac 2019-04-30 17:01:44.933049215 +0200 @@ -63,37 +63,14 @@ [EXA="$enableval"], [EXA=yes]) diff --git a/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch index 6a505591d8a..c593ed89cb2 100644 --- a/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch +++ b/srcpkgs/xf86-video-mga/patches/no-vbe-non-x86.patch @@ -10,8 +10,8 @@ Subject: [PATCH] only attempt to use VBE on x86 diff --git src/mga_driver.c src/mga_driver.c index 94183db..68f911f 100644 ---- src/mga_driver.c -+++ src/mga_driver.c +--- a/src/mga_driver.c ++++ b/src/mga_driver.c @@ -77,7 +77,9 @@ #include "xf86DDC.h" @@ -73,8 +73,8 @@ index 94183db..68f911f 100644 pScrn->monitor->DDC = MGAdoDDC(pScrn); diff --git src/mga_merge.c src/mga_merge.c index 64c85b4..62a6330 100644 ---- src/mga_merge.c -+++ src/mga_merge.c +--- a/src/mga_merge.c ++++ b/src/mga_merge.c @@ -406,7 +406,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) */ (*pMga->PreInit)(pScrn); diff --git a/srcpkgs/xf86-video-mga/template b/srcpkgs/xf86-video-mga/template index 41a80655457..39edac52798 100644 --- a/srcpkgs/xf86-video-mga/template +++ b/srcpkgs/xf86-video-mga/template @@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 lib32disabled=yes -patch_args=-Np0 LDFLAGS="-Wl,-z,lazy" CFLAGS="-fcommon" diff --git a/srcpkgs/xf86-video-r128/patches/fix-non-x86.patch b/srcpkgs/xf86-video-r128/patches/fix-non-x86.patch index efe9fbb9f73..52d6c368693 100644 --- a/srcpkgs/xf86-video-r128/patches/fix-non-x86.patch +++ b/srcpkgs/xf86-video-r128/patches/fix-non-x86.patch @@ -16,8 +16,8 @@ https://code.foxkit.us/adelie/packages/blob/master/user/xf86-video-r128 diff --git src/r128_driver.c src/r128_driver.c index 18ff57f..3f9159a 100644 ---- src/r128_driver.c -+++ src/r128_driver.c +--- a/src/r128_driver.c ++++ b/src/r128_driver.c @@ -91,7 +91,11 @@ #endif #include "xf86cmap.h" @@ -108,8 +108,8 @@ index 18ff57f..3f9159a 100644 } diff --git src/r128_output.c src/r128_output.c index 1d98fb9..5a94a3f 100644 ---- src/r128_output.c -+++ src/r128_output.c +--- a/src/r128_output.c ++++ b/src/r128_output.c @@ -426,6 +426,7 @@ void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes) /* non-x86 platform */ if (!info->VBIOS) { diff --git a/srcpkgs/xf86-video-r128/template b/srcpkgs/xf86-video-r128/template index b05086aa3c5..4dbe1529aa5 100644 --- a/srcpkgs/xf86-video-r128/template +++ b/srcpkgs/xf86-video-r128/template @@ -14,7 +14,6 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 lib32disabled=yes LDFLAGS="-Wl,-z,lazy" -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/xf86-video-vmware/patches/gcc82.patch b/srcpkgs/xf86-video-vmware/patches/gcc82.patch index f9ee9b0b631..b4c624a3b4e 100644 --- a/srcpkgs/xf86-video-vmware/patches/gcc82.patch +++ b/srcpkgs/xf86-video-vmware/patches/gcc82.patch @@ -1,5 +1,5 @@ ---- src/vmware.h 2018-05-11 17:43:24.776710047 +0200 -+++ src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200 +--- a/src/vmware.h 2018-05-11 17:43:24.776710047 +0200 ++++ b/src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200 @@ -83,7 +83,7 @@ typedef struct { @@ -18,8 +18,8 @@ #define VENDOR_ID(p) (p)->vendor_id #define DEVICE_ID(p) (p)->device_id #define SUBVENDOR_ID(p) (p)->subvendor_id ---- src/vmware.c 2018-05-11 17:28:30.612158774 +0200 -+++ src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200 +--- a/src/vmware.c 2018-05-11 17:28:30.612158774 +0200 ++++ b/src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200 @@ -341,7 +341,7 @@ SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32); } else { @@ -90,8 +90,8 @@ pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); #else xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); ---- src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200 -+++ src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200 +--- a/src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200 ++++ b/src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200 @@ -91,7 +91,7 @@ VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \ "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL) diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 12fad896b32..1da7f33d8ef 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://xorg.freedesktop.org" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c -patch_args=-Np0 lib32disabled=yes diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch index 33a440d9ff5..75f49b49944 100644 --- a/srcpkgs/xfce4-power-manager/patches/void.patch +++ b/srcpkgs/xfce4-power-manager/patches/void.patch @@ -1,5 +1,5 @@ ---- src/xfpm-pm-helper.c.orig 2019-08-13 12:17:22.787621859 +0200 -+++ src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200 +--- a/src/xfpm-pm-helper.c 2019-08-13 12:17:22.787621859 +0200 ++++ b/src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200 @@ -69,11 +69,8 @@ #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4" @@ -14,8 +14,8 @@ #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ" #endif ---- src/xfpm-suspend.c.orig 2020-12-22 20:56:08.139119371 -0500 -+++ src/xfpm-suspend.c 2020-12-22 20:56:52.359241485 -0500 +--- a/src/xfpm-suspend.c 2020-12-22 20:56:08.139119371 -0500 ++++ b/src/xfpm-suspend.c 2020-12-22 20:56:52.359241485 -0500 @@ -105,40 +105,6 @@ } #endif diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index 84d7d151409..edc9a58e27b 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" checksum=eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3 -patch_args=-Np0 diff --git a/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch b/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch index 16957b30eef..347196008c5 100644 --- a/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch +++ b/srcpkgs/xfig/patches/xfig-3.2.5-urwfonts.patch @@ -1,5 +1,5 @@ ---- src/u_fonts.c -+++ src/u_fonts.c +--- a/src/u_fonts.c ++++ b/src/u_fonts.c @@ -22,41 +22,41 @@ /* X11 font names */ diff --git a/srcpkgs/xfig/template b/srcpkgs/xfig/template index e12459c5685..4c316f35b32 100644 --- a/srcpkgs/xfig/template +++ b/srcpkgs/xfig/template @@ -13,7 +13,6 @@ license="MIT-like" homepage="http://mcj.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz" checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578 -patch_args=-Np0 post_extract() { sed -i 's/spell/aspell/' app-defaults/Fig.in diff --git a/srcpkgs/xfsprogs/patches/00-patch-for-mips.diff b/srcpkgs/xfsprogs/patches/00-patch-for-mips.diff index 3fa95fe3fbf..866dab89786 100644 --- a/srcpkgs/xfsprogs/patches/00-patch-for-mips.diff +++ b/srcpkgs/xfsprogs/patches/00-patch-for-mips.diff @@ -1,5 +1,5 @@ ---- io/mmap.c -+++ io/mmap.c +--- a/io/mmap.c ++++ b/io/mmap.c @@ -189,7 +189,11 @@ prot |= PROT_EXEC; break; diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index f33cde7cc8c..e00f8a5d34e 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="http://xfs.org/index.php/Main_Page" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" checksum=bec44445cf18f49e63971d4f27dc4e90a17b118b852714a1104b621ea30e3507 -patch_args=-Np0 post_extract() { sed -i '1i#include ' include/linux.h diff --git a/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch b/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch index 46fce7bb7ba..550f1dc4607 100644 --- a/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch +++ b/srcpkgs/xinetd/patches/fix-CVE-2013-4342.patch @@ -1,5 +1,5 @@ ---- xinetd/builtins.c -+++ xinetd/builtins.c +--- a/xinetd/builtins.c ++++ b/xinetd/builtins.c @@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) if( SC_IS_INTERNAL( scp ) ) { SC_INTERNAL(scp, nserp); diff --git a/srcpkgs/xinetd/patches/musl.patch b/srcpkgs/xinetd/patches/musl.patch index 908807b6990..13cd326690c 100644 --- a/srcpkgs/xinetd/patches/musl.patch +++ b/srcpkgs/xinetd/patches/musl.patch @@ -1,5 +1,5 @@ ---- xinetd/confparse.c.orig 2015-05-31 12:28:33.148468478 +0200 -+++ xinetd/confparse.c 2015-05-31 12:28:41.588557956 +0200 +--- a/xinetd/confparse.c 2015-05-31 12:28:33.148468478 +0200 ++++ b/xinetd/confparse.c 2015-05-31 12:28:41.588557956 +0200 @@ -746,7 +746,7 @@ static status_e check_entry( struct serv } diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template index 9456dbfdfcd..dbdd441c063 100644 --- a/srcpkgs/xinetd/template +++ b/srcpkgs/xinetd/template @@ -11,7 +11,6 @@ license="xinetd" homepage="http://www.xinetd.org/" distfiles="http://ponce.cc/slackware/sources/repo/xinetd-${version}.tar.gz" checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 -patch_args=-Np0 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services" diff --git a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff index 4770eaf4524..8d810c7da0b 100644 --- a/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff +++ b/srcpkgs/xinit/patches/06_move_serverauthfile_into_tmp.diff @@ -7,8 +7,8 @@ The trap patch didn't seem to work on reboot. Index: startx.cpp.orig =================================================================== ---- startx.cpp.orig -+++ startx.cpp +--- a/startx.cpp ++++ b/startx.cpp @@ -273,7 +273,7 @@ dummy=0 diff --git a/srcpkgs/xinit/patches/fs25361.patch b/srcpkgs/xinit/patches/fs25361.patch index 861c3938858..56dfcc9916d 100644 --- a/srcpkgs/xinit/patches/fs25361.patch +++ b/srcpkgs/xinit/patches/fs25361.patch @@ -1,5 +1,5 @@ ---- startx.cpp.orig 2018-03-10 02:46:03.000000000 +0100 -+++ startx.cpp 2018-03-12 20:30:43.041201031 +0100 +--- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100 ++++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100 @@ -296,9 +296,9 @@ XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index 2bb4c8e4352..be836ebc94a 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://xorgwiki.freedesktop.org/xorg" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 -patch_args=-Np0 conf_files=" /etc/X11/xinit/xinitrc diff --git a/srcpkgs/xkblayout-state/patches/make.patch b/srcpkgs/xkblayout-state/patches/make.patch index 20751601c54..e2837ff5a8d 100644 --- a/srcpkgs/xkblayout-state/patches/make.patch +++ b/srcpkgs/xkblayout-state/patches/make.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index c32ed6b..fb2e7a3 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,13 +1,22 @@ -all: xkblayout-state +PROG=xkblayout-state diff --git a/srcpkgs/xkblayout-state/template b/srcpkgs/xkblayout-state/template index 78407cc1ba5..e3b1f4131db 100644 --- a/srcpkgs/xkblayout-state/template +++ b/srcpkgs/xkblayout-state/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/nonpop/xkblayout-state" distfiles="https://github.com/nonpop/xkblayout-state/archive/v${version}.tar.gz" checksum=ddf2de9949edbea2cb25933c22a6b76d4f868ee3012120216555ac96e9b536d4 -patch_args=-Np0 diff --git a/srcpkgs/xload/patches/fix-musl.patch b/srcpkgs/xload/patches/fix-musl.patch index 4328d8af30b..f7baecd1148 100644 --- a/srcpkgs/xload/patches/fix-musl.patch +++ b/srcpkgs/xload/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- get_rload.c -+++ get_rload.c +--- a/get_rload.c ++++ b/get_rload.c @@ -9,7 +9,7 @@ /* Not all OS supports get_rload steal the STUB idea from get_load diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template index 62f070c1f25..74cbd8bbf5e 100644 --- a/srcpkgs/xload/template +++ b/srcpkgs/xload/template @@ -11,7 +11,6 @@ license="X11, MIT" homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/xlunch/patches/ldflags.patch b/srcpkgs/xlunch/patches/ldflags.patch index b80b8ba80c9..2d547fae6d6 100644 --- a/srcpkgs/xlunch/patches/ldflags.patch +++ b/srcpkgs/xlunch/patches/ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2017-05-16 00:48:25.302317545 -0500 -+++ Makefile 2017-05-16 00:47:47.801022135 -0500 +--- a/Makefile 2017-05-16 00:48:25.302317545 -0500 ++++ b/Makefile 2017-05-16 00:47:47.801022135 -0500 @@ -1,5 +1,5 @@ CC = gcc -LDFLAGS = -lImlib2 -lX11 diff --git a/srcpkgs/xlunch/patches/musl.patch b/srcpkgs/xlunch/patches/musl.patch index 777d18c35fb..cd76c29116e 100644 --- a/srcpkgs/xlunch/patches/musl.patch +++ b/srcpkgs/xlunch/patches/musl.patch @@ -1,5 +1,5 @@ ---- xlunch.c.orig 2017-05-17 21:38:59.048445309 -0500 -+++ xlunch.c 2017-05-17 21:39:41.334944291 -0500 +--- a/xlunch.c 2017-05-17 21:38:59.048445309 -0500 ++++ b/xlunch.c 2017-05-17 21:39:41.334944291 -0500 @@ -27,6 +27,9 @@ #include #include diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template index 54335a705a6..8c8eafcb029 100644 --- a/srcpkgs/xlunch/template +++ b/srcpkgs/xlunch/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="http://xlunch.org/" distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz" checksum=08728beba2a86b1e8f0cccf14903b7e6625e099425b6a254418c75636f2515e6 -patch_args=-Np0 do_install() { vbin xlunch diff --git a/srcpkgs/xnots/patches/Add-aarch64.patch b/srcpkgs/xnots/patches/Add-aarch64.patch index ac68d956091..89ec8a096e8 100644 --- a/srcpkgs/xnots/patches/Add-aarch64.patch +++ b/srcpkgs/xnots/patches/Add-aarch64.patch @@ -15,8 +15,8 @@ Subject: [PATCH] inotify.h is now provided with libc6. Use that instead of diff --git src/Makefile src/Makefile index 397857a..5ed7c42 100644 ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -11,7 +11,6 @@ # Source files # @@ -37,7 +37,7 @@ index 397857a..5ed7c42 100644 diff --git src/inotify-syscalls.h src/inotify-syscalls.h deleted file mode 100644 index 1431d46..0000000 ---- src/inotify-syscalls.h +--- a/src/inotify-syscalls.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef _LINUX_INOTIFY_SYSCALLS_H @@ -104,7 +104,7 @@ index 1431d46..0000000 diff --git src/inotify.h src/inotify.h deleted file mode 100644 index 267c88b..0000000 ---- src/inotify.h +--- a/src/inotify.h +++ /dev/null @@ -1,113 +0,0 @@ -/* @@ -222,8 +222,8 @@ index 267c88b..0000000 -#endif /* _LINUX_INOTIFY_H */ diff --git src/main.c src/main.c index 9007d6d..5bf063e 100644 ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -10,8 +10,7 @@ #include "xnots.h" #include diff --git a/srcpkgs/xnots/patches/compiler.patch b/srcpkgs/xnots/patches/compiler.patch index 2db29ae5fc6..a229f3c7268 100644 --- a/srcpkgs/xnots/patches/compiler.patch +++ b/srcpkgs/xnots/patches/compiler.patch @@ -1,5 +1,5 @@ ---- Makefile~ 2009-01-11 21:52:10.000000000 +0100 -+++ Makefile 2017-11-18 19:31:11.107853009 +0100 +--- a/Makefile~ 2009-01-11 21:52:10.000000000 +0100 ++++ b/Makefile 2017-11-18 19:31:11.107853009 +0100 @@ -40,7 +40,6 @@ # # Programs @@ -8,8 +8,8 @@ INSTALL = install INSTALL_PROGRAM = $(INSTALL) INSTALL_DATA = ${INSTALL} -m 644 ---- src/Makefile~ 2009-01-11 21:52:10.000000000 +0100 -+++ src/Makefile 2017-11-18 19:37:49.493851304 +0100 +--- a/src/Makefile~ 2009-01-11 21:52:10.000000000 +0100 ++++ b/src/Makefile 2017-11-18 19:37:49.493851304 +0100 @@ -16,7 +16,6 @@ objects = $(sources:.c=.o) diff --git a/srcpkgs/xnots/patches/inline.patch b/srcpkgs/xnots/patches/inline.patch index ac56858605c..c3f6201330b 100644 --- a/srcpkgs/xnots/patches/inline.patch +++ b/srcpkgs/xnots/patches/inline.patch @@ -1,7 +1,7 @@ diff --git src/notes.c src/notes.c index 0c427dd..5d32740 100644 ---- src/notes.c -+++ src/notes.c +--- a/src/notes.c ++++ b/src/notes.c @@ -731,7 +731,7 @@ correctNoteHeight( Note *note ) /* Reset the width of note internals (e.g. the pango layout) to note->width. @@ -13,8 +13,8 @@ index 0c427dd..5d32740 100644 pango_layout_set_width( note->playout, diff --git src/xnots.h src/xnots.h index 8280ccb..ef7395b 100644 ---- src/xnots.h -+++ src/xnots.h +--- a/src/xnots.h ++++ b/src/xnots.h @@ -315,7 +315,7 @@ void correctNoteGeometry ( Note *note, unsigned height ); diff --git a/srcpkgs/xnots/template b/srcpkgs/xnots/template index 05a565630c8..c08b06c26d6 100644 --- a/srcpkgs/xnots/template +++ b/srcpkgs/xnots/template @@ -14,4 +14,3 @@ license="GPL-2.0-only" homepage="http://xnots.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=80bbab0334880f79aa12cf17ebffc5730a85dc537e8e6208169720656ecd72ca -patch_args=-Np0 diff --git a/srcpkgs/xnp2/patches/define_cplusplus.patch b/srcpkgs/xnp2/patches/define_cplusplus.patch index 3245b948d1b..12b24c90bb2 100644 --- a/srcpkgs/xnp2/patches/define_cplusplus.patch +++ b/srcpkgs/xnp2/patches/define_cplusplus.patch @@ -1,5 +1,5 @@ ---- x11/compiler.h.old 2018-02-02 17:00:29.174895866 +0000 -+++ x11/compiler.h 2018-02-02 17:00:41.199160781 +0000 +--- a/x11/compiler.h.old 2018-02-02 17:00:29.174895866 +0000 ++++ b/x11/compiler.h 2018-02-02 17:00:41.199160781 +0000 @@ -117,12 +117,14 @@ #define MAX_PATH MAXPATHLEN #endif diff --git a/srcpkgs/xnp2/template b/srcpkgs/xnp2/template index 21ad123a501..1070cad41c2 100644 --- a/srcpkgs/xnp2/template +++ b/srcpkgs/xnp2/template @@ -13,7 +13,6 @@ license="BSD" homepage="https://www.nonakap.org/np2" distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2" checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd -patch_args=-Np0 do_install() { vbin xnp2 diff --git a/srcpkgs/xonotic/patches/musl-moncontrol.patch b/srcpkgs/xonotic/patches/musl-moncontrol.patch index 68deabfecef..41b11d74b8f 100644 --- a/srcpkgs/xonotic/patches/musl-moncontrol.patch +++ b/srcpkgs/xonotic/patches/musl-moncontrol.patch @@ -1,7 +1,7 @@ There is no moncontrol() in musl libc. ---- source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100 -+++ source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200 +--- a/source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100 ++++ b/source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200 @@ -69,7 +69,7 @@ else moncleanup(); diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template index 9622079c8c3..977c8cdce6e 100644 --- a/srcpkgs/xonotic/template +++ b/srcpkgs/xonotic/template @@ -14,7 +14,6 @@ homepage="http://xonotic.org" distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip" checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b nocross=yes -patch_args=-Np0 do_build() { local target diff --git a/srcpkgs/xorg-cf-files/patches/linuxconfig.patch b/srcpkgs/xorg-cf-files/patches/linuxconfig.patch index ffc30b91a4b..e6caa7f9981 100644 --- a/srcpkgs/xorg-cf-files/patches/linuxconfig.patch +++ b/srcpkgs/xorg-cf-files/patches/linuxconfig.patch @@ -1,7 +1,7 @@ From Arch. ---- linux.cf.orig 2006-03-04 18:40:43.000000000 +0000 -+++ linux.cf 2006-03-04 18:41:48.000000000 +0000 +--- a/linux.cf 2006-03-04 18:40:43.000000000 +0000 ++++ b/linux.cf 2006-03-04 18:41:48.000000000 +0000 @@ -193,6 +193,13 @@ #define FSUseSyslog YES #endif @@ -16,8 +16,8 @@ From Arch. #ifndef HasDevRandom # define HasDevRandom YES # ifndef RandomDeviceName ---- X11.tmpl.orig 2006-07-15 10:45:23.000000000 +0000 -+++ X11.tmpl 2006-07-15 10:46:19.000000000 +0000 +--- a/X11.tmpl 2006-07-15 10:45:23.000000000 +0000 ++++ b/X11.tmpl 2006-07-15 10:46:19.000000000 +0000 @@ -1502,10 +1502,10 @@ #define DocPdfDir $(DOCDIR)/PDF #endif diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template index d5d53e6296f..aea5c85748e 100644 --- a/srcpkgs/xorg-cf-files/template +++ b/srcpkgs/xorg-cf-files/template @@ -10,7 +10,6 @@ license="X11" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2" checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/xorg-server/patches/autoconfig-ati.patch b/srcpkgs/xorg-server/patches/autoconfig-ati.patch index d2b931bc60d..b52ce0bbbbd 100644 --- a/srcpkgs/xorg-server/patches/autoconfig-ati.patch +++ b/srcpkgs/xorg-server/patches/autoconfig-ati.patch @@ -1,7 +1,7 @@ Prefer the AMD Catalyst "fglrx" driver if found. ---- hw/xfree86/common/xf86pciBus.c.orig 2013-02-07 19:59:55.690518107 +0100 -+++ hw/xfree86/common/xf86pciBus.c 2013-02-07 20:01:14.832594170 +0100 +--- a/hw/xfree86/common/xf86pciBus.c 2013-02-07 19:59:55.690518107 +0100 ++++ b/hw/xfree86/common/xf86pciBus.c 2013-02-07 20:01:14.832594170 +0100 @@ -1132,8 +1132,13 @@ xf86VideoPtrToDriverList(struct pci_devi driverList[0] = "ast"; break; diff --git a/srcpkgs/xorg-server/patches/autoconfig-sis.patch b/srcpkgs/xorg-server/patches/autoconfig-sis.patch index 0b50049db55..42ff28f1342 100644 --- a/srcpkgs/xorg-server/patches/autoconfig-sis.patch +++ b/srcpkgs/xorg-server/patches/autoconfig-sis.patch @@ -1,5 +1,5 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +--- a/hw/xfree86/common/xf86pciBus.c 2011-09-24 10:53:45.421697668 +0000 ++++ b/hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 @@ -1200,9 +1200,15 @@ break; } diff --git a/srcpkgs/xorg-server/patches/fix-libshadow-2.patch b/srcpkgs/xorg-server/patches/fix-libshadow-2.patch index 446b2befbc1..b0b0440871a 100644 --- a/srcpkgs/xorg-server/patches/fix-libshadow-2.patch +++ b/srcpkgs/xorg-server/patches/fix-libshadow-2.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix libshadow diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build index 835d23215..6bd8029b6 100644 ---- hw/xfree86/dixmods/meson.build -+++ hw/xfree86/dixmods/meson.build +--- a/hw/xfree86/dixmods/meson.build ++++ b/hw/xfree86/dixmods/meson.build @@ -38,6 +38,7 @@ shared_module( install: true, diff --git a/srcpkgs/xorg-server/patches/fix-musl-input_event.patch b/srcpkgs/xorg-server/patches/fix-musl-input_event.patch index ec1ae8f3751..04e7c133249 100644 --- a/srcpkgs/xorg-server/patches/fix-musl-input_event.patch +++ b/srcpkgs/xorg-server/patches/fix-musl-input_event.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: Gracefully handle transition to 64 bit time with musl-1.2.1 ---- hw/dmx/input/usb-keyboard.c 2020-12-01 17:32:25.000000000 +0100 -+++ hw/dmx/input/usb-keyboard.c 2020-12-01 20:28:02.489695853 +0100 +--- a/hw/dmx/input/usb-keyboard.c 2020-12-01 17:32:25.000000000 +0100 ++++ b/hw/dmx/input/usb-keyboard.c 2020-12-01 20:28:02.489695853 +0100 @@ -278,8 +278,8 @@ gettimeofday(&tv, NULL); @@ -15,8 +15,8 @@ Reason: Gracefully handle transition to 64 bit time with musl-1.2.1 event.type = EV_LED; if (i == 0) led = 1; /* LED_CAPSL == 0x01 */ ---- hw/dmx/examples/ev.c 2020-12-01 17:32:25.000000000 +0100 -+++ hw/dmx/examples/ev.c 2020-12-01 20:31:24.585605950 +0100 +--- a/hw/dmx/examples/ev.c 2020-12-01 17:32:25.000000000 +0100 ++++ b/hw/dmx/examples/ev.c 2020-12-01 20:31:24.585605950 +0100 @@ -114,8 +114,8 @@ if ((fd = open(name, O_RDWR, 0)) >= 0) { printf("%s: open, fd = %d\n", name, fd); diff --git a/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch b/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch index 7cd518934d5..167e7781cf0 100644 --- a/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch +++ b/srcpkgs/xorg-server/patches/fix-segfault-on-probing-non-pci-platform-device.patch @@ -15,8 +15,8 @@ Signed-off-by: Eric Anholt diff --git hw/xfree86/common/xf86platformBus.c hw/xfree86/common/xf86platformBus.c index cef47da03d..dadbac6c8f 100644 ---- hw/xfree86/common/xf86platformBus.c -+++ hw/xfree86/common/xf86platformBus.c +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c @@ -289,7 +289,7 @@ xf86platformProbe(void) for (i = 0; i < xf86_num_platform_devices; i++) { char *busid = xf86_platform_odev_attributes(i)->busid; diff --git a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch index 2bb22bee0b6..707150956a0 100644 --- a/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch +++ b/srcpkgs/xorg-server/patches/fix-serverconfigdir-location.patch @@ -1,5 +1,5 @@ ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -507,7 +507,7 @@ glx_inc = include_directories('glx') top_srcdir_inc = include_directories('.') diff --git a/srcpkgs/xorg-server/patches/meson-fontrootdir.patch b/srcpkgs/xorg-server/patches/meson-fontrootdir.patch index f3a87d506b4..8f86d6cf428 100644 --- a/srcpkgs/xorg-server/patches/meson-fontrootdir.patch +++ b/srcpkgs/xorg-server/patches/meson-fontrootdir.patch @@ -1,5 +1,5 @@ ---- meson.build.orig -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -122,8 +122,11 @@ dfp = get_option('default_font_path') @@ -14,8 +14,8 @@ default_font_path = ','.join([ join_paths(fontrootdir, 'misc'), join_paths(fontrootdir, 'TTF'), ---- meson_options.txt.orig -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -24,6 +24,7 @@ option('module_dir', type: 'string', value: 'xorg/modules', description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)') diff --git a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch index 2a23d5b8da9..deb0fcb844c 100644 --- a/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch +++ b/srcpkgs/xorg-server/patches/meson-install-xorg-wrap-script.patch @@ -1,5 +1,5 @@ ---- hw/xfree86/meson.build.orig -+++ hw/xfree86/meson.build +--- a/hw/xfree86/meson.build ++++ b/hw/xfree86/meson.build @@ -145,12 +145,15 @@ install_dir: get_option('libexecdir'), # install_mode: ['r-sr-xr-x', 0, 0], diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index a223cb08947..852c3ab2f57 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -31,7 +31,6 @@ provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1" replaces="xf86-video-modesetting>=0 glamor-egl>=0" conf_files="/etc/X11/Xwrapper.config" -patch_args=-Np0 build_options="elogind" desc_option_elogind="Rootless Xorg support with elogind" diff --git a/srcpkgs/xosview/patches/musl-fix.patch b/srcpkgs/xosview/patches/musl-fix.patch index 98f81c61880..879008fe051 100644 --- a/srcpkgs/xosview/patches/musl-fix.patch +++ b/srcpkgs/xosview/patches/musl-fix.patch @@ -1,5 +1,5 @@ ---- linux/serialmeter.cc 2016-01-02 10:39:10.279496776 +0100 -+++ linux/serialmeter.cc 2016-01-02 10:37:54.667491325 +0100 +--- a/linux/serialmeter.cc 2016-01-02 10:39:10.279496776 +0100 ++++ b/linux/serialmeter.cc 2016-01-02 10:37:54.667491325 +0100 @@ -39,9 +39,11 @@ #endif #else diff --git a/srcpkgs/xosview/template b/srcpkgs/xosview/template index 1c4b34de9d1..3d6c3ab6c1f 100644 --- a/srcpkgs/xosview/template +++ b/srcpkgs/xosview/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://www.pogo.org.uk/~mark/xosview" distfiles="http://www.pogo.org.uk/~mark/xosview/releases/xosview-${version}.tar.gz" checksum=901b75af2676b11b28b88f0c79c5bd0f4f01de4790c0c5385edf6d71aee1f83a -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) # does not have asm/io.h diff --git a/srcpkgs/xplanet/patches/fix-gcc6-nullptr.patch b/srcpkgs/xplanet/patches/fix-gcc6-nullptr.patch index 55a229824ad..05a8720bd08 100644 --- a/srcpkgs/xplanet/patches/fix-gcc6-nullptr.patch +++ b/srcpkgs/xplanet/patches/fix-gcc6-nullptr.patch @@ -1,5 +1,5 @@ ---- src/libannotate/addArcs.cpp 2013-02-16 20:37:45.000000000 +0100 -+++ src/libannotate/addArcs.cpp 2016-09-23 11:12:28.243514027 +0200 +--- a/src/libannotate/addArcs.cpp 2013-02-16 20:37:45.000000000 +0100 ++++ b/src/libannotate/addArcs.cpp 2016-09-23 11:12:28.243514027 +0200 @@ -258,7 +258,7 @@ { ifstream inFile(arcFile.c_str()); @@ -20,8 +20,8 @@ readArcFile(line, NULL, view, NULL, NULL, annotationMap); inFile.close(); ---- src/libannotate/addMarkers.cpp 2013-02-16 20:37:45.000000000 +0100 -+++ src/libannotate/addMarkers.cpp 2016-09-23 11:15:29.932640115 +0200 +--- a/src/libannotate/addMarkers.cpp 2013-02-16 20:37:45.000000000 +0100 ++++ b/src/libannotate/addMarkers.cpp 2016-09-23 11:15:29.932640115 +0200 @@ -429,7 +429,7 @@ { ifstream inFile(markerFile.c_str()); @@ -40,8 +40,8 @@ { unsigned char color[3]; memcpy(color, options->Color(), 3); ---- src/libannotate/addSatellites.cpp 2013-02-16 20:37:45.000000000 +0100 -+++ src/libannotate/addSatellites.cpp 2016-09-23 11:18:06.052752831 +0200 +--- a/src/libannotate/addSatellites.cpp 2013-02-16 20:37:45.000000000 +0100 ++++ b/src/libannotate/addSatellites.cpp 2016-09-23 11:18:06.052752831 +0200 @@ -488,10 +488,9 @@ { ifstream inFile(tleFile.c_str()); @@ -64,8 +64,8 @@ readSatelliteFile(line, planet, view, projection, planetProperties, annotationMap); ---- src/libmultiple/drawStars.cpp 2013-02-16 20:37:45.000000000 +0100 -+++ src/libmultiple/drawStars.cpp 2016-09-23 11:20:16.747849925 +0200 +--- a/src/libmultiple/drawStars.cpp 2013-02-16 20:37:45.000000000 +0100 ++++ b/src/libmultiple/drawStars.cpp 2016-09-23 11:20:16.747849925 +0200 @@ -41,7 +41,7 @@ ifstream inFile(starMap.c_str()); @@ -75,8 +75,8 @@ { if (line[0] == '#') continue; ---- src/libmultiple/RayleighScattering.cpp 2013-02-16 20:37:45.000000000 +0100 -+++ src/libmultiple/RayleighScattering.cpp 2016-09-23 11:22:16.158937255 +0200 +--- a/src/libmultiple/RayleighScattering.cpp 2013-02-16 20:37:45.000000000 +0100 ++++ b/src/libmultiple/RayleighScattering.cpp 2016-09-23 11:22:16.158937255 +0200 @@ -369,7 +369,7 @@ diskTemplate_.clear(); @@ -104,8 +104,8 @@ { int i = 0; while (isDelimiter(line[i])) ---- src/readConfig.cpp 2013-02-16 20:37:47.000000000 +0100 -+++ src/readConfig.cpp 2016-09-23 11:24:13.950022143 +0200 +--- a/src/readConfig.cpp 2013-02-16 20:37:47.000000000 +0100 ++++ b/src/readConfig.cpp 2016-09-23 11:24:13.950022143 +0200 @@ -549,8 +549,8 @@ currentProperties = defaultProperties; diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template index abb07cf7fa5..4650dd2556c 100644 --- a/srcpkgs/xplanet/template +++ b/srcpkgs/xplanet/template @@ -12,7 +12,6 @@ license="GPL-2" homepage="http://xplanet.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=4380d570a8bf27b81fb629c97a636c1673407f4ac4989ce931720078a90aece7 -patch_args=-Np0 pre_configure() { # make it build with giflib-5.1.0 diff --git a/srcpkgs/xrick/patches/flags.patch b/srcpkgs/xrick/patches/flags.patch index c37604ce0fe..6df3a1252ce 100644 --- a/srcpkgs/xrick/patches/flags.patch +++ b/srcpkgs/xrick/patches/flags.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2017-06-02 21:17:59.554162598 -0500 -+++ Makefile 2017-06-02 21:18:27.781905157 -0500 +--- a/Makefile 2017-06-02 21:17:59.554162598 -0500 ++++ b/Makefile 2017-06-02 21:18:27.781905157 -0500 @@ -71,10 +71,8 @@ all: @echo "ROOTDIR=$(ROOTDIR)" > Makefile.global diff --git a/srcpkgs/xrick/template b/srcpkgs/xrick/template index 628972531f2..42b8a0febe9 100644 --- a/srcpkgs/xrick/template +++ b/srcpkgs/xrick/template @@ -12,7 +12,6 @@ restricted=yes homepage="http://www.bigorno.net/xrick/" distfiles="https://www.bigorno.net/xrick/xrick-${version}.tgz" checksum=aa8542120bec97a730258027a294bd16196eb8b3d66134483d085f698588fc2b -patch_args=-Np0 CFLAGS=-fcommon diff --git a/srcpkgs/xsane/patches/fix-png_jmpbuf.patch b/srcpkgs/xsane/patches/fix-png_jmpbuf.patch index 7118ee9bc60..4e8abe9dfcd 100644 --- a/srcpkgs/xsane/patches/fix-png_jmpbuf.patch +++ b/srcpkgs/xsane/patches/fix-png_jmpbuf.patch @@ -1,5 +1,5 @@ ---- src/xsane-save.c 2010-11-16 22:06:00.000000000 +0100 -+++ src/xsane-save.c 2017-01-11 13:10:33.311935745 +0100 +--- a/src/xsane-save.c 2010-11-16 22:06:00.000000000 +0100 ++++ b/src/xsane-save.c 2017-01-11 13:10:33.311935745 +0100 @@ -4910,7 +4910,7 @@ return -1; /* error */ } diff --git a/srcpkgs/xsane/patches/xdg-open.patch b/srcpkgs/xsane/patches/xdg-open.patch index e1f33852f99..5d5761ba4da 100644 --- a/srcpkgs/xsane/patches/xdg-open.patch +++ b/srcpkgs/xsane/patches/xdg-open.patch @@ -1,5 +1,5 @@ ---- src/xsane.h 2007-08-13 09:20:32.000000000 +0200 -+++ src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +--- a/src/xsane.h 2007-08-13 09:20:32.000000000 +0200 ++++ b/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 @@ -251,7 +251,7 @@ # elif defined(HAVE_OS2_H) # define DEFAULT_BROWSER "netscape" diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template index b84bedbe6d7..863e61dd58c 100644 --- a/srcpkgs/xsane/template +++ b/srcpkgs/xsane/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://www.xsane.org" distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz" checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \ diff --git a/srcpkgs/xsel/patches/strncpy.patch b/srcpkgs/xsel/patches/strncpy.patch index 7c6f42a5d06..fc08b667b01 100644 --- a/srcpkgs/xsel/patches/strncpy.patch +++ b/srcpkgs/xsel/patches/strncpy.patch @@ -1,7 +1,7 @@ diff --git xsel.c xsel.c index 79cc68b..556585e 100644 ---- xsel.c -+++ xsel.c +--- a/xsel.c ++++ b/xsel.c @@ -1983,7 +1983,7 @@ main(int argc, char *argv[]) dont_output = True; } else if (OPT("--logfile") || OPT("-l")) { diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template index 4121c114093..edc001dba40 100644 --- a/srcpkgs/xsel/template +++ b/srcpkgs/xsel/template @@ -10,4 +10,3 @@ license="custom" homepage="http://www.vergenet.net/~conrad/software/xsel/" distfiles="http://www.vergenet.net/~conrad/software/xsel/download/xsel-${version}.tar.gz" checksum=b927ce08dc82f4c30140223959b90cf65e1076f000ce95e520419ec32f5b141c -patch_args=-Np0 diff --git a/srcpkgs/xseticon/patches/fix-makefile.patch b/srcpkgs/xseticon/patches/fix-makefile.patch index 744602136d1..53acdb8a6c5 100644 --- a/srcpkgs/xseticon/patches/fix-makefile.patch +++ b/srcpkgs/xseticon/patches/fix-makefile.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index 725f750..17a47c0 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -9,22 +9,22 @@ GD_LIBS=-lgd LIBS=${GLIB_LIBS} ${XLIB_LIBS} ${GD_LIBS} diff --git a/srcpkgs/xseticon/template b/srcpkgs/xseticon/template index d3655f7d0c0..130726aa45c 100644 --- a/srcpkgs/xseticon/template +++ b/srcpkgs/xseticon/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/xeyownt/xseticon" distfiles="https://github.com/xeyownt/xseticon/archive/${version}.tar.gz" checksum=d34c349ff09ea42393fb3bac3fd2be0e7b9a244388e2f4b32cc92636967a4a2c -patch_args=-Np0 diff --git a/srcpkgs/xsettingsd/patches/scons.patch b/srcpkgs/xsettingsd/patches/scons.patch index bedffd5aae6..824731df1c8 100644 --- a/srcpkgs/xsettingsd/patches/scons.patch +++ b/srcpkgs/xsettingsd/patches/scons.patch @@ -1,5 +1,5 @@ ---- SConstruct.orig -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -48,6 +48,7 @@ env.Append(CCFLAGS='-Wall -Werror -Wno-narrowing') diff --git a/srcpkgs/xsettingsd/template b/srcpkgs/xsettingsd/template index deb1a122857..e2754ef0099 100644 --- a/srcpkgs/xsettingsd/template +++ b/srcpkgs/xsettingsd/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="https://github.com/derat/xsettingsd" distfiles="https://github.com/derat/xsettingsd/archive/v${version}.tar.gz" checksum=69b5d1987608d1b5f2a0085f2f88cc55936a99b92279118e655d665ebb5e50d3 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/xst/patches/xrdb_cursor.patch b/srcpkgs/xst/patches/xrdb_cursor.patch index 7a34296365b..4ce0ec6dbaf 100644 --- a/srcpkgs/xst/patches/xrdb_cursor.patch +++ b/srcpkgs/xst/patches/xrdb_cursor.patch @@ -13,8 +13,8 @@ Subject: [PATCH] fix(x: main): do xrdb_load before setting cursor shape (fixes diff --git x.c x.c index 4dcb168..5367d05 100644 ---- x.c -+++ x.c +--- a/x.c ++++ b/x.c @@ -2111,7 +2111,6 @@ main(int argc, char *argv[]) { xw.l = xw.t = 0; diff --git a/srcpkgs/xst/template b/srcpkgs/xst/template index 5fded5ad0a2..8600c680ae3 100644 --- a/srcpkgs/xst/template +++ b/srcpkgs/xst/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://github.com/gnotclub/xst" distfiles="https://github.com/gnotclub/xst/archive/v${version}.tar.gz" checksum=cbeb2da6c289415d1168559c6f58b4ce47fd266edefbabc38fd59e8b7c87226d -patch_args=-Np0 do_install() { vbin xst diff --git a/srcpkgs/xstarter/patches/cmake-build-type-none.patch b/srcpkgs/xstarter/patches/cmake-build-type-none.patch index 4f793e4c473..a4ee91afec0 100644 --- a/srcpkgs/xstarter/patches/cmake-build-type-none.patch +++ b/srcpkgs/xstarter/patches/cmake-build-type-none.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -5,16 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) project(xstarter) diff --git a/srcpkgs/xstarter/template b/srcpkgs/xstarter/template index 5e49b3e3f73..4363d36e3c3 100644 --- a/srcpkgs/xstarter/template +++ b/srcpkgs/xstarter/template @@ -12,7 +12,6 @@ homepage="https://xstarter.org" changelog="https://raw.githubusercontent.com/lchsk/xstarter/master/CHANGELOG" distfiles="https://github.com/lchsk/xstarter/archive/v${version}.tar.gz" checksum=cb82bf837a2693cbbad468812d517256e079d6aae56dde770d473b245603030a -patch_args=-Np0 pre_configure() { vsed -i CMakeLists.txt -e's;-Wall;-fcommon &;' diff --git a/srcpkgs/xterm/patches/musl.patch b/srcpkgs/xterm/patches/musl.patch index fb2034b63d1..dbf6b2b17b1 100644 --- a/srcpkgs/xterm/patches/musl.patch +++ b/srcpkgs/xterm/patches/musl.patch @@ -1,5 +1,5 @@ ---- main.c.orig -+++ main.c +--- a/main.c ++++ b/main.c @@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) close(opened_tty); opened_tty = -1; diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index 92d4c5866d0..cde36bc4e13 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -21,7 +21,6 @@ homepage="http://invisible-island.net/xterm/" changelog="http://invisible-island.net/xterm/xterm.log.html" distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" checksum=2ff5169930b6b49ef0bafb5e1331c94f1a98c310442bba7798add821c76ae712 -patch_args=-Np0 post_install() { for f in {u,}xterm.desktop; do diff --git a/srcpkgs/xye/patches/fix-gcc6-narrowing.patch b/srcpkgs/xye/patches/fix-gcc6-narrowing.patch index fd4e1f6c26a..e18def785fa 100644 --- a/srcpkgs/xye/patches/fix-gcc6-narrowing.patch +++ b/srcpkgs/xye/patches/fix-gcc6-narrowing.patch @@ -1,5 +1,5 @@ ---- src/xsb_level.cpp 2012-09-15 22:21:06.000000000 +0200 -+++ src/xsb_level.cpp 2016-09-23 10:56:51.900831887 +0200 +--- a/src/xsb_level.cpp 2012-09-15 22:21:06.000000000 +0200 ++++ b/src/xsb_level.cpp 2016-09-23 10:56:51.900831887 +0200 @@ -784,7 +784,7 @@ bool FromXyeDFS(int* mem, unsigned char x, unsigned char y) diff --git a/srcpkgs/xye/template b/srcpkgs/xye/template index 7d9472e29e6..d36a89c9ad2 100644 --- a/srcpkgs/xye/template +++ b/srcpkgs/xye/template @@ -11,7 +11,6 @@ homepage="http://xye.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=5d7c04f37d6b4a1821594512c7ddbc8189f968e08ecfd5af55231302f2f917d8 replaces="xye-data>=0" -patch_args=-Np0 post_install() { vdoc ReadMe.html