snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

srcpkgs/z*: convert patches to -Np1 

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
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 ad877a7e29
commit e2a21ccfd6
48 changed files with 116 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcpkgs/z3/patches/ocaml.patch
View File

@ -1,7 +1,7 @@
Does not use ocamlfind, so this fails on nums.cmxa.
--- scripts/mk_project.py.orig
+++ scripts/mk_project.py
--- a/scripts/mk_project.py
+++ b/scripts/mk_project.py
@@ -101,7 +101,6 @@
add_c_example('maxsat')
add_dotnet_example('dotnet_example', 'dotnet')

1
srcpkgs/z3/template
View File

@ -16,7 +16,6 @@ license="MIT"
homepage="https://github.com/Z3Prover/z3"
distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
checksum=99e912b9af76a17f8827f89afcf4da117736f3877a8bbdd737c548c6541009d7
patch_args=-Np0
build_options="ocaml"
desc_option_ocaml="Enable support for OCaml bindings"

4
srcpkgs/z80ex/patches/fix-cflags.patch
View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ option (OPSTEP_FAST_AND_ROUGH "Fast and
#ALL_CFLAGS := -fPIC -fno-common -ansi -pedantic -Wall -pipe -O2 -I. -I./include

1
srcpkgs/z80ex/template
View File

@ -9,7 +9,6 @@ license="GPL-2.0-only"
homepage="https://sourceforge.net/projects/z80ex/"
distfiles="${SOURCEFORGE_SITE}/project/z80ex/z80ex/${version}/z80ex-${version}.tar.gz"
checksum=6f5e521d068a614b41e10180ad4ae45b1bc258ec28c962543feb9078856c2530
patch_args=-Np0
z80ex-devel_package() {
short_desc+=" - development files"

4
srcpkgs/zabbix/patches/fix-libxml2_m4.patch
View File

@ -1,5 +1,5 @@
--- m4/libxml2.m4 2020-05-10 19:36:06.000000000 +0200
+++ m4/libxml2.m4 2020-07-24 07:58:12.642619506 +0200
--- a/m4/libxml2.m4 2020-05-10 19:36:06.000000000 +0200
+++ b/m4/libxml2.m4 2020-07-24 07:58:12.642619506 +0200
@@ -52,7 +52,7 @@
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
PKG_PROG_PKG_CONFIG()

1
srcpkgs/zabbix/template
View File

@ -23,7 +23,6 @@ conf_files="/etc/zabbix_server.conf"
system_accounts="_zabbix_server"
system_groups="_zabbix_server"
make_dirs="/var/log/zabbix-server 0750 _zabbix_server _zabbix_server"
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then
# configure scripts is bad at checking, problably runs code instead of

4
srcpkgs/zaz/patches/Makefile.in.patch
View File

@ -1,5 +1,5 @@
--- src/Makefile.in.orig 2019-12-31 19:44:51.375524565 +0100
+++ src/Makefile.in 2019-12-31 19:45:06.273524051 +0100
--- a/src/Makefile.in 2019-12-31 19:44:51.375524565 +0100
+++ b/src/Makefile.in 2019-12-31 19:45:06.273524051 +0100
@@ -273,7 +273,7 @@
splash.cpp

1
srcpkgs/zaz/template
View File

@ -13,4 +13,3 @@ homepage="http://zaz.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=e332cc1a6559e18a2b632940c53d20e2f2d2b583ba9dc1fd02a586437f9f0397
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
patch_args=-Np0

8
srcpkgs/zbackup/patches/cmake-build-type-none.patch
View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@ project( zbackup )
set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" )
@ -13,8 +13,8 @@ Index: CMakeLists.txt
Index: tartool/CMakeLists.txt
===================================================================
--- tartool/CMakeLists.txt.orig
+++ tartool/CMakeLists.txt
--- a/tartool/CMakeLists.txt
+++ b/tartool/CMakeLists.txt
@@ -4,8 +4,6 @@
cmake_minimum_required( VERSION 2.6.0 )
project( tartool )

1
srcpkgs/zbackup/template
View File

@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
homepage="http://zbackup.org/"
distfiles="https://github.com/zbackup/zbackup/archive/${version}.tar.gz"
checksum=efccccd2a045da91576c591968374379da1dc4ca2e3dec4d3f8f12628fa29a85
patch_args=-Np0

4
srcpkgs/zbar/patches/python-3.9.patch
View File

@ -24,8 +24,8 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
diff --git python/enum.c python/enum.c
index a113553..dfe1b1e 100644
--- python/enum.c
+++ python/enum.c
--- a/python/enum.c
+++ b/python/enum.c
@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
return(self->name);
}

1
srcpkgs/zbar/template
View File

@ -16,7 +16,6 @@ license="LGPL-2.1-or-later"
homepage="https://git.linuxtv.org/zbar.git/"
distfiles="https://linuxtv.org/downloads/zbar/${pkgname}-${version}.tar.bz2"
checksum=dad260b47ef887a639e840a89e5e6e132217b6bba2a8473565d1f459bcb97c1f
patch_args=-Np0
build_options="qt"
case "$XBPS_TARGET_MACHINE" in

4
srcpkgs/zeal/patches/qt5-5.15.0.patch
View File

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no
Reason: qt5-5.15.0 requires explicit include for QPainterPath
--- src/libs/ui/searchitemdelegate.cpp 2018-09-28 07:26:37.000000000 +0200
+++ src/libs/ui/searchitemdelegate.cpp 2020-07-11 23:11:37.992053122 +0200
--- a/src/libs/ui/searchitemdelegate.cpp 2018-09-28 07:26:37.000000000 +0200
+++ b/src/libs/ui/searchitemdelegate.cpp 2020-07-11 23:11:37.992053122 +0200
@@ -27,6 +27,7 @@
#include <QFontMetrics>
#include <QHelpEvent>

1
srcpkgs/zeal/template
View File

@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="https://zealdocs.org/"
distfiles="https://github.com/zealdocs/zeal/archive/v${version}.tar.gz"
checksum=095c08f9903071849d5c79878abd48237ce1615f16d324afff1873ab6b5f0026
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-qmake"

4
srcpkgs/zeek/patches/highwayhash-still-sucks.patch
View File

@ -9,8 +9,8 @@ Subject: [PATCH] fix highwayhash on ppc/musl
diff --git auxil/highwayhash/highwayhash/arch_specific.cc auxil/highwayhash/highwayhash/arch_specific.cc
index 82d1574..198a82f 100644
--- auxil/highwayhash/highwayhash/arch_specific.cc
+++ auxil/highwayhash/highwayhash/arch_specific.cc
--- a/auxil/highwayhash/highwayhash/arch_specific.cc
+++ b/auxil/highwayhash/highwayhash/arch_specific.cc
@@ -171,15 +171,18 @@ double InvariantTicksPerSecond() {
#if HH_ARCH_PPC
#if __GLIBC__

1
srcpkgs/zeek/template
View File

@ -14,7 +14,6 @@ license="BSD-3-Clause"
homepage="https://www.zeek.org"
distfiles="https://old.zeek.org/downloads/zeek-${version}.tar.gz"
checksum=659a890f433cb730519966bdc41f1a03fb67e27e94b5d52ad9ee890022a12c3a
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-fts-devel musl-legacy-compat"

4
srcpkgs/zerofree/patches/fix-musl.patch
View File

@ -1,5 +1,5 @@
--- zerofree.c
+++ zerofree.c
--- a/zerofree.c
+++ b/zerofree.c
@@ -17,6 +17,7 @@
* Jan Krämer.
*/

1
srcpkgs/zerofree/template
View File

@ -10,7 +10,6 @@ license="GPL-2.0-only"
homepage="https://frippery.org/uml/index.html"
distfiles="https://frippery.org/uml/${pkgname}-${version}.tgz"
checksum=956bc861b55ba0a2b7593c58d32339dab1a0e7da6ea2b813d27c80f08b723867
patch_args=-Np0
post_extract() {
sed -i 's|\(-lext2fs\)|$(LDFLAGS) \1|' Makefile

4
srcpkgs/zfs/patches/dkms.patch
View File

@ -2,8 +2,8 @@
# Avoids recompiling ZFS userland utilities with DKMS rebuilds
# Also short-circuits a useless test for Debian in the DKMS source
--- scripts/dkms.mkconf 2021-01-19 19:19:08.000000000 -0500
+++ scripts/dkms.mkconf 2021-02-02 19:03:02.045984881 -0500
--- a/scripts/dkms.mkconf 2021-01-19 19:19:08.000000000 -0500
+++ b/scripts/dkms.mkconf 2021-02-02 19:03:02.045984881 -0500
@@ -26,22 +26,7 @@
PRE_BUILD="configure
--prefix=/usr

78
srcpkgs/zfs/patches/linux5.12-00.patch
View File

@ -53,7 +53,7 @@ diff --git config/kernel-generic_fillattr.m4 config/kernel-generic_fillattr.m4
new file mode 100644
index 00000000000..50c8031305b
--- /dev/null
+++ config/kernel-generic_fillattr.m4
+++ b/config/kernel-generic_fillattr.m4
@@ -0,0 +1,28 @@
+dnl #
+dnl # 5.12 API
@ -85,8 +85,8 @@ index 00000000000..50c8031305b
+
diff --git config/kernel-inode-create.m4 config/kernel-inode-create.m4
index 9f28bcbd4f7..a6ea11fb61b 100644
--- config/kernel-inode-create.m4
+++ config/kernel-inode-create.m4
--- a/config/kernel-inode-create.m4
+++ b/config/kernel-inode-create.m4
@@ -1,7 +1,25 @@
-dnl #
-dnl # 3.6 API change
@ -144,8 +144,8 @@ index 9f28bcbd4f7..a6ea11fb61b 100644
])
diff --git config/kernel-inode-getattr.m4 config/kernel-inode-getattr.m4
index 48391d66f8b..f62e82f5230 100644
--- config/kernel-inode-getattr.m4
+++ config/kernel-inode-getattr.m4
--- a/config/kernel-inode-getattr.m4
+++ b/config/kernel-inode-getattr.m4
@@ -1,8 +1,29 @@
-dnl #
-dnl # Linux 4.11 API
@ -230,8 +230,8 @@ index 48391d66f8b..f62e82f5230 100644
])
diff --git config/kernel-is_owner_or_cap.m4 config/kernel-is_owner_or_cap.m4
index 3df6163da27..3c3c6ad2240 100644
--- config/kernel-is_owner_or_cap.m4
+++ config/kernel-is_owner_or_cap.m4
--- a/config/kernel-is_owner_or_cap.m4
+++ b/config/kernel-is_owner_or_cap.m4
@@ -11,13 +11,32 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_OWNER_OR_CAPABLE], [
struct inode *ip = NULL;
(void) inode_owner_or_capable(ip);
@ -270,7 +270,7 @@ index 3df6163da27..3c3c6ad2240 100644
diff --git config/kernel-mkdir-umode-t.m4 config/kernel-mkdir-umode-t.m4
deleted file mode 100644
index 19599670df3..00000000000
--- config/kernel-mkdir-umode-t.m4
--- a/config/kernel-mkdir-umode-t.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-dnl #
@ -309,7 +309,7 @@ diff --git config/kernel-mkdir.m4 config/kernel-mkdir.m4
new file mode 100644
index 00000000000..a162bcd880f
--- /dev/null
+++ config/kernel-mkdir.m4
+++ b/config/kernel-mkdir.m4
@@ -0,0 +1,65 @@
+dnl #
+dnl # Supported mkdir() interfaces checked newest to oldest.
@ -380,7 +380,7 @@ diff --git config/kernel-mknod.m4 config/kernel-mknod.m4
new file mode 100644
index 00000000000..ffe45106003
--- /dev/null
+++ config/kernel-mknod.m4
+++ b/config/kernel-mknod.m4
@@ -0,0 +1,30 @@
+AC_DEFUN([ZFS_AC_KERNEL_SRC_MKNOD], [
+ dnl #
@ -414,8 +414,8 @@ index 00000000000..ffe45106003
+])
diff --git config/kernel-rename.m4 config/kernel-rename.m4
index f707391539d..31d199f33bb 100644
--- config/kernel-rename.m4
+++ config/kernel-rename.m4
--- a/config/kernel-rename.m4
+++ b/config/kernel-rename.m4
@@ -1,10 +1,10 @@
-dnl #
-dnl # 4.9 API change,
@ -483,8 +483,8 @@ index f707391539d..31d199f33bb 100644
])
diff --git config/kernel-setattr-prepare.m4 config/kernel-setattr-prepare.m4
index 45408c45c69..24245aa5344 100644
--- config/kernel-setattr-prepare.m4
+++ config/kernel-setattr-prepare.m4
--- a/config/kernel-setattr-prepare.m4
+++ b/config/kernel-setattr-prepare.m4
@@ -1,27 +1,52 @@
-dnl #
-dnl # 4.9 API change
@ -552,7 +552,7 @@ diff --git config/kernel-symlink.m4 config/kernel-symlink.m4
new file mode 100644
index 00000000000..d90366d04b7
--- /dev/null
+++ config/kernel-symlink.m4
+++ b/config/kernel-symlink.m4
@@ -0,0 +1,30 @@
+AC_DEFUN([ZFS_AC_KERNEL_SRC_SYMLINK], [
+ dnl #
@ -586,8 +586,8 @@ index 00000000000..d90366d04b7
+])
diff --git config/kernel-xattr-handler.m4 config/kernel-xattr-handler.m4
index 137bf4a8aff..00b1e74a9cc 100644
--- config/kernel-xattr-handler.m4
+++ config/kernel-xattr-handler.m4
--- a/config/kernel-xattr-handler.m4
+++ b/config/kernel-xattr-handler.m4
@@ -152,6 +152,21 @@ dnl #
dnl # Supported xattr handler set() interfaces checked newest to oldest.
dnl #
@ -696,8 +696,8 @@ index 137bf4a8aff..00b1e74a9cc 100644
])
diff --git config/kernel.m4 config/kernel.m4
index 55620b3daa8..51c7fb926ec 100644
--- config/kernel.m4
+++ config/kernel.m4
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -79,9 +79,9 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
ZFS_AC_KERNEL_SRC_EVICT_INODE
ZFS_AC_KERNEL_SRC_DIRTY_INODE
@ -762,8 +762,8 @@ index 55620b3daa8..51c7fb926ec 100644
dnl #
diff --git include/os/linux/kernel/linux/vfs_compat.h include/os/linux/kernel/linux/vfs_compat.h
index c35e80d31cd..91e908598fb 100644
--- include/os/linux/kernel/linux/vfs_compat.h
+++ include/os/linux/kernel/linux/vfs_compat.h
--- a/include/os/linux/kernel/linux/vfs_compat.h
+++ b/include/os/linux/kernel/linux/vfs_compat.h
@@ -343,7 +343,8 @@ static inline void zfs_gid_write(struct inode *ip, gid_t gid)
/*
* 4.9 API change
@ -809,8 +809,8 @@ index c35e80d31cd..91e908598fb 100644
#endif /* _ZFS_VFS_H */
diff --git include/os/linux/kernel/linux/xattr_compat.h include/os/linux/kernel/linux/xattr_compat.h
index 8348e99198a..54690727eab 100644
--- include/os/linux/kernel/linux/xattr_compat.h
+++ include/os/linux/kernel/linux/xattr_compat.h
--- a/include/os/linux/kernel/linux/xattr_compat.h
+++ b/include/os/linux/kernel/linux/xattr_compat.h
@@ -119,12 +119,27 @@ fn(struct dentry *dentry, const char *name, void *buffer, size_t size, \
#error "Unsupported kernel"
#endif
@ -842,8 +842,8 @@ index 8348e99198a..54690727eab 100644
fn(const struct xattr_handler *handler, struct dentry *dentry, \
diff --git include/os/linux/zfs/sys/zfs_vnops_os.h include/os/linux/zfs/sys/zfs_vnops_os.h
index 1c9cdf7bf8f..ba83f5dd83d 100644
--- include/os/linux/zfs/sys/zfs_vnops_os.h
+++ include/os/linux/zfs/sys/zfs_vnops_os.h
--- a/include/os/linux/zfs/sys/zfs_vnops_os.h
+++ b/include/os/linux/zfs/sys/zfs_vnops_os.h
@@ -56,7 +56,8 @@ extern int zfs_mkdir(znode_t *dzp, char *dirname, vattr_t *vap,
extern int zfs_rmdir(znode_t *dzp, char *name, znode_t *cwd,
cred_t *cr, int flags);
@ -856,8 +856,8 @@ index 1c9cdf7bf8f..ba83f5dd83d 100644
char *tnm, cred_t *cr, int flags);
diff --git include/os/linux/zfs/sys/zpl.h include/os/linux/zfs/sys/zpl.h
index b0bb9c29c0b..21825d1f378 100644
--- include/os/linux/zfs/sys/zpl.h
+++ include/os/linux/zfs/sys/zpl.h
--- a/include/os/linux/zfs/sys/zpl.h
+++ b/include/os/linux/zfs/sys/zpl.h
@@ -171,4 +171,22 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx)
timespec_trunc(ts, (ip)->i_sb->s_time_gran)
#endif
@ -883,8 +883,8 @@ index b0bb9c29c0b..21825d1f378 100644
#endif /* _SYS_ZPL_H */
diff --git module/os/linux/zfs/policy.c module/os/linux/zfs/policy.c
index 8780d7f6c70..bbccb2e572d 100644
--- module/os/linux/zfs/policy.c
+++ module/os/linux/zfs/policy.c
--- a/module/os/linux/zfs/policy.c
+++ b/module/os/linux/zfs/policy.c
@@ -124,7 +124,7 @@ secpolicy_vnode_any_access(const cred_t *cr, struct inode *ip, uid_t owner)
if (crgetfsuid(cr) == owner)
return (0);
@ -896,8 +896,8 @@ index 8780d7f6c70..bbccb2e572d 100644
#if defined(CONFIG_USER_NS)
diff --git module/os/linux/zfs/zfs_vnops_os.c module/os/linux/zfs/zfs_vnops_os.c
index 7484d651c1f..ce0701763fd 100644
--- module/os/linux/zfs/zfs_vnops_os.c
+++ module/os/linux/zfs/zfs_vnops_os.c
--- a/module/os/linux/zfs/zfs_vnops_os.c
+++ b/module/os/linux/zfs/zfs_vnops_os.c
@@ -1907,7 +1907,8 @@ zfs_readdir(struct inode *ip, zpl_dir_context_t *ctx, cred_t *cr)
*/
/* ARGSUSED */
@ -919,8 +919,8 @@ index 7484d651c1f..ce0701763fd 100644
*/
diff --git module/os/linux/zfs/zpl_ctldir.c module/os/linux/zfs/zpl_ctldir.c
index e6420f19ed8..9b526afd000 100644
--- module/os/linux/zfs/zpl_ctldir.c
+++ module/os/linux/zfs/zpl_ctldir.c
--- a/module/os/linux/zfs/zpl_ctldir.c
+++ b/module/os/linux/zfs/zpl_ctldir.c
@@ -101,12 +101,22 @@ zpl_root_readdir(struct file *filp, void *dirent, filldir_t filldir)
*/
/* ARGSUSED */
@ -1057,8 +1057,8 @@ index e6420f19ed8..9b526afd000 100644
diff --git module/os/linux/zfs/zpl_file.c module/os/linux/zfs/zpl_file.c
index 80762f9669b..08bf97ff338 100644
--- module/os/linux/zfs/zpl_file.c
+++ module/os/linux/zfs/zpl_file.c
--- a/module/os/linux/zfs/zpl_file.c
+++ b/module/os/linux/zfs/zpl_file.c
@@ -869,7 +869,7 @@ __zpl_ioctl_setflags(struct inode *ip, uint32_t ioctl_flags, xvattr_t *xva)
!capable(CAP_LINUX_IMMUTABLE))
return (-EACCES);
@ -1070,8 +1070,8 @@ index 80762f9669b..08bf97ff338 100644
xva_init(xva);
diff --git module/os/linux/zfs/zpl_inode.c module/os/linux/zfs/zpl_inode.c
index f336fbb1272..364b9fbef24 100644
--- module/os/linux/zfs/zpl_inode.c
+++ module/os/linux/zfs/zpl_inode.c
--- a/module/os/linux/zfs/zpl_inode.c
+++ b/module/os/linux/zfs/zpl_inode.c
@@ -128,7 +128,12 @@ zpl_vap_init(vattr_t *vap, struct inode *dir, umode_t mode, cred_t *cr)
}
@ -1209,8 +1209,8 @@ index f336fbb1272..364b9fbef24 100644
.rename = zpl_rename,
diff --git module/os/linux/zfs/zpl_xattr.c module/os/linux/zfs/zpl_xattr.c
index 1ec3dae2bb8..5e35f90df85 100644
--- module/os/linux/zfs/zpl_xattr.c
+++ module/os/linux/zfs/zpl_xattr.c
--- a/module/os/linux/zfs/zpl_xattr.c
+++ b/module/os/linux/zfs/zpl_xattr.c
@@ -1233,7 +1233,7 @@ __zpl_xattr_acl_set_access(struct inode *ip, const char *name,
if (ITOZSB(ip)->z_acl_type != ZFS_ACLTYPE_POSIX)
return (-EOPNOTSUPP);

10
srcpkgs/zfs/patches/linux5.12-01.patch
View File

@ -25,7 +25,7 @@ diff --git config/kernel-bio_max_segs.m4 config/kernel-bio_max_segs.m4
new file mode 100644
index 00000000000..a90d75455c1
--- /dev/null
+++ config/kernel-bio_max_segs.m4
+++ b/config/kernel-bio_max_segs.m4
@@ -0,0 +1,23 @@
+dnl #
+dnl # 5.12 API change removes BIO_MAX_PAGES in favor of bio_max_segs()
@ -52,8 +52,8 @@ index 00000000000..a90d75455c1
+])
diff --git config/kernel.m4 config/kernel.m4
index 51c7fb926ec..b8d53490a4a 100644
--- config/kernel.m4
+++ config/kernel.m4
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -127,6 +127,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
ZFS_AC_KERNEL_SRC_GENERIC_FILLATTR_USERNS
ZFS_AC_KERNEL_SRC_MKNOD
@ -72,8 +72,8 @@ index 51c7fb926ec..b8d53490a4a 100644
dnl #
diff --git module/os/linux/zfs/vdev_disk.c module/os/linux/zfs/vdev_disk.c
index 08c33313407..aaaf4105979 100644
--- module/os/linux/zfs/vdev_disk.c
+++ module/os/linux/zfs/vdev_disk.c
--- a/module/os/linux/zfs/vdev_disk.c
+++ b/module/os/linux/zfs/vdev_disk.c
@@ -593,9 +593,14 @@ __vdev_disk_physio(struct block_device *bdev, zio_t *zio,
}

1
srcpkgs/zfs/template
View File

@ -19,7 +19,6 @@ checksum=7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
patch_args=-Np0
replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0

4
srcpkgs/zimg/patches/fix-size_t.patch
View File

@ -1,5 +1,5 @@
--- src/zimg/colorspace/matrix3.cpp 2020-03-02 05:50:02.000000000 +0100
+++ src/zimg/colorspace/matrix3.cpp 2020-08-23 20:46:14.298311898 +0200
--- a/src/zimg/colorspace/matrix3.cpp 2020-03-02 05:50:02.000000000 +0100
+++ b/src/zimg/colorspace/matrix3.cpp 2020-08-23 20:46:14.298311898 +0200
@@ -17,7 +17,7 @@
{
Vector3 ret;

1
srcpkgs/zimg/template
View File

@ -11,7 +11,6 @@ license="WTFPL"
homepage="https://github.com/sekrit-twc/zimg"
distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
checksum=a15c0483fbe945ffe695a1a989bc43b3381c8bf33e2d1760464ec21d32cdf30b
patch_args=-Np0
pre_configure() {
./autogen.sh

8
srcpkgs/zinnia/patches/Fix-compile-error-of-std-make_pair-in-C-11.patch
View File

@ -16,15 +16,15 @@ built even if C++11 is enabled.
diff --git a/AUTHORS b/AUTHORS
index a44e82c..fa52d6a 100644
--- AUTHORS
+++ AUTHORS
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
Taku Kudo <taku@chasen.org>
+Google Inc. <*@google.com>
diff --git a/trainer.cpp b/trainer.cpp
index a889bc7..84230b0 100644
--- trainer.cpp
+++ trainer.cpp
--- a/trainer.cpp
+++ b/trainer.cpp
@@ -104,7 +104,7 @@ class TrainerImpl: public Trainer {
if (!fn) {
return false;

4
srcpkgs/zinnia/patches/minimum-distance-precision.patch
View File

@ -1,5 +1,5 @@
--- feature.cpp
+++ feature.cpp
--- a/feature.cpp
+++ b/feature.cpp
@@ -42,7 +42,8 @@ float minimum_distance(const Node *first, const Node *last,
const float a = last->x - first->x;

1
srcpkgs/zinnia/template
View File

@ -11,7 +11,6 @@ license="BSD-2-Clause"
homepage="https://taku910.github.io/zinnia/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
checksum=ece3af93f937282971634fd81d3e997f848e8cfa958220e26a4564ca064ac20b
patch_args=-Np0
post_install() {
vlicense COPYING

8
srcpkgs/zip/patches/exec-stack.patch
View File

@ -3,16 +3,16 @@ Subject: put stack markings in i386 assembly to avoid executable stack
Bug-Debian: http://bugs.debian.org/528280
X-Debian-version: 3.0-2
--- crc_i386.S
+++ crc_i386.S
--- a/crc_i386.S
+++ b/crc_i386.S
@@ -302,3 +302,5 @@
#endif /* i386 || _i386 || _I386 || __i386 */
#endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
+.section .note.GNU-stack, "", @progbits
+.previous
--- match.S
+++ match.S
--- a/match.S
+++ b/match.S
@@ -405,3 +405,5 @@
#endif /* i386 || _I386 || _i386 || __i386 */

4
srcpkgs/zip/patches/fix_install.diff
View File

@ -1,5 +1,5 @@
--- unix/Makefile 2009-12-21 14:24:24.000000000 +0300
+++ unix/Makefile.new 2009-12-21 14:28:30.000000000 +0300
--- a/unix/Makefile 2009-12-21 14:24:24.000000000 +0300
+++ b/unix/Makefile.new 2009-12-21 14:28:30.000000000 +0300
@@ -38,10 +38,11 @@
MANFLAGS = 644

4
srcpkgs/zip/patches/reproducible-build.patch
View File

@ -2,8 +2,8 @@ From: Santiago Vila <sanvila@debian.org>
Subject: Remove (optional) build date to make the build reproducible
Bug-Debian: http://bugs.debian.org/779042
--- unix/unix.c
+++ unix/unix.c
--- a/unix/unix.c
+++ b/unix/unix.c
@@ -1020,7 +1020,7 @@

4
srcpkgs/zip/patches/zipnote.patch
View File

@ -3,8 +3,8 @@ Subject: zipnote.c: Close in_file instead of undefined file x
Bug-Debian: http://bugs.debian.org/628594
X-Debian-version: 3.0-4
--- zipnote.c
+++ zipnote.c
--- a/zipnote.c
+++ b/zipnote.c
@@ -661,7 +661,7 @@
if ((r = zipcopy(z)) != ZE_OK)
ziperr(r, "was copying an entry");

1
srcpkgs/zip/template
View File

@ -9,7 +9,6 @@ license="Info-ZIP"
homepage="http://infozip.sf.net/"
distfiles="${SOURCEFORGE_SITE}/infozip/zip30.tar.gz"
checksum=f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369
patch_args=-Np0
do_build() {
sed -e "s|generic CC=gcc CPP=\"gcc -E\"|zips CC=$CC CPP=\"$CPP -E\" CFLAGS=\"-DLARGE_FILE_SUPPORT $CFLAGS \${CFLAGS_NOOPT}\" LFLAGS2=\"$LDFLAGS\"|g" -i unix/Makefile

4
srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig 2012-01-28 23:48:50.000000000 +0100
+++ Makefile.in 2012-02-01 00:28:04.898440495 +0100
--- a/Makefile.in 2012-01-28 23:48:50.000000000 +0100
+++ b/Makefile.in 2012-02-01 00:28:04.898440495 +0100
@@ -190,7 +190,7 @@ install-libs: $(LIBS)
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)

1
srcpkgs/zlib/template
View File

@ -10,7 +10,6 @@ license="Zlib"
homepage="http://www.zlib.net"
distfiles="$homepage/$pkgname-$version.tar.gz"
checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
patch_args=-Np0
do_configure() {
LDFLAGS= LDSHAREDLIBC= ./configure --prefix=/usr --shared

4
srcpkgs/zsnes/patches/patch-makefilein.diff
View File

@ -2,8 +2,8 @@ $NetBSD: patch-makefilein,v 1.1 2007/06/06 22:05:45 rillig Exp $
When linking a program, the linking flags are needed.
--- src/Makefile.in.orig 2007-01-24 21:54:12.000000000 +0100
+++ src/Makefile.in 2007-06-06 23:59:19.000000000 +0200
--- a/src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ b/src/Makefile.in 2007-06-06 23:59:19.000000000 +0200
@@ -104,7 +104,7 @@ main: makefile.dep $(Z_OBJS)
rm -f version.o

4
srcpkgs/zsnes/patches/patch-tools_strutil.h.diff
View File

@ -2,8 +2,8 @@ $NetBSD: patch-tools_strutil.h,v 1.1 2012/12/17 03:37:20 dholland Exp $
add <cstring> for strcasecmp.
--- src/tools/strutil.h~ 2006-12-27 11:04:05.000000000 +0000
+++ src/tools/strutil.h
--- a/src/tools/strutil.h~ 2006-12-27 11:04:05.000000000 +0000
+++ b/src/tools/strutil.h
@@ -23,6 +23,7 @@ This is part of a toolkit used to assist
#define STRUTIL_H

4
srcpkgs/zsnes/patches/patch-zip_zpng.c.diff
View File

@ -2,8 +2,8 @@ $NetBSD: patch-zip_zpng.c,v 1.1 2011/03/15 11:46:09 obache Exp $
* direct access is not allowed with png-1.5, but already set color_type.
--- src/zip/zpng.c.orig 2007-01-15 23:06:29.000000000 +0000
+++ src/zip/zpng.c
--- a/src/zip/zpng.c 2007-01-15 23:06:29.000000000 +0000
+++ b/src/zip/zpng.c
@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,

20
srcpkgs/zsnes/patches/zsnes.patch
View File

@ -1,6 +1,6 @@
diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
--- src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ src/Makefile.in 2010-09-06 00:03:04.715810431 +0200
--- a/src/Makefile.in 2007-01-24 21:54:12.000000000 +0100
+++ b/src/Makefile.in 2010-09-06 00:03:04.715810431 +0200
@@ -95,7 +95,7 @@
%.o: %.cpp
@CXX@ @CXXFLAGS@ -o $@ -c $<
@ -20,8 +20,8 @@ diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
Makefile: Makefile.in config.status
./config.status
diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
--- src/parsegen.cpp 2007-10-31 05:30:26.000000000 +0100
+++ src/parsegen.cpp 2010-09-05 15:48:36.903333444 +0200
--- a/src/parsegen.cpp 2007-10-31 05:30:26.000000000 +0100
+++ b/src/parsegen.cpp 2010-09-05 15:48:36.903333444 +0200
@@ -19,6 +19,9 @@
Config file handler creator by Nach (C) 2005-2007
*/
@ -42,8 +42,8 @@ diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
const char *cheader_file = 0;
bool compile = false;
diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
--- src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ src/tools/depbuild.cpp 2010-09-05 15:48:36.903333444 +0200
--- a/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ b/src/tools/depbuild.cpp 2010-09-05 15:48:36.903333444 +0200
@@ -183,7 +183,7 @@
}
}
@ -54,8 +54,8 @@ diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.
if (argc < 5)
{
diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
--- src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100
+++ src/tools/strutil.h 2010-09-05 15:48:36.903333444 +0200
--- a/src/tools/strutil.h 2006-12-27 12:04:05.000000000 +0100
+++ b/src/tools/strutil.h 2010-09-05 15:48:36.903333444 +0200
@@ -15,6 +15,9 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@ -67,8 +67,8 @@ diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
This is part of a toolkit used to assist in ZSNES development
*/
diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
--- src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200
--- a/src/tools/depbuild.cpp 2006-12-27 12:04:05.000000000 +0100
+++ b/src/tools/depbuild.cpp 2012-07-14 16:20:17.759886250 +0200
@@ -26,6 +26,8 @@
#include <cstdio>
using namespace std;

1
srcpkgs/zsnes/template
View File

@ -5,7 +5,6 @@ archs="i686"
lib32mode="full"
wrksrc="zsnes_1_51"
build_wrksrc="src"
patch_args=-Np0
pkgname=zsnes
version=1.51

4
srcpkgs/zulucrypt/patches/20-disable-auto-update.patch
View File

@ -1,7 +1,7 @@
#patch "check for update" function
--- zuluCrypt-gui/zulucrypt.ui
+++ zuluCrypt-gui/zulucrypt.ui
--- a/zuluCrypt-gui/zulucrypt.ui
+++ b/zuluCrypt-gui/zulucrypt.ui
@@ -493,6 +493,9 @@
</property>
</action>

8
srcpkgs/zulucrypt/patches/fix-cflags.patch
View File

@ -1,7 +1,7 @@
Index: external_libraries/tcplay/CMakeLists.txt
===================================================================
--- external_libraries/tcplay/CMakeLists.txt.orig
+++ external_libraries/tcplay/CMakeLists.txt
--- a/external_libraries/tcplay/CMakeLists.txt
+++ b/external_libraries/tcplay/CMakeLists.txt
@@ -13,7 +13,7 @@ set (SRCS_LINUX crypto-gcrypt.c)
set (CFLAGS_LINUX "-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE")
set (CFLAGS_WARN "-w")
@ -13,8 +13,8 @@ Index: external_libraries/tcplay/CMakeLists.txt
if ($ENV{DEBUG})
Index: external_libraries/tcplay/Makefile.classic
===================================================================
--- external_libraries/tcplay/Makefile.classic.orig
+++ external_libraries/tcplay/Makefile.classic
--- a/external_libraries/tcplay/Makefile.classic
+++ b/external_libraries/tcplay/Makefile.classic
@@ -47,8 +47,6 @@ COMMON_CFLAGS= $(WARNFLAGS) -fPIC $(VER_
ifeq ($(DEBUG), yes)

1
srcpkgs/zulucrypt/template
View File

@ -21,7 +21,6 @@ homepage="https://mhogomchungu.github.io/zuluCrypt"
changelog="https://raw.githubusercontent.com/mhogomchungu/zuluCrypt/master/changelog"
distfiles="https://github.com/mhogomchungu/zuluCrypt/archive/${version}.tar.gz"
checksum=f1bc599446e6dc82c6af16672fcbd4a88679d3b3dba2cfa3921ac514cb211add
patch_args=-Np0
#https://github.com/mhogomchungu/zuluCrypt/blob/e138cc4459545b2e0f729814791a045c31b63014/BUILD_INSTRUCTIONS
build_options="udev kde gnome pwquality polkit homemount"

4
srcpkgs/zutils/patches/cflags.patch
View File

@ -1,5 +1,5 @@
--- configure.orig
+++ configure
--- a/configure
+++ b/configure
@@ -20,10 +20,6 @@
infodir='$(datarootdir)/info'
mandir='$(datarootdir)/man'

1
srcpkgs/zutils/template
View File

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="http://www.nongnu.org/zutils/zutils.html"
distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.lz"
checksum=0dd44138292d5757648037195b6945c3df70b316221b4285520ad38f2eaeb195
patch_args=-Np0
post_install() {
cd ${DESTDIR}/usr/bin

4
srcpkgs/zynaddsubfx/patches/cmake-build-type-none.patch
View File

@ -1,7 +1,7 @@
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -185,7 +185,6 @@ option (BuildForDebug "Include gdb debug
option (IncludeWhatYouUse "Check for useless includes" OFF)
mark_as_advanced(IncludeWhatYouUse)

4
srcpkgs/zynaddsubfx/patches/fix-bogus-strstr.patch
View File

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no
Reason: This piece of code is ill-conceived and cannot work. Remove it.
--- rtosc/src/dispatch.c 2019-03-10 17:16:45.000000000 +0100
+++ rtosc/src/dispatch.c 2020-03-29 09:02:42.916119722 +0200
--- a/rtosc/src/dispatch.c 2019-03-10 17:16:45.000000000 +0100
+++ b/rtosc/src/dispatch.c 2020-03-29 09:02:42.916119722 +0200
@@ -289,8 +289,7 @@
return false;
} else if(type == 4) {

4
srcpkgs/zynaddsubfx/patches/fix-memset.patch
View File

@ -1,5 +1,5 @@
--- src/globals.h 2015-06-28 00:25:59.000000000 +0200
+++ src/globals.h 2015-10-03 15:34:18.914712672 +0200
--- a/src/globals.h 2015-06-28 00:25:59.000000000 +0200
+++ b/src/globals.h 2015-10-03 15:34:18.914712672 +0200
@@ -25,6 +25,8 @@
#ifndef GLOBALS_H
#define GLOBALS_H

1
srcpkgs/zynaddsubfx/template
View File

@ -15,7 +15,6 @@ homepage="http://zynaddsubfx.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
checksum=7447322268114a1e0ac5f281ac37a09a78e761a7be61999caf79100049789f63
replaces="zynaddsubfx-data>=0"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in
armv5*) configure_args+=" -DSUPPORT_NEON=NO";;