srcpkgs/h*: 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 7fc9190f0e
commit 200bed5c06
77 changed files with 161 additions and 187 deletions

View File

@ -1,5 +1,5 @@
--- deps/neverbleed/neverbleed.c.orig 2018-04-25 12:58:28.060403297 +0200 --- a/deps/neverbleed/neverbleed.c 2018-04-25 12:58:28.060403297 +0200
+++ deps/neverbleed/neverbleed.c 2018-04-25 12:58:09.600375394 +0200 +++ b/deps/neverbleed/neverbleed.c 2018-04-25 12:58:09.600375394 +0200
@@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu @@ -547,7 +547,7 @@ static int sign_stub(struct expbuf_t *bu
return 0; return 0;
} }

View File

@ -13,7 +13,6 @@ license="MIT"
homepage="https://h2o.examp1e.net/" homepage="https://h2o.examp1e.net/"
distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz" distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz"
checksum=f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201 checksum=f8cbc1b530d85ff098f6efc2c3fdbc5e29baffb30614caac59d5c710f7bda201
patch_args=-Np0
system_accounts="h2o" system_accounts="h2o"

View File

@ -1,5 +1,5 @@
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
$(CC) $(CFLAGS) -MD -c $< $(CC) $(CFLAGS) -MD -c $<

View File

@ -13,7 +13,6 @@ license="MIT"
homepage="http://www.chiark.greenend.org.uk/~sgtatham/halibut/" homepage="http://www.chiark.greenend.org.uk/~sgtatham/halibut/"
distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f checksum=1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f
patch_args=-Np0
CFLAGS='-I../charset -I../build -fcommon' CFLAGS='-I../charset -I../build -fcommon'

View File

@ -1,5 +1,5 @@
--- bindings/Makefile.am.orig --- a/bindings/Makefile.am
+++ bindings/Makefile.am +++ b/bindings/Makefile.am
@@ -47,6 +47,9 @@ @@ -47,6 +47,9 @@
PREFIX="$(prefix)" \ PREFIX="$(prefix)" \
INC="$(AM_CPPFLAGS)" \ INC="$(AM_CPPFLAGS)" \

View File

@ -1,7 +1,7 @@
Index: rigs/prm80/prm80.h Index: rigs/prm80/prm80.h
=================================================================== ===================================================================
--- rigs/prm80/prm80.h --- a/rigs/prm80/prm80.h
+++ rigs/prm80/prm80.h +++ b/rigs/prm80/prm80.h
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#define _PRM80_H 1 #define _PRM80_H 1

View File

@ -15,7 +15,6 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later"
homepage="https://sourceforge.net/projects/hamlib/" homepage="https://sourceforge.net/projects/hamlib/"
distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/hamlib/${version}/${pkgname}-${version}.tar.gz"
checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5 checksum=e200b22f307e9a0c826187c2b08fe81c7d0283cf07056e6db3463d1481580fd5
patch_args=-Np0
pre_configure() { pre_configure() {
CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE" CFLAGS+=" -DNO_POSIX_2008_LOCALE -D_GNU_SOURCE"

View File

@ -1,5 +1,5 @@
--- gtk/configure.ac --- a/gtk/configure.ac
+++ gtk/configure.ac +++ b/gtk/configure.ac
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"]) AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
@ -10,8 +10,8 @@
PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no) PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
--- test/module.defs --- a/test/module.defs
+++ test/module.defs +++ b/test/module.defs
@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux) @@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)
ifeq (1, $(FEATURE.numa)) ifeq (1, $(FEATURE.numa))
TEST.GCC.l += numa TEST.GCC.l += numa

View File

@ -1,7 +1,7 @@
diff --git libhb/ports.c libhb/ports.c diff --git libhb/ports.c libhb/ports.c
index bb1733a..b6d0b38 100644 index bb1733a..b6d0b38 100644
--- libhb/ports.c --- a/libhb/ports.c
+++ libhb/ports.c +++ b/libhb/ports.c
@@ -286,15 +286,15 @@ const char* hb_get_cpu_platform_name() @@ -286,15 +286,15 @@ const char* hb_get_cpu_platform_name()
} }
} }

View File

@ -9,8 +9,8 @@ Subject: [PATCH] muxavformat: check for presence of AV_PKT_DATA_FALLBACK_TRACK
diff --git libhb/muxavformat.c libhb/muxavformat.c diff --git libhb/muxavformat.c libhb/muxavformat.c
index aac09b7..7879d70 100644 index aac09b7..7879d70 100644
--- libhb/muxavformat.c --- a/libhb/muxavformat.c
+++ libhb/muxavformat.c +++ b/libhb/muxavformat.c
@@ -121,7 +121,10 @@ static int avformatInit( hb_mux_object_t * m ) @@ -121,7 +121,10 @@ static int avformatInit( hb_mux_object_t * m )
hb_mux_data_t * track; hb_mux_data_t * track;
int meta_mux; int meta_mux;

View File

@ -1,5 +1,5 @@
--- /dev/null 1970-01-01 00:00:00 UTC --- /dev/null 1970-01-01 00:00:00 UTC
+++ contrib/ffmpeg/A90-libvpx-1.5.0.patch +++ b/contrib/ffmpeg/A90-libvpx-1.5.0.patch
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+commit 6540fe0 +commit 6540fe0
+Author: James Zern <jzern@google.com> +Author: James Zern <jzern@google.com>

View File

@ -1,5 +1,5 @@
--- libhb/dvdnav.c --- a/libhb/dvdnav.c
+++ libhb/dvdnav.c +++ b/libhb/dvdnav.c
@@ -1225,16 +1225,7 @@ @@ -1225,16 +1225,7 @@
{ {
for (kk = 0; kk < buttons; kk++) for (kk = 0; kk < buttons; kk++)

View File

@ -1,5 +1,5 @@
--- libhb/common.c --- a/libhb/common.c
+++ libhb/common.c +++ b/libhb/common.c
@@ -243,7 +243,6 @@ @@ -243,7 +243,6 @@
{ {
// legacy encoders, back to HB 0.9.4 whenever possible (disabled) // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
@ -8,8 +8,8 @@
{ { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, }, { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
{ { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, }, { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
{ { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, }, { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
--- scripts/manicure.rb --- a/scripts/manicure.rb
+++ scripts/manicure.rb +++ b/scripts/manicure.rb
@@ -349,7 +349,7 @@ @@ -349,7 +349,7 @@
audioEncoders << "copy:dtshd" audioEncoders << "copy:dtshd"
when /AAC Pass/ when /AAC Pass/

View File

@ -24,7 +24,6 @@ homepage="https://handbrake.fr/"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2" distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
checksum=218a37d95f48b5e7cf285363d3ab16c314d97627a7a710cab3758902ae877f85 checksum=218a37d95f48b5e7cf285363d3ab16c314d97627a7a710cab3758902ae877f85
nocross=yes nocross=yes
patch_args=-Np0
build_options="fdk_aac nvenc" build_options="fdk_aac nvenc"

View File

@ -1,7 +1,7 @@
diff --git hardinfo.h hardinfo.h diff --git hardinfo.h hardinfo.h
index 9f52f63..aeb84d9 100644 index 9f52f63..aeb84d9 100644
--- hardinfo.h --- a/hardinfo.h
+++ hardinfo.h +++ b/hardinfo.h
@@ -64,8 +64,8 @@ struct _ModuleAbout { @@ -64,8 +64,8 @@ struct _ModuleAbout {
}; };
@ -24,8 +24,8 @@ index 9f52f63..aeb84d9 100644
GSList *modules_load_selected(void); GSList *modules_load_selected(void);
diff --git util.c util.c diff --git util.c util.c
index 266ce4e..e6c81fd 100644 index 266ce4e..e6c81fd 100644
--- util.c --- a/util.c
+++ util.c +++ b/util.c
@@ -111,7 +111,7 @@ gchar *seconds_to_string(unsigned int seconds) @@ -111,7 +111,7 @@ gchar *seconds_to_string(unsigned int seconds)
plural(hours), minutes, plural(minutes)); plural(hours), minutes, plural(minutes));
} }

View File

@ -13,7 +13,6 @@ homepage="http://sourceforge.net/projects/hardinfo.berlios/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}.berlios/${pkgname}-${version}.tar.bz2"
checksum=a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a checksum=a0df6c0d7c92a7d20710b8eb551197398a965aaae053782b89a32a160b731b7a
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
post_patch() { post_patch() {
local _arch local _arch

View File

@ -1,7 +1,7 @@
# reason: fix sources to work correctly with musl # reason: fix sources to work correctly with musl
--- src/track/heaptrack_inject.cpp --- a/src/track/heaptrack_inject.cpp
+++ src/track/heaptrack_inject.cpp +++ b/src/track/heaptrack_inject.cpp
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <link.h> #include <link.h>
#include <malloc.h> #include <malloc.h>
@ -10,8 +10,8 @@
#include <sys/mman.h> #include <sys/mman.h>
--- src/track/libheaptrack.cpp --- a/src/track/libheaptrack.cpp
+++ src/track/libheaptrack.cpp +++ b/src/track/libheaptrack.cpp
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime()); return chrono::duration_cast<chrono::milliseconds>(clock::now() - startTime());
} }
@ -22,8 +22,8 @@
return syscall(SYS_gettid); return syscall(SYS_gettid);
} }
--- src/track/heaptrack_inject.cpp --- a/src/track/heaptrack_inject.cpp
+++ src/track/heaptrack_inject.cpp +++ b/src/track/heaptrack_inject.cpp
@@ -38,9 +38,10 @@ @@ -38,9 +38,10 @@
* @brief Experimental support for symbol overloading after runtime injection. * @brief Experimental support for symbol overloading after runtime injection.
*/ */
@ -39,8 +39,8 @@
#error unsupported word size #error unsupported word size
# simplify stdint.h include which failed on musl due to obscure assumptions # simplify stdint.h include which failed on musl due to obscure assumptions
--- 3rdparty/libbacktrace/backtrace.h --- a/3rdparty/libbacktrace/backtrace.h
+++ 3rdparty/libbacktrace/backtrace.h +++ b/3rdparty/libbacktrace/backtrace.h
@@ -36,24 +36,8 @@ @@ -36,24 +36,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>

View File

@ -16,7 +16,6 @@ license="LGPL-2.1-or-later"
homepage="https://github.com/KDE/heaptrack" homepage="https://github.com/KDE/heaptrack"
distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz" distfiles="https://github.com/KDE/heaptrack/archive/v${version}.tar.gz"
checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e checksum=f299a4846b80e607a412f439e17cddae13f0529701ffdb05eaa7ba878865717e
patch_args=-Np0
heaptrack-gui_package() { heaptrack-gui_package() {
short_desc+=" - GUI" short_desc+=" - GUI"

View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda @@ -54,7 +54,7 @@ option(NOVERSIONINFOUPDATE "Disable upda

View File

@ -1,5 +1,5 @@
--- hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas
+++ hedgewars/uWorld.pas +++ b/hedgewars/uWorld.pas
@@ -1168,8 +1168,8 @@ procedure RenderAttackBar(); @@ -1168,8 +1168,8 @@ procedure RenderAttackBar();
procedure ShiftWorld(Dir: LongInt); inline; procedure ShiftWorld(Dir: LongInt); inline;
begin begin

View File

@ -1,5 +1,5 @@
--- QTfrontend/ui/page/pagegamestats.cpp.orig --- a/QTfrontend/ui/page/pagegamestats.cpp
+++ QTfrontend/ui/page/pagegamestats.cpp +++ b/QTfrontend/ui/page/pagegamestats.cpp
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QGroupBox> #include <QGroupBox>

View File

@ -21,7 +21,6 @@ nopie_files="/usr/bin/hwengine"
nocross="Needs investigation: fails to link hwengine" nocross="Needs investigation: fails to link hwengine"
replaces="hedgewars-data>=0" replaces="hedgewars-data>=0"
export CMAKE_GENERATOR="Unix Makefiles" export CMAKE_GENERATOR="Unix Makefiles"
patch_args=-Np0
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
x86_64*|ppc64le|ppc64) x86_64*|ppc64le|ppc64)

View File

@ -1,5 +1,5 @@
--- JUCE/modules/juce_core/juce_core.cpp 2016-08-30 06:24:27.000000000 +0200 --- a/JUCE/modules/juce_core/juce_core.cpp 2016-08-30 06:24:27.000000000 +0200
+++ JUCE/modules/juce_core/juce_core.cpp 2016-12-12 14:53:23.532613378 +0100 +++ b/JUCE/modules/juce_core/juce_core.cpp 2016-12-12 14:53:23.532613378 +0100
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
#include <net/if.h> #include <net/if.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -9,8 +9,8 @@
#include <execinfo.h> #include <execinfo.h>
#endif #endif
#endif #endif
--- JUCE/modules/juce_core/system/juce_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 --- a/JUCE/modules/juce_core/system/juce_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200
+++ JUCE/modules/juce_core/system/juce_SystemStats.cpp 2016-12-12 14:58:35.988986030 +0100 +++ b/JUCE/modules/juce_core/system/juce_SystemStats.cpp 2016-12-12 14:58:35.988986030 +0100
@@ -134,6 +134,8 @@ @@ -134,6 +134,8 @@
} }
} }
@ -20,8 +20,8 @@
#else #else
void* stack[128]; void* stack[128];
int frames = backtrace (stack, numElementsInArray (stack)); int frames = backtrace (stack, numElementsInArray (stack));
--- JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200 --- a/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-08-30 06:24:27.000000000 +0200
+++ JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-12-12 15:07:35.046607788 +0100 +++ b/JUCE/modules/juce_core/native/juce_linux_SystemStats.cpp 2016-12-12 15:07:35.046607788 +0100
@@ -142,8 +142,15 @@ @@ -142,8 +142,15 @@
return result; return result;
} }

View File

@ -1,5 +1,5 @@
--- JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c 2017-07-08 23:40:42.000000000 +0200 --- a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c 2017-07-08 23:40:42.000000000 +0200
+++ - 2018-02-20 22:11:47.567333249 +0100 +++ b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c 2017-07-08 23:40:42.000000000 +0200
@@ -244,11 +244,7 @@ @@ -244,11 +244,7 @@
struct sigaction sigill_save; struct sigaction sigill_save;
struct sigaction sigill_sse; struct sigaction sigill_sse;

View File

@ -10,8 +10,8 @@ Subject: [PATCH] GCC 9 compatibility fixes
diff --git a/modules/juce_graphics/colour/juce_PixelFormats.h b/modules/juce_graphics/colour/juce_PixelFormats.h diff --git a/modules/juce_graphics/colour/juce_PixelFormats.h b/modules/juce_graphics/colour/juce_PixelFormats.h
index c57ad53c635..934c61c4781 100644 index c57ad53c635..934c61c4781 100644
--- JUCE/modules/juce_graphics/colour/juce_PixelFormats.h --- a/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
+++ JUCE/modules/juce_graphics/colour/juce_PixelFormats.h +++ b/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
@@ -107,22 +107,9 @@ class JUCE_API PixelARGB @@ -107,22 +107,9 @@ class JUCE_API PixelARGB
//============================================================================== //==============================================================================
@ -79,8 +79,8 @@ index c57ad53c635..934c61c4781 100644
/** Copies another pixel colour over this one. /** Copies another pixel colour over this one.
diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index b8137ac4d04..10bd64e1459 100644 index b8137ac4d04..10bd64e1459 100644
--- JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h --- a/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h +++ b/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -581,18 +581,10 @@ namespace EdgeTableFillers @@ -581,18 +581,10 @@ namespace EdgeTableFillers
: destData (image), sourceColour (colour) : destData (image), sourceColour (colour)
{ {

View File

@ -1,5 +1,5 @@
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -18,18 +18,6 @@ ifdef DPKG @@ -18,18 +18,6 @@ ifdef DPKG
PDEBLDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) PDEBLDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
endif endif

View File

@ -13,4 +13,3 @@ homepage="http://tytel.org/helm"
distfiles="https://github.com/mtytel/helm/archive/v${version}.tar.gz" distfiles="https://github.com/mtytel/helm/archive/v${version}.tar.gz"
checksum=4004c11fd1d773cc2a12adb5336873bc86c5ecbd370b8da2820fed6ef5ec58ad checksum=4004c11fd1d773cc2a12adb5336873bc86c5ecbd370b8da2820fed6ef5ec58ad
nocross="./lv2_ttl_generator: ./lv2_ttl_generator: cannot execute binary file" nocross="./lv2_ttl_generator: ./lv2_ttl_generator: cannot execute binary file"
patch_args=-Np0

View File

@ -1,5 +1,5 @@
--- plugins/perl/meson.build.orig 2018-08-15 13:30:17.108881970 +0200 --- a/plugins/perl/meson.build 2018-08-15 13:30:17.108881970 +0200
+++ plugins/perl/meson.build 2018-08-15 13:30:36.682882751 +0200 +++ b/plugins/perl/meson.build 2018-08-15 13:30:36.682882751 +0200
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
perl_ldflags = [] perl_ldflags = []
perl_rpath = '' perl_rpath = ''

View File

@ -20,7 +20,6 @@ distfiles="https://dl.hexchat.net/hexchat/${pkgname}-${version}.tar.xz"
checksum=901a9d13db5a4da69b827f6093306bbd16863dc49016f7668bd3e4506512e882 checksum=901a9d13db5a4da69b827f6093306bbd16863dc49016f7668bd3e4506512e882
build_options="LuaJIT" build_options="LuaJIT"
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
arm*-musl) : "LuaJIT is broken for musl cross arches" ;; arm*-musl) : "LuaJIT is broken for musl cross arches" ;;

View File

@ -1,5 +1,5 @@
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -29,8 +29,8 @@ CPPFLAGS_STD ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 \ @@ -29,8 +29,8 @@ CPPFLAGS_STD ?= -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 \
CPPFLAGS += $(CPPFLAGS_STD) -DHEXER_VERSION=\"1.0.4\" CPPFLAGS += $(CPPFLAGS_STD) -DHEXER_VERSION=\"1.0.4\"

View File

@ -12,7 +12,6 @@ license="BSD-3-Clause"
homepage="https://devel.ringlet.net/editors/hexer/" homepage="https://devel.ringlet.net/editors/hexer/"
distfiles="https://devel.ringlet.net/files/editors/hexer/hexer-${version}.tar.xz" distfiles="https://devel.ringlet.net/files/editors/hexer/hexer-${version}.tar.xz"
checksum=e6b84ace5283825943f88ce7ec4ae836ec15ba41978b3a858d6d478cfe09ff94 checksum=e6b84ace5283825943f88ce7ec4ae836ec15ba41978b3a858d6d478cfe09ff94
patch_args=-Np0
post_install() { post_install() {
vlicense COPYRIGHT vlicense COPYRIGHT

View File

@ -1,5 +1,5 @@
--- tty.c.bck 2016-09-14 08:12:52.517706416 -0400 --- a/tty.c.bck 2016-09-14 08:12:52.517706416 -0400
+++ tty.c 2016-09-14 08:13:29.218260165 -0400 +++ b/tty.c 2016-09-14 08:13:29.218260165 -0400
@@ -50,10 +50,8 @@ @@ -50,10 +50,8 @@
#ifdef SOLARIS #ifdef SOLARIS
#include <strings.h> #include <strings.h>
@ -11,8 +11,8 @@
#include "x10.h" #include "x10.h"
#include "process.h" #include "process.h"
--- tty_aux.c.bck 2016-09-14 08:19:51.568551550 -0400 --- a/tty_aux.c.bck 2016-09-14 08:19:51.568551550 -0400
+++ tty_aux.c 2016-09-14 08:20:11.046306417 -0400 +++ b/tty_aux.c 2016-09-14 08:20:11.046306417 -0400
@@ -50,10 +50,8 @@ @@ -50,10 +50,8 @@
#ifdef SOLARIS #ifdef SOLARIS
#include <strings.h> #include <strings.h>

View File

@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
homepage="http://www.heyu.org" homepage="http://www.heyu.org"
distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz" distfiles="https://github.com/HeyuX10Automation/heyu/archive/v${version}.tar.gz"
checksum=621a20f45eef62070b3f95ad17ecbc3e7e1f7352d25dac86093ff6938b606baa checksum=621a20f45eef62070b3f95ad17ecbc3e7e1f7352d25dac86093ff6938b606baa
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

View File

@ -2,8 +2,8 @@ Source: pullmoll
Upstream: no (should be reported) Upstream: no (should be reported)
Reason: needs binary and (&) to test for bit mask Reason: needs binary and (&) to test for bit mask
--- fsck_hfs.tproj/dfalib/SBTree.c 2012-02-01 18:17:19.000000000 +0100 --- a/fsck_hfs.tproj/dfalib/SBTree.c 2012-02-01 18:17:19.000000000 +0100
+++ fsck_hfs.tproj/dfalib/SBTree.c 2019-05-26 12:45:16.688514031 +0200 +++ b/fsck_hfs.tproj/dfalib/SBTree.c 2019-05-26 12:45:16.688514031 +0200
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
{ {
if ( recordSize != sizeof(HFSPlusCatalogFolder) ) if ( recordSize != sizeof(HFSPlusCatalogFolder) )

View File

@ -1,5 +1,5 @@
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
VERSION=540.1.linux3 VERSION=540.1.linux3

View File

@ -2,8 +2,8 @@ Source: pullmoll
Upstream: no (feel free to suggest) Upstream: no (feel free to suggest)
Reason: use snprintf to avoid potential buffer overruns and fix mis-typed != compare Reason: use snprintf to avoid potential buffer overruns and fix mis-typed != compare
--- fsck_hfs.tproj/utilities.c --- a/fsck_hfs.tproj/utilities.c
+++ fsck_hfs.tproj/utilities.c +++ b/fsck_hfs.tproj/utilities.c
@@ -221,14 +221,12 @@ @@ -221,14 +221,12 @@
if ((dp = strrchr(name, '/')) == 0) if ((dp = strrchr(name, '/')) == 0)
return (0); return (0);
@ -22,8 +22,8 @@ Reason: use snprintf to avoid potential buffer overruns and fix mis-typed != com
return (rawbuf); return (rawbuf);
} }
--- fsck_hfs.tproj/dfalib/SControl.c --- a/fsck_hfs.tproj/dfalib/SControl.c
+++ fsck_hfs.tproj/dfalib/SControl.c +++ b/fsck_hfs.tproj/dfalib/SControl.c
@@ -321,9 +321,7 @@ @@ -321,9 +321,7 @@
dataArea.DrvNum = fsReadRef; dataArea.DrvNum = fsReadRef;
dataArea.liveVerifyState = liveMode; dataArea.liveVerifyState = liveMode;

View File

@ -1,7 +1,7 @@
Patch-Source: https://src.fedoraproject.org/rpms/hfsplus-tools/blob/f27/f/hfsplus-tools-learn-to-stdarg.patch Patch-Source: https://src.fedoraproject.org/rpms/hfsplus-tools/blob/f27/f/hfsplus-tools-learn-to-stdarg.patch
--- fsck_hfs.tproj/utilities.c.jx 2012-02-01 12:17:19.000000000 -0500 --- a/fsck_hfs.tproj/utilities.c.jx 2012-02-01 12:17:19.000000000 -0500
+++ fsck_hfs.tproj/utilities.c 2014-06-18 13:44:45.125620007 -0400 +++ b/fsck_hfs.tproj/utilities.c 2014-06-18 13:44:45.125620007 -0400
@@ -296,11 +296,8 @@ static volatile int keep_going = 1; @@ -296,11 +296,8 @@ static volatile int keep_going = 1;
#undef printf #undef printf

View File

@ -1,5 +1,5 @@
--- fsck_hfs.tproj/dfalib/Scavenger.h --- a/fsck_hfs.tproj/dfalib/Scavenger.h
+++ fsck_hfs.tproj/dfalib/Scavenger.h +++ b/fsck_hfs.tproj/dfalib/Scavenger.h
@@ -48,7 +48,6 @@ @@ -48,7 +48,6 @@
#endif #endif
#include <sys/errno.h> #include <sys/errno.h>
@ -8,8 +8,8 @@
#include <sys/mount.h> #include <sys/mount.h>
#include <hfs/hfs_mount.h> #include <hfs/hfs_mount.h>
--- fsck_hfs.tproj/fsck_hfs.c --- a/fsck_hfs.tproj/fsck_hfs.c
+++ fsck_hfs.tproj/fsck_hfs.c +++ b/fsck_hfs.tproj/fsck_hfs.c
@@ -30,7 +30,6 @@ @@ -30,7 +30,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if !LINUX #if !LINUX
@ -18,8 +18,8 @@
#include <setjmp.h> #include <setjmp.h>
#endif #endif
#include <hfs/hfs_mount.h> #include <hfs/hfs_mount.h>
--- newfs_hfs.tproj/makehfs.c --- a/newfs_hfs.tproj/makehfs.c
+++ newfs_hfs.tproj/makehfs.c +++ b/newfs_hfs.tproj/makehfs.c
@@ -38,7 +38,6 @@ @@ -38,7 +38,6 @@
#endif #endif
#include <sys/errno.h> #include <sys/errno.h>
@ -28,8 +28,8 @@
#if !LINUX #if !LINUX
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
#endif #endif
--- fsck_hfs.tproj/utilities.c --- a/fsck_hfs.tproj/utilities.c
+++ fsck_hfs.tproj/utilities.c +++ b/fsck_hfs.tproj/utilities.c
@@ -70,7 +70,6 @@ @@ -70,7 +70,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
@ -38,8 +38,8 @@
#include "fsck_hfs.h" #include "fsck_hfs.h"
--- fsck_hfs.tproj/dfalib/Scavenger.h --- a/fsck_hfs.tproj/dfalib/Scavenger.h
+++ fsck_hfs.tproj/dfalib/Scavenger.h +++ b/fsck_hfs.tproj/dfalib/Scavenger.h
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
#include <sys/kauth.h> #include <sys/kauth.h>
#include <sys/syslimits.h> #include <sys/syslimits.h>
@ -49,8 +49,8 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <hfs/hfs_mount.h> #include <hfs/hfs_mount.h>
--- fsck_hfs.tproj/utilities.c --- a/fsck_hfs.tproj/utilities.c
+++ fsck_hfs.tproj/utilities.c +++ b/fsck_hfs.tproj/utilities.c
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
#include <stddef.h> #include <stddef.h>
#include <sys/types.h> #include <sys/types.h>
@ -60,8 +60,8 @@
#if LINUX #if LINUX
#include <limits.h> #include <limits.h>
#include <signal.h> #include <signal.h>
--- newfs_hfs.tproj/makehfs.c --- a/newfs_hfs.tproj/makehfs.c
+++ newfs_hfs.tproj/makehfs.c +++ b/newfs_hfs.tproj/makehfs.c
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
#include <time.h> #include <time.h>
#include "missing.h" #include "missing.h"
@ -71,8 +71,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#if !LINUX #if !LINUX
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
--- fsck_hfs.tproj/cache.h --- a/fsck_hfs.tproj/cache.h
+++ fsck_hfs.tproj/cache.h +++ b/fsck_hfs.tproj/cache.h
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#ifndef _CACHE_H_ #ifndef _CACHE_H_
#define _CACHE_H_ #define _CACHE_H_
@ -81,8 +81,8 @@
/* Different values for initializing cache */ /* Different values for initializing cache */
enum { enum {
--- newfs_hfs.tproj/makehfs.c --- a/newfs_hfs.tproj/makehfs.c
+++ newfs_hfs.tproj/makehfs.c +++ b/newfs_hfs.tproj/makehfs.c
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#if !LINUX #if !LINUX
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
@ -91,8 +91,8 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
--- newfs_hfs.tproj/newfs_hfs.c --- a/newfs_hfs.tproj/newfs_hfs.c
+++ newfs_hfs.tproj/newfs_hfs.c +++ b/newfs_hfs.tproj/newfs_hfs.c
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
#if LINUX #if LINUX
#include <time.h> #include <time.h>
@ -101,8 +101,8 @@
#if !LINUX #if !LINUX
#include <IOKit/storage/IOMediaBSDClient.h> #include <IOKit/storage/IOMediaBSDClient.h>
--- fsck_hfs.tproj/fsck_hfs.h --- a/fsck_hfs.tproj/fsck_hfs.h
+++ fsck_hfs.tproj/fsck_hfs.h +++ b/fsck_hfs.tproj/fsck_hfs.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
*/ */
@ -111,8 +111,8 @@
const extern char *cdevname; /* name of device being checked */ const extern char *cdevname; /* name of device being checked */
--- fsck_hfs.tproj/utilities.c --- a/fsck_hfs.tproj/utilities.c
+++ fsck_hfs.tproj/utilities.c +++ b/fsck_hfs.tproj/utilities.c
@@ -785,7 +785,7 @@ @@ -785,7 +785,7 @@
if (!live_fsck) { if (!live_fsck) {
@ -122,8 +122,8 @@
vfprintf(stdout, fmt, ap_stdout); vfprintf(stdout, fmt, ap_stdout);
} }
--- fsck_hfs.tproj/fsck_messages.c --- a/fsck_hfs.tproj/fsck_messages.c
+++ fsck_hfs.tproj/fsck_messages.c +++ b/fsck_hfs.tproj/fsck_messages.c
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
if (c == NULL) if (c == NULL)

View File

@ -2,8 +2,8 @@ Source: pullmoll
Upstream: no Upstream: no
Reason: avoid format string mismatch for 64 bit types on 32/64 bit arch Reason: avoid format string mismatch for 64 bit types on 32/64 bit arch
--- newfs_hfs.tproj/newfs_hfs.c --- a/newfs_hfs.tproj/newfs_hfs.c
+++ newfs_hfs.tproj/newfs_hfs.c +++ b/newfs_hfs.tproj/newfs_hfs.c
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
#include <ctype.h> #include <ctype.h>
#include <syslog.h> #include <syslog.h>
@ -66,8 +66,8 @@ Reason: avoid format string mismatch for 64 bit types on 32/64 bit arch
printf("HFS Plus format parameters:\n"); printf("HFS Plus format parameters:\n");
printf("\tvolume name: \"%s\"\n", gVolumeName); printf("\tvolume name: \"%s\"\n", gVolumeName);
printf("\tblock-size: %u\n", defaults->blockSize); printf("\tblock-size: %u\n", defaults->blockSize);
--- newfs_hfs.tproj/makehfs.c --- a/newfs_hfs.tproj/makehfs.c
+++ newfs_hfs.tproj/makehfs.c +++ b/newfs_hfs.tproj/makehfs.c
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
#if !LINUX #if !LINUX
#include <wipefs.h> #include <wipefs.h>
@ -89,8 +89,8 @@ Reason: avoid format string mismatch for 64 bit types on 32/64 bit arch
} }
return; return;
--- fsck_hfs.tproj/dfalib/CatalogCheck.c 2012-02-01 18:17:19.000000000 +0100 --- a/fsck_hfs.tproj/dfalib/CatalogCheck.c 2012-02-01 18:17:19.000000000 +0100
+++ fsck_hfs.tproj/dfalib/CatalogCheck.c 2019-05-26 13:03:31.395612279 +0200 +++ b/fsck_hfs.tproj/dfalib/CatalogCheck.c 2019-05-26 13:03:31.395612279 +0200
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include "DecompDataEnums.h" #include "DecompDataEnums.h"
#include "DecompData.h" #include "DecompData.h"

View File

@ -14,7 +14,6 @@ license="APSL-2.0"
homepage="https://www.opensource.apple.com/" homepage="https://www.opensource.apple.com/"
distfiles="https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-${version}.tar.gz/${_md5sum}/diskdev_cmds-${version}.tar.gz" distfiles="https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/diskdev_cmds-${version}.tar.gz/${_md5sum}/diskdev_cmds-${version}.tar.gz"
checksum=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497 checksum=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat" makedepends+=" musl-legacy-compat"

View File

@ -10,8 +10,8 @@ Subject: [PATCH] use more sensible paths
diff --git higan/target-higan/higan.cpp higan/target-higan/higan.cpp diff --git higan/target-higan/higan.cpp higan/target-higan/higan.cpp
index 1ce9b991..7d1ae122 100644 index 1ce9b991..7d1ae122 100644
--- higan/target-higan/higan.cpp --- a/higan/target-higan/higan.cpp
+++ higan/target-higan/higan.cpp +++ b/higan/target-higan/higan.cpp
@@ -43,11 +43,10 @@ auto nall::main(Arguments arguments) -> void { @@ -43,11 +43,10 @@ auto nall::main(Arguments arguments) -> void {
Path::data = document["data"].text(); Path::data = document["data"].text();
} }
@ -28,8 +28,8 @@ index 1ce9b991..7d1ae122 100644
file::write({Path::settings, "paths.bml"}, string{ file::write({Path::settings, "paths.bml"}, string{
diff --git a/icarus/icarus.cpp b/icarus/icarus.cpp diff --git a/icarus/icarus.cpp b/icarus/icarus.cpp
index 95435f38..a46744e5 100644 index 95435f38..a46744e5 100644
--- icarus/icarus.cpp --- a/icarus/icarus.cpp
+++ icarus/icarus.cpp +++ b/icarus/icarus.cpp
@@ -8,8 +8,7 @@ auto locate(string name) -> string { @@ -8,8 +8,7 @@ auto locate(string name) -> string {
string location = {Path::program(), name}; string location = {Path::program(), name};
if(inode::exists(location)) return location; if(inode::exists(location)) return location;

View File

@ -1,5 +1,5 @@
--- higan/GNUmakefile 2019-12-21 21:44:28.000000000 +0100 --- a/higan/GNUmakefile 2019-12-21 21:44:28.000000000 +0100
+++ - 2019-12-27 20:24:30.207313870 +0100 +++ b/higan/GNUmakefile 2019-12-21 21:44:28.000000000 +0100
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
else ifeq ($(platform),macos) else ifeq ($(platform),macos)
else ifneq ($(filter $(platform),linux bsd),) else ifneq ($(filter $(platform),linux bsd),)

View File

@ -17,7 +17,6 @@ license="GPL-3.0-or-later, ISC"
homepage="https://byuu.org/emulation/higan/" homepage="https://byuu.org/emulation/higan/"
distfiles="https://byuu.org/download/higan/higan_v${version}-source.zip" distfiles="https://byuu.org/download/higan/higan_v${version}-source.zip"
checksum=1b70d85454aaae557fd5ba5aaed9add8cb8c939f2b7a07a6d3734f971bb07ab7 checksum=1b70d85454aaae557fd5ba5aaed9add8cb8c939f2b7a07a6d3734f971bb07ab7
patch_args=-Np0
build_options="icarus" build_options="icarus"
build_options_default="icarus" build_options_default="icarus"

View File

@ -1,7 +1,7 @@
Index: Makefile Index: Makefile
=================================================================== ===================================================================
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG @@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH. # Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')

View File

@ -1,7 +1,7 @@
Index: Makefile Index: Makefile
=================================================================== ===================================================================
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h @@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h
@echo "Generating $@ for pkgconfig..." @echo "Generating $@ for pkgconfig..."
@echo prefix=$(PREFIX) > $@ @echo prefix=$(PREFIX) > $@

View File

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

View File

@ -1,5 +1,5 @@
--- hitch.m4 --- a/hitch.m4
+++ hitch.m4 +++ b/hitch.m4
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
AC_MSG_CHECKING([whether the compiler accepts $2]) AC_MSG_CHECKING([whether the compiler accepts $2])
hitch_save_CFLAGS=$CFLAGS hitch_save_CFLAGS=$CFLAGS

View File

@ -14,7 +14,6 @@ homepage="https://hitch-tls.org/"
distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz" distfiles="https://hitch-tls.org/source/hitch-${version}.tar.gz"
checksum=c97ef8f1e115156640c40dfdfe9662d5f6d57a796fccad3bbad198ec797ce5c4 checksum=c97ef8f1e115156640c40dfdfe9662d5f6d57a796fccad3bbad198ec797ce5c4
system_accounts="_hitch" system_accounts="_hitch"
patch_args=-Np0
post_patch() { post_patch() {
vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \ vsed -i -e "s/grep -Pq/grep -q/" -e 's/\\t/\t/' \

View File

@ -1,7 +1,7 @@
diff --git src/CmdLine.hs src/CmdLine.hs diff --git src/CmdLine.hs src/CmdLine.hs
index 8c3d530..ccf7aac 100644 index 8c3d530..ccf7aac 100644
--- src/CmdLine.hs --- a/src/CmdLine.hs
+++ src/CmdLine.hs +++ b/src/CmdLine.hs
@@ -52,7 +52,7 @@ automatic cmd = case cmd of @@ -52,7 +52,7 @@ automatic cmd = case cmd of
b <- doesDirectoryExist x b <- doesDirectoryExist x
if b then return cmd{cmdDataDir=x} else do if b then return cmd{cmdDataDir=x} else do

View File

@ -13,7 +13,6 @@ distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172 checksum=207539d3627efd3caed9e6fd3b1aeb8f1eb64553f1f9f166090adbf2fb71e172
nocross=yes # Can't yet cross compile Haskell nocross=yes # Can't yet cross compile Haskell
nopie_files="/usr/bin/hlint" nopie_files="/usr/bin/hlint"
patch_args=-Np0
post_install() { post_install() {
rm -f ${DESTDIR}/usr/bin/engine rm -f ${DESTDIR}/usr/bin/engine

View File

@ -1,6 +1,6 @@
diff -ru a/Makefile b/Makefile diff -ru a/Makefile b/Makefile
--- Makefile 2015-09-09 07:54:02.000000000 -0700 --- a/Makefile 2015-09-09 07:54:02.000000000 -0700
+++ Makefile 2015-11-23 02:32:22.886247897 -0800 +++ b/Makefile 2015-11-23 02:32:22.886247897 -0800
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
install -Dm644 doc/$(PN).1 "$(DESTDIR)$(MANDIR)/$(PN).1" install -Dm644 doc/$(PN).1 "$(DESTDIR)$(MANDIR)/$(PN).1"
gzip -9 "$(DESTDIR)$(MANDIR)/$(PN).1" gzip -9 "$(DESTDIR)$(MANDIR)/$(PN).1"

View File

@ -10,7 +10,6 @@ license="MIT"
homepage="https://github.com/graysky2/hosts-update" homepage="https://github.com/graysky2/hosts-update"
distfiles="${homepage}/archive/v${version}.tar.gz" distfiles="${homepage}/archive/v${version}.tar.gz"
checksum="9a0fdb028beaf9fa4c2ec5f1a0030fcfe1a996ea42b874b944ec07885ca0f2ba" checksum="9a0fdb028beaf9fa4c2ec5f1a0030fcfe1a996ea42b874b944ec07885ca0f2ba"
patch_args=-Np0
post_install() { post_install() {
vlicense MIT vlicense MIT

View File

@ -10,8 +10,8 @@ Subject: Remove all ImageProcessor functionality, which is closed-source
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index 1b097c4f9..8d5d78c9f 100644 index 1b097c4f9..8d5d78c9f 100644
--- Makefile.am --- a/Makefile.am
+++ Makefile.am +++ b/Makefile.am
@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER @@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER endif #HPLIP_CLASS_DRIVER
@ -49,8 +49,8 @@ index 1b097c4f9..8d5d78c9f 100644
if [ "$(scan_build)" = "yes" ]; then \ if [ "$(scan_build)" = "yes" ]; then \
diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
index 5b282d83f..0bacfafac 100644 index 5b282d83f..0bacfafac 100644
--- prnt/hpcups/HPCupsFilter.cpp --- a/prnt/hpcups/HPCupsFilter.cpp
+++ prnt/hpcups/HPCupsFilter.cpp +++ b/prnt/hpcups/HPCupsFilter.cpp
@@ -31,7 +31,6 @@ @@ -31,7 +31,6 @@
\*****************************************************************************/ \*****************************************************************************/

View File

@ -1,8 +1,8 @@
The wrong variable is saved before the test and CFLAGS gets overwritten The wrong variable is saved before the test and CFLAGS gets overwritten
with an empty one afterwards. with an empty one afterwards.
--- configure.in.orig 2020-05-11 15:34:13.000000000 +0200 --- a/configure.in 2020-05-11 15:34:13.000000000 +0200
+++ configure.in 2020-05-21 08:45:20.113154658 +0200 +++ b/configure.in 2020-05-21 08:45:20.113154658 +0200
@@ -604,7 +604,7 @@ @@ -604,7 +604,7 @@
fi fi
fi fi

View File

@ -1,7 +1,7 @@
Fix build with cups>=2.2 Fix build with cups>=2.2
--- prnt/hpcups/CommonDefinitions.h.orig --- a/prnt/hpcups/CommonDefinitions.h
+++ prnt/hpcups/CommonDefinitions.h +++ b/prnt/hpcups/CommonDefinitions.h
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -10,8 +10,8 @@ Fix build with cups>=2.2
#include <cups/raster.h> #include <cups/raster.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
--- prnt/hpijs/hpcupsfax.cpp.orig --- a/prnt/hpijs/hpcupsfax.cpp
+++ prnt/hpijs/hpcupsfax.cpp +++ b/prnt/hpijs/hpcupsfax.cpp
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <math.h> #include <math.h>

View File

@ -1,5 +1,5 @@
--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100 --- a/upgrade.py 2013-10-31 12:46:54.000000000 +0100
+++ upgrade.py 2013-12-04 14:58:03.000000000 +0100 +++ b/upgrade.py 2013-12-04 14:58:03.000000000 +0100
@@ -134,6 +134,11 @@ except getopt.GetoptError, e: @@ -134,6 +134,11 @@ except getopt.GetoptError, e:
if os.getenv("HPLIP_DEBUG"): if os.getenv("HPLIP_DEBUG"):
log.set_level('debug') log.set_level('debug')

View File

@ -1,5 +1,5 @@
--- scan/sane.py.orig 2020-10-13 22:29:59.456276307 -0400 --- a/scan/sane.py 2020-10-13 22:29:59.456276307 -0400
+++ scan/sane.py 2020-10-13 22:32:44.663586789 -0400 +++ b/scan/sane.py 2020-10-13 22:32:44.663586789 -0400
@@ -378,14 +378,14 @@ @@ -378,14 +378,14 @@
def isScanActive(self): def isScanActive(self):

View File

@ -1,5 +1,5 @@
--- scan/sane/OrbliteScan/LinuxCommon.h.orig 2018-10-10 22:20:30.798911195 +0200 --- a/scan/sane/OrbliteScan/LinuxCommon.h 2018-10-10 22:20:30.798911195 +0200
+++ scan/sane/OrbliteScan/LinuxCommon.h 2018-10-10 22:21:28.815911201 +0200 +++ b/scan/sane/OrbliteScan/LinuxCommon.h 2018-10-10 22:21:28.815911201 +0200
@@ -3,6 +3,17 @@ @@ -3,6 +3,17 @@
#include <sys/types.h> #include <sys/types.h>

View File

@ -33,7 +33,6 @@ homepage="https://developers.hp.com/hp-linux-imaging-and-printing"
distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/hplip/hplip/${version}/hplip-${version}.tar.gz"
checksum=36251189aa9cc349f6a3eacbb7ac3c4fd26fc9f087c9f75cee051010c85d2ddf checksum=36251189aa9cc349f6a3eacbb7ac3c4fd26fc9f087c9f75cee051010c85d2ddf
conflicts="hplip-gui" conflicts="hplip-gui"
patch_args=-Np0
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libusb-1.0 -I${XBPS_CROSS_BASE}/${py3_inc}"

View File

@ -1,5 +1,5 @@
--- configure.ac.orig 2018-10-04 11:22:39.253662649 +0200 --- a/configure.ac 2018-10-04 11:22:39.253662649 +0200
+++ configure.ac 2018-10-04 11:23:27.646660149 +0200 +++ b/configure.ac 2018-10-04 11:23:27.646660149 +0200
@@ -116,9 +116,6 @@ @@ -116,9 +116,6 @@
AC_FUNC_MALLOC AC_FUNC_MALLOC
AC_CHECK_FUNCS([memset strdup strstr]) AC_CHECK_FUNCS([memset strdup strstr])

View File

@ -12,7 +12,6 @@ homepage="https://github.com/dvorka/hstr"
changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog" changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz" distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b
patch_args=-Np0
pre_configure() { pre_configure() {
vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h

View File

@ -1,5 +1,5 @@
--- htapp.cc.orig 2018-01-10 18:38:43.062092621 +0100 --- a/htapp.cc 2018-01-10 18:38:43.062092621 +0100
+++ htapp.cc 2018-01-10 18:39:04.732035497 +0100 +++ b/htapp.cc 2018-01-10 18:39:04.732035497 +0100
@@ -3023,7 +3023,7 @@ static uint isqr(uint u) @@ -3023,7 +3023,7 @@ static uint isqr(uint u)
{ {
uint a = 2; uint a = 2;

View File

@ -10,7 +10,6 @@ license="GPL-2.0-only"
homepage="http://hte.sourceforge.net/" homepage="http://hte.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/hte/ht-source/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/hte/ht-source/${pkgname}-${version}.tar.bz2"
checksum=31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70 checksum=31f5e8e2ca7f85d40bb18ef518bf1a105a6f602918a0755bc649f3f407b75d70
patch_args=-Np0
CXXFLAGS="-Wno-narrowing" CXXFLAGS="-Wno-narrowing"

View File

@ -1,5 +1,5 @@
--- hxnum.c.orig 2016-03-20 16:18:47.815855780 +0100 --- a/hxnum.c 2016-03-20 16:18:47.815855780 +0100
+++ hxnum.c 2016-03-20 16:19:40.197200923 +0100 +++ b/hxnum.c 2016-03-20 16:19:40.197200923 +0100
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#endif #endif
#include <stdlib.h> #include <stdlib.h>

View File

@ -10,4 +10,3 @@ license="W3C"
homepage="https://www.w3.org/Tools/HTML-XML-utils/README" homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz" distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
checksum=d86ac96ea660316bef814c17b2a96d54cdf91c69e59614459865c2bfdaee433f checksum=d86ac96ea660316bef814c17b2a96d54cdf91c69e59614459865c2bfdaee433f
patch_args=-Np0

View File

@ -2,8 +2,8 @@ Upstream: no
Patch from NodeJS's vendored version: Patch from NodeJS's vendored version:
https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e
--- http_parser.c --- a/http_parser.c
+++ http_parser.c +++ b/http_parser.c
@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser, @@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser,
} else if (parser->index == sizeof(TRANSFER_ENCODING)-2) { } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
parser->header_state = h_transfer_encoding; parser->header_state = h_transfer_encoding;
@ -18,8 +18,8 @@ https://github.com/nodejs/node/commit/fc70ce08f5818a286fb5899a1bc3aff5965a745e
} }
break; break;
--- test.c --- a/test.c
+++ test.c +++ b/test.c
@@ -2154,6 +2154,32 @@ const struct message responses[] = @@ -2154,6 +2154,32 @@ const struct message responses[] =
,.body= "2\r\nOK\r\n0\r\n\r\n" ,.body= "2\r\nOK\r\n0\r\n\r\n"
,.num_chunks_complete= 0 ,.num_chunks_complete= 0

View File

@ -13,7 +13,6 @@ license="MIT"
homepage="https://github.com/nodejs/http-parser" homepage="https://github.com/nodejs/http-parser"
distfiles="${homepage}/archive/${_githash}.tar.gz" distfiles="${homepage}/archive/${_githash}.tar.gz"
checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128 checksum=765a21444322ea2476ca1e3cfeb74d280eeb37f4713cf52d2bf398dabf6e4128
patch_args=-Np0
pre_install() { pre_install() {
vmkdir usr/lib/pkgconfig vmkdir usr/lib/pkgconfig

View File

@ -1,7 +1,7 @@
diff --git src/main.c src/main.c diff --git src/main.c src/main.c
index 154f052..b44463c 100644 index 154f052..b44463c 100644
--- src/main.c --- a/src/main.c
+++ src/main.c +++ b/src/main.c
@@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help) @@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help)
static void print_version() static void print_version()
@ -17,8 +17,8 @@ index 154f052..b44463c 100644
static void print_long_help() static void print_long_help()
diff --git src/util.h src/util.h diff --git src/util.h src/util.h
index d7c7c15..4ae9ce8 100644 index d7c7c15..4ae9ce8 100644
--- src/util.h --- a/src/util.h
+++ src/util.h +++ b/src/util.h
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
/** /**
* \brief the default user agent string * \brief the default user agent string

View File

@ -1,7 +1,7 @@
diff --git src/util.c src/util.c diff --git src/util.c src/util.c
index f2141bd..10e1549 100644 index f2141bd..10e1549 100644
--- src/util.c --- a/src/util.c
+++ src/util.c +++ b/src/util.c
@@ -2,8 +2,9 @@ @@ -2,8 +2,9 @@
#include <openssl/md5.h> #include <openssl/md5.h>

View File

@ -12,7 +12,6 @@ license="GPL-3.0-only"
homepage="https://github.com/fangfufu/httpdirfs" homepage="https://github.com/fangfufu/httpdirfs"
distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz" distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz"
checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a
patch_args=-Np0
CFLAGS="-D_FILE_OFFSET_BITS=64" CFLAGS="-D_FILE_OFFSET_BITS=64"

View File

@ -9,8 +9,8 @@ Subject: [PATCH] disable vigra-links-exr check
diff --git CMakeModules/FindVIGRA.cmake CMakeModules/FindVIGRA.cmake diff --git CMakeModules/FindVIGRA.cmake CMakeModules/FindVIGRA.cmake
index 2349916..f867b55 100755 index 2349916..f867b55 100755
--- CMakeModules/FindVIGRA.cmake --- a/CMakeModules/FindVIGRA.cmake
+++ CMakeModules/FindVIGRA.cmake +++ b/CMakeModules/FindVIGRA.cmake
@@ -63,24 +63,6 @@ IF (VIGRA_FOUND) @@ -63,24 +63,6 @@ IF (VIGRA_FOUND)
"VIGRA lib is too old.\nHugin requires at least version 1.9.0, but found version ${VIGRA_VERSION}." "VIGRA lib is too old.\nHugin requires at least version 1.9.0, but found version ${VIGRA_VERSION}."
) )

View File

@ -1,7 +1,7 @@
Index: src/celeste/CMakeLists.txt Index: src/celeste/CMakeLists.txt
=================================================================== ===================================================================
--- src/celeste/CMakeLists.txt.orig --- a/src/celeste/CMakeLists.txt
+++ src/celeste/CMakeLists.txt +++ b/src/celeste/CMakeLists.txt
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Hugin If not, see <http://www.gnu.org/licenses/>. # along with Hugin If not, see <http://www.gnu.org/licenses/>.

View File

@ -19,7 +19,6 @@ homepage="http://hugin.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb checksum=283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
python_version=3 python_version=3
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3" hostmakedepends+=" python3"

View File

@ -1,7 +1,7 @@
diff --git src/tools/hunspell.cxx src/tools/hunspell.cxx diff --git src/tools/hunspell.cxx src/tools/hunspell.cxx
index 690e34a..d9b094d 100644 index 690e34a..d9b094d 100644
--- src/tools/hunspell.cxx --- a/src/tools/hunspell.cxx
+++ src/tools/hunspell.cxx +++ b/src/tools/hunspell.cxx
@@ -119,25 +119,11 @@ @@ -119,25 +119,11 @@
"/usr/share/hunspell:" \ "/usr/share/hunspell:" \
"/usr/share/myspell:" \ "/usr/share/myspell:" \

View File

@ -12,7 +12,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later, MPL-1.1"
homepage="https://hunspell.github.io/" homepage="https://hunspell.github.io/"
distfiles="https://github.com/hunspell/hunspell/archive/v${version}.tar.gz" distfiles="https://github.com/hunspell/hunspell/archive/v${version}.tar.gz"
checksum=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a checksum=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -fi autoreconf -fi

View File

@ -1,5 +1,5 @@
--- sdevel/cctypeinfo.c --- a/sdevel/cctypeinfo.c
+++ sdevel/cctypeinfo.c +++ b/sdevel/cctypeinfo.c
@@ -18,6 +18,8 @@ @@ -18,6 +18,8 @@
#else #else
# include <netinet/in.h> # include <netinet/in.h>

View File

@ -12,4 +12,3 @@ homepage="http://inai.de/projects/hxtools"
distfiles="http://inai.de/files/hxtools/hxtools-${version}.tar.xz" distfiles="http://inai.de/files/hxtools/hxtools-${version}.tar.xz"
checksum=45ceee8db0b9b926712b336ebb91c572f2247cec64862f6171fc416db4e9e12f checksum=45ceee8db0b9b926712b336ebb91c572f2247cec64862f6171fc416db4e9e12f
conflicts="bsd-games>=0" conflicts="bsd-games>=0"
patch_args=-Np0