srcpkgs/u*: convert patches to -Np1

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
This commit is contained in:
Đoàn Trần Công Danh 2021-06-19 10:03:21 +07:00 committed by Đoàn Trần Công Danh
parent 4f75cf25fd
commit 5769f150de
56 changed files with 84 additions and 105 deletions

View File

@ -1,5 +1,5 @@
--- Makefile 2015-10-30 14:48:49.000000000 -0400 --- a/Makefile 2015-10-30 14:48:49.000000000 -0400
+++ Makefile.bck 2016-08-16 18:38:41.989106570 -0400 +++ b/Makefile.bck 2016-08-16 18:38:41.989106570 -0400
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
CFLAGS := -O2 -Wall CFLAGS := -O2 -Wall

View File

@ -11,7 +11,6 @@ license="LGPL-2.0-or-later"
homepage="https://github.com/amluto/u2f-hidraw-policy" homepage="https://github.com/amluto/u2f-hidraw-policy"
distfiles="${homepage}/archive/${version}.tar.gz" distfiles="${homepage}/archive/${version}.tar.gz"
checksum=50e327a9df3dd3db3b292af41fb119cc4c8d9bc29abddfb442e972053bf5e6d1 checksum=50e327a9df3dd3db3b292af41fb119cc4c8d9bc29abddfb442e972053bf5e6d1
patch_args=-Np0
post_install() { post_install() {
vmkdir usr vmkdir usr

View File

@ -1,5 +1,5 @@
--- makefile.orig 2016-10-10 13:35:16.980246499 +0200 --- a/makefile 2016-10-10 13:35:16.980246499 +0200
+++ makefile 2016-10-10 13:35:39.805246090 +0200 +++ b/makefile 2016-10-10 13:35:39.805246090 +0200
@@ -15,9 +15,8 @@ @@ -15,9 +15,8 @@
# If you need <inttypes.h> copy sun-inttypes.h to inttypes.h. # If you need <inttypes.h> copy sun-inttypes.h to inttypes.h.
# #

View File

@ -1,5 +1,5 @@
--- authrhosts.c.orig 2016-10-10 13:51:34.924228986 +0200 --- a/authrhosts.c 2016-10-10 13:51:34.924228986 +0200
+++ authrhosts.c 2016-10-10 13:51:37.359228942 +0200 +++ b/authrhosts.c 2016-10-10 13:51:37.359228942 +0200
@@ -24,11 +24,16 @@ @@ -24,11 +24,16 @@
{ {
USED(tx); USED(tx);

View File

@ -12,7 +12,6 @@ license="custom:MIT-like"
homepage="https://bitbucket.org/plan9-from-bell-labs/u9fs" homepage="https://bitbucket.org/plan9-from-bell-labs/u9fs"
distfiles="https://bitbucket.org/plan9-from-bell-labs/u9fs/get/${_commit}.tar.gz" distfiles="https://bitbucket.org/plan9-from-bell-labs/u9fs/get/${_commit}.tar.gz"
checksum=201619c1c29bad1c9ed1bc886afe7b4965cfd0781b2296c9de87db10ba71615d checksum=201619c1c29bad1c9ed1bc886afe7b4965cfd0781b2296c9de87db10ba71615d
patch_args=-Np0
do_install() { do_install() {
vbin u9fs vbin u9fs

View File

@ -1,5 +1,5 @@
--- acc/acc_defs.h --- a/acc/acc_defs.h
+++ acc/acc_defs.h +++ b/acc/acc_defs.h
@@ -87,6 +87,9 @@ @@ -87,6 +87,9 @@
/* This can be put into a header file but may get ignored by some compilers. */ /* This can be put into a header file but may get ignored by some compilers. */

View File

@ -10,4 +10,3 @@ homepage="http://www.oberhumer.com/opensource/ucl/"
distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz" distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz"
checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
conflicts="libucl-devel>=0" conflicts="libucl-devel>=0"
patch_args=-Np0

View File

@ -1,5 +1,5 @@
--- host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c 2019-06-22 10:19:41.000000000 +0200 --- a/host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c 2019-06-22 10:19:41.000000000 +0200
+++ host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c 2020-09-28 23:36:57.970547752 +0200 +++ b/host/superscript.com/net/ucspi-ssl-0.11.6a/src/sslperl.c 2020-09-28 23:36:57.970547752 +0200
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
#define call_argv perl_call_argv #define call_argv perl_call_argv
#endif #endif

View File

@ -17,7 +17,6 @@ distfiles="http://www.fehcom.de/ipnet/ucspi-ssl/ucspi-ssl-${version}.tgz"
checksum=e7fcd4ceec351a0f36b7d27188758709a6c095460ed4dce434e0c5d463c4c4ea checksum=e7fcd4ceec351a0f36b7d27188758709a6c095460ed4dce434e0c5d463c4c4ea
# ad hoc build system breaks parallel build and cross-compilation # ad hoc build system breaks parallel build and cross-compilation
disable_parallel_build="ad hoc build system breaks parallel build" disable_parallel_build="ad hoc build system breaks parallel build"
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

View File

@ -3,8 +3,8 @@
Description: Fix issue where udptunnel was failing to receive packets sent to a multicast address. (See #254834). Description: Fix issue where udptunnel was failing to receive packets sent to a multicast address. (See #254834).
Author: singh_chinmay@extenprise.net Author: singh_chinmay@extenprise.net
--- udptunnel.c --- a/udptunnel.c
+++ udptunnel.c +++ b/udptunnel.c
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
(*relays)[i].udpaddr.sin_port = htons(udpport + i); (*relays)[i].udpaddr.sin_port = htons(udpport + i);
(*relays)[i].udpaddr.sin_family = AF_INET; (*relays)[i].udpaddr.sin_family = AF_INET;

View File

@ -4,8 +4,8 @@ Description: Include string.h header for strlen prototype for GCC 4.4. compatibi
Author: Chris Lamb <chris@chris-lamb.co.uk> Author: Chris Lamb <chris@chris-lamb.co.uk>
diff -urNad /tmp/bp-build/udptunnel-1.1.orig.orig/host2ip.c /tmp/bp-build/udptunnel-1.1.orig/host2ip.c diff -urNad /tmp/bp-build/udptunnel-1.1.orig.orig/host2ip.c /tmp/bp-build/udptunnel-1.1.orig/host2ip.c
--- host2ip.c 2008-08-28 07:50:41.000000000 +0100 --- a/host2ip.c 2008-08-28 07:50:41.000000000 +0100
+++ host2ip.c 2008-08-28 07:50:49.000000000 +0100 +++ b/host2ip.c 2008-08-28 07:50:49.000000000 +0100
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
#include <arpa/inet.h> /* inet_addr() */ #include <arpa/inet.h> /* inet_addr() */
#include <rpcsvc/ypclnt.h> /* YP */ #include <rpcsvc/ypclnt.h> /* YP */

View File

@ -1,7 +1,7 @@
# reason: rpcsvc/ypclnt.h is only present in glibc, so check for it # reason: rpcsvc/ypclnt.h is only present in glibc, so check for it
--- configure.in --- a/configure.in
+++ configure.in +++ b/configure.in
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
@ -11,8 +11,8 @@
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(short)
--- host2ip.c --- a/host2ip.c
+++ host2ip.c +++ b/host2ip.c
@@ -4,7 +4,9 @@ @@ -4,7 +4,9 @@
#include <netdb.h> /* gethostbyname() */ #include <netdb.h> /* gethostbyname() */
#include <netinet/in.h> /* sockaddr_in */ #include <netinet/in.h> /* sockaddr_in */

View File

@ -10,7 +10,6 @@ license="BSD-3-Clause"
homepage="http://www.cs.columbia.edu/~lennox/udptunnel/" homepage="http://www.cs.columbia.edu/~lennox/udptunnel/"
distfiles="http://www.cs.columbia.edu/~lennox/udptunnel/udptunnel-${version}.tar.gz" distfiles="http://www.cs.columbia.edu/~lennox/udptunnel/udptunnel-${version}.tar.gz"
checksum=45c0e12045735bc55734076ebbdc7622c746d1fe4e6f7267fa122e2421754670 checksum=45c0e12045735bc55734076ebbdc7622c746d1fe4e6f7267fa122e2421754670
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -vfi autoreconf -vfi

View File

@ -1,8 +1,8 @@
With gcc6 this logic error needs to be fixed. I think With gcc6 this logic error needs to be fixed. I think
the intention here was to continue, if FS_CheckFile() fails. the intention here was to continue, if FS_CheckFile() fails.
--- src/client/battlescape/events/e_main.cpp 2014-06-05 06:18:39.000000000 +0200 --- a/src/client/battlescape/events/e_main.cpp 2014-06-05 06:18:39.000000000 +0200
+++ src/client/battlescape/events/e_main.cpp 2017-01-25 16:18:47.764221448 +0100 +++ b/src/client/battlescape/events/e_main.cpp 2017-01-25 16:18:47.764221448 +0100
@@ -221,7 +221,7 @@ @@ -221,7 +221,7 @@
return sound; return sound;
@ -15,8 +15,8 @@ the intention here was to continue, if FS_CheckFile() fails.
With gcc6 the checks for narrowing integer types are very strict. With gcc6 the checks for narrowing integer types are very strict.
Explicitly cast the flag combinations to int. Explicitly cast the flag combinations to int.
--- src/client/battlescape/cl_particle.cpp 2014-06-05 06:18:39.000000000 +0200 --- a/src/client/battlescape/cl_particle.cpp 2014-06-05 06:18:39.000000000 +0200
+++ src/client/battlescape/cl_particle.cpp 2017-01-25 16:23:44.737146135 +0100 +++ b/src/client/battlescape/cl_particle.cpp 2017-01-25 16:23:44.737146135 +0100
@@ -144,12 +144,17 @@ @@ -144,12 +144,17 @@
V_UNTYPED, V_UNTYPED, V_UNTYPED, V_UNTYPED, V_UNTYPED, V_UNTYPED,
V_VECS, V_VECS, V_VECS, V_VECS,

View File

@ -1,5 +1,5 @@
--- src/tools/radiant/libs/gtkutil/glfont.cpp.orig 2020-10-10 12:51:38.707431160 +0700 --- a/src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:38.707431160 +0700
+++ src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:59.843621038 +0700 +++ b/src/tools/radiant/libs/gtkutil/glfont.cpp 2020-10-10 12:51:59.843621038 +0700
@@ -26,35 +26,7 @@ @@ -26,35 +26,7 @@
GLFont glfont_create (const std::string& font_string) GLFont glfont_create (const std::string& font_string)

View File

@ -1,5 +1,5 @@
--- src/tools/radiant/radiant/stacktrace.cpp 2014-06-05 06:18:39.000000000 +0200 --- a/src/tools/radiant/radiant/stacktrace.cpp 2014-06-05 06:18:39.000000000 +0200
+++ src/tools/radiant/radiant/stacktrace.cpp 2015-10-30 10:51:24.956710075 +0100 +++ b/src/tools/radiant/radiant/stacktrace.cpp 2015-10-30 10:51:24.956710075 +0100
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
#include "environment.h" #include "environment.h"

View File

@ -1,5 +1,5 @@
--- src/client/renderer/r_program.h 2014-06-05 06:18:39.000000000 +0200 --- a/src/client/renderer/r_program.h 2014-06-05 06:18:39.000000000 +0200
+++ src/client/renderer/r_program.h 2017-01-25 16:15:42.467269009 +0100 +++ b/src/client/renderer/r_program.h 2017-01-25 16:15:42.467269009 +0100
@@ -30,8 +30,12 @@ @@ -30,8 +30,12 @@
char name[MAX_QPATH]; char name[MAX_QPATH];
} r_shader_t; } r_shader_t;

View File

@ -2,8 +2,8 @@ SDL_opengl.h dosen't have the nessecary headers. GL/gl.h has the parts
of SDL_opengl.h needed for SDL_opengl_glext.h, then include of SDL_opengl.h needed for SDL_opengl_glext.h, then include
SDL_opengl_glext.h which has the *f functions. SDL_opengl_glext.h which has the *f functions.
--- src/client/renderer/r_gl.h 2020-10-08 07:50:29.818581990 +1100 --- a/src/client/renderer/r_gl.h 2020-10-08 07:50:29.818581990 +1100
+++ src/client/renderer/r_gl.h 2020-10-08 07:52:16.805006133 +1100 +++ b/src/client/renderer/r_gl.h 2020-10-08 07:52:16.805006133 +1100
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@
#include "../../ports/android/r_gles_android.h" #include "../../ports/android/r_gles_android.h"
#include <stdlib.h> #include <stdlib.h>

View File

@ -22,7 +22,6 @@ checksum="0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f
replaces="ufoai-data>=0" replaces="ufoai-data>=0"
ignore_elf_dirs="/usr/share/ufoai" ignore_elf_dirs="/usr/share/ufoai"
broken="game doesn't work" broken="game doesn't work"
patch_args=-Np0
# suppress a lot of warnings # suppress a lot of warnings
CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline" CXXFLAGS="-Wno-cast-align -Wno-cast-qual -Wno-inline"

View File

@ -1,6 +1,6 @@
Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality Don't use gimp-remote since gimp 2.4 already includes gimp-remote functionality
--- ufraw_conf.c --- a/ufraw_conf.c
+++ ufraw_conf.c +++ b/ufraw_conf.c
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
#elif HAVE_GIMP_2_4 #elif HAVE_GIMP_2_4
"gimp", /* remoteGimpCommand */ "gimp", /* remoteGimpCommand */

View File

@ -1,5 +1,5 @@
--- dcraw.cc 2015-06-16 05:58:38.000000000 +0200 --- a/dcraw.cc 2015-06-16 05:58:38.000000000 +0200
+++ dcraw.cc 2018-02-04 14:46:54.489951076 +0100 +++ b/dcraw.cc 2018-02-04 14:46:54.489951076 +0100
@@ -9242,7 +9242,7 @@ @@ -9242,7 +9242,7 @@
if (make[0] == 'O') { if (make[0] == 'O') {
i = find_green (12, 32, 1188864, 3576832); i = find_green (12, 32, 1188864, 3576832);

View File

@ -1,8 +1,8 @@
Source: written by John Paul Adrian Glaubitz for Debian Source: written by John Paul Adrian Glaubitz for Debian
Upstream: https://sourceforge.net/p/ufraw/bugs/417 Upstream: https://sourceforge.net/p/ufraw/bugs/417
Reason: fixes a compilation failure on arm architectures Reason: fixes a compilation failure on arm architectures
--- dcraw.cc --- a/dcraw.cc
+++ dcraw.cc +++ b/dcraw.cc
@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw() @@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
void CLASS kodak_radc_load_raw() void CLASS kodak_radc_load_raw()

View File

@ -1,5 +1,5 @@
--- ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200 --- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200
+++ ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100 +++ b/ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100
@@ -15,9 +15,7 @@ @@ -15,9 +15,7 @@
#include "ufraw.h" #include "ufraw.h"

View File

@ -1,8 +1,8 @@
ufraw_exiv2.cc:343:10: note: 'std::cerr' is defined in header '<iostream>' ufraw_exiv2.cc:343:10: note: 'std::cerr' is defined in header '<iostream>'
ufraw_exiv2.cc:365:14: error: 'cerr' is not a member of 'std' ufraw_exiv2.cc:365:14: error: 'cerr' is not a member of 'std'
--- ufraw_exiv2.cc --- a/ufraw_exiv2.cc
+++ ufraw_exiv2.cc +++ b/ufraw_exiv2.cc
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
#ifdef HAVE_EXIV2 #ifdef HAVE_EXIV2
#include <exiv2/exiv2.hpp> #include <exiv2/exiv2.hpp>

View File

@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
homepage="http://ufraw.sourceforge.net/" homepage="http://ufraw.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/ufraw/ufraw/ufraw-${version}/ufraw-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/ufraw/ufraw/ufraw-${version}/ufraw-${version}.tar.gz"
checksum=f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e checksum=f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e
patch_args=-Np0
build_options="extras" build_options="extras"

View File

@ -1,5 +1,5 @@
--- utils/debug.c.orig --- a/utils/debug.c
+++ utils/debug.c +++ b/utils/debug.c
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
vfprintf(logfp, fmt, ap); vfprintf(logfp, fmt, ap);
va_end(ap); va_end(ap);
@ -9,8 +9,8 @@
color(TERM_COLOR_RESET, logfp); color(TERM_COLOR_RESET, logfp);
--- libtraceevent/event-parse.c 2017-12-05 06:11:38.000000000 +0100 --- a/libtraceevent/event-parse.c 2017-12-05 06:11:38.000000000 +0100
+++ libtraceevent/event-parse.c 2017-12-06 21:02:42.135421115 +0100 +++ b/libtraceevent/event-parse.c 2017-12-06 21:02:42.135421115 +0100
@@ -5353,12 +5353,19 @@ @@ -5353,12 +5353,19 @@
const char *msg; const char *msg;

View File

@ -13,7 +13,6 @@ license="GPL-2.0-only"
homepage="https://github.com/namhyung/uftrace" homepage="https://github.com/namhyung/uftrace"
distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz" distfiles="https://github.com/namhyung/uftrace/archive/v${version}.tar.gz"
checksum=b8b56d540ea95c3eafe56440d6a998e0a140d53ca2584916b6ca82702795bbd9 checksum=b8b56d540ea95c3eafe56440d6a998e0a140d53ca2584916b6ca82702795bbd9
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;; *-musl) makedepends+=" argp-standalone"; export LDFLAGS=-largp;;

View File

@ -1,7 +1,7 @@
diff --git Makefile Makefile diff --git Makefile Makefile
index f6d69d3..58a9d98 100644 index f6d69d3..58a9d98 100644
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s) @@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s)
DESTDIR ?= DESTDIR ?=

View File

@ -11,4 +11,3 @@ license="GPL-2.0-only"
homepage="https://github.com/mvp/uhubctl" homepage="https://github.com/mvp/uhubctl"
distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz" distfiles="https://github.com/mvp/uhubctl/archive/v${version}.tar.gz"
checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b checksum=227fdd541067b84eaa0e15cdc171458a56de7591f7a1deaff3e6d42d2809450b
patch_args=-Np0

View File

@ -1,7 +1,7 @@
Index: configure.ac Index: configure.ac
=================================================================== ===================================================================
--- configure.ac.orig --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8, @@ -124,7 +124,7 @@ AC_ARG_WITH(anthy-utf8,
[with_anthy_utf8=no]) [with_anthy_utf8=no])

View File

@ -12,8 +12,8 @@ see https://www.gnu.org/software/emacs/news/NEWS.22.1 and https://git.savannah.g
diff --git emacs/uim-helper.el emacs/uim-helper.el diff --git emacs/uim-helper.el emacs/uim-helper.el
index e86e32d06..19ecd4538 100644 index e86e32d06..19ecd4538 100644
--- emacs/uim-helper.el --- a/emacs/uim-helper.el
+++ emacs/uim-helper.el +++ b/emacs/uim-helper.el
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
(if (not proc) (if (not proc)
(error "uim.el: Couldn't invoke uim-el-helper-agent.")) (error "uim.el: Couldn't invoke uim-el-helper-agent."))
@ -25,8 +25,8 @@ index e86e32d06..19ecd4538 100644
(let ((patience uim-startup-timeout) (ok nil)) (let ((patience uim-startup-timeout) (ok nil))
diff --git emacs/uim.el emacs/uim.el diff --git emacs/uim.el emacs/uim.el
index 9110c3cb6..7e1fadbba 100644 index 9110c3cb6..7e1fadbba 100644
--- emacs/uim.el --- a/emacs/uim.el
+++ emacs/uim.el +++ b/emacs/uim.el
@@ -488,7 +488,7 @@ @@ -488,7 +488,7 @@
(error "uim.el: Couldn't invoke uim-el-agent.")) (error "uim.el: Couldn't invoke uim-el-agent."))

View File

@ -17,7 +17,6 @@ license="BSD-3-Clause"
homepage="https://github.com/uim/uim/wiki" homepage="https://github.com/uim/uim/wiki"
distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2" distfiles="https://github.com/uim/uim/releases/download/${version}/uim-${version}.tar.bz2"
checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc checksum=34599bbcc4e5ab87832370763e38be5100984a64237555e9234a1ea225a0fadc
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

View File

@ -1,5 +1,5 @@
--- ulauncher/api/shared/item/SmallResultItem.py.orig 2020-10-27 19:02:14.175943597 +0700 --- a/ulauncher/api/shared/item/SmallResultItem.py 2020-10-27 19:02:14.175943597 +0700
+++ ulauncher/api/shared/item/SmallResultItem.py 2020-10-27 19:02:23.472931496 +0700 +++ b/ulauncher/api/shared/item/SmallResultItem.py 2020-10-27 19:02:23.472931496 +0700
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-from .ResultItem import ResultItem -from .ResultItem import ResultItem
+from ulauncher.api.shared.item.ResultItem import ResultItem +from ulauncher.api.shared.item.ResultItem import ResultItem

View File

@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
homepage="https://ulauncher.io/" homepage="https://ulauncher.io/"
distfiles="https://github.com/Ulauncher/Ulauncher/releases/download/${version}/${pkgname}_${version}.tar.gz" distfiles="https://github.com/Ulauncher/Ulauncher/releases/download/${version}/${pkgname}_${version}.tar.gz"
checksum=c4433bb06d0d456a2e0eee8dc4d03de164f273290484f2380728c3936ca31e3a checksum=c4433bb06d0d456a2e0eee8dc4d03de164f273290484f2380728c3936ca31e3a
patch_args=-Np0
pre_build() { pre_build() {
export DISPLAY= export DISPLAY=

View File

@ -1,5 +1,5 @@
--- src/ulogd.c --- a/src/ulogd.c
+++ src/ulogd.c +++ b/src/ulogd.c
@@ -65,6 +65,7 @@ @@ -65,6 +65,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -15,7 +15,6 @@ distfiles="${homepage}/files/${pkgname}-${version}.tar.bz2"
checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b checksum=990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b
CFLAGS="-D_GNU_SOURCE" CFLAGS="-D_GNU_SOURCE"
system_accounts="_ulogd" system_accounts="_ulogd"
patch_args=-Np0
post_install() { post_install() {
vinstall ulogd.conf 644 etc vinstall ulogd.conf 644 etc

View File

@ -1,5 +1,5 @@
--- src/fsmonitor/linux/inotify_stubs.c --- a/src/fsmonitor/linux/inotify_stubs.c
+++ src/fsmonitor/linux/inotify_stubs.c +++ b/src/fsmonitor/linux/inotify_stubs.c
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#define GLIBC_SUPPORT_INOTIFY 0 #define GLIBC_SUPPORT_INOTIFY 0
#endif #endif

View File

@ -10,7 +10,6 @@ homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz" distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
nocross="OCaml does not cross compile" nocross="OCaml does not cross compile"
patch_args=-Np0
do_build() { do_build() {
CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true

View File

@ -1,5 +1,5 @@
--- setup.py.orig --- a/setup.py
+++ setup.py +++ b/setup.py
@@ -39,10 +39,7 @@ @@ -39,10 +39,7 @@
# Ensure we are in the correct directory # Ensure we are in the correct directory
os.chdir(os.path.realpath(os.path.dirname(__file__))) os.chdir(os.path.realpath(os.path.dirname(__file__)))

View File

@ -1,5 +1,5 @@
--- setup.py 2019-01-21 16:11:35.644513578 +0100 --- a/setup.py 2019-01-21 16:11:35.644513578 +0100
+++ setup.py 2019-01-21 16:11:50.592513273 +0100 +++ b/setup.py 2019-01-21 16:11:50.592513273 +0100
@@ -228,8 +228,6 @@ @@ -228,8 +228,6 @@
rmtree(os.path.join("content", "lang")) rmtree(os.path.join("content", "lang"))
copytree(os.path.join("build", "mo"), os.path.join("content", "lang")) copytree(os.path.join("build", "mo"), os.path.join("content", "lang"))

View File

@ -10,7 +10,6 @@ license="GPL-2.0-or-later, MIT, BSD-3-Clause, CC-BY-SY-3.0"
homepage="http://unknown-horizons.org" homepage="http://unknown-horizons.org"
distfiles="https://github.com/unknown-horizons/unknown-horizons/archive/${version}.tar.gz" distfiles="https://github.com/unknown-horizons/unknown-horizons/archive/${version}.tar.gz"
checksum=a417fd3d342212fd190e4f21be82ef13c10e1ed7c288fbbe46e46200cf3de4d8 checksum=a417fd3d342212fd190e4f21be82ef13c10e1ed7c288fbbe46e46200cf3de4d8
patch_args=-Np0
pre_install() { pre_install() {
python3 horizons/engine/generate_atlases.py 2048 python3 horizons/engine/generate_atlases.py 2048

View File

@ -9,8 +9,8 @@ Subject: [PATCH] musl
diff --git code/unix/unix_main.c code/unix/unix_main.c diff --git code/unix/unix_main.c code/unix/unix_main.c
index ab3608b..f823800 100644 index ab3608b..f823800 100644
--- code/unix/unix_main.c --- a/code/unix/unix_main.c
+++ code/unix/unix_main.c +++ b/code/unix/unix_main.c
@@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif

View File

@ -12,7 +12,6 @@ homepage="https://github.com/Barbatos/ioq3-for-UrbanTerror-4"
distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz" distfiles="https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.tar.gz"
checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43 checksum=ce9d09a8ad149f8a1d36a85a586e1dd8ec9b8dcb3e5e9e82ec2a33017655bf43
nocross=yes nocross=yes
patch_args=-Np0
do_build() { do_build() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

View File

@ -1,5 +1,5 @@
--- urlview.c.orig 2005-02-06 17:10:54.000000000 +0100 --- a/urlview.c 2005-02-06 17:10:54.000000000 +0100
+++ urlview.c 2005-02-06 17:57:06.998290062 +0100 +++ b/urlview.c 2005-02-06 17:57:06.998290062 +0100
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -12,7 +12,6 @@ license="GPL-2.0"
homepage="https://github.com/sigpipe/urlview" homepage="https://github.com/sigpipe/urlview"
distfiles="https://gnupg.org/ftp/mutt/contrib/$pkgname-$version.tar.gz" distfiles="https://gnupg.org/ftp/mutt/contrib/$pkgname-$version.tar.gz"
checksum=74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3 checksum=74d18026e84e3cd70a3fdd1a7247a68031b0c1c1c6d761d64b7063ff71091cc3
patch_args=-Np0
pre_configure() { pre_configure() {
sed -i '/install-data-local/,/^$/d' Makefile.am sed -i '/install-data-local/,/^$/d' Makefile.am

View File

@ -1,5 +1,5 @@
--- Makefile.orig 2016-08-03 19:08:23.000000000 +0200 --- a/Makefile 2016-08-03 19:08:23.000000000 +0200
+++ Makefile 2016-08-04 23:44:35.642686213 +0200 +++ b/Makefile 2016-08-04 23:44:35.642686213 +0200
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
PROG = usb-modeswitch-data PROG = usb-modeswitch-data
VERS = 20160803 VERS = 20160803

View File

@ -10,4 +10,3 @@ license="GPL-2.0-or-later"
homepage="http://www.draisberghof.de/usb_modeswitch/" homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2" distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2"
checksum=3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9 checksum=3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9
patch_args=-Np0

View File

@ -1,5 +1,5 @@
--- Makefile.orig 2019-11-11 21:45:13.000000000 +0100 --- a/Makefile 2019-11-11 21:45:13.000000000 +0100
+++ Makefile 2020-05-04 21:22:53.680445703 +0200 +++ b/Makefile 2020-05-04 21:22:53.680445703 +0200
@@ -5,11 +5,11 @@ CFLAGS += -Wall -Wno-deprecated-dec @@ -5,11 +5,11 @@ CFLAGS += -Wall -Wno-deprecated-dec
LIBS = `pkg-config --libs --cflags libusb-1.0` LIBS = `pkg-config --libs --cflags libusb-1.0`
RM = /bin/rm -f RM = /bin/rm -f

View File

@ -14,4 +14,3 @@ license="GPL-2"
homepage="http://www.draisberghof.de/usb_modeswitch/" homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2" distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2"
checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3 checksum=c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3
patch_args=-Np0

View File

@ -1,5 +1,5 @@
--- src/CLI/usbguard.cpp.orig 2019-06-13 11:51:53.787863657 +0000 --- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000
+++ src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000 +++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000
@@ -26,10 +26,8 @@ @@ -26,10 +26,8 @@
#include <map> #include <map>
#include <iostream> #include <iostream>
@ -22,8 +22,8 @@
if (argc == 1) { if (argc == 1) {
showTopLevelHelp(); showTopLevelHelp();
--- src/CLI/usbguard-rule-parser.cpp.orig 2019-06-13 11:51:53.783863704 +0000 --- a/src/CLI/usbguard-rule-parser.cpp 2019-06-13 11:51:53.783863704 +0000
+++ src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000 +++ b/src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000
@@ -24,10 +24,8 @@ @@ -24,10 +24,8 @@
#include "RuleParser.hpp" #include "RuleParser.hpp"
@ -49,8 +49,8 @@
stream << std::endl; stream << std::endl;
stream << " Options:" << std::endl; stream << " Options:" << std::endl;
stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl; stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl;
--- src/DBus/gdbus-server.cpp.orig 2019-06-28 08:45:27.616687137 +0000 --- a/src/DBus/gdbus-server.cpp 2019-06-28 08:45:27.616687137 +0000
+++ src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000 +++ b/src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>
@ -70,8 +70,8 @@
stream << std::endl; stream << std::endl;
stream << " Options:" << std::endl; stream << " Options:" << std::endl;
stream << " -s, --system Listen on the system bus." << std::endl; stream << " -s, --system Listen on the system bus." << std::endl;
--- src/Library/public/usbguard/Exception.hpp.orig 2019-06-28 08:45:27.620687089 +0000 --- a/src/Library/public/usbguard/Exception.hpp 2019-06-28 08:45:27.620687089 +0000
+++ src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000 +++ b/src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000
@@ -116,7 +116,8 @@ @@ -116,7 +116,8 @@
static std::string reasonFromErrno(const int errno_value) static std::string reasonFromErrno(const int errno_value)
{ {

View File

@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
homepage="https://usbguard.github.io" homepage="https://usbguard.github.io"
distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz" distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42 checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
patch_args=-Np0
post_install() { post_install() {
vsv usbguard vsv usbguard

View File

@ -1,5 +1,5 @@
--- doc/Makefile.in.orig 2014-10-12 15:50:27.000000000 +0000 --- a/doc/Makefile.in 2014-10-12 15:50:27.000000000 +0000
+++ doc/Makefile.in 2016-12-10 18:43:26.681283216 +0000 +++ b/doc/Makefile.in 2016-12-10 18:43:26.681283216 +0000
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
manual.pdf manual.pdf

View File

@ -10,6 +10,5 @@ license="GPL-2.0-only"
homepage="http://udeproject.sourceforge.net" homepage="http://udeproject.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/project/udeproject/UWM/uwm-${version}%20stable/uwm-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/project/udeproject/UWM/uwm-${version}%20stable/uwm-${version}.tar.gz"
checksum=dd056857c98b75c9203861917db33bcaf87ba074bdd204cf732ce4cb777cb408 checksum=dd056857c98b75c9203861917db33bcaf87ba074bdd204cf732ce4cb777cb408
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

View File

@ -1,7 +1,7 @@
diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h diff --git a/plugins/python/uwsgi_python.h b/plugins/python/uwsgi_python.h
index 0c5c1c8..5c0dc6d 100644 index 0c5c1c8..5c0dc6d 100644
--- plugins/python/uwsgi_python.h --- a/plugins/python/uwsgi_python.h
+++ plugins/python/uwsgi_python.h +++ b/plugins/python/uwsgi_python.h
@@ -1,4 +1,8 @@ @@ -1,4 +1,8 @@
#include <uwsgi.h> #include <uwsgi.h>
+/* seems like Python.h explicitlyl redefines _GNU_SOURCE */ +/* seems like Python.h explicitlyl redefines _GNU_SOURCE */

View File

@ -1,5 +1,5 @@
--- core/lock.c --- a/core/lock.c
+++ core/lock.c +++ b/core/lock.c
@@ -96,7 +96,9 @@ @@ -96,7 +96,9 @@
#endif #endif
if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) { if (pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT)) {

View File

@ -10,7 +10,6 @@ license="GPL-2.0-linking-exception"
homepage="http://projects.unbit.it/uwsgi" homepage="http://projects.unbit.it/uwsgi"
distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz" distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
patch_args=-Np0
_libdir=usr/lib/uwsgi _libdir=usr/lib/uwsgi