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

srcpkgs/m*: 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 861ac185a6
commit 765e304c4b
176 changed files with 318 additions and 383 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch
View file

@ -1,5 +1,5 @@
--- Clients/dns-sd.c.orig 2021-01-26 20:47:47 UTC --- a/Clients/dns-sd.c 2021-01-26 20:47:47 UTC
+++ Clients/dns-sd.c +++ b/Clients/dns-sd.c
@@ -58,11 +58,13 @@ @@ -58,11 +58,13 @@
//#define TEST_NEW_CLIENTSTUB 1 //#define TEST_NEW_CLIENTSTUB 1

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

@ -1,5 +1,5 @@
--- ./mDNSPosix/nss_mdns.c --- a/mDNSPosix/nss_mdns.c
+++ ./mDNSPosix/nss_mdns.c +++ b/mDNSPosix/nss_mdns.c
@@ -379,7 +379,19 @@ @@ -379,7 +379,19 @@
#define ENTNAME hostent #define ENTNAME hostent
#define DATABASE "hosts" #define DATABASE "hosts"

1
srcpkgs/mDNSResponder/template
View file

@ -9,7 +9,6 @@ license="Apache-2.0, BSD-3-Clause"
homepage="https://opensource.apple.com/" homepage="https://opensource.apple.com/"
distfiles="https://opensource.apple.com/tarballs/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="https://opensource.apple.com/tarballs/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=097662447e1535573484697861d9f50eceaf2c52ec2742e451ee6ffe9bbf3e75 checksum=097662447e1535573484697861d9f50eceaf2c52ec2742e451ee6ffe9bbf3e75
patch_args=-Np0
conf_files="/etc/nss_mdns.conf" conf_files="/etc/nss_mdns.conf"
conflicts="nss-mdns>=0" conflicts="nss-mdns>=0"

4
srcpkgs/macchanger/patches/fix-caddr_t.patch
View file

@ -1,7 +1,7 @@
https://github.com/alobbs/macchanger/issues/14 https://github.com/alobbs/macchanger/issues/14
--- ./src/netinfo.c.orig --- a/src/netinfo.c
+++ ./src/netinfo.c +++ b/src/netinfo.c
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
epa->size = IFHWADDRLEN; epa->size = IFHWADDRLEN;

1
srcpkgs/macchanger/template
View file

@ -11,4 +11,3 @@ license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/macchanger" homepage="http://www.gnu.org/software/macchanger"
distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz" distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz"
checksum=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f checksum=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f
patch_args=-Np0

4
srcpkgs/mairix/patches/issue5.patch
View file

@ -7,8 +7,8 @@ If we get two terminators in a row, don't carry out last_action twice.
Fixes vandry/mairix#5 Fixes vandry/mairix#5
--- nvp.c --- a/nvp.c
+++ nvp.c +++ b/nvp.c
@@ -307,6 +307,9 @@ struct nvp *make_nvp(struct msg_src *src, char *s, const char *pfx)/*{{{*/ @@ -307,6 +307,9 @@ struct nvp *make_nvp(struct msg_src *src, char *s, const char *pfx)/*{{{*/
default: default:
break; break;

1
srcpkgs/mairix/template
View file

@ -12,7 +12,6 @@ license="GPL-2.0-only"
homepage="https://github.com/vandry/mairix" homepage="https://github.com/vandry/mairix"
distfiles="https://github.com/vandry/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" distfiles="https://github.com/vandry/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz"
checksum=a0702e079c768b6fbe25687ebcbabe7965eb493d269a105998c7c1c2caef4a57 checksum=a0702e079c768b6fbe25687ebcbabe7965eb493d269a105998c7c1c2caef4a57
patch_args=-Np0
pre_build() { pre_build() {
make -C dfasyn CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" make -C dfasyn CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS"

8
srcpkgs/makedumpfile/patches/ppc32.patch
View file

@ -10,8 +10,8 @@ Subject: [PATCH] Fix definitions for ppc32
diff --git arch/ppc.c arch/ppc.c diff --git arch/ppc.c arch/ppc.c
index 37c6a3b..4130c2d 100644 index 37c6a3b..4130c2d 100644
--- arch/ppc.c --- a/arch/ppc.c
+++ arch/ppc.c +++ b/arch/ppc.c
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
@ -23,8 +23,8 @@ index 37c6a3b..4130c2d 100644
#include "../elf_info.h" #include "../elf_info.h"
diff --git makedumpfile.h makedumpfile.h diff --git makedumpfile.h makedumpfile.h
index 24b2f69..d802833 100644 index 24b2f69..d802833 100644
--- makedumpfile.h --- a/makedumpfile.h
+++ makedumpfile.h +++ b/makedumpfile.h
@@ -765,7 +765,7 @@ unsigned long get_kvbase_arm64(void); @@ -765,7 +765,7 @@ unsigned long get_kvbase_arm64(void);
#endif #endif

1
srcpkgs/makedumpfile/template
View file

@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
homepage="https://github.com/makedumpfile/makedumpfile" homepage="https://github.com/makedumpfile/makedumpfile"
distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
checksum=393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350 checksum=393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

4
srcpkgs/makeself/patches/header.patch
View file

@ -1,5 +1,5 @@
--- makeself.sh.orig 2019-06-13 07:22:52.406415309 +0000 --- a/makeself.sh 2019-06-13 07:22:52.406415309 +0000
+++ makeself.sh 2019-06-13 07:23:10.116346635 +0000 +++ b/makeself.sh 2019-06-13 07:23:10.116346635 +0000
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
TAR_EXTRA="" TAR_EXTRA=""
GPG_EXTRA="" GPG_EXTRA=""

1
srcpkgs/makeself/template
View file

@ -9,7 +9,6 @@ license="GPL-2.0-or-later"
homepage="http://makeself.io" homepage="http://makeself.io"
distfiles="https://github.com/megastep/makeself/archive/release-$version.tar.gz" distfiles="https://github.com/megastep/makeself/archive/release-$version.tar.gz"
checksum=8789312db5e93fc471a1e4fb88ec13227ef63a9c7aad297f3bbf35f9511f8d62 checksum=8789312db5e93fc471a1e4fb88ec13227ef63a9c7aad297f3bbf35f9511f8d62
patch_args=-Np0
do_install() { do_install() {
vmkdir usr/share/man/man1 vmkdir usr/share/man/man1

4
srcpkgs/mame/patches/musl-netlist.patch
View file

@ -1,5 +1,5 @@
--- src/lib/netlist/plib/pexception.cpp 2017-01-24 23:44:30.000000000 +0100 --- a/src/lib/netlist/plib/pexception.cpp 2017-01-24 23:44:30.000000000 +0100
+++ src/lib/netlist/plib/pexception.cpp 2017-01-25 06:48:09.658604647 +0100 +++ b/src/lib/netlist/plib/pexception.cpp 2017-01-25 06:48:09.658604647 +0100
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
#include "pexception.h" #include "pexception.h"
#include "pfmtlog.h" #include "pfmtlog.h"

4
srcpkgs/mame/patches/musl-time_t.patch
View file

@ -1,5 +1,5 @@
--- 3rdparty/bx/include/bx/bx.h 2017-12-27 02:45:37.000000000 +0100 --- a/3rdparty/bx/include/bx/bx.h 2017-12-27 02:45:37.000000000 +0100
+++ 3rdparty/bx/include/bx/bx.h 2017-12-28 10:58:30.254932880 +0100 +++ b/3rdparty/bx/include/bx/bx.h 2017-12-28 10:58:30.254932880 +0100
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
#include <stdint.h> // uint32_t #include <stdint.h> // uint32_t
#include <stdlib.h> // size_t #include <stdlib.h> // size_t

4
srcpkgs/mame/patches/pagesize-name-clash.patch
View file

@ -1,5 +1,5 @@
--- src/lib/netlist/plib/palloc.h 2020-06-26 07:55:07.000000000 +0200 --- a/src/lib/netlist/plib/palloc.h 2020-06-26 07:55:07.000000000 +0200
+++ src/lib/netlist/plib/palloc.h 2020-06-27 17:37:11.920172697 +0200 +++ b/src/lib/netlist/plib/palloc.h 2020-06-27 17:37:11.920172697 +0200
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
#include <algorithm> #include <algorithm>

1
srcpkgs/mame/template
View file

@ -16,7 +16,6 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz"
checksum=414921771ada0804a8c7f3540e33338e8495e16a3bca78a5a2b355abafa51e6a checksum=414921771ada0804a8c7f3540e33338e8495e16a3bca78a5a2b355abafa51e6a
nodebug=yes nodebug=yes
replaces="sdlmame>=0 sdlmess>=0" replaces="sdlmame>=0 sdlmess>=0"
patch_args=-Np0
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include/libutf8proc" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include/libutf8proc"
CXXFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"

4
srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch
View file

@ -1,5 +1,5 @@
--- libdb/db_btree.c --- a/libdb/db_btree.c
+++ libdb/db_btree.c +++ b/libdb/db_btree.c
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#ifdef BTREE #ifdef BTREE

12
srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch
View file

@ -5,8 +5,8 @@
diff --git src/manconv.c src/manconv.c diff --git src/manconv.c src/manconv.c
index b9ac8d3a..8f5bdaee 100644 index b9ac8d3a..8f5bdaee 100644
--- src/manconv.c --- a/src/manconv.c
+++ src/manconv.c +++ b/src/manconv.c
@@ -111,9 +111,14 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to, @@ -111,9 +111,14 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to,
iconv_t cd_utf8, cd = NULL; iconv_t cd_utf8, cd = NULL;
bool to_utf8 = STREQ (try_to_code, "UTF-8") || bool to_utf8 = STREQ (try_to_code, "UTF-8") ||
@ -25,8 +25,8 @@ index b9ac8d3a..8f5bdaee 100644
diff --git src/manconv_client.c src/manconv_client.c diff --git src/manconv_client.c src/manconv_client.c
index 0c41bec6..2a7f1398 100644 index 0c41bec6..2a7f1398 100644
--- src/manconv_client.c --- a/src/manconv_client.c
+++ src/manconv_client.c +++ b/src/manconv_client.c
@@ -102,7 +102,11 @@ void add_manconv (pipeline *p, const char *source, const char *target) @@ -102,7 +102,11 @@ void add_manconv (pipeline *p, const char *source, const char *target)
gl_list_add_last (codes->from, xstrdup (source)); gl_list_add_last (codes->from, xstrdup (source));
name = appendstr (name, "UTF-8:", source, (void *) 0); name = appendstr (name, "UTF-8:", source, (void *) 0);
@ -41,8 +41,8 @@ index 0c41bec6..2a7f1398 100644
if (quiet >= 2) if (quiet >= 2)
diff --git src/whatis.c src/whatis.c diff --git src/whatis.c src/whatis.c
index d2559169..ec80c117 100644 index d2559169..ec80c117 100644
--- src/whatis.c --- a/src/whatis.c
+++ src/whatis.c +++ b/src/whatis.c
@@ -945,9 +945,13 @@ int main (int argc, char *argv[]) @@ -945,9 +945,13 @@ int main (int argc, char *argv[])
display_seen = new_string_set (GL_HASH_SET); display_seen = new_string_set (GL_HASH_SET);

1
srcpkgs/man-db/template
View file

@ -26,7 +26,6 @@ lib32disabled=yes
system_accounts="_man" system_accounts="_man"
_man_homedir="/var/cache/man" _man_homedir="/var/cache/man"
make_dirs="/var/cache/man 0755 _man _man" make_dirs="/var/cache/man 0755 _man _man"
patch_args=-Np0
# among others, requires the _man user to be available in the masterdir # among others, requires the _man user to be available in the masterdir
make_check=no make_check=no

8
srcpkgs/marble5/patches/soversion.diff
View file

@ -1,5 +1,5 @@
--- src/lib/astro/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 --- a/src/lib/astro/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100
+++ src/lib/astro/CMakeLists.txt 2018-02-10 15:08:03.545093856 +0100 +++ b/src/lib/astro/CMakeLists.txt 2018-02-10 15:08:03.545093856 +0100
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
) )
@ -9,8 +9,8 @@
ADD_DEFINITIONS(-O3) ADD_DEFINITIONS(-O3)
--- src/lib/marble/declarative/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 --- a/src/lib/marble/declarative/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100
+++ src/lib/marble/declarative/CMakeLists.txt 2018-02-10 15:08:55.007096153 +0100 +++ b/src/lib/marble/declarative/CMakeLists.txt 2018-02-10 15:08:55.007096153 +0100
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
RouteRelationModel.cpp RouteRelationModel.cpp
) )

1
srcpkgs/marble5/template
View file

@ -16,7 +16,6 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
homepage="https://marble.kde.org" homepage="https://marble.kde.org"
distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz" distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
checksum=66e1fe73e248ba18245e2a1e234eecf49d531569b5080e19a4ca9dddbbbd0545 checksum=66e1fe73e248ba18245e2a1e234eecf49d531569b5080e19a4ca9dddbbbd0545
patch_args=-Np0
pre_configure() { pre_configure() {
vsed -i CMakeLists.txt -e 's/-Wcast-align//' vsed -i CMakeLists.txt -e 's/-Wcast-align//'

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

@ -1,5 +1,5 @@
--- src/ui/theme.c.orig 2015-05-13 18:52:13.340057387 +0200 --- a/src/ui/theme.c 2015-05-13 18:52:13.340057387 +0200
+++ src/ui/theme.c 2015-05-13 18:55:30.469306867 +0200 +++ b/src/ui/theme.c 2015-05-13 18:55:30.469306867 +0200
@@ -60,7 +60,8 @@ @@ -60,7 +60,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <string.h> #include <string.h>

1
srcpkgs/marco/template
View file

@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org" homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=498350cb12fc4d9c7c4a0355102c17b50043fbab258d11ad41b7d698b4f042a7 checksum=498350cb12fc4d9c7c4a0355102c17b50043fbab258d11ad41b7d698b4f042a7
patch_args=-Np0
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh

16
srcpkgs/mariadb/patches/atomic-fix.patch
View file

@ -18,8 +18,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200
James Cowgill <jcowgill@debian.org> James Cowgill <jcowgill@debian.org>
Jessica Clarke <jrtc27@debian.org> Jessica Clarke <jrtc27@debian.org>
--- configure.cmake --- a/configure.cmake
+++ configure.cmake +++ b/configure.cmake
@@ -862,7 +862,25 @@ int main() @@ -862,7 +862,25 @@ int main()
long long int *ptr= &var; long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
@ -47,8 +47,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200
IF(WITH_VALGRIND) IF(WITH_VALGRIND)
SET(HAVE_valgrind 1) SET(HAVE_valgrind 1)
--- mysys/CMakeLists.txt --- a/mysys/CMakeLists.txt
+++ mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt
@@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings @@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO})
DTRACE_INSTRUMENT(mysys) DTRACE_INSTRUMENT(mysys)
@ -60,8 +60,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200
IF(HAVE_BFD_H) IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd) TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H) ENDIF(HAVE_BFD_H)
--- sql/CMakeLists.txt --- a/sql/CMakeLists.txt
+++ sql/CMakeLists.txt +++ b/sql/CMakeLists.txt
@@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS) @@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS)
"${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}") "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
ENDIF() ENDIF()
@ -92,8 +92,8 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index d7895b0..3bcd52a 100644 index d7895b0..3bcd52a 100644
--- storage/rocksdb/build_rocksdb.cmake --- a/storage/rocksdb/build_rocksdb.cmake
+++ storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake
@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) @@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})

4
srcpkgs/mariadb/patches/revert-isb-assembly-instruction.patch
View file

@ -7,8 +7,8 @@ Description:
https://github.com/MariaDB/server/commit/76d2846a71a155ee2861fd52e6635e35490a9dd1 https://github.com/MariaDB/server/commit/76d2846a71a155ee2861fd52e6635e35490a9dd1
is likely to fix it and make armhf build again. is likely to fix it and make armhf build again.
--- include/my_cpu.h --- a/include/my_cpu.h
+++ include/my_cpu.h +++ b/include/my_cpu.h
@@ -84,7 +84,7 @@ static inline void MY_RELAX_CPU(void) @@ -84,7 +84,7 @@ static inline void MY_RELAX_CPU(void)
__ppc_get_timebase(); __ppc_get_timebase();
#elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)

1
srcpkgs/mariadb/template
View file

@ -35,7 +35,6 @@ system_accounts="mysql"
mysql_homedir="/var/lib/mysql" mysql_homedir="/var/lib/mysql"
make_dirs="/var/lib/mysql 0700 mysql mysql make_dirs="/var/lib/mysql 0700 mysql mysql
/usr/lib/mysql/plugin/auth_pam_tool_dir 0700 mysql root" /usr/lib/mysql/plugin/auth_pam_tool_dir 0700 mysql root"
patch_args=-Np0
post_patch() { post_patch() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

4
srcpkgs/masterpassword-cli/patches/fix-cflags.patch
View file

@ -1,7 +1,7 @@
Index: platform-independent/cli-c/CMakeLists.txt Index: platform-independent/cli-c/CMakeLists.txt
=================================================================== ===================================================================
--- platform-independent/cli-c/CMakeLists.txt.orig --- a/platform-independent/cli-c/CMakeLists.txt
+++ platform-independent/cli-c/CMakeLists.txt +++ b/platform-independent/cli-c/CMakeLists.txt
@@ -15,8 +15,6 @@ option( BUILD_MPW_BENCH "C CLI M @@ -15,8 +15,6 @@ option( BUILD_MPW_BENCH "C CLI M
option( BUILD_MPW_TESTS "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF ) option( BUILD_MPW_TESTS "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF )

4
srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch
View file

@ -1,5 +1,5 @@
--- core/c/mpw-marshal-util.c 2017-09-25 02:59:09.000000000 -0400 --- a/core/c/mpw-marshal-util.c 2017-09-25 02:59:09.000000000 -0400
+++ core/c/mpw-marshal-util.c 2020-05-31 11:32:02.362438198 -0400 +++ b/core/c/mpw-marshal-util.c 2020-05-31 11:32:02.362438198 -0400
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
if (!json_value) if (!json_value)
return defaultValue; return defaultValue;

1
srcpkgs/masterpassword-cli/template
View file

@ -16,7 +16,6 @@ distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-3.tar
checksum=35dc64bc74c04b534824c21da96e4a10fc7978da376fcc036d7ec08fd800ab7a checksum=35dc64bc74c04b534824c21da96e4a10fc7978da376fcc036d7ec08fd800ab7a
# Apache-1.0 is incompatible with GPL-3+ # Apache-1.0 is incompatible with GPL-3+
restricted=yes restricted=yes
patch_args=-Np0
pre_configure() { pre_configure() {
echo "${version}-cli" > ${wrksrc}/${build_wrksrc}/VERSION echo "${version}-cli" > ${wrksrc}/${build_wrksrc}/VERSION

12
srcpkgs/mate-power-manager/patches/musl.patch
View file

@ -1,5 +1,5 @@
--- src/egg-debug.c.orig 2015-11-07 07:50:36.623167156 +0100 --- a/src/egg-debug.c 2015-11-07 07:50:36.623167156 +0100
+++ src/egg-debug.c 2015-11-07 07:51:46.719072134 +0100 +++ b/src/egg-debug.c 2015-11-07 07:51:46.719072134 +0100
@@ -39,7 +39,9 @@ @@ -39,7 +39,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -26,8 +26,8 @@
} }
/** /**
--- applets/brightness/egg-debug.c.orig 2015-11-07 07:52:33.320008962 +0100 --- a/applets/brightness/egg-debug.c 2015-11-07 07:52:33.320008962 +0100
+++ applets/brightness/egg-debug.c 2015-11-07 07:53:09.302960183 +0100 +++ b/applets/brightness/egg-debug.c 2015-11-07 07:53:09.302960183 +0100
@@ -39,7 +39,9 @@ @@ -39,7 +39,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@ -54,8 +54,8 @@
} }
/** /**
--- applets/inhibit/egg-debug.c.orig 2015-11-07 07:53:32.815928309 +0100 --- a/applets/inhibit/egg-debug.c 2015-11-07 07:53:32.815928309 +0100
+++ applets/inhibit/egg-debug.c 2015-11-07 07:53:55.503897553 +0100 +++ b/applets/inhibit/egg-debug.c 2015-11-07 07:53:55.503897553 +0100
@@ -39,7 +39,9 @@ @@ -39,7 +39,9 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>

1
srcpkgs/mate-power-manager/template
View file

@ -15,4 +15,3 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org" homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=d24b9fce23b086817d5494f7e65e58f18367af6eb5d0d4ade45de5396e20d13a checksum=d24b9fce23b086817d5494f7e65e58f18367af6eb5d0d4ade45de5396e20d13a
patch_args=-Np0

4
srcpkgs/mate-utils/patches/cross-strftime.patch
View file

@ -1,5 +1,5 @@
--- configure.ac.orig 2015-09-01 15:56:57.000000000 +0200 --- a/configure.ac 2015-09-01 15:56:57.000000000 +0200
+++ configure.ac 2015-10-23 15:09:25.486599085 +0200 +++ b/configure.ac 2015-10-23 15:09:25.486599085 +0200
@@ -277,24 +277,32 @@ AS_IF([test "x$have_ipv6" = "xyes"], @@ -277,24 +277,32 @@ AS_IF([test "x$have_ipv6" = "xyes"],
] ]
) )

1
srcpkgs/mate-utils/template
View file

@ -16,7 +16,6 @@ license="GPL-2.0-or-later"
homepage="https://mate-desktop.org" homepage="https://mate-desktop.org"
distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=219673047fe2a14eb9c8bc23a5fb7c99d45e7acad4c05b4bf59a3d244cb026ac checksum=219673047fe2a14eb9c8bc23a5fb7c99d45e7acad4c05b4bf59a3d244cb026ac
patch_args=-Np0
pre_configure() { pre_configure() {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh

4
srcpkgs/matio/patches/CVE-2019-20020.patch
View file

@ -10,8 +10,8 @@ Signed-off-by: Nathan Owens <ndowens04@gmail.com>
diff --git a/src/mat5.c b/src/mat5.c diff --git a/src/mat5.c b/src/mat5.c
index abdb351..776f233 100644 index abdb351..776f233 100644
--- src/mat5.c --- a/src/mat5.c
+++ src/mat5.c +++ b/src/mat5.c
@@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar ) @@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar )
/* Rank and Dimension */ /* Rank and Dimension */
if ( uncomp_buf[0] == MAT_T_INT32 ) { if ( uncomp_buf[0] == MAT_T_INT32 ) {

1
srcpkgs/matio/template
View file

@ -12,7 +12,6 @@ license="BSD-2-Clause"
homepage="https://github.com/tbeu/matio" homepage="https://github.com/tbeu/matio"
distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz" distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz"
checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400 checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_va_copy=C99" configure_args+=" ac_cv_va_copy=C99"

8
srcpkgs/maturin/patches/add-ppc-tier3.patch
View file

@ -1,6 +1,6 @@
diff -ur setup.py setup.py diff -ur setup.py setup.py
--- setup.py --- a/setup.py
+++ setup.py +++ b/setup.py
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
"--message-format=json", "--message-format=json",
] ]
@ -11,8 +11,8 @@ diff -ur setup.py setup.py
["--no-default-features", "--features=upload,log,human-panic"] ["--no-default-features", "--features=upload,log,human-panic"]
) )
diff -ur src/target.rs src/target.rs diff -ur src/target.rs src/target.rs
--- src/target.rs --- a/src/target.rs
+++ src/target.rs +++ b/src/target.rs
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
Armv7L, Armv7L,
Powerpc64Le, Powerpc64Le,

4
srcpkgs/maturin/patches/target-lexicon-ppcle.patch
View file

@ -1,5 +1,5 @@
--- target-lexicon/src/targets.rs --- a/target-lexicon/src/targets.rs
+++ target-lexicon/src/targets.rs +++ b/target-lexicon/src/targets.rs
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
Msp430, Msp430,
Nvptx64, Nvptx64,

1
srcpkgs/maturin/template
View file

@ -18,7 +18,6 @@ distfiles="${homepage}/archive/v${version}.tar.gz
https://github.com/bytecodealliance/target-lexicon/archive/v0.12.0.tar.gz" https://github.com/bytecodealliance/target-lexicon/archive/v0.12.0.tar.gz"
checksum="e6a9a67cc62ffe248654e60e7ec211bf23319c4c936ad87022f7a1fd0997430d checksum="e6a9a67cc62ffe248654e60e7ec211bf23319c4c936ad87022f7a1fd0997430d
18fead54e5dfa2cb0fa8af3db3c2765ca1c003b20cd4eca7be0553b30ce229de" 18fead54e5dfa2cb0fa8af3db3c2765ca1c003b20cd4eca7be0553b30ce229de"
patch_args=-Np0
post_extract() { post_extract() {
mv ../target-lexicon* target-lexicon mv ../target-lexicon* target-lexicon

12
srcpkgs/mc/patches/mc-mksh-subshell-v2.patch
View file

@ -1,5 +1,5 @@
--- lib/shell.c 2016-09-22 18:24:12.000000000 +0000 --- a/lib/shell.c 2016-09-22 18:24:12.000000000 +0000
+++ lib/shell.c 2017-02-16 13:47:34.933939000 +0000 +++ b/lib/shell.c 2017-02-16 13:47:34.933939000 +0000
@@ -66,6 +66,10 @@ @@ -66,6 +66,10 @@
/* 3rd choice: look for existing shells supported as MC subshells. */ /* 3rd choice: look for existing shells supported as MC subshells. */
if (access ("/bin/bash", X_OK) == 0) if (access ("/bin/bash", X_OK) == 0)
@ -25,8 +25,8 @@
|| strstr (mc_shell->real_path, "/tcsh") != NULL) || strstr (mc_shell->real_path, "/tcsh") != NULL)
{ {
diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
--- lib/shell.h 2016-03-12 15:45:47.000000000 +0000 --- a/lib/shell.h 2016-03-12 15:45:47.000000000 +0000
+++ lib/shell.h 2017-02-15 21:57:39.000000000 +0000 +++ b/lib/shell.h 2017-02-15 21:57:39.000000000 +0000
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
typedef enum typedef enum
{ {
@ -36,8 +36,8 @@ diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h
SHELL_BASH, SHELL_BASH,
SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */ SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */
diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c
--- src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000 --- a/src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000
+++ src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000 +++ b/src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000
@@ -320,6 +320,12 @@ @@ -320,6 +320,12 @@
break; break;

4
srcpkgs/mc/patches/xbps.patch
View file

@ -1,5 +1,5 @@
--- misc/mc.ext.in 2017-08-21 19:28:49.638411103 +0200 --- a/misc/mc.ext.in 2017-08-21 19:28:49.638411103 +0200
+++ misc/mc.ext.in 2017-08-21 19:38:05.633602005 +0200 +++ b/misc/mc.ext.in 2017-08-21 19:38:05.633602005 +0200
@@ -145,8 +145,8 @@ @@ -145,8 +145,8 @@
Open=%cd %p/utar:// Open=%cd %p/utar://
View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4 View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4

1
srcpkgs/mc/template
View file

@ -14,7 +14,6 @@ distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
#distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz" #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27 checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27
python_version=2 python_version=2
patch_args=-Np0
conf_files=" conf_files="
/etc/mc/filehighlight.ini /etc/mc/filehighlight.ini

4
srcpkgs/mcomix/patches/image_tools.py.patch
View file

@ -1,6 +1,6 @@
Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files
--- mcomix/image_tools.py.orig 2016-02-12 18:51:58 UTC --- a/mcomix/image_tools.py 2016-02-12 18:51:58 UTC
+++ mcomix/image_tools.py +++ b/mcomix/image_tools.py
@@ -9,7 +9,6 @@ import gtk @@ -9,7 +9,6 @@ import gtk
from PIL import Image from PIL import Image
from PIL import ImageEnhance from PIL import ImageEnhance

4
srcpkgs/mcomix/patches/run.py.patch
View file

@ -1,6 +1,6 @@
Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files
--- mcomix/run.py.orig 2016-02-12 18:52:12 UTC --- a/mcomix/run.py 2016-02-12 18:52:12 UTC
+++ mcomix/run.py +++ b/mcomix/run.py
@@ -203,7 +203,11 @@ def run(): @@ -203,7 +203,11 @@ def run():
try: try:

1
srcpkgs/mcomix/template
View file

@ -11,4 +11,3 @@ license="GPL-2.0-only"
homepage="http://sourceforge.net/projects/mcomix/" homepage="http://sourceforge.net/projects/mcomix/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.bz2"
checksum=7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b checksum=7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b
patch_args=-Np0

4
srcpkgs/mcpp/patches/mbchar.patch
View file

@ -1,8 +1,8 @@
Fix set_encoding() to understand C.UTF-8 and other Fix set_encoding() to understand C.UTF-8 and other
locale names with != 5 characters before . locale names with != 5 characters before .
--- src/mbchar.c 2008-03-08 11:06:13.000000000 -0200 --- a/src/mbchar.c 2008-03-08 11:06:13.000000000 -0200
+++ src/mbchar.c 2020-01-13 10:02:20.800174591 -0300 +++ b/src/mbchar.c 2020-01-13 10:02:20.800174591 -0300
@@ -366,6 +366,7 @@ @@ -366,6 +366,7 @@
= "Too long encoding name: %s%.0ld%.0s"; /* _E_ */ = "Too long encoding name: %s%.0ld%.0s"; /* _E_ */
const char * loc = ""; const char * loc = "";

1
srcpkgs/mcpp/template
View file

@ -10,7 +10,6 @@ license="BSD-2-Clause"
homepage="http://mcpp.sourceforge.net/" homepage="http://mcpp.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/mcpp/mcpp-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/mcpp/mcpp-${version}.tar.gz"
checksum=3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864 checksum=3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

4
srcpkgs/mdadm/patches/sysmacros_h.patch
View file

@ -1,5 +1,5 @@
--- mdadm.h 2018-10-01 20:26:06.000000000 +0200 --- a/mdadm.h 2018-10-01 20:26:06.000000000 +0200
+++ mdadm.h 2019-12-27 07:24:26.224920452 +0100 +++ b/mdadm.h 2019-12-27 07:24:26.224920452 +0100
@@ -45,10 +45,7 @@ @@ -45,10 +45,7 @@
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>

4
srcpkgs/mdadm/patches/time64.patch
View file

@ -1,7 +1,7 @@
diff --git monitor.c monitor.c diff --git monitor.c monitor.c
index 81537ed..08027ac 100644 index 81537ed..08027ac 100644
--- monitor.c --- a/monitor.c
+++ monitor.c +++ b/monitor.c
@@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds) @@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds)
} }

4
srcpkgs/mdadm/patches/use-after-free.patch
View file

@ -2,8 +2,8 @@ From Rich Felker, over IRC
diff --git a/policy.c b/policy.c diff --git a/policy.c b/policy.c
index c0d18a7e..78ad34cd 100644 index c0d18a7e..78ad34cd 100644
--- policy.c --- a/policy.c
+++ policy.c +++ b/policy.c
@@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk) @@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk)
continue; continue;
if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor)) if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor))

1
srcpkgs/mdadm/template
View file

@ -10,7 +10,6 @@ license="GPL-2"
homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/" homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/"
distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a checksum=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a
patch_args=-Np0
pre_configure() { pre_configure() {
sed -i 's,^install : mdadm mdmon,install: ,g' Makefile sed -i 's,^install : mdadm mdmon,install: ,g' Makefile

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

@ -1,5 +1,5 @@
--- configure.orig --- a/configure
+++ configure +++ b/configure
@@ -168,14 +168,6 @@ @@ -168,14 +168,6 @@
if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} ${4} 1>&3 2>&3 if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} ${4} 1>&3 2>&3
then then

4
srcpkgs/mdocml/patches/fix-tbl-NULL-pointer-dereference.patch
View file

@ -3,8 +3,8 @@ RCS file: /vhosts/mdocml.bsd.lv/cvs/mdocml/tbl_term.c,v
retrieving revision 1.69 retrieving revision 1.69
retrieving revision 1.70 retrieving revision 1.70
diff -u -p -r1.69 -r1.70 diff -u -p -r1.69 -r1.70
--- tbl_term.c 2019/03/16 21:35:48 1.69 --- a/tbl_term.c 2019/03/16 21:35:48 1.69
+++ tbl_term.c 2019/03/18 08:00:34 1.70 +++ b/tbl_term.c 2019/03/18 08:00:34 1.70
@@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp @@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
lw = cpp == NULL || cpn == NULL || lw = cpp == NULL || cpn == NULL ||

4
srcpkgs/mdocml/patches/fix-tbl-crash.patch
View file

@ -3,8 +3,8 @@ RCS file: /vhosts/mdocml.bsd.lv/cvs/mdocml/out.c,v
retrieving revision 1.77 retrieving revision 1.77
retrieving revision 1.78 retrieving revision 1.78
diff -u -p -r1.77 -r1.78 diff -u -p -r1.77 -r1.78
--- out.c 2018/12/13 11:55:47 1.77 --- a/out.c 2018/12/13 11:55:47 1.77
+++ out.c 2019/03/29 21:27:06 1.78 +++ b/out.c 2019/03/29 21:27:06 1.78
@@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp @@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp
gp = &first_group; gp = &first_group;
for (dp = sp->first; dp != NULL; dp = dp->next) { for (dp = sp->first; dp != NULL; dp = dp->next) {

12
srcpkgs/mdocml/patches/fix.9868-1.patch
View file

@ -27,8 +27,8 @@ RCS file: /home/cvs/mandoc/mandoc/mansearch.c,v
retrieving revision 1.80 retrieving revision 1.80
retrieving revision 1.81 retrieving revision 1.81
diff -Lmansearch.c -Lmansearch.c -u -p -r1.80 -r1.81 diff -Lmansearch.c -Lmansearch.c -u -p -r1.80 -r1.81
--- mansearch.c --- a/mansearch.c
+++ mansearch.c +++ b/mansearch.c
@@ -199,6 +199,7 @@ mansearch(const struct mansearch *search @@ -199,6 +199,7 @@ mansearch(const struct mansearch *search
} }
mpage->names = buildnames(page); mpage->names = buildnames(page);
@ -65,8 +65,8 @@ RCS file: /home/cvs/mandoc/mandoc/mansearch.h,v
retrieving revision 1.29 retrieving revision 1.29
retrieving revision 1.30 retrieving revision 1.30
diff -Lmansearch.h -Lmansearch.h -u -p -r1.29 -r1.30 diff -Lmansearch.h -Lmansearch.h -u -p -r1.29 -r1.30
--- mansearch.h --- a/mansearch.h
+++ mansearch.h +++ b/mansearch.h
@@ -92,6 +92,7 @@ struct manpage { @@ -92,6 +92,7 @@ struct manpage {
char *file; /* to be prefixed by manpath */ char *file; /* to be prefixed by manpath */
char *names; /* a list of names with sections */ char *names; /* a list of names with sections */
@ -81,8 +81,8 @@ RCS file: /home/cvs/mandoc/mandoc/main.c,v
retrieving revision 1.322 retrieving revision 1.322
retrieving revision 1.323 retrieving revision 1.323
diff -Lmain.c -Lmain.c -u -p -r1.322 -r1.323 diff -Lmain.c -Lmain.c -u -p -r1.322 -r1.323
--- main.c --- a/main.c
+++ main.c +++ b/main.c
@@ -411,6 +411,7 @@ main(int argc, char *argv[]) @@ -411,6 +411,7 @@ main(int argc, char *argv[])
res[sz].file = mandoc_strdup(argv[c]); res[sz].file = mandoc_strdup(argv[c]);
res[sz].names = NULL; res[sz].names = NULL;

4
srcpkgs/mdocml/patches/fix.9868-2.patch
View file

@ -28,8 +28,8 @@ RCS file: /home/cvs/mandoc/mandoc/main.c,v
retrieving revision 1.324 retrieving revision 1.324
retrieving revision 1.325 retrieving revision 1.325
diff -Lmain.c -Lmain.c -u -p -r1.324 -r1.325 diff -Lmain.c -Lmain.c -u -p -r1.324 -r1.325
--- main.c --- a/main.c
+++ main.c +++ b/main.c
@@ -125,7 +125,7 @@ main(int argc, char *argv[]) @@ -125,7 +125,7 @@ main(int argc, char *argv[])
char *conf_file, *defpaths, *auxpaths; char *conf_file, *defpaths, *auxpaths;
char *oarg, *tagarg; char *oarg, *tagarg;

4
srcpkgs/mdocml/patches/fix.9868-3.patch
View file

@ -21,8 +21,8 @@ RCS file: /home/cvs/mandoc/mandoc/mandocdb.c,v
retrieving revision 1.262 retrieving revision 1.262
retrieving revision 1.263 retrieving revision 1.263
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.262 -r1.263 diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.262 -r1.263
--- mandocdb.c --- a/mandocdb.c
+++ mandocdb.c +++ b/mandocdb.c
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
/* $Id$ */ /* $Id$ */
/* /*

1
srcpkgs/mdocml/template
View file

@ -17,7 +17,6 @@ homepage="http://mandoc.bsd.lv"
distfiles="http://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz" distfiles="http://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz"
checksum=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 checksum=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
provides="man-0_1" provides="man-0_1"
patch_args=-Np0
alternatives=" alternatives="
man:man:/usr/bin/mandoc man:man:/usr/bin/mandoc

6
srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch
View file

@ -23,8 +23,8 @@ targets.
diff --git a/libco/libco.c b/libco/libco.c diff --git a/libco/libco.c b/libco/libco.c
index de11fbe9..f5ee5d0a 100755 index de11fbe9..f5ee5d0a 100755
--- src/snes/src/lib/libco/libco.c --- a/src/snes/src/lib/libco/libco.c
+++ src/snes/src/lib/libco/libco.c +++ b/src/snes/src/lib/libco/libco.c
@@ -9,6 +9,8 @@ @@ -9,6 +9,8 @@
#include "amd64.c" #include "amd64.c"
#elif defined(__arm__) #elif defined(__arm__)
@ -38,7 +38,7 @@ diff --git a/libco/ppc64v2.c b/libco/ppc64v2.c
new file mode 100644 new file mode 100644
index 00000000..8f733de2 index 00000000..8f733de2
--- /dev/null --- /dev/null
+++ src/snes/src/lib/libco/ppc64v2.c +++ b/src/snes/src/lib/libco/ppc64v2.c
@@ -0,0 +1,283 @@ @@ -0,0 +1,283 @@
+/** +/**
+ * libco implementation for ppc64 elfv2. + * libco implementation for ppc64 elfv2.

1
srcpkgs/mednafen/template
View file

@ -15,7 +15,6 @@ homepage="https://mednafen.github.io/"
distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz" distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz"
checksum=842907c25c4292c9ba497c9cb9229c7d10e04e22cb4740d154ab690e6587fdf4 checksum=842907c25c4292c9ba497c9cb9229c7d10e04e22cb4740d154ab690e6587fdf4
nopie=yes nopie=yes
patch_args=-Np0
build_options="altivec" build_options="altivec"
desc_option_altivec="Enable AltiVec support on PowerPC" desc_option_altivec="Enable AltiVec support on PowerPC"

4
srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
View file

@ -1,5 +1,5 @@
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ @@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \

4
srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
View file

@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o
Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
--- Makefile~ 2014-01-08 01:30:11.355900076 +0000 --- a/Makefile~ 2014-01-08 01:30:11.355900076 +0000
+++ Makefile 2014-01-08 01:31:19.387555469 +0000 +++ b/Makefile 2014-01-08 01:31:19.387555469 +0000
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
AS=as -32 AS=as -32
CC=gcc CC=gcc

4
srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
View file

@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o
Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
--- io.h~ 2013-08-10 02:01:58.000000000 +0000 --- a/io.h~ 2013-08-10 02:01:58.000000000 +0000
+++ io.h 2014-01-08 01:29:12.404465515 +0000 +++ b/io.h 2014-01-08 01:29:12.404465515 +0000
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
*/ */

12
srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
View file

@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o
Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
--- controller.c.orig --- a/controller.c
+++ controller.c +++ b/controller.c
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
* MemTest86+ V5 Specific code (GPL V2.0) * MemTest86+ V5 Specific code (GPL V2.0)
* By Samuel DEMEULEMEESTER, sdemeule@memtest.org * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
@ -59,8 +59,8 @@ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
ptr2=(long*)(dev6+0x68); ptr2=(long*)(dev6+0x68);
/* Read the MMR Base Address & Define the pointer */ /* Read the MMR Base Address & Define the pointer */
--- init.c.orig --- a/init.c
+++ init.c +++ b/init.c
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
* *
* Released under version 2 of the Gnu Public License. * Released under version 2 of the Gnu Public License.
@ -78,8 +78,8 @@ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
} }
} }
--- main.c.orig --- a/main.c
+++ main.c +++ b/main.c
@@ -422,7 +422,7 @@ void test_start(void) @@ -422,7 +422,7 @@ void test_start(void)
//initialise_cpus(); //initialise_cpus();
btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);

4
srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
View file

@ -2,8 +2,8 @@
Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -13,7 +13,7 @@ AS=as -32 @@ -13,7 +13,7 @@ AS=as -32
CC=gcc CC=gcc

4
srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
View file

@ -1,5 +1,5 @@
--- Makefile.orig 2019-03-29 16:41:29.629879497 +0100 --- a/Makefile 2019-03-29 16:41:29.629879497 +0100
+++ Makefile 2019-03-29 16:41:55.351031244 +0100 +++ b/Makefile 2019-03-29 16:41:55.351031244 +0100
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c

1
srcpkgs/memtest86+/template
View file

@ -9,7 +9,6 @@ license="GPL-2.0-or-later"
homepage="http://www.memtest.org" homepage="http://www.memtest.org"
distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz" distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
patch_args=-Np0
nostrip=yes nostrip=yes
noverifyrdeps=yes noverifyrdeps=yes

4
srcpkgs/mergerfs/patches/0001-install_fix.patch
View file

@ -9,8 +9,8 @@ Subject: [PATCH] install_fix
diff --git libfuse/Makefile libfuse/Makefile diff --git libfuse/Makefile libfuse/Makefile
index 61a1a11..99ccf9f 100644 index 61a1a11..99ccf9f 100644
--- libfuse/Makefile --- a/libfuse/Makefile
+++ libfuse/Makefile +++ b/libfuse/Makefile
@@ -106,13 +106,8 @@ strip: @@ -106,13 +106,8 @@ strip:
strip --strip-all build/mount.mergerfs strip --strip-all build/mount.mergerfs
strip --strip-all build/mergerfs-fusermount strip --strip-all build/mergerfs-fusermount

1
srcpkgs/mergerfs/template
View file

@ -12,7 +12,6 @@ license="ISC"
homepage="https://github.com/trapexit/mergerfs" homepage="https://github.com/trapexit/mergerfs"
distfiles="${homepage}/archive/${version}.tar.gz" distfiles="${homepage}/archive/${version}.tar.gz"
checksum=8857d2058c38251bff539c77b6c90472ab139bda96265ce09485c3689d11a4ac checksum=8857d2058c38251bff539c77b6c90472ab139bda96265ce09485c3689d11a4ac
patch_args=-Np0
pre_build() { pre_build() {
# we build from source, spoof release tarball # we build from source, spoof release tarball

28
srcpkgs/merkaartor/patches/QPainterPath.patch
View file

@ -1,5 +1,5 @@
--- interfaces/IFeature.h 2019-11-12 15:09:05.000000000 +0100 --- a/interfaces/IFeature.h 2019-11-12 15:09:05.000000000 +0100
+++ interfaces/IFeature.h 2020-09-01 19:40:43.284975549 +0200 +++ b/interfaces/IFeature.h 2020-09-01 19:40:43.284975549 +0200
@@ -4,10 +4,11 @@ @@ -4,10 +4,11 @@
#include <QString> #include <QString>
#include <QDateTime> #include <QDateTime>
@ -13,8 +13,8 @@
class IFeature class IFeature
{ {
--- src/Features/Feature.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/Features/Feature.h 2019-11-12 15:09:05.000000000 +0100
+++ src/Features/Feature.h 2020-09-01 19:40:16.524974169 +0200 +++ b/src/Features/Feature.h 2020-09-01 19:40:16.524974169 +0200
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
#include <QtCore/QString> #include <QtCore/QString>
@ -24,8 +24,8 @@
#define CAST_FEATURE(x) (dynamic_cast<Feature*>(x)) #define CAST_FEATURE(x) (dynamic_cast<Feature*>(x))
#define CAST_NODE(x) (dynamic_cast<Node*>(x)) #define CAST_NODE(x) (dynamic_cast<Node*>(x))
--- src/Features/Relation.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/Features/Relation.h 2019-11-12 15:09:05.000000000 +0100
+++ src/Features/Relation.h 2020-09-01 19:40:02.889973465 +0200 +++ b/src/Features/Relation.h 2020-09-01 19:40:02.889973465 +0200
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
#include "Document.h" #include "Document.h"
#include "Feature.h" #include "Feature.h"
@ -36,8 +36,8 @@
class MainWindow; class MainWindow;
class RelationPrivate; class RelationPrivate;
class QAbstractTableModel; class QAbstractTableModel;
--- src/Features/Way.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/Features/Way.h 2019-11-12 15:09:05.000000000 +0100
+++ src/Features/Way.h 2020-09-01 19:40:30.309974880 +0200 +++ b/src/Features/Way.h 2020-09-01 19:40:30.309974880 +0200
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
#define MERKAARTOR_ROAD_H_ #define MERKAARTOR_ROAD_H_
@ -47,8 +47,8 @@
#include "Document.h" #include "Document.h"
#include "Feature.h" #include "Feature.h"
--- src/PaintStyle/FeaturePainter.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/PaintStyle/FeaturePainter.h 2019-11-12 15:09:05.000000000 +0100
+++ src/PaintStyle/FeaturePainter.h 2020-09-01 19:39:41.450972359 +0200 +++ b/src/PaintStyle/FeaturePainter.h 2020-09-01 19:39:41.450972359 +0200
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
#include <QFont> #include <QFont>
@ -67,8 +67,8 @@
class QFont; class QFont;
class QDomElement; class QDomElement;
--- src/PaintStyle/PrimitivePainter.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/PaintStyle/PrimitivePainter.h 2019-11-12 15:09:05.000000000 +0100
+++ src/PaintStyle/PrimitivePainter.h 2020-09-01 19:39:24.565971488 +0200 +++ b/src/PaintStyle/PrimitivePainter.h 2020-09-01 19:39:24.565971488 +0200
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
#include <QList> #include <QList>
#include <QPair> #include <QPair>
@ -87,8 +87,8 @@
class QFont; class QFont;
class QDomElement; class QDomElement;
--- src/common/Painting.h 2019-11-12 15:09:05.000000000 +0100 --- a/src/common/Painting.h 2019-11-12 15:09:05.000000000 +0100
+++ src/common/Painting.h 2020-09-01 19:38:48.379969621 +0200 +++ b/src/common/Painting.h 2020-09-01 19:38:48.379969621 +0200
@@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
class Way; class Way;
class Way; class Way;

1
srcpkgs/merkaartor/template
View file

@ -13,6 +13,5 @@ license="GPL-2.0-or-later"
homepage="http://merkaartor.be" homepage="http://merkaartor.be"
distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz" distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz"
checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a
patch_args=-Np0
CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"

4
srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch
View file

@ -20,8 +20,8 @@ Signed-off-by: Jon Nettleton <jon@solid-run.com>
diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c
index 6b58aebee2d..c9e983367a0 100644 index 6b58aebee2d..c9e983367a0 100644
--- src/gallium/drivers/radeonsi/si_buffer.c --- a/src/gallium/drivers/radeonsi/si_buffer.c
+++ src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c
@@ -151,6 +151,11 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res, @@ -151,6 +151,11 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res,
*/ */
if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu) if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu)

8
srcpkgs/mesa/patches/add-use-elf-tls.patch
View file

@ -3,8 +3,8 @@ Status: Not fixed upstream
diff --git meson.build meson.build diff --git meson.build meson.build
index 932eb13..1d1a4be 100644 index 932eb13..1d1a4be 100644
--- meson.build --- a/meson.build
+++ meson.build +++ b/meson.build
@@ -448,7 +448,8 @@ endif @@ -448,7 +448,8 @@ endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
@ -17,8 +17,8 @@ index 932eb13..1d1a4be 100644
endif endif
diff --git meson_options.txt meson_options.txt diff --git meson_options.txt meson_options.txt
index fc73f6e..2d9e4a2 100644 index fc73f6e..2d9e4a2 100644
--- meson_options.txt --- a/meson_options.txt
+++ meson_options.txt +++ b/meson_options.txt
@@ -445,6 +445,12 @@ option( @@ -445,6 +445,12 @@ option(
value : 25, value : 25,
description : 'Android Platform SDK version. Default: Nougat version.' description : 'Android Platform SDK version. Default: Nougat version.'

8
srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch
View file

@ -27,8 +27,8 @@ Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8543>
diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
index 78eb8c982a8..d537819f292 100644 index 78eb8c982a8..d537819f292 100644
--- src/gallium/frontends/clover/llvm/compat.hpp --- a/src/gallium/frontends/clover/llvm/compat.hpp
+++ src/gallium/frontends/clover/llvm/compat.hpp +++ b/src/gallium/frontends/clover/llvm/compat.hpp
@@ -38,14 +38,14 @@ @@ -38,14 +38,14 @@
#include <llvm/Config/llvm-config.h> #include <llvm/Config/llvm-config.h>
@ -71,8 +71,8 @@ index 78eb8c982a8..d537819f292 100644
} }
diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp
index 536e952b100..30592e4343b 100644 index 536e952b100..30592e4343b 100644
--- src/gallium/frontends/clover/llvm/invocation.cpp --- a/src/gallium/frontends/clover/llvm/invocation.cpp
+++ src/gallium/frontends/clover/llvm/invocation.cpp +++ b/src/gallium/frontends/clover/llvm/invocation.cpp
@@ -247,9 +247,8 @@ namespace { @@ -247,9 +247,8 @@ namespace {
// http://www.llvm.org/bugs/show_bug.cgi?id=19735 // http://www.llvm.org/bugs/show_bug.cgi?id=19735
c->getDiagnosticOpts().ShowCarets = false; c->getDiagnosticOpts().ShowCarets = false;

4
srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch
View file

@ -13,8 +13,8 @@ Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9372>
diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp
index d537819f292..380d16a8346 100644 index d537819f292..380d16a8346 100644
--- src/gallium/frontends/clover/llvm/compat.hpp --- a/src/gallium/frontends/clover/llvm/compat.hpp
+++ src/gallium/frontends/clover/llvm/compat.hpp +++ b/src/gallium/frontends/clover/llvm/compat.hpp
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
#include <clang/Basic/TargetInfo.h> #include <clang/Basic/TargetInfo.h>

4
srcpkgs/mesa/patches/musl-endian.patch
View file

@ -1,5 +1,5 @@
--- src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100 --- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100
+++ src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100 +++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100
@@ -68,6 +68,16 @@ @@ -68,6 +68,16 @@
#define PIPE_ARCH_LITTLE_ENDIAN #define PIPE_ARCH_LITTLE_ENDIAN

4
srcpkgs/mesa/patches/musl-stacksize.patch
View file

@ -1,7 +1,7 @@
diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
index 45cb6075e6..1a2ea1a450 100644 index 45cb6075e6..1a2ea1a450 100644
--- ./include/c11/threads_posix.h --- a/include/c11/threads_posix.h
+++ ./include/c11/threads_posix.h +++ b/include/c11/threads_posix.h
@@ -281,15 +281,29 @@ static inline int @@ -281,15 +281,29 @@ static inline int
thrd_create(thrd_t *thr, thrd_start_t func, void *arg) thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
{ {

20
srcpkgs/mesa/patches/musl.patch
View file

@ -1,5 +1,5 @@
--- src/gallium/winsys/svga/drm/vmw_screen.h.orig 2015-05-07 14:02:28.033079796 +0200 --- a/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:28.033079796 +0200
+++ src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200 +++ b/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200
@@ -35,6 +35,8 @@ @@ -35,6 +35,8 @@
#define VMW_SCREEN_H_ #define VMW_SCREEN_H_
@ -9,8 +9,8 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
--- src/gallium/frontends/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 --- a/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:10:53.443337212 +0200
+++ src/gallium/frontends/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +++ b/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200
@@ -24,6 +24,8 @@ @@ -24,6 +24,8 @@
#ifndef _THREADPOOL_H_ #ifndef _THREADPOOL_H_
#define _THREADPOOL_H_ #define _THREADPOOL_H_
@ -20,8 +20,8 @@
#define MAXTHREADS 1 #define MAXTHREADS 1
struct threadpool { struct threadpool {
--- src/util/rand_xor.c.orig 2020-10-03 12:27:48.489024729 +0200 --- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200
+++ src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200 +++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#if defined(HAVE_GETRANDOM) #if defined(HAVE_GETRANDOM)
#include <sys/random.h> #include <sys/random.h>
@ -30,8 +30,8 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#endif #endif
--- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,6 +28,8 @@ @@ -28,6 +28,8 @@
#ifndef RADV_AMDGPU_WINSYS_H #ifndef RADV_AMDGPU_WINSYS_H
#define RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H
@ -41,8 +41,8 @@
#include "radv_radeon_winsys.h" #include "radv_radeon_winsys.h"
#include "ac_gpu_info.h" #include "ac_gpu_info.h"
#include "addrlib/addrinterface.h" #include "addrlib/addrinterface.h"
--- src/gallium/frontends/nine/nine_debug.c.orig 2020-03-06 07:46:48.278918421 +0100 --- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100
+++ src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100 +++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100
@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag, @@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag,
{ {
static boolean first = TRUE; static boolean first = TRUE;

4
srcpkgs/mesa/patches/no-unlink-megadrivers.patch
View file

@ -2,8 +2,8 @@ This patch is needed to retain the master .so, so that only that filename is
stripped while the related hard links are excluded. stripped while the related hard links are excluded.
diff --git bin/install_megadrivers.py bin/install_megadrivers.py diff --git bin/install_megadrivers.py bin/install_megadrivers.py
index 470137e..7d56def 100644 index 470137e..7d56def 100644
--- bin/install_megadrivers.py --- a/bin/install_megadrivers.py
+++ bin/install_megadrivers.py +++ b/bin/install_megadrivers.py
@@ -71,7 +71,7 @@ def main(): @@ -71,7 +71,7 @@ def main():
os.chdir(ret) os.chdir(ret)

1
srcpkgs/mesa/template
View file

@ -24,7 +24,6 @@ homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html" changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
checksum=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b checksum=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -Duse-elf-tls=false" configure_args+=" -Duse-elf-tls=false"

4
srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch
View file

@ -1,5 +1,5 @@
--- mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200 --- a/mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200
+++ - 2020-07-13 12:48:58.087313471 +0200 +++ b/mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200
@@ -403,7 +403,7 @@ @@ -403,7 +403,7 @@
def _get_gir_dep(self, state): def _get_gir_dep(self, state):

4
srcpkgs/meson/patches/fix-unittest.patch
View file

@ -22,8 +22,8 @@ Date: Mon Feb 1 00:26:49 2021 -0300
diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build
index 26f13d6fa..a59480c2d 100644 index 26f13d6fa..a59480c2d 100644
--- test cases/common/39 has function/meson.build --- a/test cases/common/39 has function/meson.build
+++ test cases/common/39 has function/meson.build +++ b/test cases/common/39 has function/meson.build
@@ -44,11 +44,13 @@ foreach cc : compilers @@ -44,11 +44,13 @@ foreach cc : compilers
error('Found non-existent function "hfkerhisadf".') error('Found non-existent function "hfkerhisadf".')
endif endif

1
srcpkgs/meson/template
View file

@ -16,7 +16,6 @@ homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4 checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4
patch_args=-Np0
# XXX: sanitizers aren't available on musl # XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then if [ "$XBPS_TARGET_LIBC" = glibc ]; then

4
srcpkgs/mftrace/patches/gf2pbm.1.patch
View file

@ -1,5 +1,5 @@
--- GNUmakefile.in --- a/GNUmakefile.in
+++ GNUmakefile.in +++ b/GNUmakefile.in
@@ -14,7 +14,7 @@ CFLAGS += -I. @@ -14,7 +14,7 @@ CFLAGS += -I.
srcdir=@srcdir@ srcdir=@srcdir@
VPATH=$(srcdir) VPATH=$(srcdir)

1
srcpkgs/mftrace/template
View file

@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
homepage="http://lilypond.org/mftrace" homepage="http://lilypond.org/mftrace"
distfiles="http://lilypond.org/downloads/sources/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="http://lilypond.org/downloads/sources/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=626b7a9945a768c086195ba392632a68d6af5ea24ef525dcd0a4a8b199ea5f6f checksum=626b7a9945a768c086195ba392632a68d6af5ea24ef525dcd0a4a8b199ea5f6f
patch_args=-Np0

4
srcpkgs/mg/patches/pkg-config-ncurses.patch
View file

@ -1,5 +1,5 @@
--- GNUmakefile.orig 2016-09-05 13:51:19.133051791 +0200 --- a/GNUmakefile 2016-09-05 13:51:19.133051791 +0200
+++ GNUmakefile 2016-09-05 13:51:29.519052327 +0200 +++ b/GNUmakefile 2016-09-05 13:51:29.519052327 +0200
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
includedir= $(prefix)/include includedir= $(prefix)/include
mandir= $(prefix)/man mandir= $(prefix)/man

1
srcpkgs/mg/template
View file

@ -10,7 +10,6 @@ license="Public Domain"
homepage="https://github.com/hboetes/mg" homepage="https://github.com/hboetes/mg"
distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz" distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz"
checksum=6820e76a0e27d9a744624d421b3b30b0030140c2a817df1310b25c3abe397106 checksum=6820e76a0e27d9a744624d421b3b30b0030140c2a817df1310b25c3abe397106
patch_args=-Np0
CFLAGS="-DTCSASOFT=0" CFLAGS="-DTCSASOFT=0"

8
srcpkgs/mhddfs/patches/fix-build.patch
View file

@ -6,8 +6,8 @@ Date: Wed Jan 1 22:42:38 2020 +0100
diff --git src/main.c src/main.c diff --git src/main.c src/main.c
index 6dc3230..1dfb3ef 100644 index 6dc3230..1dfb3ef 100644
--- src/main.c --- a/src/main.c
+++ src/main.c +++ b/src/main.c
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
#include <utime.h> #include <utime.h>
@ -19,8 +19,8 @@ index 6dc3230..1dfb3ef 100644
#include "parse_options.h" #include "parse_options.h"
diff --git src/tools.c src/tools.c diff --git src/tools.c src/tools.c
index c427b82..69747a8 100644 index c427b82..69747a8 100644
--- src/tools.c --- a/src/tools.c
+++ src/tools.c +++ b/src/tools.c
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include <dirent.h> #include <dirent.h>

1
srcpkgs/mhddfs/template
View file

@ -11,7 +11,6 @@ license="GPL-3"
homepage="http://mhddfs.uvw.ru/" homepage="http://mhddfs.uvw.ru/"
distfiles="http://mhddfs.uvw.ru/downloads/${pkgname}_${version}.tar.gz" distfiles="http://mhddfs.uvw.ru/downloads/${pkgname}_${version}.tar.gz"
checksum=702fc5486460c1828898426b1935179ce60bc1ed16fc8bc575c9ec1d12acef91 checksum=702fc5486460c1828898426b1935179ce60bc1ed16fc8bc575c9ec1d12acef91
patch_args=-Np0
pre_build() { pre_build() {
sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile

4
srcpkgs/milkytracker/patches/fix-jack-library-call.patch
View file

@ -1,5 +1,5 @@
--- ./src/milkyplay/drivers/jack/AudioDriver_JACK.cpp.orig --- a/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
+++ ./src/milkyplay/drivers/jack/AudioDriver_JACK.cpp +++ b/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
mp_sint32 AudioDriver_JACK::initDevice(mp_sint32 bufferSizeInWords, mp_uint32 mixFrequency, MasterMixer* mixer) mp_sint32 AudioDriver_JACK::initDevice(mp_sint32 bufferSizeInWords, mp_uint32 mixFrequency, MasterMixer* mixer)
{ {

1
srcpkgs/milkytracker/template
View file

@ -13,7 +13,6 @@ license="GPL-3.0-only"
homepage="http://milkytracker.titandemo.org/" homepage="http://milkytracker.titandemo.org/"
distfiles="https://github.com/milkytracker/MilkyTracker/archive/v${version}.tar.gz" distfiles="https://github.com/milkytracker/MilkyTracker/archive/v${version}.tar.gz"
checksum=6bcb6e74ee333e831137435a25c0f2f3da6e1462864deec9e693ef7d23a16023 checksum=6bcb6e74ee333e831137435a25c0f2f3da6e1462864deec9e693ef7d23a16023
patch_args=-Np0
post_install() { post_install() {
vinstall resources/milkytracker.desktop 644 usr/share/applications vinstall resources/milkytracker.desktop 644 usr/share/applications

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

@ -1,5 +1,5 @@
--- src/hts/hts_engine_API/lib/HTS_misc.c.orig 2020-05-06 08:48:23.207180474 -0400 --- a/src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:48:23.207180474 -0400
+++ src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:49:38.850713440 -0400 +++ b/src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:49:38.850713440 -0400
@@ -247,6 +247,8 @@ @@ -247,6 +247,8 @@
fgetpos((FILE *) fp->pointer, &pos); fgetpos((FILE *) fp->pointer, &pos);
#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)

1
srcpkgs/mimic/template
View file

@ -14,7 +14,6 @@ homepage="https://github.com/MycroftAI/mimic"
changelog="https://github.com/MycroftAI/mimic1/releases" changelog="https://github.com/MycroftAI/mimic1/releases"
distfiles="https://github.com/MycroftAI/mimic/archive/${version}.tar.gz" distfiles="https://github.com/MycroftAI/mimic/archive/${version}.tar.gz"
checksum=9041f5c7d3720899c90c890ada179c92c3b542b90bb655c247e4a4835df79249 checksum=9041f5c7d3720899c90c890ada179c92c3b542b90bb655c247e4a4835df79249
patch_args=-Np0
pre_configure() { pre_configure() {
./autogen.sh ./autogen.sh

4
srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch
View file

@ -6,8 +6,8 @@
Add ARRAY_SIZE macro Add ARRAY_SIZE macro
diff -r 3cb4335d5819 -r 4eff7b4cde33 src/minicom.h diff -r 3cb4335d5819 -r 4eff7b4cde33 src/minicom.h
--- src/minicom.h Mon Jun 29 21:16:14 2015 +0200 --- a/src/minicom.h Mon Jun 29 21:16:14 2015 +0200
+++ src/minicom.h Sun Aug 23 23:16:40 2015 +0200 +++ b/src/minicom.h Sun Aug 23 23:16:40 2015 +0200
@@ -302,6 +302,7 @@ @@ -302,6 +302,7 @@
int lockfile_create(int no_msgs); int lockfile_create(int no_msgs);
void lockfile_remove(void); void lockfile_remove(void);

4
srcpkgs/minicom/patches/CVE-2017-7467.patch
View file

@ -19,8 +19,8 @@ Openwall would like to thank the Virtuozzo company for
funding the effort. funding the effort.
diff -r c72edf0e43bc -r c33d24938f3e src/vt100.c diff -r c72edf0e43bc -r c33d24938f3e src/vt100.c
--- src/vt100.c Sat Sep 17 02:17:37 2016 +0200 --- a/src/vt100.c Sat Sep 17 02:17:37 2016 +0200
+++ src/vt100.c Tue Apr 18 12:20:34 2017 +0200 +++ b/src/vt100.c Tue Apr 18 12:20:34 2017 +0200
@@ -427,7 +427,7 @@ @@ -427,7 +427,7 @@
} }
/* Separation between numbers ? */ /* Separation between numbers ? */

4
srcpkgs/minicom/patches/musl-sys_param_h.patch
View file

@ -1,7 +1,7 @@
MAXNAMLEN is defined in sys/param.h MAXNAMLEN is defined in sys/param.h
--- src/getsdir.c 2011-02-14 11:07:00.000000000 +0100 --- a/src/getsdir.c 2011-02-14 11:07:00.000000000 +0100
+++ src/getsdir.c 2015-06-22 02:47:36.263541750 +0200 +++ b/src/getsdir.c 2015-06-22 02:47:36.263541750 +0200
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

4
srcpkgs/minicom/patches/musl-vc_music.patch
View file

@ -2,8 +2,8 @@ In musl libc __GLIBC__ is not defined, while it has the
same required header files for VC_MUSIC to work. same required header files for VC_MUSIC to work.
Just disable the additional __GLIBC__ shield. Just disable the additional __GLIBC__ shield.
--- src/dial.c 2013-05-09 20:32:02.000000000 +0200 --- a/src/dial.c 2013-05-09 20:32:02.000000000 +0200
+++ src/dial.c 2015-06-22 02:44:34.768551564 +0200 +++ b/src/dial.c 2015-06-22 02:44:34.768551564 +0200
@@ -39,11 +39,9 @@ @@ -39,11 +39,9 @@
#include "intl.h" #include "intl.h"

1
srcpkgs/minicom/template
View file

@ -10,6 +10,5 @@ license="GPL-2.0-or-later"
homepage="https://tracker.debian.org/pkg/minicom" homepage="https://tracker.debian.org/pkg/minicom"
distfiles="https://deb.debian.org/debian/pool/main/m/minicom/minicom_${version}.orig.tar.gz" distfiles="https://deb.debian.org/debian/pool/main/m/minicom/minicom_${version}.orig.tar.gz"
checksum=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 checksum=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

4
srcpkgs/minidlna/patches/config.patch
View file

@ -1,7 +1,7 @@
diff --git minidlna.conf minidlna.conf diff --git minidlna.conf minidlna.conf
index 7e00e89..33a7c51 100644 index 7e00e89..33a7c51 100644
--- minidlna.conf --- a/minidlna.conf
+++ minidlna.conf +++ b/minidlna.conf
@@ -5,7 +5,7 @@ port=8200 @@ -5,7 +5,7 @@ port=8200
#network_interface=eth0 #network_interface=eth0

1
srcpkgs/minidlna/template
View file

@ -21,7 +21,6 @@ homepage="https://minidlna.sourceforge.net/"
changelog="https://sourceforge.net/projects/minidlna/files/minidlna/${version}/README/view" changelog="https://sourceforge.net/projects/minidlna/files/minidlna/${version}/README/view"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 checksum=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63
patch_args=-Np0
system_accounts="minidlna" system_accounts="minidlna"
minidlna_homedir="/var/lib/minidlna" minidlna_homedir="/var/lib/minidlna"

4
srcpkgs/minijail/patches/ppc.patch
View file

@ -3,8 +3,8 @@ that are in headers which are not included. Additionally, ELF_GREG_TYPE refers
to a typedef, which is not a constant value. So undef them, just like some to a typedef, which is not a constant value. So undef them, just like some
others are already undef'd for other platforms above that. others are already undef'd for other platforms above that.
--- gen_constants-inl.h --- a/gen_constants-inl.h
+++ gen_constants-inl.h +++ b/gen_constants-inl.h
@@ -24,3 +24,8 @@ @@ -24,3 +24,8 @@
// build errors on such broken systems. // build errors on such broken systems.
#undef BLKTRACESETUP #undef BLKTRACESETUP

1
srcpkgs/minijail/template
View file

@ -11,7 +11,6 @@ license="BSD-3-Clause"
homepage="https://android.googlesource.com/platform/external/minijail" homepage="https://android.googlesource.com/platform/external/minijail"
distfiles="https://github.com/google/minijail/archive/linux-v${version}.tar.gz" distfiles="https://github.com/google/minijail/archive/linux-v${version}.tar.gz"
checksum=1efb6224465cf8a5bb7a69659b35482e69786fce572f29125201e9a0e793bdd6 checksum=1efb6224465cf8a5bb7a69659b35482e69786fce572f29125201e9a0e793bdd6
patch_args=-Np0
if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
broken="bpf.h:110:2: error: #error Unsupported endianness" broken="bpf.h:110:2: error: #error Unsupported endianness"

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