jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

srcpkgs/s*: convert patches to -Np1

Browse source 
```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 103ab731ab
commit 4b97cd2fb4
265 changed files with 620 additions and 685 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
View file

@ -16,8 +16,8 @@ https://docs.python.org/3.9/whatsnew/3.9.html#removed
S3/Utils.py | 8 ++++---- S3/Utils.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-) 2 files changed, 5 insertions(+), 5 deletions(-)
--- S3/Exceptions.py --- a/S3/Exceptions.py
+++ S3/Exceptions.py +++ b/S3/Exceptions.py
@@ -127,7 +127,7 @@ def parse_error_xml(tree): @@ -127,7 +127,7 @@ def parse_error_xml(tree):
if not error_node.tag == "Error": if not error_node.tag == "Error":
error_node = tree.find(".//Error") error_node = tree.find(".//Error")
@ -27,8 +27,8 @@ https://docs.python.org/3.9/whatsnew/3.9.html#removed
if child.text != "": if child.text != "":
debug("ErrorXML: " + child.tag + ": " + repr(child.text)) debug("ErrorXML: " + child.tag + ": " + repr(child.text))
info[child.tag] = child.text info[child.tag] = child.text
--- S3/Utils.py --- a/S3/Utils.py
+++ S3/Utils.py +++ b/S3/Utils.py
@@ -65,9 +65,9 @@ def parseNodes(nodes): @@ -65,9 +65,9 @@ def parseNodes(nodes):
retval = [] retval = []
for node in nodes: for node in nodes:

1
srcpkgs/s3cmd/template
View file

@ -12,7 +12,6 @@ changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS"
homepage="http://s3tools.org/s3cmd" homepage="http://s3tools.org/s3cmd"
distfiles="https://github.com/s3tools/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/s3tools/${pkgname}/archive/v${version}.tar.gz"
checksum=2293f775fde77201bf8e489f20516fd594168c77897168f129e5c1a2b33b7e37 checksum=2293f775fde77201bf8e489f20516fd594168c77897168f129e5c1a2b33b7e37
patch_args=-Np0
pre_install() { pre_install() {
export S3CMD_INSTPATH_DOC="share/doc" export S3CMD_INSTPATH_DOC="share/doc"

4
srcpkgs/samba/patches/add_missing___compar_fn_t.patch
View file

@ -1,5 +1,5 @@
--- source4/dsdb/samdb/ldb_modules/count_attrs.c --- a/source4/dsdb/samdb/ldb_modules/count_attrs.c
+++ source4/dsdb/samdb/ldb_modules/count_attrs.c +++ b/source4/dsdb/samdb/ldb_modules/count_attrs.c
@@ -38,6 +38,11 @@ @@ -38,6 +38,11 @@
#define NULL_REQ_PSEUDO_N -2LL; #define NULL_REQ_PSEUDO_N -2LL;
#define STAR_REQ_PSEUDO_N -4LL; #define STAR_REQ_PSEUDO_N -4LL;

4
srcpkgs/samba/patches/getpwent_r.patch
View file

@ -1,7 +1,7 @@
diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c
index 2cd6122..04f13c6 100644 index 2cd6122..04f13c6 100644
--- source4/torture/local/nss_tests.c --- a/source4/torture/local/nss_tests.c
+++ source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c
@@ -333,6 +333,7 @@ static bool test_enum_passwd(struct torture_context *tctx, @@ -333,6 +333,7 @@ static bool test_enum_passwd(struct torture_context *tctx,
return true; return true;
} }

16
srcpkgs/samba/patches/missing-headers.patch
View file

@ -1,7 +1,7 @@
diff --git lib/param/loadparm.h lib/param/loadparm.h diff --git lib/param/loadparm.h lib/param/loadparm.h
index b5d79b9..3f4eae0 100644 index b5d79b9..3f4eae0 100644
--- lib/param/loadparm.h --- a/lib/param/loadparm.h
+++ lib/param/loadparm.h +++ b/lib/param/loadparm.h
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#define _LOADPARM_H #define _LOADPARM_H
@ -12,8 +12,8 @@ index b5d79b9..3f4eae0 100644
struct parmlist_entry *prev, *next; struct parmlist_entry *prev, *next;
diff --git source3/lib/system_smbd.c source3/lib/system_smbd.c diff --git source3/lib/system_smbd.c source3/lib/system_smbd.c
index 3b1ac9c..4044d75 100644 index 3b1ac9c..4044d75 100644
--- source3/lib/system_smbd.c --- a/source3/lib/system_smbd.c
+++ source3/lib/system_smbd.c +++ b/source3/lib/system_smbd.c
@@ -27,6 +27,8 @@ @@ -27,6 +27,8 @@
#include "system/passwd.h" #include "system/passwd.h"
#include "nsswitch/winbind_client.h" #include "nsswitch/winbind_client.h"
@ -25,8 +25,8 @@ index 3b1ac9c..4044d75 100644
diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c
index 2cd6122..0c84ec2 100644 index 2cd6122..0c84ec2 100644
--- source4/torture/local/nss_tests.c --- a/source4/torture/local/nss_tests.c
+++ source4/torture/local/nss_tests.c +++ b/source4/torture/local/nss_tests.c
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
*/ */
@ -39,8 +39,8 @@ index 2cd6122..0c84ec2 100644
diff --git ctdb/tests/src/protocol_util_test.c ctdb/tests/src/protocol_util_test.c diff --git ctdb/tests/src/protocol_util_test.c ctdb/tests/src/protocol_util_test.c
index edd2a34..48ce96e 100644 index edd2a34..48ce96e 100644
--- ctdb/tests/src/protocol_util_test.c --- a/ctdb/tests/src/protocol_util_test.c
+++ ctdb/tests/src/protocol_util_test.c +++ b/ctdb/tests/src/protocol_util_test.c
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include "replace.h" #include "replace.h"
#include "system/network.h" #include "system/network.h"

12
srcpkgs/samba/patches/musl_rm_unistd_incl.patch
View file

@ -1,5 +1,5 @@
--- lib/replace/replace.h --- a/lib/replace/replace.h
+++ lib/replace/replace.h +++ b/lib/replace/replace.h
@@ -168,10 +168,6 @@ @@ -168,10 +168,6 @@
#include <bsd/unistd.h> #include <bsd/unistd.h>
#endif #endif
@ -11,8 +11,8 @@
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif
--- lib/replace/system/network.h --- a/lib/replace/system/network.h
+++ lib/replace/system/network.h +++ b/lib/replace/system/network.h
@@ -31,10 +31,6 @@ @@ -31,10 +31,6 @@
#error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure" #error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure"
#endif #endif
@ -24,8 +24,8 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
--- source3/rpc_server/mdssvc/mdssvc.c --- a/source3/rpc_server/mdssvc/mdssvc.c
+++ source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -18,6 +18,8 @@ @@ -18,6 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */

4
srcpkgs/samba/patches/musl_uintptr.patch
View file

@ -13,8 +13,8 @@ Date: Wed Mar 29 15:22:38 2017 -0300
diff --git third_party/cmocka/cmocka.h third_party/cmocka/cmocka.h diff --git third_party/cmocka/cmocka.h third_party/cmocka/cmocka.h
index 303d0ae..a2bfc40 100644 index 303d0ae..a2bfc40 100644
--- third_party/cmocka/cmocka.h --- a/third_party/cmocka/cmocka.h
+++ third_party/cmocka/cmocka.h +++ b/third_party/cmocka/cmocka.h
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
((LargestIntegralType)(value)) ((LargestIntegralType)(value))

4
srcpkgs/samba/patches/netdb-defines.patch
View file

@ -1,7 +1,7 @@
diff --git nsswitch/wins.c nsswitch/wins.c diff --git nsswitch/wins.c nsswitch/wins.c
index dccb6dd..bb24acb 100644 index dccb6dd..bb24acb 100644
--- nsswitch/wins.c --- a/nsswitch/wins.c
+++ nsswitch/wins.c +++ b/nsswitch/wins.c
@@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
#define INADDRSZ 4 #define INADDRSZ 4
#endif #endif

1
srcpkgs/samba/template
View file

@ -32,7 +32,6 @@ lib32disabled=yes
conf_files="/etc/pam.d/samba /etc/samba/smb.conf" conf_files="/etc/pam.d/samba /etc/samba/smb.conf"
make_dirs="/etc/samba/private 0750 root root" make_dirs="/etc/samba/private 0750 root root"
subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3"
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat" makedepends+=" musl-legacy-compat"

8
srcpkgs/sandboxfs/patches/32bit.patch
View file

@ -1,5 +1,5 @@
--- src/nodes/mod.rs.orig --- a/src/nodes/mod.rs
+++ src/nodes/mod.rs +++ b/src/nodes/mod.rs
@@ -173,11 +173,11 @@ @@ -173,11 +173,11 @@
} }
let size = size.unwrap(); let size = size.unwrap();
@ -15,8 +15,8 @@
}; };
if result.is_ok() { if result.is_ok() {
attr.size = size; attr.size = size;
--- src/nodes/conv.rs.orig --- a/src/nodes/conv.rs
+++ src/nodes/conv.rs +++ b/src/nodes/conv.rs
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
} else { } else {
val.tv_usec() as i32 val.tv_usec() as i32

1
srcpkgs/sandboxfs/template
View file

@ -12,7 +12,6 @@ license="Apache-2.0"
homepage="https://github.com/bazelbuild/sandboxfs" homepage="https://github.com/bazelbuild/sandboxfs"
distfiles="https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-${version}.tar.gz" distfiles="https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-${version}.tar.gz"
checksum=bff68e7d33ae56a3f34a79a74b2576599f5ccc381a237bbc10b5a3c3ea106b60 checksum=bff68e7d33ae56a3f34a79a74b2576599f5ccc381a237bbc10b5a3c3ea106b60
patch_args=-Np0
post_install() { post_install() {
vman man/sandboxfs.1 vman man/sandboxfs.1

4
srcpkgs/sane/patches/sane-desc-cross.patch
View file

@ -1,5 +1,5 @@
--- tools/Makefile.in --- a/tools/Makefile.in
+++ tools/Makefile.in +++ b/tools/Makefile.in
@@ -586,7 +586,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC @@ -586,7 +586,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC
sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES)

1
srcpkgs/sane/template
View file

@ -21,7 +21,6 @@ homepage="http://www.sane-project.org/"
distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz" distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz"
checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa
noshlibprovides="avoid false detection of device drivers" noshlibprovides="avoid false detection of device drivers"
patch_args=-Np0
build_options="snmp" build_options="snmp"

4
srcpkgs/sasm/patches/dont-install-vendores-binaries.patch
View file

@ -1,7 +1,7 @@
reason: Linux/bin/ vendors {listing,fasm} binaries, statically linked for i386 reason: Linux/bin/ vendors {listing,fasm} binaries, statically linked for i386
--- SASM.pro --- a/SASM.pro
+++ SASM.pro +++ b/SASM.pro
@@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
docfiles.path = $$DATADIR/doc/sasm/ docfiles.path = $$DATADIR/doc/sasm/
} else { } else {

1
srcpkgs/sasm/template
View file

@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
homepage="http://dman95.github.io/SASM/" homepage="http://dman95.github.io/SASM/"
distfiles="https://github.com/Dman95/SASM/archive/v${version}.tar.gz" distfiles="https://github.com/Dman95/SASM/archive/v${version}.tar.gz"
checksum=2c551d4a04f2e11f000eb1716885a646110305f8f2892d1a7761c0d4670d19a0 checksum=2c551d4a04f2e11f000eb1716885a646110305f8f2892d1a7761c0d4670d19a0
patch_args=-Np0

4
srcpkgs/sauerbraten/patches/flags.patch
View file

@ -1,5 +1,5 @@
--- src/Makefile.orig 2017-01-12 21:54:08.156276696 -0600 --- a/src/Makefile 2017-01-12 21:54:08.156276696 -0600
+++ src/Makefile 2017-01-12 21:56:06.889752748 -0600 +++ b/src/Makefile 2017-01-12 21:56:06.889752748 -0600
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-CXXFLAGS= -O3 -fomit-frame-pointer -CXXFLAGS= -O3 -fomit-frame-pointer
+CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS) +CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS)

1
srcpkgs/sauerbraten/template
View file

@ -13,7 +13,6 @@ license="Zlib"
homepage="http://sauerbraten.org" homepage="http://sauerbraten.org"
distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2" distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2"
checksum=45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e checksum=45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e
patch_args=-Np0
restricted="Very large - not worth storing on current Void infrastructure" restricted="Very large - not worth storing on current Void infrastructure"

4
srcpkgs/sbcl/patches/ppc-musl.patch
View file

@ -1,5 +1,5 @@
--- src/runtime/ppc-linux-os.c --- a/src/runtime/ppc-linux-os.c
+++ src/runtime/ppc-linux-os.c +++ b/src/runtime/ppc-linux-os.c
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

1
srcpkgs/sbcl/template
View file

@ -15,7 +15,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
checksum=965807ecd65a9590d68a0ed408b544e7e49a1f6e337ebd2b25e34788bcc8a8c5 checksum=965807ecd65a9590d68a0ed408b544e7e49a1f6e337ebd2b25e34788bcc8a8c5
nocross=yes nocross=yes
nopie=yes nopie=yes
patch_args=-Np0
_bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

4
srcpkgs/sc3-plugins/patches/cstdio.patch
View file

@ -1,5 +1,5 @@
--- source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 --- a/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100
+++ source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 +++ b/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
For more information, please refer to <http://unlicense.org> For more information, please refer to <http://unlicense.org>
*/ */

1
srcpkgs/sc3-plugins/template
View file

@ -19,7 +19,6 @@ distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${versio
checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe
9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a 9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a
df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8" df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8"
patch_args=-Np0
post_extract() { post_extract() {
rm -rf external_libraries/nova-simd rm -rf external_libraries/nova-simd

8
srcpkgs/scanmem/patches/fix-musl.patch
View file

@ -1,7 +1,7 @@
diff --git a/scanroutines.c b/scanroutines.c diff --git a/scanroutines.c b/scanroutines.c
index 2c5f33a..edc7c29 100644 index 2c5f33a..edc7c29 100644
--- scanroutines.c --- a/scanroutines.c
+++ scanroutines.c +++ b/scanroutines.c
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
along with this library. If not, see <http://www.gnu.org/licenses/>. along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
@ -13,8 +13,8 @@ index 2c5f33a..edc7c29 100644
diff --git a/targetmem.h b/targetmem.h diff --git a/targetmem.h b/targetmem.h
index b62a4f2..25b5c9c 100644 index b62a4f2..25b5c9c 100644
--- targetmem.h --- a/targetmem.h
+++ targetmem.h +++ b/targetmem.h
@@ -24,6 +24,9 @@ @@ -24,6 +24,9 @@
#ifndef TARGETMEM_H #ifndef TARGETMEM_H
#define TARGETMEM_H #define TARGETMEM_H

1
srcpkgs/scanmem/template
View file

@ -13,7 +13,6 @@ homepage="https://github.com/scanmem/scanmem"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
checksum=f02054b91322cf41517506158fcb74554e9fc6644e696f8aa25e5acf162d374b checksum=f02054b91322cf41517506158fcb74554e9fc6644e696f8aa25e5acf162d374b
CFLAGS="-D__NEED_pid_t" CFLAGS="-D__NEED_pid_t"
patch_args=-Np0
nocross="checking for /proc/self/maps... configure: error" nocross="checking for /proc/self/maps... configure: error"

4
srcpkgs/schroot/patches/getent.patch
View file

@ -9,8 +9,8 @@ Subject: [PATCH] getent
diff --git etc/setup.d/20nssdatabases etc/setup.d/20nssdatabases diff --git etc/setup.d/20nssdatabases etc/setup.d/20nssdatabases
index 6f14c81..697bb1e 100755 index 6f14c81..697bb1e 100755
--- etc/setup.d/20nssdatabases --- a/etc/setup.d/20nssdatabases
+++ etc/setup.d/20nssdatabases +++ b/etc/setup.d/20nssdatabases
@@ -29,7 +29,7 @@ set -e @@ -29,7 +29,7 @@ set -e
dup_nss() dup_nss()
{ {

8
srcpkgs/schroot/patches/getmntent.patch
View file

@ -10,8 +10,8 @@ Subject: [PATCH] getmntent fix
diff --git sbuild/sbuild-mntstream.cc sbuild/sbuild-mntstream.cc diff --git sbuild/sbuild-mntstream.cc sbuild/sbuild-mntstream.cc
index d376fe5..d7324e7 100644 index d376fe5..d7324e7 100644
--- sbuild/sbuild-mntstream.cc --- a/sbuild/sbuild-mntstream.cc
+++ sbuild/sbuild-mntstream.cc +++ b/sbuild/sbuild-mntstream.cc
@@ -37,9 +37,7 @@ namespace @@ -37,9 +37,7 @@ namespace
emap init_errors[] = emap init_errors[] =
{ {
@ -43,8 +43,8 @@ index d376fe5..d7324e7 100644
this->data.push_back(newentry); // push onto the end of the list this->data.push_back(newentry); // push onto the end of the list
diff --git sbuild/sbuild-mntstream.h sbuild/sbuild-mntstream.h diff --git sbuild/sbuild-mntstream.h sbuild/sbuild-mntstream.h
index ea3d179..fffcdf4 100644 index ea3d179..fffcdf4 100644
--- sbuild/sbuild-mntstream.h --- a/sbuild/sbuild-mntstream.h
+++ sbuild/sbuild-mntstream.h +++ b/sbuild/sbuild-mntstream.h
@@ -49,8 +49,7 @@ namespace sbuild @@ -49,8 +49,7 @@ namespace sbuild
/// Error codes. /// Error codes.
enum error_code enum error_code

4
srcpkgs/schroot/patches/musl.patch
View file

@ -9,8 +9,8 @@ Subject: [PATCH] musl
diff --git sbuild/sbuild-feature.cc sbuild/sbuild-feature.cc diff --git sbuild/sbuild-feature.cc sbuild/sbuild-feature.cc
index 5ac4725..9902db3 100644 index 5ac4725..9902db3 100644
--- sbuild/sbuild-feature.cc --- a/sbuild/sbuild-feature.cc
+++ sbuild/sbuild-feature.cc +++ b/sbuild/sbuild-feature.cc
@@ -20,6 +20,8 @@ @@ -20,6 +20,8 @@
#include <iostream> #include <iostream>

12
srcpkgs/schroot/patches/remove-networks.patch
View file

@ -11,8 +11,8 @@ Subject: [PATCH] remove networks
diff --git etc/profile-templates/buildd/all/copyfiles etc/profile-templates/buildd/all/copyfiles diff --git etc/profile-templates/buildd/all/copyfiles etc/profile-templates/buildd/all/copyfiles
index fe18fb3..2469d3e 100644 index fe18fb3..2469d3e 100644
--- etc/profile-templates/buildd/all/copyfiles --- a/etc/profile-templates/buildd/all/copyfiles
+++ etc/profile-templates/buildd/all/copyfiles +++ b/etc/profile-templates/buildd/all/copyfiles
@@ -3,4 +3,3 @@ @@ -3,4 +3,3 @@
# <source and destination> # <source and destination>
/etc/hosts /etc/hosts
@ -20,8 +20,8 @@ index fe18fb3..2469d3e 100644
-/etc/networks -/etc/networks
diff --git etc/profile-templates/default/all/nssdatabases etc/profile-templates/default/all/nssdatabases diff --git etc/profile-templates/default/all/nssdatabases etc/profile-templates/default/all/nssdatabases
index a9f1319..22efe1b 100644 index a9f1319..22efe1b 100644
--- etc/profile-templates/default/all/nssdatabases --- a/etc/profile-templates/default/all/nssdatabases
+++ etc/profile-templates/default/all/nssdatabases +++ b/etc/profile-templates/default/all/nssdatabases
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
services services
protocols protocols
@ -29,8 +29,8 @@ index a9f1319..22efe1b 100644
hosts hosts
diff --git etc/profile-templates/desktop/all/nssdatabases etc/profile-templates/desktop/all/nssdatabases diff --git etc/profile-templates/desktop/all/nssdatabases etc/profile-templates/desktop/all/nssdatabases
index a9f1319..22efe1b 100644 index a9f1319..22efe1b 100644
--- etc/profile-templates/desktop/all/nssdatabases --- a/etc/profile-templates/desktop/all/nssdatabases
+++ etc/profile-templates/desktop/all/nssdatabases +++ b/etc/profile-templates/desktop/all/nssdatabases
@@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
services services
protocols protocols

4
srcpkgs/schroot/patches/schroot-cppunit.patch
View file

@ -1,5 +1,5 @@
--- configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 --- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
+++ configure.ac 2017-05-20 09:51:26.216792794 +0000 +++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
@@ -336,7 +336,7 @@ @@ -336,7 +336,7 @@
[HAVE_UUID=yes], [HAVE_UUID=yes],
[HAVE_UUID=no]) [HAVE_UUID=no])

1
srcpkgs/schroot/template
View file

@ -55,7 +55,6 @@ checksum="
3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb" 56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb"
nocross=yes nocross=yes
patch_args=-Np0
pre_configure() { pre_configure() {
cat ../debian/patches/series | while read p; do cat ../debian/patches/series | while read p; do

4
srcpkgs/screen/patches/cve-2021-26937.patch
View file

@ -6,8 +6,8 @@ Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html
Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3
Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html
--- encoding.c.orig --- a/encoding.c
+++ encoding.c +++ b/encoding.c
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
# ifdef UTF8 # ifdef UTF8
static int recode_char __P((int, int, int)); static int recode_char __P((int, int, int));

4
srcpkgs/screen/patches/screen-cross_compile_fix.patch
View file

@ -1,5 +1,5 @@
--- configure.orig 2014-08-12 23:28:34.867815037 +0200 --- a/configure 2014-08-12 23:28:34.867815037 +0200
+++ configure 2014-08-12 23:31:35.647817252 +0200 +++ b/configure 2014-08-12 23:31:35.647817252 +0200
@@ -305,6 +305,7 @@ @@ -305,6 +305,7 @@
# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
as_fn_exit () as_fn_exit ()

4
srcpkgs/screen/patches/utf8_nfd.patch
View file

@ -13,8 +13,8 @@ Bugs-Debian: https://bugs.debian.org/677512
diff --git a/ansi.c b/ansi.c diff --git a/ansi.c b/ansi.c
index 2a52edd..83b266d 100644 index 2a52edd..83b266d 100644
--- ansi.c.orig --- a/ansi.c
+++ ansi.c +++ b/ansi.c
@@ -692,10 +692,6 @@ register int len; @@ -692,10 +692,6 @@ register int len;
} }
curr->w_rend.font = 0; curr->w_rend.font = 0;

1
srcpkgs/screen/template
View file

@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="http://www.gnu.org/s/screen/" homepage="http://www.gnu.org/s/screen/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 checksum=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1
patch_args=-Np0
post_install() { post_install() {
vinstall etc/etcscreenrc 0644 etc screenrc vinstall etc/etcscreenrc 0644 etc screenrc

4
srcpkgs/scribus/patches/cmake-build-type-none.patch
View file

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)

4
srcpkgs/scribus/patches/export-symbols-for-plugins.patch
View file

@ -1,5 +1,5 @@
--- scribus/CMakeLists.txt.ORIG 2021-04-25 22:24:52.000000000 +0200 --- a/scribus/CMakeLists.txt 2021-04-25 22:24:52.000000000 +0200
+++ scribus/CMakeLists.txt 2021-06-12 16:23:22.884229251 +0200 +++ b/scribus/CMakeLists.txt 2021-06-12 16:23:22.884229251 +0200
@@ -757,7 +757,7 @@ @@ -757,7 +757,7 @@
# Should fix bug 6897 . # Should fix bug 6897 .
set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E) set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)

8
srcpkgs/scribus/patches/fix-musl.patch
View file

@ -1,5 +1,5 @@
--- scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200 --- a/scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200
+++ - 2019-09-17 22:29:18.301884583 +0200 +++ b/scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
#include <csignal> #include <csignal>
@ -9,8 +9,8 @@
#include <execinfo.h> #include <execinfo.h>
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
--- scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200 --- a/scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200
+++ - 2019-09-17 22:30:10.159216480 +0200 +++ b/scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
#include <QDateTime> #include <QDateTime>
#include <QtGlobal> #include <QtGlobal>

1
srcpkgs/scribus/template
View file

@ -19,4 +19,3 @@ homepage="https://scribus.net"
distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz" distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz"
checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce
python_version=3 python_version=3
patch_args=-Np0

4
srcpkgs/scrotty/patches/fish-completion-vendor.patch
View file

@ -1,7 +1,7 @@
#reason: fish-shell requires 3rd-party completion files to be installed to vendor_completions.d #reason: fish-shell requires 3rd-party completion files to be installed to vendor_completions.d
--- mk/shell.mk --- a/mk/shell.mk
+++ mk/shell.mk +++ b/mk/shell.mk
@@ -189,12 +189,12 @@ @@ -189,12 +189,12 @@
.PHONY: install-fish .PHONY: install-fish
install-fish: $(foreach F,$(_AUTO_COMPLETE),bin/$(F).fish-completion) install-fish: $(foreach F,$(_AUTO_COMPLETE),bin/$(F).fish-completion)

1
srcpkgs/scrotty/template
View file

@ -12,7 +12,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/maandree/scrotty" homepage="https://github.com/maandree/scrotty"
distfiles="https://github.com/maandree/scrotty/archive/${version}.tar.gz" distfiles="https://github.com/maandree/scrotty/archive/${version}.tar.gz"
checksum=466528d6ecf0138f57c40541258389686e22771c28d40f28c00825faaeaab1a3 checksum=466528d6ecf0138f57c40541258389686e22771c28d40f28c00825faaeaab1a3
patch_args=-Np0
pre_configure() { pre_configure() {
export EXTRA_CFLAGS="$CFLAGS" export EXTRA_CFLAGS="$CFLAGS"

4
srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff
View file

@ -1,5 +1,5 @@
--- audio/softsynth/fluidsynth.cpp --- a/audio/softsynth/fluidsynth.cpp
+++ audio/softsynth/fluidsynth.cpp +++ b/audio/softsynth/fluidsynth.cpp
@@ -144,11 +144,11 @@ @@ -144,11 +144,11 @@
return p; return p;
} }

1
srcpkgs/scummvm/template
View file

@ -16,7 +16,6 @@ license="GPL-2.0-or-later"
homepage="https://www.scummvm.org/" homepage="https://www.scummvm.org/"
distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz" distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*);; i686*|x86_64*);;

4
srcpkgs/sddm/patches/remove-consolekit-detection.patch
View file

@ -2,8 +2,8 @@ Source: Hoshpak
Upstream: https://github.com/sddm/sddm/issues/903 and https://github.com/sddm/sddm/pull/923 Upstream: https://github.com/sddm/sddm/issues/903 and https://github.com/sddm/sddm/pull/923
Reason: removes detection for the ConsoleKit interface because the ConsoleKit2 code path is Reason: removes detection for the ConsoleKit interface because the ConsoleKit2 code path is
currently broken and would cause sddm to fail to start with ConsoleKit2 present currently broken and would cause sddm to fail to start with ConsoleKit2 present
--- src/daemon/LogindDBusTypes.cpp 2018-10-07 17:40:49.944625726 +0200 --- a/src/daemon/LogindDBusTypes.cpp 2018-10-07 17:40:49.944625726 +0200
+++ src/daemon/LogindDBusTypes.cpp 2018-10-07 17:41:01.590479575 +0200 +++ b/src/daemon/LogindDBusTypes.cpp 2018-10-07 17:41:01.590479575 +0200
@@ -58,17 +58,6 @@ @@ -58,17 +58,6 @@
return; return;
} }

1
srcpkgs/sddm/template
View file

@ -15,7 +15,6 @@ license="GPL-2.0-or-later, CC-BY-3.0"
homepage="http://github.com/sddm/sddm" homepage="http://github.com/sddm/sddm"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41 checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools" hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools"

8
srcpkgs/seafile-client-qt/patches/qt5.15-QPainterPath.patch
View file

@ -1,15 +1,15 @@
source: upstream pull request https://github.com/haiwen/seafile-client/pull/1297 source: upstream pull request https://github.com/haiwen/seafile-client/pull/1297
--- src/ui/events-list-view.cpp.orig --- a/src/ui/events-list-view.cpp
+++ src/ui/events-list-view.cpp +++ b/src/ui/events-list-view.cpp
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
#include <QPainter> #include <QPainter>
+#include <QPainterPath> +#include <QPainterPath>
#include <QApplication> #include <QApplication>
#include <QPixmap> #include <QPixmap>
#include <QToolTip> #include <QToolTip>
--- src/ui/private-share-dialog.cpp.orig --- a/src/ui/private-share-dialog.cpp
+++ src/ui/private-share-dialog.cpp +++ b/src/ui/private-share-dialog.cpp
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
#include <QCompleter> #include <QCompleter>
#include <QLineEdit> #include <QLineEdit>

1
srcpkgs/seafile-client-qt/template
View file

@ -15,7 +15,6 @@ license="Apache-2.0"
homepage="https://seafile.com" homepage="https://seafile.com"
distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz" distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz"
checksum=a6be7e55236cd4fb6028259ab5f35163ce044811f45b6008f280d42f5cee9f8d checksum=a6be7e55236cd4fb6028259ab5f35163ce044811f45b6008f280d42f5cee9f8d
patch_args=-Np0
build_options="shibboleth" build_options="shibboleth"
desc_option_shibboleth="Build with Shibboleth support" desc_option_shibboleth="Build with Shibboleth support"

4
srcpkgs/seahorse-nautilus/patches/locale.patch
View file

@ -1,7 +1,7 @@
Index: configure Index: configure
=================================================================== ===================================================================
--- configure.orig --- a/configure
+++ configure +++ b/configure
@@ -14606,8 +14606,8 @@ fi @@ -14606,8 +14606,8 @@ fi
DATADIRNAME=share DATADIRNAME=share
;; ;;

1
srcpkgs/seahorse-nautilus/template
View file

@ -15,4 +15,3 @@ homepage="http://www.gnome.org/projects/seahorse/"
distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz" distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz"
checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a
lib32disabled=yes lib32disabled=yes
patch_args=-Np0

4
srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch
View file

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -42,14 +42,6 @@ endif() @@ -42,14 +42,6 @@ endif()
## Choose build options ## Choose build options

1
srcpkgs/seexpr-krita/template
View file

@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="https://krita.org" homepage="https://krita.org"
distfiles="${KDE_SITE}/kseexpr/${version%.*}/kseexpr-${version}.tar.gz" distfiles="${KDE_SITE}/kseexpr/${version%.*}/kseexpr-${version}.tar.gz"
checksum=13b8455883001668f5d79c5734821c1ad2a0fbc91d019af085bb7e31cf6ce926 checksum=13b8455883001668f5d79c5734821c1ad2a0fbc91d019af085bb7e31cf6ce926
patch_args=-Np0
if [ "$XBPS_CHECK_PKGS" ]; then if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DBUILD_TESTS=ON" configure_args+=" -DBUILD_TESTS=ON"

48
srcpkgs/seq2gif/patches/ifdef.patch
View file

@ -1,7 +1,7 @@
diff --git dcs.c dcs.c diff --git dcs.c dcs.c
index e0f5f97..b1e7919 100644 index e0f5f97..b1e7919 100644
--- dcs.c --- a/dcs.c
+++ dcs.c +++ b/dcs.c
@@ -28,13 +28,13 @@ @@ -28,13 +28,13 @@
#include "dcs.h" #include "dcs.h"
@ -21,8 +21,8 @@ index e0f5f97..b1e7919 100644
diff --git function.c function.c diff --git function.c function.c
index fb2066d..efbd4b4 100644 index fb2066d..efbd4b4 100644
--- function.c --- a/function.c
+++ function.c +++ b/function.c
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
#include "function.h" #include "function.h"
@ -34,8 +34,8 @@ index fb2066d..efbd4b4 100644
diff --git gifsave89.c gifsave89.c diff --git gifsave89.c gifsave89.c
index 1eeb1ad..3af3384 100644 index 1eeb1ad..3af3384 100644
--- gifsave89.c --- a/gifsave89.c
+++ gifsave89.c +++ b/gifsave89.c
@@ -25,10 +25,10 @@ standard headers... @@ -25,10 +25,10 @@ standard headers...
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
@ -51,8 +51,8 @@ index 1eeb1ad..3af3384 100644
#if defined(GSTESTDRIVE) #if defined(GSTESTDRIVE)
diff --git main.c main.c diff --git main.c main.c
index 894e493..18cd178 100644 index 894e493..18cd178 100644
--- main.c --- a/main.c
+++ main.c +++ b/main.c
@@ -28,22 +28,22 @@ @@ -28,22 +28,22 @@
#include <stdio.h> #include <stdio.h>
@ -125,8 +125,8 @@ index 894e493..18cd178 100644
#endif /* HAVE_ERRNO_H */ #endif /* HAVE_ERRNO_H */
diff --git malloc_stub.c malloc_stub.c diff --git malloc_stub.c malloc_stub.c
index c5e881a..e858069 100644 index c5e881a..e858069 100644
--- malloc_stub.c --- a/malloc_stub.c
+++ malloc_stub.c +++ b/malloc_stub.c
@@ -17,17 +17,17 @@ @@ -17,17 +17,17 @@
#include "config.h" #include "config.h"
@ -159,8 +159,8 @@ index c5e881a..e858069 100644
rpl_realloc(void *p, size_t n) rpl_realloc(void *p, size_t n)
diff --git malloc_stub.h malloc_stub.h diff --git malloc_stub.h malloc_stub.h
index 676b1b6..3ae5a50 100644 index 676b1b6..3ae5a50 100644
--- malloc_stub.h --- a/malloc_stub.h
+++ malloc_stub.h +++ b/malloc_stub.h
@@ -18,15 +18,15 @@ @@ -18,15 +18,15 @@
#ifndef MALLOC_STUB_H #ifndef MALLOC_STUB_H
#define MALLOC_STUB_H #define MALLOC_STUB_H
@ -182,8 +182,8 @@ index 676b1b6..3ae5a50 100644
diff --git parse.c parse.c diff --git parse.c parse.c
index 65b00ab..aec3692 100644 index 65b00ab..aec3692 100644
--- parse.c --- a/parse.c
+++ parse.c +++ b/parse.c
@@ -24,10 +24,10 @@ @@ -24,10 +24,10 @@
#include "dcs.h" #include "dcs.h"
@ -199,8 +199,8 @@ index 65b00ab..aec3692 100644
diff --git pseudo.c pseudo.c diff --git pseudo.c pseudo.c
index 89de986..2560b11 100644 index 89de986..2560b11 100644
--- pseudo.c --- a/pseudo.c
+++ pseudo.c +++ b/pseudo.c
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
#include "util.h" #include "util.h"
#include "pseudo.h" #include "pseudo.h"
@ -212,8 +212,8 @@ index 89de986..2560b11 100644
diff --git terminal.c terminal.c diff --git terminal.c terminal.c
index 6d1a0be..26ce2aa 100644 index 6d1a0be..26ce2aa 100644
--- terminal.c --- a/terminal.c
+++ terminal.c +++ b/terminal.c
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
#include "wcwidth.h" #include "wcwidth.h"
@ -229,8 +229,8 @@ index 6d1a0be..26ce2aa 100644
diff --git util.c util.c diff --git util.c util.c
index ce3cfe8..6aa0439 100644 index ce3cfe8..6aa0439 100644
--- util.c --- a/util.c
+++ util.c +++ b/util.c
@@ -19,19 +19,19 @@ @@ -19,19 +19,19 @@
#include "config.h" #include "config.h"
@ -296,8 +296,8 @@ index ce3cfe8..6aa0439 100644
return 0; return 0;
diff --git wcwidth.h wcwidth.h diff --git wcwidth.h wcwidth.h
index 5a2041f..e1da9e5 100644 index 5a2041f..e1da9e5 100644
--- wcwidth.h --- a/wcwidth.h
+++ wcwidth.h +++ b/wcwidth.h
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
@ -309,8 +309,8 @@ index 5a2041f..e1da9e5 100644
diff --git yaft.h yaft.h diff --git yaft.h yaft.h
index 9ecdfd6..4fc3644 100644 index 9ecdfd6..4fc3644 100644
--- yaft.h --- a/yaft.h
+++ yaft.h +++ b/yaft.h
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include <stdbool.h> #include <stdbool.h>

1
srcpkgs/seq2gif/template
View file

@ -9,4 +9,3 @@ license="GPL-3.0-or-later"
homepage="http://saitoha.github.io/seq2gif/" homepage="http://saitoha.github.io/seq2gif/"
distfiles="https://github.com/saitoha/seq2gif/archive/v${version}.tar.gz" distfiles="https://github.com/saitoha/seq2gif/archive/v${version}.tar.gz"
checksum=738805bf8eb7ee5171ded7f43326cca7caecb77031283720f97253c234261f29 checksum=738805bf8eb7ee5171ded7f43326cca7caecb77031283720f97253c234261f29
patch_args=-Np0

4
srcpkgs/serf/patches/0001-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch
View file

@ -15,8 +15,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-03
diff --git SConstruct SConstruct diff --git SConstruct SConstruct
index 4358a23..1766870 100644 index 4358a23..1766870 100644
--- SConstruct --- a/SConstruct
+++ SConstruct +++ b/SConstruct
@@ -166,7 +166,7 @@ env.Append(BUILDERS = { @@ -166,7 +166,7 @@ env.Append(BUILDERS = {
match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
'SERF_MINOR_VERSION ([0-9]+).*' 'SERF_MINOR_VERSION ([0-9]+).*'

4
srcpkgs/serf/patches/0002-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch
View file

@ -15,8 +15,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-03
diff --git SConstruct SConstruct diff --git SConstruct SConstruct
index 1766870..a7e18da 100644 index 1766870..a7e18da 100644
--- SConstruct --- a/SConstruct
+++ SConstruct +++ b/SConstruct
@@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) @@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
unknown = opts.UnknownVariables() unknown = opts.UnknownVariables()

4
srcpkgs/serf/patches/0003-Make-the-tests-run-with-Python-3.x.patch
View file

@ -13,8 +13,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-03
diff --git build/check.py build/check.py diff --git build/check.py build/check.py
index 2dacb4c..341bb3b 100755 index 2dacb4c..341bb3b 100755
--- build/check.py --- a/build/check.py
+++ build/check.py +++ b/build/check.py
@@ -52,16 +52,16 @@ if __name__ == '__main__': @@ -52,16 +52,16 @@ if __name__ == '__main__':
# Find test responses and run them one by one # Find test responses and run them one by one

4
srcpkgs/serf/patches/libressl.patch
View file

@ -1,5 +1,5 @@
--- buckets/ssl_buckets.c.orig --- a/buckets/ssl_buckets.c
+++ buckets/ssl_buckets.c +++ b/buckets/ssl_buckets.c
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
#define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary))) #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary)))
#endif #endif

1
srcpkgs/serf/template
View file

@ -12,7 +12,6 @@ license="Apache-2.0"
homepage="http://serf.apache.org" homepage="http://serf.apache.org"
distfiles="https://archive.apache.org/dist/serf/serf-${version}.tar.bz2" distfiles="https://archive.apache.org/dist/serf/serf-${version}.tar.bz2"
checksum=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc checksum=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
make_build_args+=" APR=${XBPS_WRAPPERDIR}/apr-1-config" make_build_args+=" APR=${XBPS_WRAPPERDIR}/apr-1-config"

4
srcpkgs/sgfutils/patches/Makefile.patch
View file

@ -1,7 +1,7 @@
diff --git Makefile Makefile diff --git Makefile Makefile
index d624f49..4355fc7 100644 index d624f49..4355fc7 100644
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -3,6 +3,7 @@ TPROGS=sgf sgfsplit sgfvarsplit sgfstrip sgfinfo sgfmerge sgftf \ @@ -3,6 +3,7 @@ TPROGS=sgf sgfsplit sgfvarsplit sgfstrip sgfinfo sgfmerge sgftf \
ngf2sgf nip2sgf nk2sgf gib2sgf ngf2sgf nip2sgf nk2sgf gib2sgf

1
srcpkgs/sgfutils/template
View file

@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
homepage="https://www.cwi.nl/~aeb/go/sgfutils/html/" homepage="https://www.cwi.nl/~aeb/go/sgfutils/html/"
distfiles="https://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz" distfiles="https://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2 checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
patch_args=-Np0

8
srcpkgs/shaderc/patches/fix-glslang-link-order.patch
View file

@ -16,8 +16,8 @@ Additionally, libshaderc_util also depends on SPIRV-Tools
libshaderc_util/CMakeLists.txt | 4 ++-- libshaderc_util/CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) 2 files changed, 3 insertions(+), 3 deletions(-)
--- glslc/CMakeLists.txt --- a/glslc/CMakeLists.txt
+++ glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(glslc STATIC @@ -18,7 +18,7 @@ add_library(glslc STATIC
shaderc_default_compile_options(glslc) shaderc_default_compile_options(glslc)
target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
@ -27,8 +27,8 @@ Additionally, libshaderc_util also depends on SPIRV-Tools
target_link_libraries(glslc PRIVATE shaderc_util shaderc) target_link_libraries(glslc PRIVATE shaderc_util shaderc)
add_executable(glslc_exe src/main.cc) add_executable(glslc_exe src/main.cc)
--- libshaderc_util/CMakeLists.txt --- a/libshaderc_util/CMakeLists.txt
+++ libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt
@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) @@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
find_package(Threads) find_package(Threads)

1
srcpkgs/shaderc/template
View file

@ -12,7 +12,6 @@ license="Apache-2.0"
homepage="https://github.com/google/shaderc" homepage="https://github.com/google/shaderc"
distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz" distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz"
checksum=e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec checksum=e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec
patch_args=-Np0
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang"

8
srcpkgs/shadow/patches/shadow-strncpy-usage.patch
View file

@ -1,5 +1,5 @@
--- src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 --- a/src/usermod.c 2012-02-13 08:19:43.792146449 -0500
+++ src/usermod.c 2012-02-13 08:21:19.375114500 -0500 +++ b/src/usermod.c 2012-02-13 08:21:19.375114500 -0500
@@ -182,7 +182,7 @@ @@ -182,7 +182,7 @@
struct tm *tp; struct tm *tp;
@ -9,8 +9,8 @@
} else { } else {
time_t t = (time_t) date; time_t t = (time_t) date;
tp = gmtime (&t); tp = gmtime (&t);
--- src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 --- a/src/login.c 2012-02-13 08:19:50.951994454 -0500
+++ src/login.c 2012-02-13 08:21:04.490430937 -0500 +++ b/src/login.c 2012-02-13 08:21:04.490430937 -0500
@@ -752,7 +752,8 @@ @@ -752,7 +752,8 @@
_("%s login: "), hostn); _("%s login: "), hostn);
} else { } else {

4
srcpkgs/shadow/patches/xstrdup.patch
View file

@ -1,5 +1,5 @@
--- libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 --- a/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500
+++ libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 +++ b/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500
@@ -61,5 +61,6 @@ @@ -61,5 +61,6 @@
char *xstrdup (const char *str) char *xstrdup (const char *str)

1
srcpkgs/shadow/template
View file

@ -17,7 +17,6 @@ homepage="https://github.com/shadow-maint/shadow"
distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz" distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz"
checksum=a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 checksum=a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62
conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs" conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs"
patch_args=-Np0
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

4
srcpkgs/shapelib/patches/libdir.patch
View file

@ -1,7 +1,7 @@
diff --git CMakeLists.txt CMakeLists.txt diff --git CMakeLists.txt CMakeLists.txt
index c3ef935..4b0e65c 100644 index c3ef935..4b0e65c 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -53,11 +53,11 @@ set( @@ -53,11 +53,11 @@ set(
CACHE PATH "install location for user executables" CACHE PATH "install location for user executables"
) )

1
srcpkgs/shapelib/template
View file

@ -9,7 +9,6 @@ license="LGPL-2.0-only"
homepage="http://shapelib.maptools.org/" homepage="http://shapelib.maptools.org/"
distfiles="http://download.osgeo.org/shapelib/shapelib-${version}.tar.gz" distfiles="http://download.osgeo.org/shapelib/shapelib-${version}.tar.gz"
checksum=1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 checksum=1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1
patch_args=-Np0
shapelib-devel_package() { shapelib-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"

4
srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch
View file

@ -1,8 +1,8 @@
Add ability to pass additional options to clang via environnement variable. Add ability to pass additional options to clang via environnement variable.
With help from https://github.com/void-linux/void-packages/pull/26962 With help from https://github.com/void-linux/void-packages/pull/26962
--- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp --- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
+++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp
@@ -305,6 +305,15 @@ @@ -305,6 +305,15 @@
QByteArrayList emulatedCompilerOptions() QByteArrayList emulatedCompilerOptions()
{ {

8
srcpkgs/shiboken2/patches/no-python-arch-suffix.patch
View file

@ -3,8 +3,8 @@ remove intermediate suffix like ".cpython-36m-x86_64-linux-gnu".
Avoid overwriting the "real" cmake file with the generic wrapper's one (same Avoid overwriting the "real" cmake file with the generic wrapper's one (same
name in such a case) name in such a case)
--- sources/shiboken2/CMakeLists.txt.ORIG --- a/sources/shiboken2/CMakeLists.txt
+++ sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt
@@ -98,6 +98,11 @@ @@ -98,6 +98,11 @@
"PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.") "PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.")
endif() endif()
@ -17,8 +17,8 @@ name in such a case)
message(STATUS "PYTHON_EXTENSION_SUFFIX: ${PYTHON_EXTENSION_SUFFIX}") message(STATUS "PYTHON_EXTENSION_SUFFIX: ${PYTHON_EXTENSION_SUFFIX}")
message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}") message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}")
message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}") message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
--- sources/shiboken2/data/CMakeLists.txt.ORIG --- a/sources/shiboken2/data/CMakeLists.txt
+++ sources/shiboken2/data/CMakeLists.txt +++ b/sources/shiboken2/data/CMakeLists.txt
@@ -37,16 +37,11 @@ @@ -37,16 +37,11 @@
PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR
) )

4
srcpkgs/shiboken2/patches/tests-need-python-modules.patch
View file

@ -1,8 +1,8 @@
tests need python modules that are not installed yet: so point the built ones. tests need python modules that are not installed yet: so point the built ones.
Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429 Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429
--- sources/shiboken2/tests/CMakeLists.txt.ORIG 2020-09-09 14:45:42.000000000 +0200 --- a/sources/shiboken2/tests/CMakeLists.txt 2020-09-09 14:45:42.000000000 +0200
+++ sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100 +++ b/sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100
@@ -53,6 +53,6 @@ @@ -53,6 +53,6 @@
list(FIND test_blacklist ${test_name} expect_fail) list(FIND test_blacklist ${test_name} expect_fail)
add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file})

12
srcpkgs/shiboken2/patches/tests-python-syntax.patch
View file

@ -31,8 +31,8 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
diff --git build_history/blacklist.txt build_history/blacklist.txt diff --git build_history/blacklist.txt build_history/blacklist.txt
index 9b63f9784..2a2a5d4c4 100644 index 9b63f9784..2a2a5d4c4 100644
--- build_history/blacklist.txt --- a/build_history/blacklist.txt
+++ build_history/blacklist.txt +++ b/build_history/blacklist.txt
@@ -18,9 +18,6 @@ @@ -18,9 +18,6 @@
darwin py3 darwin py3
[QtCore::qfileread_test] [QtCore::qfileread_test]
@ -45,8 +45,8 @@ index 9b63f9784..2a2a5d4c4 100644
darwin darwin
diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py
index 08a7c55b1..e1e989c1e 100644 index 08a7c55b1..e1e989c1e 100644
--- sources/pyside2/tests/QtCore/qflags_test.py --- a/sources/pyside2/tests/QtCore/qflags_test.py
+++ sources/pyside2/tests/QtCore/qflags_test.py +++ b/sources/pyside2/tests/QtCore/qflags_test.py
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
'''Test cases for QFlags''' '''Test cases for QFlags'''
@ -76,8 +76,8 @@ index 08a7c55b1..e1e989c1e 100644
unittest.main() unittest.main()
diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index ff44db955..87ddd73a5 100644 index ff44db955..87ddd73a5 100644
--- sources/shiboken2/generator/shiboken2/cppgenerator.cpp --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn @@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn
s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName() s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName()
<< ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n"; << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n";

1
srcpkgs/shiboken2/template
View file

@ -16,7 +16,6 @@ license="GPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418
patch_args=-Np0
python_version=3 python_version=3
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr

4
srcpkgs/shmux/patches/time.patch
View file

@ -1,5 +1,5 @@
--- src/os.h.orig --- a/src/os.h
+++ src/os.h +++ b/src/os.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

1
srcpkgs/shmux/template
View file

@ -10,7 +10,6 @@ license="BSD-3-Clause"
homepage="https://github.com/shmux/shmux" homepage="https://github.com/shmux/shmux"
distfiles="https://github.com/shmux/shmux/archive/v${version}.tar.gz" distfiles="https://github.com/shmux/shmux/archive/v${version}.tar.gz"
checksum=c9f8863e2550e23e633cf5fc7a9c4c52d287059f424ef78aba6ecd98390fb9ab checksum=c9f8863e2550e23e633cf5fc7a9c4c52d287059f424ef78aba6ecd98390fb9ab
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

4
srcpkgs/shotwell/patches/fix-unused-method.patch
View file

@ -1,5 +1,5 @@
--- vapi/libgdata.vapi.orig 2019-08-12 11:01:50.347941770 +0200 --- a/vapi/libgdata.vapi 2019-08-12 11:01:50.347941770 +0200
+++ vapi/libgdata.vapi 2019-08-12 11:02:02.993946056 +0200 +++ b/vapi/libgdata.vapi 2019-08-12 11:02:02.993946056 +0200
@@ -1916,7 +1916,6 @@ namespace GData { @@ -1916,7 +1916,6 @@ namespace GData {
public abstract bool is_authorized_for_domain (GData.AuthorizationDomain domain); public abstract bool is_authorized_for_domain (GData.AuthorizationDomain domain);
public abstract void process_request (GData.AuthorizationDomain? domain, Soup.Message message); public abstract void process_request (GData.AuthorizationDomain? domain, Soup.Message message);

1
srcpkgs/shotwell/template
View file

@ -17,7 +17,6 @@ homepage="https://wiki.gnome.org/Apps/Shotwell"
distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2 checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
post_extract() { post_extract() {
# because shotwell intelligently forces fatal warnings even for # because shotwell intelligently forces fatal warnings even for

4
srcpkgs/sidplayfp/patches/musl-PATH_MAX.patch
View file

@ -1,5 +1,5 @@
--- src/IniConfig.cpp 2019-06-23 16:35:20.000000000 +0800 --- a/src/IniConfig.cpp 2019-06-23 16:35:20.000000000 +0800
+++ src/IniConfig.cpp 2020-04-03 22:46:45.585216398 +0800 +++ b/src/IniConfig.cpp 2020-04-03 22:46:45.585216398 +0800
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> /* mkdir */ # include <sys/stat.h> /* mkdir */

1
srcpkgs/sidplayfp/template
View file

@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/sidplay-residfp/" homepage="https://sourceforge.net/projects/sidplay-residfp/"
distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=1c9dd519c39f7c811c33a7b8f516f33c36b36d29af6075316a7ec7320f9d9155 checksum=1c9dd519c39f7c811c33a7b8f516f33c36b36d29af6075316a7ec7320f9d9155
patch_args=-Np0

4
srcpkgs/signond/patches/cross.patch
View file

@ -1,5 +1,5 @@
--- lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 --- a/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200
+++ - 2020-04-27 00:51:57.131405714 +0200 +++ b/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200
@@ -2,6 +2,21 @@ @@ -2,6 +2,21 @@
# SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
# SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt

1
srcpkgs/signond/template
View file

@ -14,7 +14,6 @@ license="LGPL-2.1-only"
homepage="https://gitlab.com/accounts-sso/signond" homepage="https://gitlab.com/accounts-sso/signond"
distfiles="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_${version}>signond-${version}.tar.gz" distfiles="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_${version}>signond-${version}.tar.gz"
checksum=a9cd90cf3e8b1a8bdbe5acf46c797a817092e77946c69fc3ed3a76930f3a76aa checksum=a9cd90cf3e8b1a8bdbe5acf46c797a817092e77946c69fc3ed3a76930f3a76aa
patch_args=-Np0
pre_configure() { pre_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then

4
srcpkgs/sile/patches/lua.patch
View file

@ -1,5 +1,5 @@
--- sile.in 2019-01-07 09:48:08.943943000 +0100 --- a/sile.in 2019-01-07 09:48:08.943943000 +0100
+++ - 2019-01-07 23:26:28.635815999 +0100 +++ b/sile.in 2019-01-07 09:48:08.943943000 +0100
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!@LUA@ -#!@LUA@
+#!@LUA@@LUA_VERSION@ +#!@LUA@@LUA_VERSION@

1
srcpkgs/sile/template
View file

@ -14,7 +14,6 @@ license="MIT"
homepage="http://www.sile-typesetter.org/" homepage="http://www.sile-typesetter.org/"
distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sile-${version}.tar.bz2" distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sile-${version}.tar.bz2"
checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" lua51 lua51-devel lua51-lpeg luaexpat lua51-zlib luafilesystem hostmakedepends+=" lua51 lua51-devel lua51-lpeg luaexpat lua51-zlib luafilesystem

4
srcpkgs/silly/patches/png_longjmp.patch
View file

@ -1,5 +1,5 @@
--- src/loaders/SILLYPNGImageLoader.cpp 2006-06-19 00:42:12.000000000 +0200 --- a/src/loaders/SILLYPNGImageLoader.cpp 2006-06-19 00:42:12.000000000 +0200
+++ src/loaders/SILLYPNGImageLoader.cpp 2015-08-03 15:39:36.102606369 +0200 +++ b/src/loaders/SILLYPNGImageLoader.cpp 2015-08-03 15:39:36.102606369 +0200
@@ -64,10 +64,8 @@ @@ -64,10 +64,8 @@
png_const_charp error) png_const_charp error)
{ {

1
srcpkgs/silly/template
View file

@ -12,7 +12,6 @@ license="MIT"
homepage="http://sourceforge.net/projects/crayzedsgui/" homepage="http://sourceforge.net/projects/crayzedsgui/"
distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz"
checksum=afa064f70433008ec9837fb601c8d73e73db07856e4566f8bee010758c5304ac checksum=afa064f70433008ec9837fb601c8d73e73db07856e4566f8bee010758c5304ac
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

4
srcpkgs/simgear/patches/musl-strerror_r.patch
View file

@ -1,5 +1,5 @@
--- simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200 --- a/simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200
+++ simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200 +++ b/simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200
@@ -1137,7 +1137,13 @@ @@ -1137,7 +1137,13 @@
// Always makes the string in 'buf' null-terminated // Always makes the string in 'buf' null-terminated
retcode = strerror_s(buf, sizeof(buf), errnum); retcode = strerror_s(buf, sizeof(buf), errnum);

8
srcpkgs/simgear/patches/musl-u_types.patch
View file

@ -1,5 +1,5 @@
--- simgear/package/md5.h 2016-05-17 10:36:36.000000000 +0200 --- a/simgear/package/md5.h 2016-05-17 10:36:36.000000000 +0200
+++ simgear/package/md5.h 2016-06-18 14:38:16.524925475 +0200 +++ b/simgear/package/md5.h 2016-06-18 14:38:16.524925475 +0200
@@ -19,27 +19,23 @@ @@ -19,27 +19,23 @@
extern "C" { extern "C" {
#endif #endif
@ -35,8 +35,8 @@
#ifdef __cplusplus #ifdef __cplusplus
} // of extern C } // of extern C
--- simgear/package/md5.c 2016-05-17 10:36:36.000000000 +0200 --- a/simgear/package/md5.c 2016-05-17 10:36:36.000000000 +0200
+++ simgear/package/md5.c 2016-06-18 14:38:25.150680387 +0200 +++ b/simgear/package/md5.c 2016-06-18 14:38:25.150680387 +0200
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
(cp)[1] = (value) >> 8; \ (cp)[1] = (value) >> 8; \
(cp)[0] = (value); } while (0) (cp)[0] = (value); } while (0)

1
srcpkgs/simgear/template
View file

@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
homepage="http://www.flightgear.org/" homepage="http://www.flightgear.org/"
distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1 checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1
patch_args=-Np0
# Suppress warnings regarding auto_ptr # Suppress warnings regarding auto_ptr
CXXFLAGS="-Wno-deprecated-declarations" CXXFLAGS="-Wno-deprecated-declarations"

4
srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch
View file

@ -1,5 +1,5 @@
--- plugins/avrmcu/plugin/firmware.c --- a/plugins/avrmcu/plugin/firmware.c
+++ plugins/avrmcu/plugin/firmware.c +++ b/plugins/avrmcu/plugin/firmware.c
@@ -118,10 +118,6 @@ @@ -118,10 +118,6 @@
case AVR_MMCU_TAG_SIMAVR_CONSOLE: { case AVR_MMCU_TAG_SIMAVR_CONSOLE: {
firmware->console_register_addr = src[0] | (src[1] << 8); firmware->console_register_addr = src[0] | (src[1] << 8);

1
srcpkgs/simutron/template
View file

@ -13,7 +13,6 @@ maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="GPL-3.0-only" license="GPL-3.0-only"
homepage="https://sourceforge.net/projects/simutron/" homepage="https://sourceforge.net/projects/simutron/"
nostrip_files="LCD20x4Test.elf" nostrip_files="LCD20x4Test.elf"
patch_args=-Np0
do_fetch() { do_fetch() {
svn checkout "https://svn.code.sf.net/p/${pkgname}/code/branches/RB-${_version}-${_rev}" "$wrksrc" svn checkout "https://svn.code.sf.net/p/${pkgname}/code/branches/RB-${_version}-${_rev}" "$wrksrc"

4
srcpkgs/sisl/patches/maxdouble.patch
View file

@ -1,5 +1,5 @@
--- include/sislP.h.orig --- a/include/sislP.h
+++ include/sislP.h +++ b/include/sislP.h
@@ -362,7 +362,7 @@ enum @@ -362,7 +362,7 @@ enum
#if defined(SISL_INTERNAL) #if defined(SISL_INTERNAL)

1
srcpkgs/sisl/template
View file

@ -10,7 +10,6 @@ license="AGPL-3.0-only"
homepage="https://github.com/SINTEF-Geometry/SISL" homepage="https://github.com/SINTEF-Geometry/SISL"
distfiles="$homepage/archive/SISL-$version.tar.gz" distfiles="$homepage/archive/SISL-$version.tar.gz"
checksum=b207fe6b4b20775e3064168633256fddd475ff98573408f6f5088a938c086f86 checksum=b207fe6b4b20775e3064168633256fddd475ff98573408f6f5088a938c086f86
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

4
srcpkgs/skroll/patches/fix-makefile.patch
View file

@ -1,7 +1,7 @@
Enable configurable CC and LD. Enable configurable CC and LD.
--- Makefile 2015-03-16 11:50:36.000000000 +0100 --- a/Makefile 2015-03-16 11:50:36.000000000 +0100
+++ Makefile 2015-10-25 23:55:25.205767890 +0100 +++ b/Makefile 2015-10-25 23:55:25.205767890 +0100
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
PREFIX:=/usr PREFIX:=/usr
MANPREFIX:=${PREFIX}/share/man MANPREFIX:=${PREFIX}/share/man

1
srcpkgs/skroll/template
View file

@ -10,7 +10,6 @@ license="WTFPL"
homepage="http://git.z3bra.org/skroll/log.html" homepage="http://git.z3bra.org/skroll/log.html"
distfiles="http://dl.z3bra.org/releases/${pkgname}-${version}.tar.bz2" distfiles="http://dl.z3bra.org/releases/${pkgname}-${version}.tar.bz2"
checksum=32221fef51f6814a7bf3cf4207b8a2466624544a2fd1e5b110ee2af3580d2959 checksum=32221fef51f6814a7bf3cf4207b8a2466624544a2fd1e5b110ee2af3580d2959
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

4
srcpkgs/slcp/patches/libgit-initializion.patch
View file

@ -9,8 +9,8 @@ Subject: [PATCH] fix libgit initialization
diff --git slcp.c slcp.c diff --git slcp.c slcp.c
index 2e9f9f4..7f12b08 100644 index 2e9f9f4..7f12b08 100644
--- slcp.c --- a/slcp.c
+++ slcp.c +++ b/slcp.c
@@ -100,6 +100,7 @@ int main(int argc, char* argv[]) @@ -100,6 +100,7 @@ int main(int argc, char* argv[])
if(argc > 1) termwidth = atoi(argv[1]); if(argc > 1) termwidth = atoi(argv[1]);

4
srcpkgs/slcp/patches/libgit2-0.28.patch
View file

@ -1,7 +1,7 @@
diff --git a/slcp.c b/slcp.c diff --git a/slcp.c b/slcp.c
index 7f12b08..e93c1fd 100644 index 7f12b08..e93c1fd 100644
--- slcp.c --- a/slcp.c
+++ slcp.c +++ b/slcp.c
@@ -106,7 +106,7 @@ int main(int argc, char* argv[]) @@ -106,7 +106,7 @@ int main(int argc, char* argv[])
{ {
git_repo = NULL; git_repo = NULL;

1
srcpkgs/slcp/template
View file

@ -10,7 +10,6 @@ license="Beerware"
homepage="https://github.com/schachmat/slcp" homepage="https://github.com/schachmat/slcp"
distfiles="https://github.com/schachmat/slcp/archive/${version}.tar.gz" distfiles="https://github.com/schachmat/slcp/archive/${version}.tar.gz"
checksum=a26e56832e37dbf1c7b776ddb137e422c987c19330575708a5945697e08e7cfe checksum=a26e56832e37dbf1c7b776ddb137e422c987c19330575708a5945697e08e7cfe
patch_args=-Np0
pre_build() { pre_build() {
sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk

8
srcpkgs/sleuthkit/patches/fix-libewf-v2-API.patch
View file

@ -1,5 +1,5 @@
--- tsk/img/ewf.cpp --- a/tsk/img/ewf.cpp
+++ tsk/img/ewf.cpp +++ b/tsk/img/ewf.cpp
@@ -64,7 +64,7 @@ ewf_image_read(TSK_IMG_INFO * img_info, TSK_OFF_T offset, char *buf, @@ -64,7 +64,7 @@ ewf_image_read(TSK_IMG_INFO * img_info, TSK_OFF_T offset, char *buf,
tsk_take_lock(&(ewf_info->read_lock)); tsk_take_lock(&(ewf_info->read_lock));
@ -9,8 +9,8 @@
buf, len, offset, &ewf_error); buf, len, offset, &ewf_error);
if (cnt < 0) { if (cnt < 0) {
char *errmsg = NULL; char *errmsg = NULL;
--- tsk/img/ewf.h --- a/tsk/img/ewf.h
+++ tsk/img/ewf.h +++ b/tsk/img/ewf.h
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
#include <libewf.h> #include <libewf.h>

1
srcpkgs/sleuthkit/template
View file

@ -15,7 +15,6 @@ homepage="https://www.sleuthkit.org/"
changelog="https://github.com/sleuthkit/sleuthkit/releases" changelog="https://github.com/sleuthkit/sleuthkit/releases"
distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz" distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz"
checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11 checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11
patch_args=-Np0
post_extract() { post_extract() {
sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h

4
srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch
View file

@ -7,8 +7,8 @@ Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
--- ---
diff --git a/slim.conf b/slim.conf diff --git a/slim.conf b/slim.conf
index a8e2e1c..c5f1d38 100644 index a8e2e1c..c5f1d38 100644
--- slim.conf --- a/slim.conf
+++ slim.conf +++ b/slim.conf
@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session @@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session
# options "-d" and "-nodaemon" # options "-d" and "-nodaemon"
# daemon yes # daemon yes

4
srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch
View file

@ -1,5 +1,5 @@
--- CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 --- a/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300
+++ CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +++ b/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300
@@ -119,6 +119,7 @@ if(USE_PAM) @@ -119,6 +119,7 @@ if(USE_PAM)
if(PAM_FOUND) if(PAM_FOUND)
message("\tPAM Found") message("\tPAM Found")

1
srcpkgs/slim/template
View file

@ -15,7 +15,6 @@ homepage="http://sourceforge.net/projects/slim.berlios/"
distfiles="${SOURCEFORGE_SITE}/slim.berlios/slim-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/slim.berlios/slim-${version}.tar.gz"
checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-DNEEDS_BASENAME";; *-musl) CXXFLAGS="-DNEEDS_BASENAME";;

4
srcpkgs/sloccount/patches/fix-c-and-ldflags.patch
View file

@ -1,5 +1,5 @@
--- makefile.orig 2016-05-24 14:50:13.551844062 +0200 --- a/makefile 2016-05-24 14:50:13.551844062 +0200
+++ makefile 2016-05-24 14:50:22.173843417 +0200 +++ b/makefile 2016-05-24 14:50:22.173843417 +0200
@@ -128,28 +128,28 @@ MYDOCS=sloccount.html README TODO Change @@ -128,28 +128,28 @@ MYDOCS=sloccount.html README TODO Change
all: $(COMPILED_EXECUTABLES) all: $(COMPILED_EXECUTABLES)

Some files were not shown because too many files have changed in this diff Show more