srcpkgs/e*: 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
```
This commit is contained in:
Đoàn Trần Công Danh 2021-06-19 10:03:21 +07:00 committed by Đoàn Trần Công Danh
parent b6bcd8cd34
commit a03d116397
92 changed files with 130 additions and 165 deletions

View file

@ -1,5 +1,5 @@
--- configure.ac.orig 2019-07-18 10:57:21.187376556 +0200
+++ configure.ac 2019-07-18 10:58:09.968379876 +0200
--- a/configure.ac 2019-07-18 10:57:21.187376556 +0200
+++ b/configure.ac 2019-07-18 10:58:09.968379876 +0200
@@ -1611,6 +1611,9 @@
if test $cross_compiling = no; then
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"

View file

@ -19,7 +19,6 @@ homepage="http://e2fsprogs.sourceforge.net/"
distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
checksum=23aa093295c94e71ef1be490c4004871c5b01d216a8cb4d111fa6c0aac354168
conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
patch_args=-Np0
do_check() {
ln -sfv /tools/lib/lib{blk,uu}id.so.1 lib

View file

@ -1,5 +1,5 @@
--- configure.old 2017-07-01 12:43:00.384785855 +0200
+++ configure 2017-07-01 12:55:03.102813398 +0200
--- a/configure.old 2017-07-01 12:43:00.384785855 +0200
+++ b/configure 2017-07-01 12:55:03.102813398 +0200
@@ -6752,7 +6752,7 @@
if test $ac_cv_header_stdc = yes; then

View file

@ -11,7 +11,6 @@ license="BSD-3-Clause"
homepage="https://github.com/2ion/eb"
distfiles="https://github.com/2ion/eb/archive/${version}.tar.gz"
checksum=16274f4d5ec34cc37ed308927390a1d0d09e0e6a2b35fbff7d17aacca0524a37
patch_args=-Np0
post_install() {
vlicense COPYING

View file

@ -1,5 +1,5 @@
--- configure.orig 2017-01-05 01:07:49.029440284 +0100
+++ configure 2017-01-08 19:42:47.704475698 +0100
--- a/configure 2017-01-05 01:07:49.029440284 +0100
+++ b/configure 2017-01-08 19:42:47.704475698 +0100
@@ -16,6 +16,7 @@
my $manprefix = '';
#my $dgt = 1;

View file

@ -1,5 +1,5 @@
--- ntext.cc.orig 2017-01-05 00:57:16.943420989 +0100
+++ ntext.cc 2017-01-05 00:57:29.321421367 +0100
--- a/ntext.cc 2017-01-05 00:57:16.943420989 +0100
+++ b/ntext.cc 2017-01-05 00:57:29.321421367 +0100
@@ -244,7 +244,7 @@
return;
}

View file

@ -12,7 +12,6 @@ homepage="http://www.bergo.eng.br/eboard"
distfiles="https://github.com/fbergo/eboard/archive/v${version}.tar.gz"
checksum=2a1ba23a27c94ee4ec167bb31ab7dd6eedf148e139c9a96e8cb5ac36ec8423c1
broken="ELF in /usr/share"
patch_args=-Np0
pre_install() {
mkdir -p "${DESTDIR}/usr/share/eboard"

View file

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no
Reason: ffitarget.h no longer defines FFI_SYSV for *nix
--- src/c/ffi.d 2016-12-19 11:25:00.000000000 +0100
+++ src/c/ffi.d 2020-04-25 13:29:05.385149890 +0200
--- a/src/c/ffi.d 2016-12-19 11:25:00.000000000 +0100
+++ b/src/c/ffi.d 2020-04-25 13:29:05.385149890 +0200
@@ -133,8 +133,6 @@
#elif defined(X86_WIN64)
{@':win64', FFI_WIN64},

View file

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no
Reason: Some architectures do not define all of the FE_.. constants
--- src/h/impl/math_fenv.h 2016-12-19 11:25:00.000000000 +0100
+++ src/h/impl/math_fenv.h 2020-04-25 15:36:04.984693324 +0200
--- a/src/h/impl/math_fenv.h 2016-12-19 11:25:00.000000000 +0100
+++ b/src/h/impl/math_fenv.h 2020-04-25 15:36:04.984693324 +0200
@@ -67,8 +67,27 @@
#endif /* !HAVE_FENV_H */
@ -34,8 +34,8 @@ Reason: Some architectures do not define all of the FE_.. constants
# define ECL_MATHERR_TEST do { \
int bits = fetestexcept(ECL_USED_EXCEPTIONS); \
unlikely_if (bits) ecl_deliver_fpe(bits); } while(0)
--- src/c/unixint.d 2016-12-19 11:25:00.000000000 +0100
+++ src/c/unixint.d 2020-04-25 15:57:15.864783964 +0200
--- a/src/c/unixint.d 2016-12-19 11:25:00.000000000 +0100
+++ b/src/c/unixint.d 2020-04-25 15:57:15.864783964 +0200
@@ -655,22 +655,36 @@
#else /* !_MSC_VER */
# if defined(HAVE_FENV_H) & !defined(ECL_AVOID_FENV_H)

View file

@ -14,7 +14,6 @@ license="LGPL-2.1-or-later"
homepage="https://common-lisp.net/project/ecl/"
distfiles="https://common-lisp.net/project/ecl/static/files/release/ecl-${version}.tgz"
checksum=76a585c616e8fa83a6b7209325a309da5bc0ca68e0658f396f49955638111254
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then
# Depend on system ecl

View file

@ -1,5 +1,5 @@
--- src/utils/mount.ecryptfs_private.c 2015-02-10 17:59:34.000000000 +0100
+++ src/utils/mount.ecryptfs_private.c 2015-08-07 15:21:39.847867532 +0200
--- a/src/utils/mount.ecryptfs_private.c 2015-02-10 17:59:34.000000000 +0100
+++ b/src/utils/mount.ecryptfs_private.c 2015-08-07 15:21:39.847867532 +0200
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <ctype.h>

View file

@ -1,8 +1,8 @@
The types uid_t and gid_t are defined in <unistd.h>, which
isn't included as a side effect with musl libc.
--- src/utils/io.c 2015-02-10 17:59:34.000000000 +0100
+++ src/utils/io.c 2015-08-07 15:07:56.127793677 +0200
--- a/src/utils/io.c 2015-02-10 17:59:34.000000000 +0100
+++ b/src/utils/io.c 2015-08-07 15:07:56.127793677 +0200
@@ -26,6 +26,7 @@
#include <string.h>
#include <termios.h>
@ -11,8 +11,8 @@ isn't included as a side effect with musl libc.
#include <errno.h>
#include <sys/mman.h>
#include "ecryptfs.h"
--- src/utils/mount.ecryptfs.c 2015-03-10 17:45:52.000000000 +0100
+++ src/utils/mount.ecryptfs.c 2015-08-07 15:15:28.411834229 +0200
--- a/src/utils/mount.ecryptfs.c 2015-03-10 17:45:52.000000000 +0100
+++ b/src/utils/mount.ecryptfs.c 2015-08-07 15:15:28.411834229 +0200
@@ -23,6 +23,7 @@
#include <errno.h>

View file

@ -1,6 +1,6 @@
=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000
+++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000
--- a/src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000
+++ b/src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000
@@ -50,6 +50,20 @@
#include "../include/ecryptfs.h"
#include "../include/decision_graph.h"

View file

@ -17,7 +17,6 @@ homepage="http://ecryptfs.org/"
distfiles="http://launchpad.net/ecryptfs/trunk/${version}/+download/${pkgname}_${version}.orig.tar.gz"
checksum=112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f
lib32disabled=yes
patch_args=-Np0
CPPFLAGS="-D_FILE_OFFSET_BITS=64 -I${XBPS_CROSS_BASE}/usr/include/python2.7"

View file

@ -1,5 +1,5 @@
--- src/widgets/QDisassemblyView.cpp 2020-04-10 21:07:19.000000000 +0200
+++ src/widgets/QDisassemblyView.cpp 2020-09-01 01:29:20.286597335 +0200
--- a/src/widgets/QDisassemblyView.cpp 2020-04-10 21:07:19.000000000 +0200
+++ b/src/widgets/QDisassemblyView.cpp 2020-09-01 01:29:20.286597335 +0200
@@ -40,6 +40,7 @@
#include <QElapsedTimer>
#include <QMouseEvent>

View file

@ -2,8 +2,8 @@ Source: maxice8
Upstream: no
Reason: fixes compilation by avoiding using __ptrace_request as an enum.
--- plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
+++ plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
--- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
@@ -33,6 +33,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <sys/ptrace.h>
#include <sys/user.h>

View file

@ -1,5 +1,5 @@
--- include/ByteShiftArray.h.orig 2019-08-16 23:27:51.186731499 +0200
+++ include/ByteShiftArray.h 2019-08-16 23:28:15.909729902 +0200
--- a/include/ByteShiftArray.h 2019-08-16 23:27:51.186731499 +0200
+++ b/include/ByteShiftArray.h 2019-08-16 23:28:15.909729902 +0200
@@ -22,6 +22,7 @@
#include "API.h"
#include <QVector>

View file

@ -13,4 +13,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/eteran/edb-debugger"
distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tgz"
checksum=86df4a0940a39c1480a6fc789f167f94e87a7a330f2d8163fe871f42c754afe8
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- src/efibootmgr.c
+++ src/efibootmgr.c
--- a/src/efibootmgr.c
+++ b/src/efibootmgr.c
@@ -1239,7 +1239,7 @@ usage()
printf("\t --ip-origin { {dhcp|static} | { static|stateless|stateful} }\n");
#endif

View file

@ -1,5 +1,5 @@
--- src/efibootmgr.c 2019-01-16 16:38:24.694719888 +0100
+++ src/efibootmgr.c 2019-01-16 16:39:35.773715651 +0100
--- a/src/efibootmgr.c 2019-01-16 16:38:24.694719888 +0100
+++ b/src/efibootmgr.c 2019-01-16 16:39:35.773715651 +0100
@@ -1536,9 +1536,6 @@
"invalid numeric value %s\n",
optarg);

View file

@ -11,7 +11,6 @@ homepage="https://github.com/rhinstaller/efibootmgr"
distfiles="https://github.com/rhinstaller/efibootmgr/releases/download/${version}/${pkgname}-${version}.tar.bz2"
distfiles="https://github.com/rhboot/efibootmgr/archive/${version}.tar.gz"
checksum=22a95ebe0d5c9fb2915b3a100450f8f37484d1dbb8b296f55b343cc84f10397d
patch_args=-Np0
conf_files="/etc/default/efibootmgr-kernel-hook"

View file

@ -1,7 +1,7 @@
Use release-type parameters even with buildtype=plain.
--- src/lib/eina/meson.build
+++ src/lib/eina/meson.build
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -205,7 +205,7 @@ if get_option('buildtype') == 'debug'
debug_threads=true
default_mempool=true

View file

@ -56,7 +56,6 @@ changelog="https://git.enlightenment.org/core/efl.git/plain/NEWS"
distfiles="https://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.xz"
checksum=351ca0211ca000234527a503585f039f985607ec9439e34b49d8b8bbf35a7e6b
make_check=extended
patch_args=-Np0
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -Dbuild-tests=true"

View file

@ -33,7 +33,6 @@ distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electro
checksum="d75b78107656ef854cc99a967b225eeb1e5989c0a1307d9efad3f8039d387cd8
e018547e54566410fb365d9f3dae10037c30fca5debe6ba8baceef3ad3b03d28
dcd0a1e619ff326399ca8fd87f61c255f4d1e9bff47860064993f01e4ff37fe1"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;

View file

@ -34,7 +34,6 @@ distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electro
checksum="1b4073baa3e93bb410591688b7ca6e59201ae9c8cf18f05e5a05ecfd7ffebfc8
1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b
bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in
ppc64*-musl) makedepends+=" libucontext-devel" ;;

View file

@ -1,5 +1,5 @@
--- src/basic/user-util.h
+++ src/basic/user-util.h
--- a/src/basic/user-util.h
+++ b/src/basic/user-util.h
@@ -70,8 +70,8 @@ int take_etc_passwd_lock(const char *root);
#define UID_INVALID ((uid_t) -1)
#define GID_INVALID ((gid_t) -1)

View file

@ -1,5 +1,5 @@
--- src/basic/missing_syscall.h 2021-01-15 08:12:02.000000000 +0100
+++ src/basic/missing_syscall.h 2021-02-24 07:20:32.026355819 +0100
--- a/src/basic/missing_syscall.h 2021-01-15 08:12:02.000000000 +0100
+++ b/src/basic/missing_syscall.h 2021-02-24 07:20:32.026355819 +0100
@@ -11,7 +11,7 @@
#include <sys/wait.h>
#include <unistd.h>

View file

@ -9,8 +9,8 @@ Subject: [PATCH] fix ppc64 arch tuple
diff --git src/basic/architecture.h src/basic/architecture.h
index 620b522..3ea6e52 100644
--- src/basic/architecture.h
+++ src/basic/architecture.h
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -77,7 +77,7 @@ int uname_architecture(void);
#elif defined(__powerpc64__)
# if __BYTE_ORDER == __BIG_ENDIAN

View file

@ -9,8 +9,8 @@ Subject: [PATCH] add ppcle arch tuple
diff --git src/basic/architecture.h src/basic/architecture.h
index 620b522..afdff7a 100644
--- src/basic/architecture.h
+++ src/basic/architecture.h
--- a/src/basic/architecture.h
+++ b/src/basic/architecture.h
@@ -94,7 +94,7 @@ int uname_architecture(void);
# endif
# else

View file

@ -22,7 +22,6 @@ checksum=dd2fcf22a89a078cad22e633d2f14a4cc9f4a9c8bae25c0e39fc4aec3e273bc9
conf_files="/etc/elogind/*.conf"
# tests fail differently due to containerization and kernel features
make_check=ci-skip
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Dutmp=false"

View file

@ -1,5 +1,5 @@
--- configure.ac.old 2017-07-24 11:11:08.588672399 -0700
+++ configure.ac 2017-07-24 11:51:52.841737854 -0700
--- a/configure.ac.old 2017-07-24 11:11:08.588672399 -0700
+++ b/configure.ac 2017-07-24 11:51:52.841737854 -0700
@@ -132,8 +132,12 @@
AC_MSG_NOTICE([Using decorator interface version ${decor_ver}])
],

View file

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="https://github.com/compiz-reloaded"
distfiles="https://github.com/compiz-reloaded/emerald/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=53112b557c0d726ad75450b69df1649412ab5fcdf6c0827e383889f58bf437b1
patch_args=-Np0
pre_configure() {
mkdir -p m4

View file

@ -1,5 +1,5 @@
--- source/Panel.h 2021-01-17 14:25:52.952063261 +0100
+++ source/Panel.h 2021-01-17 14:29:26.466536974 +0100
--- a/source/Panel.h 2021-01-17 14:25:52.952063261 +0100
+++ b/source/Panel.h 2021-01-17 14:29:26.466536974 +0100
@@ -15,6 +15,7 @@
#include "Rectangle.h"

View file

@ -1,5 +1,5 @@
--- SConstruct.old 2017-12-06 12:54:20.524502000 -0800
+++ SConstruct 2017-12-12 12:39:21.764384877 -0800
--- a/SConstruct.old 2017-12-06 12:54:20.524502000 -0800
+++ b/SConstruct 2017-12-12 12:39:21.764384877 -0800
@@ -18,7 +18,7 @@
env.Append(LINKFLAGS = ["-static-libstdc++"])

View file

@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/SolraBizna/endless-sky"
distfiles="https://github.com/SolraBizna/endless-sky/archive/${_commit}.tar.gz"
checksum=46918d0cc35aaeb1219194099223e3338245aa04aa3f29fd76e3376bf5779376
patch_args=-Np0
endless-sky-gl21-data_package() {
short_desc+=" - data files"

View file

@ -1,5 +1,5 @@
--- SConstruct
+++ SConstruct
--- a/SConstruct
+++ b/SConstruct
@@ -41,7 +41,7 @@
PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate),
PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate),

View file

@ -1,5 +1,5 @@
--- source/Panel.h 2020-05-01 21:02:38.000000000 +0200
+++ source/Panel.h 2020-09-05 07:34:01.667091079 +0200
--- a/source/Panel.h 2020-05-01 21:02:38.000000000 +0200
+++ b/source/Panel.h 2020-09-05 07:34:01.667091079 +0200
@@ -15,6 +15,7 @@
#include "Rectangle.h"

View file

@ -12,4 +12,3 @@ homepage="http://endless-sky.github.io/"
distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz"
checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d
replaces="endless-sky-data>=0"
patch_args=-Np0

View file

@ -1,6 +1,6 @@
diff --git caja/caja-engrampa.c caja/caja-engrampa.c
--- caja/caja-engrampa.c
+++ caja/caja-engrampa.c
--- a/caja/caja-engrampa.c
+++ b/caja/caja-engrampa.c
@@ -191,7 +191,8 @@ static struct {
{ "application/x-zip", TRUE },
{ "application/x-zip-compressed", TRUE },
@ -12,8 +12,8 @@ diff --git caja/caja-engrampa.c caja/caja-engrampa.c
{ "application/zip", TRUE },
{ "multipart/x-zip", TRUE },
diff --git configure.ac configure.ac
--- configure.ac
+++ configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ AC_ARG_ENABLE([magic],
AS_HELP_STRING([--enable-magic], [use libmagic to detect file type]),,
[enable_magic=no])
@ -81,8 +81,8 @@ diff --git configure.ac configure.ac
AC_ARG_VAR([CPIO], [Path to the `cpio` command])
AC_PATH_PROGS(CPIO, gcpio cpio, cpio)
diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
--- data/engrampa.desktop.in.in
+++ data/engrampa.desktop.in.in
--- a/data/engrampa.desktop.in.in
+++ b/data/engrampa.desktop.in.in
@@ -11,7 +11,7 @@ Type=Application
Icon=engrampa
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
@ -93,8 +93,8 @@ diff --git data/engrampa.desktop.in.in data/engrampa.desktop.in.in
Keywords=MATE;archive;manager;compression;
X-MATE-DocPath=engrampa/engrampa.xml
diff --git src/fr-command-cfile.c src/fr-command-cfile.c
--- src/fr-command-cfile.c
+++ src/fr-command-cfile.c
--- a/src/fr-command-cfile.c
+++ b/src/fr-command-cfile.c
@@ -301,7 +301,8 @@ fr_command_cfile_add (FrCommand *comm,
compressed_filename = g_strconcat (filename, ".rz", NULL);
}
@ -156,8 +156,8 @@ diff --git src/fr-command-cfile.c src/fr-command-cfile.c
return NULL;
diff --git src/fr-init.c src/fr-init.c
--- src/fr-init.c
+++ src/fr-init.c
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -108,7 +108,8 @@ FrMimeTypeDescription mime_type_desc[] = {
{ "application/x-xz", ".xz", N_("Xz compressed file"), 0 },
{ "application/x-xz-compressed-tar", ".tar.xz", N_("Tar compressed with xz"), 0 },

View file

@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=ee280d288c974732ec7bc2d1c3e18fa563b33a30f3e4cb3e976ebc71be6c4674
patch_args=-Np0
pre_configure() {
autoreconf -fi

View file

@ -1,5 +1,5 @@
--- src/lev/Proxy.cc 2014-12-19 22:24:37.000000000 +0100
+++ src/lev/Proxy.cc 2017-09-01 16:55:50.009413332 +0200
--- a/src/lev/Proxy.cc 2014-12-19 22:24:37.000000000 +0100
+++ b/src/lev/Proxy.cc 2017-09-01 16:55:50.009413332 +0200
@@ -933,7 +933,7 @@
} else if (haveLocalCopy) {
// plain file

View file

@ -1,8 +1,8 @@
We can't assign to *stdout and *stderr with musl libc
because both file pointers are const.
--- src/main.cc 2014-12-19 22:24:38.000000000 +0100
+++ src/main.cc 2015-11-19 13:53:23.419299858 +0100
--- a/src/main.cc 2014-12-19 22:24:38.000000000 +0100
+++ b/src/main.cc 2015-11-19 13:53:23.419299858 +0100
@@ -301,21 +301,25 @@
if (ap.redirect) {
FILE *newfp;

View file

@ -1,8 +1,8 @@
Do not check for SDL_ttf version because it fails when
cross compiling.
--- configure.ac 2014-12-19 22:26:06.000000000 +0100
+++ configure.ac 2015-11-19 12:08:46.996789539 +0100
--- a/configure.ac 2014-12-19 22:26:06.000000000 +0100
+++ b/configure.ac 2015-11-19 12:08:46.996789539 +0100
@@ -176,19 +176,6 @@
dnl ----------------------------------------
dnl Check for SDL_ttf library

View file

@ -12,7 +12,6 @@ homepage="http://www.nongnu.org/enigma/"
distfiles="${SOURCEFORGE_SITE}/enigma-game/Release%20${version}/${pkgname}-${version}.tar.gz"
checksum=d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01
replaces="enigma-data>=0"
patch_args=-Np0
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/SDL"

View file

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no
Reason: variable name 'mips' clashes with target system headers
--- src/bin/e_wallpaper_gen_main.c 2020-05-31 20:22:37.495587000 +0200
+++ src/bin/e_wallpaper_gen_main.c 2020-11-09 17:21:27.533538646 +0100
--- a/src/bin/e_wallpaper_gen_main.c 2020-05-31 20:22:37.495587000 +0200
+++ b/src/bin/e_wallpaper_gen_main.c 2020-11-09 17:21:27.533538646 +0100
@@ -85,33 +85,33 @@
{
int i, j = 0;

View file

@ -20,7 +20,6 @@ checksum=be18e2f18d6c0b058f633e769863d3cbc4c07b629058ae670dec74cd7906dff1
lib32disabled=yes
build_options="wayland"
build_options_default="wayland"
patch_args=-Np0
if [ "$CROSS_BUILD" -a "$build_option_wayland" ]; then
hostmakedepends+=" wayland-devel"

View file

@ -1,5 +1,5 @@
--- missing/kqueue_inotify.c 2020-01-02 21:20:12.000000000 +0100
+++ - 2020-02-15 16:35:42.567901553 +0100
--- a/missing/kqueue_inotify.c 2020-01-02 21:20:12.000000000 +0100
+++ b/missing/kqueue_inotify.c 2020-01-02 21:20:12.000000000 +0100
@@ -16,6 +16,7 @@
#include <sys/inotify.h>
#include <sys/event.h>

View file

@ -10,7 +10,6 @@ homepage="http://entrproject.org"
changelog="https://raw.githubusercontent.com/eradman/entr/master/NEWS"
distfiles="$homepage/code/$pkgname-$version.tar.gz"
checksum=e256a4d2fbe46f6132460833ba447e65d7f35ba9d0b265e7c4150397cc4405a2
patch_args=-Np0
post_extract() {
case "$XBPS_TARGET_MACHINE" in

View file

@ -1,5 +1,5 @@
--- CMakeLists.txt 2020-09-20 23:03:04.000000000 +0200
+++ - 2021-02-08 16:29:03.621982747 +0100
--- a/CMakeLists.txt 2020-09-20 23:03:04.000000000 +0200
+++ b/CMakeLists.txt 2020-09-20 23:03:04.000000000 +0200
@@ -22,8 +22,8 @@
include_directories ( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
find_package ( Qt5Core REQUIRED )

View file

@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.com/sdcofer70/enyo-doom"
distfiles="https://gitlab.com/sdcofer70/enyo-doom/-/archive/${version}/enyo-doom-${version}.tar.bz2"
checksum=03d490081753dfd1d40b7cc8142b8f0e7642bad6f3d724f9ba9cfad0253f1a34
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"

View file

@ -1,5 +1,5 @@
--- python-webextension/meson.build.orig
+++ python-webextension/meson.build
--- a/python-webextension/meson.build
+++ b/python-webextension/meson.build
@@ -2,7 +2,7 @@
webkitextension = dependency('webkit2gtk-web-extension-4.0')

View file

@ -15,4 +15,3 @@ license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Eolie"
distfiles="https://gitlab.gnome.org/World/eolie/uploads/${_eolie_hash}/eolie-${version}.tar.xz"
checksum=9da359895306cf5929a01acb60d1506afb0a04ddbbd0d80ae1d0ba831e34671b
patch_args=-Np0

View file

@ -12,8 +12,8 @@ git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-9
diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx
index df5d75f..63b3513 100644
--- src/PDFDocument.cxx
+++ src/PDFDocument.cxx
--- a/src/PDFDocument.cxx
+++ b/src/PDFDocument.cxx
@@ -20,6 +20,7 @@
#include <time.h>
#include <poppler.h>

View file

@ -1,5 +1,5 @@
--- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700
+++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700
--- a/data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700
+++ b/data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700
@@ -7,7 +7,7 @@
GenericName=PDF Viewer
GenericName[ca]=Visor PDF

View file

@ -1,7 +1,7 @@
diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h
index c142a7a..58fcf2e 100644
--- src/gtk/StockIcons.h
+++ src/gtk/StockIcons.h
--- a/src/gtk/StockIcons.h
+++ b/src/gtk/StockIcons.h
@@ -18,7 +18,7 @@
#if !defined (__STOCK_ICONS_H__)
#define __STOCK_ICONS_H__

View file

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="http://freshmeat.sourceforge.net/projects/epdfview"
distfiles="http://anduin.linuxfromscratch.org/BLFS/epdfview/epdfview-${version}.tar.bz2"
checksum=948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0
patch_args=-Np0
post_install() {
for f in 24 32 48; do

View file

@ -1,5 +1,5 @@
--- src/filter.c
+++ src/filter.c
--- a/src/filter.c
+++ b/src/filter.c
@@ -45,6 +45,7 @@
#include "libprtX.h"
#include "optBase.h"

View file

@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
distfiles="https://download3.ebz.epson.net/dsc/f/03/00/10/49/18/f3016be6120a7271a6d9cb64872f817bce1920b8/${pkgname}-${version}-1lsb3.2.tar.gz"
checksum=8d964368a1395a8902b8637e3dc176d6793f0afdfe3f21e95509f29894700d4e
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
+++ Makefile 2020-12-15 20:41:07.473982625 -0500
--- a/Makefile 2020-12-15 20:40:30.660983776 -0500
+++ b/Makefile 2020-12-15 20:41:07.473982625 -0500
@@ -6,7 +6,7 @@
WARNFLAGS = -Wall
CFLAGS += ${DEPFLAGS} ${WARNFLAGS}

View file

@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
patch_args=-Np0
post_install() {
vsv espeakup

View file

@ -1,5 +1,5 @@
--- doc/eukleides.texi 2010-04-27 06:31:00 UTC
+++ doc/eukleides.texi
--- a/doc/eukleides.texi 2010-04-27 06:31:00 UTC
+++ b/doc/eukleides.texi
@@ -6,12 +6,14 @@
% ------------------------------------------------------------------------------

View file

@ -12,7 +12,6 @@ homepage="http://www.eukleides.org/"
distfiles="http://www.eukleides.org/files/${pkgname}-${version}.tar.bz2"
checksum=18c489460cb2cb98f4ea9c0187519ef77b4422117fd43bcd4e4836580ef40c69
disable_parallel_build=yes
patch_args=-Np0
CFLAGS="-fcommon"

View file

@ -9,8 +9,8 @@ Subject: [PATCH] musl build fix
diff --git tools/find_event_devices.c tools/find_event_devices.c
index 2a43d54..70314e8 100644
--- tools/find_event_devices.c
+++ tools/find_event_devices.c
--- a/tools/find_event_devices.c
+++ b/tools/find_event_devices.c
@@ -32,7 +32,7 @@
#include <sys/stat.h>
#include <fcntl.h>

View file

@ -1,5 +1,5 @@
--- src/evemu.c 2017-06-02 10:02:09.000000000 +0200
+++ src/evemu.c 2020-12-11 16:11:53.764932154 +0100
--- a/src/evemu.c 2017-06-02 10:02:09.000000000 +0200
+++ b/src/evemu.c 2020-12-11 16:11:53.764932154 +0100
@@ -53,6 +53,7 @@
#include <ctype.h>
#include <unistd.h>

View file

@ -11,7 +11,6 @@ license="LGPL-3.0-only, MIT"
homepage="https://freedesktop.org/wiki/Evemu/"
distfiles=${FREEDESKTOP_SITE}/evemu/evemu-$version.tar.xz
checksum=78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379
patch_args=-Np0
post_install() {
sed -n '/Copyright/,/IN THE SOFTWARE/p' src/evemu.c >LICENSE

View file

@ -1,8 +1,8 @@
camel-gen-tables and gen-western-table are executed in the build process so
they need to be built for the host architecture
--- src/camel/CMakeLists.txt.orig 2018-10-27 15:24:42.168166299 +0200
+++ src/camel/CMakeLists.txt 2018-10-27 15:37:04.341765727 +0200
--- a/src/camel/CMakeLists.txt.orig 2018-10-27 15:24:42.168166299 +0200
+++ b/src/camel/CMakeLists.txt 2018-10-27 15:37:04.341765727 +0200
@@ -1,17 +1,10 @@
glib_mkenums(camel-enumtypes camel-enums.h CAMEL_ENUMTYPES_H)
@ -24,8 +24,8 @@ they need to be built for the host architecture
set(SOURCES
--- src/addressbook/libebook-contacts/CMakeLists.txt.orig 2018-10-27 15:42:14.644088211 +0200
+++ src/addressbook/libebook-contacts/CMakeLists.txt 2018-10-27 15:45:43.359285829 +0200
--- a/src/addressbook/libebook-contacts/CMakeLists.txt.orig 2018-10-27 15:42:14.644088211 +0200
+++ b/src/addressbook/libebook-contacts/CMakeLists.txt 2018-10-27 15:45:43.359285829 +0200
@@ -2,31 +2,12 @@
add_pkgconfig_file(libebook-contacts.pc.in libebook-contacts-${API_VERSION}.pc)

View file

@ -1,5 +1,5 @@
--- cmake/modules/GObjectIntrospection.cmake
+++ cmake/modules/GObjectIntrospection.cmake
--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -122,7 +122,7 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")

View file

@ -20,7 +20,6 @@ homepage="https://wiki.gnome.org/Apps/Evolution"
changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-38/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418
patch_args=-Np0
build_options="gir"
build_options_default="gir"

View file

@ -1,5 +1,5 @@
--- CMakeLists.txt 2017-03-20 03:14:35.000000000 -0600
+++ CMakeLists.txt 2017-04-06 15:05:22.473504016 -0600
--- a/CMakeLists.txt 2017-03-20 03:14:35.000000000 -0600
+++ b/CMakeLists.txt 2017-04-06 15:05:22.473504016 -0600
@@ -350,10 +350,6 @@
CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
unset(CMAKE_REQUIRED_LIBRARIES)

View file

@ -22,7 +22,6 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=9b4c31352332fb9dc0ff23625ba1552c13808f1c9ba019496b750be87e07a5fd
shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so"
patch_args=-Np0
evolution-devel_package() {
depends="webkit2gtk-devel gtk+3-devel libglib-devel evolution-data-server-devel

View file

@ -22,8 +22,8 @@ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git evtest.c evtest.c
index 37d4f85..548c203 100644
--- evtest.c
+++ evtest.c
--- a/evtest.c
+++ b/evtest.c
@@ -56,6 +56,7 @@
#include <getopt.h>
#include <ctype.h>

View file

@ -1,5 +1,5 @@
--- evtest.c 2019-08-02 20:14:30.000000000 +0200
+++ evtest.c 2020-12-11 15:33:15.895384954 +0100
--- a/evtest.c 2019-08-02 20:14:30.000000000 +0200
+++ b/evtest.c 2020-12-11 15:33:15.895384954 +0100
@@ -1139,7 +1139,7 @@
type = ev[i].type;
code = ev[i].code;

View file

@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
homepage="https://cgit.freedesktop.org/evtest/"
distfiles="https://cgit.freedesktop.org/evtest/snapshot/evtest-${version}.tar.xz"
checksum=e49f1f160b30c8f7c2a4caef5ab655f1caf816483d19fdedd6db2d251d7ab80e
patch_args=-Np0
pre_configure() {
autoreconf -fi

View file

@ -1,5 +1,5 @@
--- config.h 2005-02-19 05:25:39.000000000 -0500
+++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500
--- a/config.h 2005-02-19 05:25:39.000000000 -0500
+++ b/config.h.fixed 2010-01-04 22:02:01.000000000 -0500
@@ -95,8 +95,8 @@
#define TUBESIZE 6000 /* Maximum screen size for visual */
#else /* VMUNIX */

View file

@ -1,5 +1,5 @@
--- ex_tty.c 2005-03-04 13:42:58.000000000 +0100
+++ ex_tty.c 2009-06-25 20:06:57.000000000 +0200
--- a/ex_tty.c 2005-03-04 13:42:58.000000000 +0100
+++ b/ex_tty.c 2009-06-25 20:06:57.000000000 +0200
@@ -132,7 +132,8 @@
&ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9,
&HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL,
@ -33,8 +33,8 @@
sp = sstrs;
do {
string = tgetstr(namp, &aoftspace);
--- ex_tty.h 2004-12-01 19:21:06.000000000 +0100
+++ ex_tty.h 2009-06-25 20:06:05.000000000 +0200
--- a/ex_tty.h 2004-12-01 19:21:06.000000000 +0100
+++ b/ex_tty.h 2009-06-25 20:06:05.000000000 +0200
@@ -183,6 +183,15 @@
var bool XX; /* Tektronix 4025 insert line */
/* X? is reserved for severely nauseous glitches */

View file

@ -15,7 +15,6 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/ex-${version}.tar.bz2"
checksum=da4be7cf67e94572463b19e56850aa36dc4e39eb0d933d3688fe8574bb632409
CFLAGS=-I.
disable_parallel_build=yes
patch_args=-Np0
alternatives="
vi:ex:/usr/bin/ex-ex

View file

@ -1,7 +1,7 @@
diff --git exfat_super.c exfat_super.c
index 312de36..262b74d 100644
--- exfat_super.c
+++ exfat_super.c
--- a/exfat_super.c
+++ b/exfat_super.c
@@ -97,6 +97,11 @@ static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE;
static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;

View file

@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
homepage="https://github.com/dorimanx/exfat-nofuse"
distfiles="https://github.com/dorimanx/exfat-nofuse/archive/${_commit}.tar.gz"
checksum=b88a98f0a7e1b987465f5ccfcafb384b293506c7fec9d3b91b803e0fe5b16e0a
patch_args=-Np0
dkms_modules="exfat ${version}"
depends="dkms"

View file

@ -1,5 +1,5 @@
--- libexfat/platform.h.orig 2015-08-17 23:32:56.701648786 +0200
+++ libexfat/platform.h 2015-08-17 23:33:04.219648224 +0200
--- a/libexfat/platform.h 2015-08-17 23:32:56.701648786 +0200
+++ b/libexfat/platform.h 2015-08-17 23:33:04.219648224 +0200
@@ -57,7 +57,14 @@
#define EXFAT_BIG_ENDIAN _BIG_ENDIAN

View file

@ -9,4 +9,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/relan/exfat"
distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
checksum=dfebd07a7b907e2d603d3a9626e6440bd43ec6c4e8c07ccfc57ce9502b724835
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- configure.ac.orig
+++ configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -137,22 +137,29 @@ AC_FUNC_MMAP()
dnl ***************************************
dnl *** Check for strftime() extensions ***

View file

@ -13,7 +13,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
checksum=4e89f5536afbf1cb9191cceb720fb2764df1a4fae3459512b7320841ab5a9e9d
patch_args=-Np0
pre_configure() {
if [ "$CROSS_BUILD" ]; then

View file

@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
diff --git configure.in configure.in
index aa6fd6e..ad8db32 100755
--- configure.in
+++ configure.in
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,8 @@ TEA_INIT([3.9])
AC_CONFIG_AUX_DIR(tclconfig)

View file

@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
diff --git configure.in configure.in
index ad8db32..6570a07 100755
--- configure.in
+++ configure.in
--- a/configure.in
+++ b/configure.in
@@ -469,21 +469,19 @@ memcpy(s1,s2,0);
# and if so that WNOHANG is not defined. The only place I've
# seen this is ISC.

View file

@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
diff --git configure.in configure.in
index 6570a07..0e4c9d1 100755
--- configure.in
+++ configure.in
--- a/configure.in
+++ b/configure.in
@@ -486,6 +486,25 @@ AC_LANG_PROGRAM([[
AC_MSG_CHECKING([if any value exists for WNOHANG])

View file

@ -5,8 +5,8 @@ From: Đoàn Trần Công Danh <congdanhqx@gmail.com>
diff --git configure.in configure.in
index 0e4c9d1..d41a7a4 100755
--- configure.in
+++ configure.in
--- a/configure.in
+++ b/configure.in
@@ -732,20 +732,17 @@ fi
# first check for the pure bsd

View file

@ -1,6 +1,6 @@
diff -up exp_log.c.orig exp_log.c
--- exp_log.c.orig 2013-12-12 12:43:38.527854189 +0100
+++ exp_log.c 2013-12-12 12:49:26.866576387 +0100
--- a/exp_log.c 2013-12-12 12:43:38.527854189 +0100
+++ b/exp_log.c 2013-12-12 12:49:26.866576387 +0100
@@ -176,7 +176,7 @@ expStdoutLog TCL_VARARGS_DEF(int,arg1)
if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) return;

View file

@ -14,7 +14,6 @@ license="Public Domain"
homepage="http://www.nist.gov/el/msid/expect.cfm"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz"
checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
patch_args=-Np0
alternatives="
mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd

View file

@ -15,8 +15,8 @@ Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake
index dfa29f7..f50911c 100644
--- kde-modules/KDECompilerSettings.cmake
+++ kde-modules/KDECompilerSettings.cmake
--- a/kde-modules/KDECompilerSettings.cmake
+++ b/kde-modules/KDECompilerSettings.cmake
@@ -140,6 +140,9 @@ if (UNIX)
# implementation recognize it?
_kde_add_platform_definitions(-D_LARGEFILE64_SOURCE)

View file

@ -14,7 +14,6 @@ homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=72b7f3b3917f3208fff10f0402b0fa3a65815aca924f0f94a4f96383d8e0f81e
python_version=3
patch_args=-Np0
do_check() {
cd build

View file

@ -1,5 +1,5 @@
--- src/insertionops.cc
+++ src/insertionops.cc
--- a/src/insertionops.cc
+++ b/src/insertionops.cc
@@ -33,7 +33,7 @@ std::ostream& operator<<(std::ostream& o
os << "File flags: " << inode.i_flags << std::endl;
os << "File version (for NFS): " << inode.i_generation << std::endl;

View file

@ -10,4 +10,3 @@ license="GPL-2.0-only"
homepage="http://extundelete.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4
patch_args=-Np0