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

srcpkgs/r*: convert patches to -Np1 

* runit is kept at -Np0

```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 635e9da391
commit 103ab731ab
122 changed files with 253 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
srcpkgs/rabbitmq-c/patches/test.patch
View File

@ -19,8 +19,8 @@ to ensure the library is built correctly.
diff --git .travis.yml .travis.yml diff --git .travis.yml .travis.yml
index 52a66b9c..5f56cb03 100644 index 52a66b9c..5f56cb03 100644
--- .travis.yml --- a/.travis.yml
+++ .travis.yml +++ b/.travis.yml
@@ -19,7 +19,7 @@ addons: @@ -19,7 +19,7 @@ addons:
name: "alanxz/rabbitmq-c" name: "alanxz/rabbitmq-c"
description: "C AMQP client for RabbitMQ" description: "C AMQP client for RabbitMQ"
@ -32,8 +32,8 @@ index 52a66b9c..5f56cb03 100644
diff --git CMakeLists.txt CMakeLists.txt diff --git CMakeLists.txt CMakeLists.txt
index f620ddc8..a39645f4 100644 index f620ddc8..a39645f4 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND}) @@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND})
option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS}) option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS})
option(BUILD_TESTS "Build tests (run tests with make test)" ON) option(BUILD_TESTS "Build tests (run tests with make test)" ON)
@ -44,8 +44,8 @@ index f620ddc8..a39645f4 100644
message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build") message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
diff --git README.md README.md diff --git README.md README.md
index b7776c65..31347b15 100644 index b7776c65..31347b15 100644
--- README.md --- a/README.md
+++ README.md +++ b/README.md
@@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake: @@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake:
default this is ON if the OpenSSL headers and library can be found. default this is ON if the OpenSSL headers and library can be found.
* `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by
@ -57,8 +57,8 @@ index b7776c65..31347b15 100644
diff --git appveyor.yml appveyor.yml diff --git appveyor.yml appveyor.yml
index 7e41c099..af315227 100644 index 7e41c099..af315227 100644
--- appveyor.yml --- a/appveyor.yml
+++ appveyor.yml +++ b/appveyor.yml
@@ -30,7 +30,7 @@ install: @@ -30,7 +30,7 @@ install:
- "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART" - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART"
@ -70,8 +70,8 @@ index 7e41c099..af315227 100644
project: ALL_BUILD.vcxproj project: ALL_BUILD.vcxproj
diff --git tests/CMakeLists.txt tests/CMakeLists.txt diff --git tests/CMakeLists.txt tests/CMakeLists.txt
index cf042b04..320a73d7 100644 index cf042b04..320a73d7 100644
--- tests/CMakeLists.txt --- a/tests/CMakeLists.txt
+++ tests/CMakeLists.txt +++ b/tests/CMakeLists.txt
@@ -33,9 +33,11 @@ add_executable(test_basic @@ -33,9 +33,11 @@ add_executable(test_basic
test_basic.c) test_basic.c)
target_link_libraries(test_basic rabbitmq-static) target_link_libraries(test_basic rabbitmq-static)

1
srcpkgs/rabbitmq-c/template
View File

@ -12,7 +12,6 @@ license="MIT"
homepage="https://github.com/alanxz/rabbitmq-c" homepage="https://github.com/alanxz/rabbitmq-c"
distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz"
checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0 checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE-MIT LICENSE vlicense LICENSE-MIT LICENSE

4
srcpkgs/racket/patches/musl-fixes.patch
View File

@ -14,8 +14,8 @@ Resources:
* https://github.com/NixOS/nixpkgs/pull/31017 * https://github.com/NixOS/nixpkgs/pull/31017
* https://github.com/racket/racket/pull/1886 * https://github.com/racket/racket/pull/1886
--- collects/compiler/private/xform.rkt --- a/collects/compiler/private/xform.rkt
--- collects/compiler/private/xform.rkt --- a/collects/compiler/private/xform.rkt
@@ -924,6 +924,7 @@ @@ -924,6 +924,7 @@
|GetStdHandle| |__CFStringMakeConstantString| |GetStdHandle| |__CFStringMakeConstantString|
_vswprintf_c _vswprintf_c

1
srcpkgs/racket/template
View File

@ -16,7 +16,6 @@ distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${vers
checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e
nostrip=yes nostrip=yes
nocross=yes nocross=yes
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args+=" --enable-racket=/usr/bin/racket" configure_args+=" --enable-racket=/usr/bin/racket"

4
srcpkgs/radare2/patches/try.patch
View File

@ -1,5 +1,5 @@
--- shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 --- a/shlr/Makefile 2020-12-21 09:39:46.000000000 +0100
+++ shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 +++ b/shlr/Makefile 2021-01-04 22:13:43.513442861 +0100
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
SDB_LIBA=sdb/src/libsdb.a SDB_LIBA=sdb/src/libsdb.a

1
srcpkgs/radare2/template
View File

@ -13,7 +13,6 @@ license="LGPL-3.0-only"
homepage="http://www.radare.org" homepage="http://www.radare.org"
distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
mips*) CFLAGS="-Os";; mips*) CFLAGS="-Os";;

8
srcpkgs/rakarrack/patches/fltk_include.patch
View File

@ -1,6 +1,6 @@
diff -baur src/global.h src/global.h diff -baur src/global.h src/global.h
--- src/global.h 2011-07-12 05:13:31.367583829 +0800 --- a/src/global.h 2011-07-12 05:13:31.367583829 +0800
+++ src/global.h 2011-07-12 05:15:20.670325018 +0800 +++ b/src/global.h 2011-07-12 05:15:20.670325018 +0800
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
#include <X11/xpm.h> #include <X11/xpm.h>
#include <jack/jack.h> #include <jack/jack.h>
@ -11,8 +11,8 @@ diff -baur src/global.h src/global.h
#include "Reverb.h" #include "Reverb.h"
#include "Chorus.h" #include "Chorus.h"
diff -baur src/process.C src/process.C diff -baur src/process.C src/process.C
--- src/process.C 2011-07-12 05:13:31.367583829 +0800 --- a/src/process.C 2011-07-12 05:13:31.367583829 +0800
+++ src/process.C 2011-07-12 05:15:31.293600800 +0800 +++ b/src/process.C 2011-07-12 05:15:31.293600800 +0800
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>

1
srcpkgs/rakarrack/template
View File

@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
homepage="http://rakarrack.sourceforge.net" homepage="http://rakarrack.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=7696d27a4814b140fe651d137612ddfa1f167858eccc119e278c14dbee30eee6 checksum=7696d27a4814b140fe651d137612ddfa1f167858eccc119e278c14dbee30eee6
patch_args=-Np0
pre_configure() { pre_configure() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

4
srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch
View File

@ -1,7 +1,7 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceda71b1..9fc52736 100644 index ceda71b1..9fc52736 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ if(CCACHE_FOUND) @@ -50,7 +50,7 @@ if(CCACHE_FOUND)
endif(CCACHE_FOUND) endif(CCACHE_FOUND)

4
srcpkgs/rapidjson/patches/fallthrough.patch
View File

@ -1,5 +1,5 @@
--- include/rapidjson/internal/regex.h.orig 2016-08-25 09:59:05.000000000 +0200 --- a/include/rapidjson/internal/regex.h 2016-08-25 09:59:05.000000000 +0200
+++ include/rapidjson/internal/regex.h 2018-01-13 21:51:33.959472047 +0100 +++ b/include/rapidjson/internal/regex.h 2018-01-13 21:51:33.959472047 +0100
@@ -300,7 +300,7 @@ @@ -300,7 +300,7 @@
case '\\': // Escape character case '\\': // Escape character
if (!CharacterEscape(ds, &codepoint)) if (!CharacterEscape(ds, &codepoint))

1
srcpkgs/rapidjson/template
View File

@ -9,7 +9,6 @@ license="BSD-3-Clause, MIT"
homepage="https://github.com/miloyip/rapidjson" homepage="https://github.com/miloyip/rapidjson"
distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz"
checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e
patch_args=-Np0
# class-memaccess is required by https://github.com/Tencent/rapidjson/issues/1700 # class-memaccess is required by https://github.com/Tencent/rapidjson/issues/1700
CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess -DNDEBUG" CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess -DNDEBUG"

4
srcpkgs/raptor/patches/CVE-2017-18926.patch
View File

@ -14,8 +14,8 @@ and #0000618 http://bugs.librdf.org/mantis/view.php?id=618
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
index 693b9468..0d3a36a5 100644 index 693b9468..0d3a36a5 100644
--- src/raptor_xml_writer.c --- a/src/raptor_xml_writer.c
+++ src/raptor_xml_writer.c +++ b/src/raptor_xml_writer.c
@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, @@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
size_t nspace_declarations_count = 0; size_t nspace_declarations_count = 0;
unsigned int i; unsigned int i;

4
srcpkgs/raptor/patches/out-of-bounds.patch
View File

@ -2,8 +2,8 @@ Patch from https://bugs.librdf.org/mantis/view.php?id=650
diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c
index 56993dc3..163f34d5 100644 index 56993dc3..163f34d5 100644
--- src/raptor_xml_writer.c --- a/src/raptor_xml_writer.c
+++ src/raptor_xml_writer.c +++ b/src/raptor_xml_writer.c
@@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, @@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer,
if(nstack && element->attributes) { if(nstack && element->attributes) {

1
srcpkgs/raptor/template
View File

@ -13,7 +13,6 @@ license="LGPL-2.1"
homepage="http://librdf.org/raptor" homepage="http://librdf.org/raptor"
distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz" distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz"
checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
patch_args=-Np0
libraptor_package() { libraptor_package() {
short_desc+=" - Runtime libraries" short_desc+=" - Runtime libraries"

4
srcpkgs/rdedup/patches/bindgen-cross.patch
View File

@ -1,8 +1,8 @@
patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args
--- Cargo.toml.orig 2019-06-15 13:18:05.509893680 +0200 --- a/Cargo.toml 2019-06-15 13:18:05.509893680 +0200
+++ Cargo.toml 2019-06-15 13:19:48.854887006 +0200 +++ b/Cargo.toml 2019-06-15 13:19:48.854887006 +0200
@@ -53,3 +53,6 @@ @@ -53,3 +53,6 @@
slog-term = "2" slog-term = "2"
slog-async = "2" slog-async = "2"

1
srcpkgs/rdedup/template
View File

@ -12,7 +12,6 @@ license="MPL-2.0"
homepage="https://github.com/dpc/rdedup" homepage="https://github.com/dpc/rdedup"
distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz" distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz"
checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28 checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
export HOST_CC="$BUILD_CC" export HOST_CC="$BUILD_CC"

20
srcpkgs/rdis-git/patches/luajit_version.patch
View File

@ -1,6 +1,6 @@
fix luajit version checks (for 2.1 support) fix luajit version checks (for 2.1 support)
--- src/Makefile --- a/src/Makefile
+++ src/Makefile +++ b/src/Makefile
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
OBJS=object.o rdg.o rdg_node.o rdis.o serialize.o settings.o util.o wqueue.o OBJS=object.o rdg.o rdg_node.o rdis.o serialize.o settings.o util.o wqueue.o
@ -10,8 +10,8 @@ fix luajit version checks (for 2.1 support)
-iquotecontainer/ -iquoteloader/ -iquote./ -iquotescript/ -iquotegui/ -iquoteredis/ -iquotecontainer/ -iquoteloader/ -iquote./ -iquotescript/ -iquotegui/ -iquoteredis/
LIB=`pkg-config --libs gtk+-3.0 cairo` -ludis86 -lm -lfontconfig -lpthread \ LIB=`pkg-config --libs gtk+-3.0 cairo` -ludis86 -lm -lfontconfig -lpthread \
-ljansson -lluajit-5.1 -lcrypto -ljansson -lluajit-5.1 -lcrypto
--- src/gui/Makefile --- a/src/gui/Makefile
+++ src/gui/Makefile +++ b/src/gui/Makefile
@@ -2,7 +2,7 @@ OBJS = hexwindow.o funcwindow.o main.o refwindow.o rdgwindow.o \ @@ -2,7 +2,7 @@ OBJS = hexwindow.o funcwindow.o main.o refwindow.o rdgwindow.o \
rdiswindow.o gui.o rdiswindow.o gui.o
@ -21,8 +21,8 @@ fix luajit version checks (for 2.1 support)
-iquote../ -iquote../container -iquote../loader -iquote../script -iquote../ -iquote../container -iquote../loader -iquote../script
all : $(OBJS) all : $(OBJS)
--- src/loader/Makefile --- a/src/loader/Makefile
+++ src/loader/Makefile +++ b/src/loader/Makefile
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
OBJS=elf32.o elf64.o x86.o x8664.o loader.o pe.o lua.o dummy.o OBJS=elf32.o elf64.o x86.o x8664.o loader.o pe.o lua.o dummy.o
@ -32,8 +32,8 @@ fix luajit version checks (for 2.1 support)
-iquote../container -iquote../ -iquote../script -iquote./ -iquote../container -iquote../ -iquote../script -iquote./
all : $(OBJS) all : $(OBJS)
--- src/script/Makefile --- a/src/script/Makefile
+++ src/script/Makefile +++ b/src/script/Makefile
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
OBJS=rdis_lua.o rl_redis_x86.o OBJS=rdis_lua.o rl_redis_x86.o
@ -43,8 +43,8 @@ fix luajit version checks (for 2.1 support)
-iquote../ -iquote../container -iquote../loader -iquote./ -iquote../redis -iquote../gui -iquote../ -iquote../container -iquote../loader -iquote./ -iquote../redis -iquote../gui
all : $(OBJS) all : $(OBJS)
--- src/script/rdis_lua.h --- a/src/script/rdis_lua.h
+++ src/script/rdis_lua.h +++ b/src/script/rdis_lua.h
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
#ifndef rdis_lua_HEADER #ifndef rdis_lua_HEADER
#define rdis_lua_HEADER #define rdis_lua_HEADER

1
srcpkgs/rdis-git/template
View File

@ -8,7 +8,6 @@ short_desc="A binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3" license="GPL-3"
homepage="https://github.com/endeav0r/rdis" homepage="https://github.com/endeav0r/rdis"
patch_args=-Np0
do_fetch() { do_fetch() {
git clone git://github.com/endeav0r/rdis.git $wrksrc git clone git://github.com/endeav0r/rdis.git $wrksrc

12
srcpkgs/re/patches/bsdnet.diff
View File

@ -1,5 +1,5 @@
--- src/net/posix/pif.c.orig 2016-12-03 15:21:22.000000000 +0100 --- a/src/net/posix/pif.c 2016-12-03 15:21:22.000000000 +0100
+++ src/net/posix/pif.c 2016-12-03 15:21:39.000000000 +0100 +++ b/src/net/posix/pif.c 2016-12-03 15:21:39.000000000 +0100
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
* *
* Copyright (C) 2010 Creytiv.com * Copyright (C) 2010 Creytiv.com
@ -8,8 +8,8 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
--- src/net/ifaddrs.c.orig 2016-12-03 15:24:22.000000000 +0100 --- a/src/net/ifaddrs.c 2016-12-03 15:24:22.000000000 +0100
+++ src/net/ifaddrs.c 2016-12-03 15:24:39.000000000 +0100 +++ b/src/net/ifaddrs.c 2016-12-03 15:24:39.000000000 +0100
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
* *
* Copyright (C) 2010 Creytiv.com * Copyright (C) 2010 Creytiv.com
@ -18,8 +18,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#define __USE_MISC 1 /**< Use MISC code */ #define __USE_MISC 1 /**< Use MISC code */
--- src/tcp/tcp.c.orig 2016-12-03 15:30:06.000000000 +0100 --- a/src/tcp/tcp.c 2016-12-03 15:30:06.000000000 +0100
+++ src/tcp/tcp.c 2016-12-03 15:29:46.000000000 +0100 +++ b/src/tcp/tcp.c 2016-12-03 15:29:46.000000000 +0100
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
* *
* Copyright (C) 2010 Creytiv.com * Copyright (C) 2010 Creytiv.com

4
srcpkgs/re/patches/musl.patch
View File

@ -1,5 +1,5 @@
--- re_types.h 2018-01-14 21:33:25.561341291 +0100 --- a/re_types.h 2018-01-14 21:33:25.561341291 +0100
+++ include/re_types.h 2018-01-14 21:34:45.444384148 +0100 +++ b/include/re_types.h 2018-01-14 21:34:45.444384148 +0100
@@ -37,20 +37,25 @@ @@ -37,20 +37,25 @@
typedef signed long long int int64_t; typedef signed long long int int64_t;

4
srcpkgs/re/patches/resolver.diff
View File

@ -1,5 +1,5 @@
--- src/dns/res.c.orig 2016-12-03 15:17:53.000000000 +0100 --- a/src/dns/res.c 2016-12-03 15:17:53.000000000 +0100
+++ src/dns/res.c 2016-12-03 15:18:30.000000000 +0100 +++ b/src/dns/res.c 2016-12-03 15:18:30.000000000 +0100
@@ -25,13 +25,9 @@ int get_resolv_dns(char *domain, size_t @@ -25,13 +25,9 @@ int get_resolv_dns(char *domain, size_t
uint32_t i; uint32_t i;
int ret, err; int ret, err;

1
srcpkgs/re/template
View File

@ -16,7 +16,6 @@ homepage="https://github.com/baresip/re/"
distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz" distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz"
checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
shlib_provides="libre.so" shlib_provides="libre.so"
patch_args=-Np0
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
i686*) arch="i686";; i686*) arch="i686";;

8
srcpkgs/recoll/patches/musl.patch
View File

@ -1,7 +1,7 @@
Index: utils/fstreewalk.cpp Index: utils/fstreewalk.cpp
=================================================================== ===================================================================
--- utils/fstreewalk.cpp.orig --- a/utils/fstreewalk.cpp
+++ utils/fstreewalk.cpp +++ b/utils/fstreewalk.cpp
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
#include "autoconfig.h" #include "autoconfig.h"
@ -12,8 +12,8 @@ Index: utils/fstreewalk.cpp
#include <errno.h> #include <errno.h>
Index: utils/pxattr.cpp Index: utils/pxattr.cpp
=================================================================== ===================================================================
--- utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 --- a/utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200
+++ utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 +++ b/utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
// just let the methods return errors (like they would on a non-xattr // just let the methods return errors (like they would on a non-xattr
// fs on e.g. linux) // fs on e.g. linux)

1
srcpkgs/recoll/template
View File

@ -16,4 +16,3 @@ license="GPL-2.0-or-later"
homepage="https://www.lesbonscomptes.com/recoll/" homepage="https://www.lesbonscomptes.com/recoll/"
distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885 checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885
patch_args=-Np0

8
srcpkgs/recordmydesktop/patches/sane-theora-defaults.patch
View File

@ -1,8 +1,8 @@
# Use sane theora defaults # Use sane theora defaults
# https://bugzilla.redhat.com/show_bug.cgi?id=525155 # https://bugzilla.redhat.com/show_bug.cgi?id=525155
--- src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 --- a/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500
+++ src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 +++ b/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500
@@ -224,7 +224,7 @@ @@ -224,7 +224,7 @@
args->channels = 1; args->channels = 1;
args->frequency = 22050; args->frequency = 22050;
@ -12,8 +12,8 @@
args->v_quality = 63; args->v_quality = 63;
args->s_quality = 10; args->s_quality = 10;
--- src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 --- a/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500
+++ src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 +++ b/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500
@@ -104,10 +104,10 @@ @@ -104,10 +104,10 @@
"Encoding Options\n" "Encoding Options\n"
"\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"

8
srcpkgs/recordmydesktop/patches/shmstr-to-shmproto.patch
View File

@ -2,8 +2,8 @@
# 2010-01-15: Bug with proposed fix already upstream: # 2010-01-15: Bug with proposed fix already upstream:
# http://sourceforge.net/tracker/?func=detail&aid=2889699&group_id=172357&atid=861428 # http://sourceforge.net/tracker/?func=detail&aid=2889699&group_id=172357&atid=861428
--- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 --- a/src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100
+++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +++ b/src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -13,8 +13,8 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
--- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 --- a/src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100
+++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +++ b/src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
#include "rmd_types.h" #include "rmd_types.h"

1
srcpkgs/recordmydesktop/template
View File

@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
homepage="http://recordmydesktop.sourceforge.net/about.php" homepage="http://recordmydesktop.sourceforge.net/about.php"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c checksum=33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c
patch_args=-Np0

4
srcpkgs/redis/patches/use-system-jemalloc.patch
View File

@ -1,5 +1,5 @@
--- src/Makefile 2018-11-23 20:32:03.881081556 +0200 --- a/src/Makefile 2018-11-23 20:32:03.881081556 +0200
+++ src/Makefile 2018-11-23 23:55:55.800219510 +0200 +++ b/src/Makefile 2018-11-23 23:55:55.800219510 +0200
@@ -134,9 +134,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) @@ -134,9 +134,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
endif endif

1
srcpkgs/redis/template
View File

@ -11,7 +11,6 @@ homepage="https://redis.io"
changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES" changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES"
distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz"
checksum=dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd checksum=dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd
patch_args=-Np0
system_accounts="redis" system_accounts="redis"
redis_homedir="/var/lib/redis" redis_homedir="/var/lib/redis"

4
srcpkgs/redo/patches/musl.patch
View File

@ -1,5 +1,5 @@
--- source/lockfile.cpp.orig --- a/source/lockfile.cpp
+++ source/lockfile.cpp +++ b/source/lockfile.cpp
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
#include <sys/types.h> #include <sys/types.h>

1
srcpkgs/redo/template
View File

@ -10,7 +10,6 @@ license="ISC"
homepage="http://jdebp.info/Softwares/redo/" homepage="http://jdebp.info/Softwares/redo/"
distfiles="http://jdebp.info/Repository/freebsd/redo-${version}.tar.gz" distfiles="http://jdebp.info/Repository/freebsd/redo-${version}.tar.gz"
checksum=5ff21779993418cf16f5632c593e30d9a2780bfc38cef9de9ab9427154736d36 checksum=5ff21779993418cf16f5632c593e30d9a2780bfc38cef9de9ab9427154736d36
patch_args=-Np0
do_configure() { do_configure() {
./package/prepare ./package/prepare

4
srcpkgs/refind/patches/add-cross-compile-support.patch
View File

@ -1,7 +1,7 @@
diff --git a/Make.common b/Make.common diff --git a/Make.common b/Make.common
index 3f0b919..562a03e 100644 index 3f0b919..562a03e 100644
--- Make.common --- a/Make.common
+++ Make.common +++ b/Make.common
@@ -34,21 +34,13 @@ ARCH ?= $(HOSTARCH) @@ -34,21 +34,13 @@ ARCH ?= $(HOSTARCH)
# Note: TIANOBASE is defined in master Makefile and exported # Note: TIANOBASE is defined in master Makefile and exported
GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw

12
srcpkgs/refind/patches/force-inline-musl.patch
View File

@ -1,5 +1,5 @@
--- filesystems/zstd/fse_decompress.c.orig 2019-11-11 17:00:57.423347660 +0700 --- a/filesystems/zstd/fse_decompress.c 2019-11-11 17:00:57.423347660 +0700
+++ filesystems/zstd/fse_decompress.c 2019-11-11 17:01:52.654692140 +0700 +++ b/filesystems/zstd/fse_decompress.c 2019-11-11 17:01:52.654692140 +0700
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
/* ************************************************************** /* **************************************************************
* Compiler specifics * Compiler specifics
@ -9,8 +9,8 @@
/* ************************************************************** /* **************************************************************
* Includes * Includes
--- filesystems/zstd/zstd_internal.h.orig 2019-11-11 15:56:42.258217148 +0700 --- a/filesystems/zstd/zstd_internal.h 2019-11-11 15:56:42.258217148 +0700
+++ filesystems/zstd/zstd_internal.h 2019-11-11 16:04:09.433867777 +0700 +++ b/filesystems/zstd/zstd_internal.h 2019-11-11 16:04:09.433867777 +0700
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
/*-******************************************************* /*-*******************************************************
* Compiler specifics * Compiler specifics
@ -20,8 +20,8 @@
#define FORCE_NOINLINE static /*noinline*/ #define FORCE_NOINLINE static /*noinline*/
/*-************************************* /*-*************************************
--- filesystems/zstd/huf_decompress.c.orig 2019-11-11 17:00:46.487280468 +0700 --- a/filesystems/zstd/huf_decompress.c 2019-11-11 17:00:46.487280468 +0700
+++ filesystems/zstd/huf_decompress.c 2019-11-11 17:01:20.095488026 +0700 +++ b/filesystems/zstd/huf_decompress.c 2019-11-11 17:01:20.095488026 +0700
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
/* ************************************************************** /* **************************************************************
* Compiler specifics * Compiler specifics

1
srcpkgs/refind/template
View File

@ -13,7 +13,6 @@ distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz"
checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970 checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970
python_version=2 python_version=2
conf_files="/etc/default/refind-kernel-hook.conf" conf_files="/etc/default/refind-kernel-hook.conf"
patch_args=-Np0
post_extract() { post_extract() {
vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \ vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \

4
srcpkgs/reiserfsprogs/patches/musl-__compar_fn_t.patch
View File

@ -2,8 +2,8 @@ Define _GNU_SOURCE for the declaration of loff_t in fcntl.h
Add missing typedefs for __compar_fn_t and compare_fn_t for Add missing typedefs for __compar_fn_t and compare_fn_t for
non __GLIBC__ case. non __GLIBC__ case.
--- include/misc.h --- a/include/misc.h
+++ include/misc.h +++ b/include/misc.h
@@ -35,6 +35,11 @@ @@ -35,6 +35,11 @@
#define INVAL_PTR (void *)-1 #define INVAL_PTR (void *)-1

4
srcpkgs/reiserfsprogs/patches/musl-loff_t.patch
View File

@ -1,6 +1,6 @@
See https://www.openwall.com/lists/musl/2013/01/23/6 See https://www.openwall.com/lists/musl/2013/01/23/6
--- include/reiserfs_lib.h --- a/include/reiserfs_lib.h
+++ include/reiserfs_lib.h +++ b/include/reiserfs_lib.h
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
* reiserfsprogs/README * reiserfsprogs/README
*/ */

4
srcpkgs/reiserfsprogs/patches/musl-long_long_min_max.patch
View File

@ -1,8 +1,8 @@
Add definitions for LONG_LONG_MIN and _MAX derived Add definitions for LONG_LONG_MIN and _MAX derived
from the values for int64_t. from the values for int64_t.
--- resize_reiserfs/resize_reiserfs.c --- a/resize_reiserfs/resize_reiserfs.c
+++ resize_reiserfs/resize_reiserfs.c +++ b/resize_reiserfs/resize_reiserfs.c
@@ -15,6 +15,13 @@ @@ -15,6 +15,13 @@
#include "resize.h" #include "resize.h"
#include <limits.h> #include <limits.h>

4
srcpkgs/reiserfsprogs/patches/musl-prints.patch
View File

@ -1,5 +1,5 @@
--- reiserfscore/prints.c --- a/reiserfscore/prints.c
+++ reiserfscore/prints.c +++ b/reiserfscore/prints.c
@@ -7,8 +7,11 @@ @@ -7,8 +7,11 @@
#include "includes.h" #include "includes.h"

4
srcpkgs/reiserfsprogs/patches/reiserfsprogs-3.6.27-loff_t.patch
View File

@ -7,8 +7,8 @@ This caused build failure:
Re-enable extensions to pull loff_t back. Re-enable extensions to pull loff_t back.
https://bugs.gentoo.org/663930 https://bugs.gentoo.org/663930
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET @@ -23,2 +23,4 @@ AC_PROG_MAKE_SET
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
+dnl pull in loff_t from glibc +dnl pull in loff_t from glibc

1
srcpkgs/reiserfsprogs/template
View File

@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
homepage="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/" homepage="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/"
distfiles="${KERNEL_SITE}/kernel/people/jeffm/${pkgname}/v${version}/${pkgname}-${version}.tar.xz" distfiles="${KERNEL_SITE}/kernel/people/jeffm/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
checksum=0e95b67fa7746a3c2d59145e9b9c2feb4a6be52853e83b497b182eae508e62e3 checksum=0e95b67fa7746a3c2d59145e9b9c2feb4a6be52853e83b497b182eae508e62e3
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) *-musl)

8
srcpkgs/renderdoc/patches/add-x86-family.patch
View File

@ -16,8 +16,8 @@ Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ee30d4..d2edf3d 100644 index 7ee30d4..d2edf3d 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -89,6 +89,14 @@ set(RENDERDOC_APK_PATH "" CACHE STRING "Path to RenderDoc .apk files after insta @@ -89,6 +89,14 @@ set(RENDERDOC_APK_PATH "" CACHE STRING "Path to RenderDoc .apk files after insta
set(LIB_SUFFIX "" CACHE STRING "Suffix for 'lib' folder in target directory structure. E.g. set to '64' to use /usr/local/lib64 instead of /usr/local/lib.") set(LIB_SUFFIX "" CACHE STRING "Suffix for 'lib' folder in target directory structure. E.g. set to '64' to use /usr/local/lib64 instead of /usr/local/lib.")
set(LIB_SUBFOLDER "" CACHE STRING "Subfolder under the 'lib' folder in target directory structure. E.g. set to 'renderdoc' to use /usr/local/lib/renderdoc instead of /usr/local/lib.") set(LIB_SUBFOLDER "" CACHE STRING "Subfolder under the 'lib' folder in target directory structure. E.g. set to 'renderdoc' to use /usr/local/lib/renderdoc instead of /usr/local/lib.")
@ -35,8 +35,8 @@ index 7ee30d4..d2edf3d 100644
endif() endif()
diff --git a/renderdoc/common/globalconfig.h b/renderdoc/common/globalconfig.h diff --git a/renderdoc/common/globalconfig.h b/renderdoc/common/globalconfig.h
index d266166..d21da15 100644 index d266166..d21da15 100644
--- renderdoc/common/globalconfig.h --- a/renderdoc/common/globalconfig.h
+++ renderdoc/common/globalconfig.h +++ b/renderdoc/common/globalconfig.h
@@ -125,6 +125,16 @@ @@ -125,6 +125,16 @@
#endif #endif

8
srcpkgs/renderdoc/patches/atomic.patch
View File

@ -1,8 +1,8 @@
@q66: replace old __sync stuff with equivalent modern ones, @q66: replace old __sync stuff with equivalent modern ones,
so we can use libatomic on targets without atomic8 support so we can use libatomic on targets without atomic8 support
--- renderdoc/CMakeLists.txt --- a/renderdoc/CMakeLists.txt
+++ renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt
@@ -55,6 +55,8 @@ elseif(UNIX) @@ -55,6 +55,8 @@ elseif(UNIX)
PRIVATE -ldl PRIVATE -ldl
PRIVATE -lrt) PRIVATE -lrt)
@ -12,8 +12,8 @@ so we can use libatomic on targets without atomic8 support
if(ENABLE_XLIB) if(ENABLE_XLIB)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
--- renderdoc/os/posix/posix_threading.cpp --- a/renderdoc/os/posix/posix_threading.cpp
+++ renderdoc/os/posix/posix_threading.cpp +++ b/renderdoc/os/posix/posix_threading.cpp
@@ -43,32 +43,33 @@ namespace Atomic @@ -43,32 +43,33 @@ namespace Atomic
{ {
int32_t Inc32(int32_t *i) int32_t Inc32(int32_t *i)

4
srcpkgs/renderdoc/patches/build-type-none-is-release.patch
View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -315,6 +315,7 @@ set(RELEASE_MODE 0) @@ -315,6 +315,7 @@ set(RELEASE_MODE 0)
if(cmake_build_type_lower STREQUAL "release" OR if(cmake_build_type_lower STREQUAL "release" OR

8
srcpkgs/renderdoc/patches/compressonator-only-x86.patch
View File

@ -10,8 +10,8 @@ Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index e3e8c28..59c8937 100644 index e3e8c28..59c8937 100644
--- renderdoc/CMakeLists.txt --- a/renderdoc/CMakeLists.txt
+++ renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt
@@ -342,7 +342,7 @@ elseif(UNIX) @@ -342,7 +342,7 @@ elseif(UNIX)
os/posix/posix_specific.h) os/posix/posix_specific.h)
endif() endif()
@ -23,8 +23,8 @@ index e3e8c28..59c8937 100644
3rdparty/compressonator/BC2_Encode_kernel.cpp 3rdparty/compressonator/BC2_Encode_kernel.cpp
diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp
index a704726..7f3387f 100644 index a704726..7f3387f 100644
--- renderdoc/replay/replay_driver.cpp --- a/renderdoc/replay/replay_driver.cpp
+++ renderdoc/replay/replay_driver.cpp +++ b/renderdoc/replay/replay_driver.cpp
@@ -1430,8 +1430,8 @@ bytebuf GetDiscardPattern(DiscardType type, const ResourceFormat &fmt, uint32_t @@ -1430,8 +1430,8 @@ bytebuf GetDiscardPattern(DiscardType type, const ResourceFormat &fmt, uint32_t
fmt.type == ResourceFormatType::BC5 || fmt.type == ResourceFormatType::BC6 || fmt.type == ResourceFormatType::BC5 || fmt.type == ResourceFormatType::BC6 ||
fmt.type == ResourceFormatType::BC7) fmt.type == ResourceFormatType::BC7)

4
srcpkgs/renderdoc/patches/dostringise.patch
View File

@ -14,8 +14,8 @@ Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/renderdoc/serialise/serialiser.cpp b/renderdoc/serialise/serialiser.cpp diff --git a/renderdoc/serialise/serialiser.cpp b/renderdoc/serialise/serialiser.cpp
index 460a310..9e53fb1 100644 index 460a310..9e53fb1 100644
--- renderdoc/serialise/serialiser.cpp --- a/renderdoc/serialise/serialiser.cpp
+++ renderdoc/serialise/serialiser.cpp +++ b/renderdoc/serialise/serialiser.cpp
@@ -937,6 +937,14 @@ rdcstr DoStringise(const int16_t &el) @@ -937,6 +937,14 @@ rdcstr DoStringise(const int16_t &el)
return StringFormat::Fmt("%hd", el); return StringFormat::Fmt("%hd", el);
} }

4
srcpkgs/renderdoc/patches/ptrace-only-x86.patch
View File

@ -16,8 +16,8 @@ Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp
index 7db273f..491268d 100644 index 7db273f..491268d 100644
--- renderdoc/os/posix/linux/linux_process.cpp --- a/renderdoc/os/posix/linux/linux_process.cpp
+++ renderdoc/os/posix/linux/linux_process.cpp +++ b/renderdoc/os/posix/linux/linux_process.cpp
@@ -50,6 +50,8 @@ extern char **environ; @@ -50,6 +50,8 @@ extern char **environ;
#define INITIAL_WAIT_TIME 1 #define INITIAL_WAIT_TIME 1
#define MAX_WAIT_TIME 0xfffff #define MAX_WAIT_TIME 0xfffff

4
srcpkgs/renderdoc/patches/qmake-no-rpath.patch
View File

@ -1,7 +1,7 @@
Index: qrenderdoc/CMakeLists.txt Index: qrenderdoc/CMakeLists.txt
=================================================================== ===================================================================
--- qrenderdoc/CMakeLists.txt.orig --- a/qrenderdoc/CMakeLists.txt
+++ qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt
@@ -144,7 +144,7 @@ endif() @@ -144,7 +144,7 @@ endif()
# and finding dependencies from the cmake build # and finding dependencies from the cmake build
file(WRITE file(WRITE

4
srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch
View File

@ -1,7 +1,7 @@
Index: renderdoc/CMakeLists.txt Index: renderdoc/CMakeLists.txt
=================================================================== ===================================================================
--- renderdoc/CMakeLists.txt.orig --- a/renderdoc/CMakeLists.txt
+++ renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt
@@ -213,54 +213,10 @@ set(sources @@ -213,54 +213,10 @@ set(sources
3rdparty/pugixml/pugixml.cpp 3rdparty/pugixml/pugixml.cpp
3rdparty/pugixml/pugixml.hpp 3rdparty/pugixml/pugixml.hpp

1
srcpkgs/renderdoc/template
View File

@ -16,7 +16,6 @@ license="MIT"
homepage="https://github.com/baldurk/renderdoc" homepage="https://github.com/baldurk/renderdoc"
distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz"
checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = musl ]; then if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel" makedepends+=" libexecinfo-devel"

4
srcpkgs/residualvm/patches/fluidsynth-2.1.patch
View File

@ -1,5 +1,5 @@
--- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000 --- a/audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000
+++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000 +++ b/audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000
@@ -20,10 +20,16 @@ @@ -20,10 +20,16 @@
* *
*/ */

1
srcpkgs/residualvm/template
View File

@ -15,7 +15,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause, IS
homepage="https://www.residualvm.org/" homepage="https://www.residualvm.org/"
distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2" distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2"
checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9 checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9
patch_args=-Np0
build_options="sndio" build_options="sndio"
build_options_default="sndio" build_options_default="sndio"

8
srcpkgs/resvg/patches/QPainterPath.patch
View File

@ -1,5 +1,5 @@
--- capi/include/ResvgQt.h 2019-03-21 21:50:09.719296805 +0100 --- a/capi/include/ResvgQt.h 2019-03-21 21:50:09.719296805 +0100
+++ capi/include/ResvgQt.h 2020-09-01 01:20:43.903570695 +0200 +++ b/capi/include/ResvgQt.h 2020-09-01 01:20:43.903570695 +0200
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <QFile> #include <QFile>
#include <QGuiApplication> #include <QGuiApplication>
@ -8,8 +8,8 @@
#include <QRectF> #include <QRectF>
#include <QScopedPointer> #include <QScopedPointer>
#include <QScreen> #include <QScreen>
--- resvg-qt/cpp/qt_capi.cpp 2019-03-21 21:50:09.719296805 +0100 --- a/resvg-qt/cpp/qt_capi.cpp 2019-03-21 21:50:09.719296805 +0100
+++ resvg-qt/cpp/qt_capi.cpp 2020-09-01 01:23:19.594578727 +0200 +++ b/resvg-qt/cpp/qt_capi.cpp 2020-09-01 01:23:19.594578727 +0200
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QImage> #include <QImage>

1
srcpkgs/resvg/template
View File

@ -11,7 +11,6 @@ license="MPL-2.0"
homepage="https://github.com/RazrFalcon/resvg" homepage="https://github.com/RazrFalcon/resvg"
distfiles="https://github.com/RazrFalcon/resvg/releases/download/v${version}/resvg-${version}.tar.xz" distfiles="https://github.com/RazrFalcon/resvg/releases/download/v${version}/resvg-${version}.tar.xz"
checksum=7206f79f67b4c8610353134c375ed3ff9c5eb63b16fae267b94730c23ebe4ee1 checksum=7206f79f67b4c8610353134c375ed3ff9c5eb63b16fae267b94730c23ebe4ee1
patch_args=-Np0
do_build() { do_build() {
for dir in capi tools/{render,u}svg; do for dir in capi tools/{render,u}svg; do

8
srcpkgs/retroshare/patches/mhd_result_enum.patch
View File

@ -1,5 +1,5 @@
--- libresapi/src/api/ApiServerMHD.cpp.orig 2021-05-04 08:25:21.960601037 -0700 --- a/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:25:21.960601037 -0700
+++ libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700 +++ b/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
// return MHD_NO to terminate connection // return MHD_NO to terminate connection
// return MHD_YES otherwise // return MHD_YES otherwise
@ -76,8 +76,8 @@
const char *url, const char *method, const char *version, const char *url, const char *method, const char *version,
const char *upload_data, size_t *upload_data_size, const char *upload_data, size_t *upload_data_size,
void **con_cls) void **con_cls)
--- libresapi/src/api/ApiServerMHD.h.orig 2021-05-04 08:25:24.368594515 -0700 --- a/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:24.368594515 -0700
+++ libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700 +++ b/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700
@@ -58,11 +58,11 @@ @@ -58,11 +58,11 @@
private: private:

8
srcpkgs/retroshare/patches/qt5.15.patch
View File

@ -1,5 +1,5 @@
--- retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100 --- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100
+++ - 2020-07-05 00:47:16.416125978 +0200 +++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
#include <QDateTime> #include <QDateTime>
#include <QMenu> #include <QMenu>
@ -8,8 +8,8 @@
#include <QPainter> #include <QPainter>
#include <QTextDocument> #include <QTextDocument>
--- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100 --- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100
+++ - 2020-07-05 00:47:57.366966204 +0200 +++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>

1
srcpkgs/retroshare/template
View File

@ -16,7 +16,6 @@ license="GPL-2.0-or-later, AGPL-3.0-or-later"
homepage="https://retroshare.cc" homepage="https://retroshare.cc"
distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5 checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5
patch_args=-Np0
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel" makedepends+=" libatomic-devel"

12
srcpkgs/rhythmbox/patches/fix-missing-icons.patch
View File

@ -10,8 +10,8 @@ Fixes: #1775
diff --git lib/rb-stock-icons.c lib/rb-stock-icons.c diff --git lib/rb-stock-icons.c lib/rb-stock-icons.c
index cf52c7a38..cbc221a7d 100644 index cf52c7a38..cbc221a7d 100644
--- lib/rb-stock-icons.c --- a/lib/rb-stock-icons.c
+++ lib/rb-stock-icons.c +++ b/lib/rb-stock-icons.c
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
#include "rb-file-helpers.h" #include "rb-file-helpers.h"
#include "rb-stock-icons.h" #include "rb-stock-icons.h"
@ -37,8 +37,8 @@ Subject: [PATCH 2/2] use RB_APP_ICON instead of hardcoding icon names
diff --git shell/main.c shell/main.c diff --git shell/main.c shell/main.c
index 5060f6545..7170f29d5 100644 index 5060f6545..7170f29d5 100644
--- shell/main.c --- a/shell/main.c
+++ shell/main.c +++ b/shell/main.c
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
#include "rb-util.h" #include "rb-util.h"
#include "rb-debug.h" #include "rb-debug.h"
@ -58,8 +58,8 @@ index 5060f6545..7170f29d5 100644
g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi"); g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi");
diff --git shell/rb-application.c shell/rb-application.c diff --git shell/rb-application.c shell/rb-application.c
index 37afb36fb..8492bb03b 100644 index 37afb36fb..8492bb03b 100644
--- shell/rb-application.c --- a/shell/rb-application.c
+++ shell/rb-application.c +++ b/shell/rb-application.c
@@ -205,7 +205,7 @@ about_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data @@ -205,7 +205,7 @@ about_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data
"authors", (const char **) authors, "authors", (const char **) authors,
"documenters", (const char **) documenters, "documenters", (const char **) documenters,

1
srcpkgs/rhythmbox/template
View File

@ -22,7 +22,6 @@ license="GPL-2.0-or-later"
homepage="http://www.rhythmbox.org" homepage="http://www.rhythmbox.org"
distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz"
checksum=ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90 checksum=ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90
patch_args=-Np0
python_version=3 python_version=3
pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins" pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins"

28
srcpkgs/rinse/patches/fix-tests.patch
View File

@ -2,8 +2,8 @@ Source: maxice8
Upstream: no (feel free to) Upstream: no (feel free to)
Reason: fixes test for tab chars Reason: fixes test for tab chars
--- scripts/opensuse-11.1/post-install.sh --- a/scripts/opensuse-11.1/post-install.sh
+++ scripts/opensuse-11.1/post-install.sh +++ b/scripts/opensuse-11.1/post-install.sh
@@ -42,8 +42,8 @@ gpgcheck=1 @@ -42,8 +42,8 @@ gpgcheck=1
EOF EOF
@ -15,8 +15,8 @@ Reason: fixes test for tab chars
fi fi
--- scripts/opensuse-11.2/post-install.sh --- a/scripts/opensuse-11.2/post-install.sh
+++ scripts/opensuse-11.2/post-install.sh +++ b/scripts/opensuse-11.2/post-install.sh
@@ -60,8 +60,8 @@ gpgcheck=1 @@ -60,8 +60,8 @@ gpgcheck=1
EOF EOF
@ -28,8 +28,8 @@ Reason: fixes test for tab chars
fi fi
--- scripts/opensuse-11.3/post-install.sh --- a/scripts/opensuse-11.3/post-install.sh
+++ scripts/opensuse-11.3/post-install.sh +++ b/scripts/opensuse-11.3/post-install.sh
@@ -39,8 +39,8 @@ gpgcheck=1 @@ -39,8 +39,8 @@ gpgcheck=1
EOF EOF
@ -41,8 +41,8 @@ Reason: fixes test for tab chars
fi fi
--- scripts/opensuse-12.3/post-install.sh --- a/scripts/opensuse-12.3/post-install.sh
+++ scripts/opensuse-12.3/post-install.sh +++ b/scripts/opensuse-12.3/post-install.sh
@@ -38,8 +38,8 @@ gpgcheck=1 @@ -38,8 +38,8 @@ gpgcheck=1
EOF EOF
@ -54,8 +54,8 @@ Reason: fixes test for tab chars
fi fi
--- scripts/opensuse-13.1/post-install.sh --- a/scripts/opensuse-13.1/post-install.sh
+++ scripts/opensuse-13.1/post-install.sh +++ b/scripts/opensuse-13.1/post-install.sh
@@ -38,8 +38,8 @@ gpgcheck=1 @@ -38,8 +38,8 @@ gpgcheck=1
EOF EOF
@ -67,8 +67,8 @@ Reason: fixes test for tab chars
fi fi
--- scripts/centos-7/post-install.sh --- a/scripts/centos-7/post-install.sh
+++ scripts/centos-7/post-install.sh +++ b/scripts/centos-7/post-install.sh
@@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog @@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog
cd $prefix/var/log cd $prefix/var/log
@ -80,8 +80,8 @@ Reason: fixes test for tab chars
done done
cd / cd /
touch $prefix/var/log/lastlog touch $prefix/var/log/lastlog
--- scripts/opensuse-42.2/post-install.sh --- a/scripts/opensuse-42.2/post-install.sh
+++ scripts/opensuse-42.2/post-install.sh +++ b/scripts/opensuse-42.2/post-install.sh
@@ -38,8 +38,8 @@ gpgcheck=1 @@ -38,8 +38,8 @@ gpgcheck=1
EOF EOF

4
srcpkgs/rinse/patches/sbin.patch
View File

@ -1,5 +1,5 @@
--- Makefile 2014-06-17 21:16:29.000000000 +0700 --- a/Makefile 2014-06-17 21:16:29.000000000 +0700
+++ Makefile 2015-10-19 11:45:52.398805700 +0600 +++ b/Makefile 2015-10-19 11:45:52.398805700 +0600
@@ -52,15 +52,15 @@ @@ -52,15 +52,15 @@
install: fixupperms install: fixupperms
mkdir -p ${PREFIX}/etc/bash_completion.d mkdir -p ${PREFIX}/etc/bash_completion.d

1
srcpkgs/rinse/template
View File

@ -15,7 +15,6 @@ homepage="https://salsa.debian.org/debian/rinse"
changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog" changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog"
distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz" distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz"
checksum=ebe2384f2aa4565c5f29882b177f7afd4c7cdbca9de9525618c6040e63a76d23 checksum=ebe2384f2aa4565c5f29882b177f7afd4c7cdbca9de9525618c6040e63a76d23
patch_args=-Np0
conf_files="/etc/rinse/rinse.conf" conf_files="/etc/rinse/rinse.conf"

8
srcpkgs/rix/patches/fixes.patch
View File

@ -1,5 +1,5 @@
--- rixc.h.orig --- a/rixc.h
+++ rixc.h +++ b/rixc.h
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
void defineRSLSymbols(Object *); void defineRSLSymbols(Object *);
@ -8,8 +8,8 @@
Object *findByName(char *name); Object *findByName(char *name);
Object *findFunctionByFullName(char *name); Object *findFunctionByFullName(char *name);
--- rix.l.orig --- a/rix.l
+++ rix.l +++ b/rix.l
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "ObjectTree.h" #include "ObjectTree.h"
#include "rix.tab.h" /* Generated by bison. */ #include "rix.tab.h" /* Generated by bison. */

4
srcpkgs/rix/patches/makefile.patch
View File

@ -1,5 +1,5 @@
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
flex rix.l flex rix.l

4
srcpkgs/rix/patches/overflow.patch
View File

@ -1,5 +1,5 @@
--- rixc.c.orig --- a/rixc.c
+++ rixc.c +++ b/rixc.c
@@ -1563,7 +1563,7 @@ @@ -1563,7 +1563,7 @@
Object *objectfloat(float f) Object *objectfloat(float f)
{ {

1
srcpkgs/rix/template
View File

@ -10,7 +10,6 @@ license="GPL-3"
homepage="https://github.com/riolet/rix" homepage="https://github.com/riolet/rix"
distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz" distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz"
checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

4
srcpkgs/rmilter/patches/de-vendor.patch
View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -240,10 +240,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR} @@ -240,10 +240,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}
"${CMAKE_BINARY_DIR}/src" "${CMAKE_BINARY_DIR}/src"
"${CMAKE_BINARY_DIR}/" "${CMAKE_BINARY_DIR}/"

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

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -296,18 +296,7 @@ IF(SUPPORT_STD_FLAG) @@ -296,18 +296,7 @@ IF(SUPPORT_STD_FLAG)
ENDIF(SUPPORT_STD_FLAG) ENDIF(SUPPORT_STD_FLAG)

1
srcpkgs/rmilter/template
View File

@ -17,7 +17,6 @@ checksum=ea80563fa7636afed0b5fd9a29aa2300f15793ed85788e4ce69c187d341a7d54
system_accounts="rmilter" system_accounts="rmilter"
rmilter_pgroup="_rmilter" rmilter_pgroup="_rmilter"
rmilter_homedir="/var/lib/rmilter" rmilter_homedir="/var/lib/rmilter"
patch_args=-Np0
post_install() { post_install() {
vdoc rmilter.conf.sample vdoc rmilter.conf.sample

18
srcpkgs/rmlint/patches/faccessat.patch
View File

@ -14,8 +14,8 @@ Subject: [PATCH] remove faccessat() (fixes #438)
diff --git a/SConstruct b/SConstruct diff --git a/SConstruct b/SConstruct
index 5c905eee..53455ab6 100755 index 5c905eee..53455ab6 100755
--- SConstruct --- a/SConstruct
+++ SConstruct +++ b/SConstruct
@@ -264,29 +264,6 @@ def check_posix_fadvise(context): @@ -264,29 +264,6 @@ def check_posix_fadvise(context):
return rc return rc
@ -64,8 +64,8 @@ index 5c905eee..53455ab6 100755
conf.check_uname() conf.check_uname()
diff --git a/lib/SConscript b/lib/SConscript diff --git a/lib/SConscript b/lib/SConscript
index 04f5da91..e00231dd 100644 index 04f5da91..e00231dd 100644
--- lib/SConscript --- a/lib/SConscript
+++ lib/SConscript +++ b/lib/SConscript
@@ -37,7 +37,6 @@ def build_config_template(target, source, env): @@ -37,7 +37,6 @@ def build_config_template(target, source, env):
HAVE_BTRFS_H=env['HAVE_BTRFS_H'], HAVE_BTRFS_H=env['HAVE_BTRFS_H'],
HAVE_MM_CRC32_U64=env['HAVE_MM_CRC32_U64'], HAVE_MM_CRC32_U64=env['HAVE_MM_CRC32_U64'],
@ -76,8 +76,8 @@ index 04f5da91..e00231dd 100644
VERSION_MAJOR=VERSION_MAJOR, VERSION_MAJOR=VERSION_MAJOR,
diff --git a/lib/cfg.c b/lib/cfg.c diff --git a/lib/cfg.c b/lib/cfg.c
index 92b02136..114ea780 100644 index 92b02136..114ea780 100644
--- lib/cfg.c --- a/lib/cfg.c
+++ lib/cfg.c +++ b/lib/cfg.c
@@ -106,18 +106,28 @@ void rm_cfg_set_default(RmCfg *cfg) { @@ -106,18 +106,28 @@ void rm_cfg_set_default(RmCfg *cfg) {
} }
@ -119,8 +119,8 @@ index 92b02136..114ea780 100644
bool realpath_worked = true; bool realpath_worked = true;
diff --git a/lib/config.h.in b/lib/config.h.in diff --git a/lib/config.h.in b/lib/config.h.in
index a12fa65a..30025171 100644 index a12fa65a..30025171 100644
--- lib/config.h.in --- a/lib/config.h.in
+++ lib/config.h.in +++ b/lib/config.h.in
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
#define HAVE_POSIX_FADVISE ({HAVE_POSIX_FADVISE}) #define HAVE_POSIX_FADVISE ({HAVE_POSIX_FADVISE})
#define HAVE_BTRFS_H ({HAVE_BTRFS_H}) #define HAVE_BTRFS_H ({HAVE_BTRFS_H})
@ -133,7 +133,7 @@ diff --git a/tests/test_robustness/test_badlinks_as_args.py b/tests/test_robustn
new file mode 100644 new file mode 100644
index 00000000..981e1a00 index 00000000..981e1a00
--- /dev/null --- /dev/null
+++ tests/test_robustness/test_badlinks_as_args.py +++ b/tests/test_robustness/test_badlinks_as_args.py
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
+#!/usr/bin/env python3 +#!/usr/bin/env python3
+# encoding: utf-8 +# encoding: utf-8

1
srcpkgs/rmlint/template
View File

@ -12,7 +12,6 @@ homepage="http://rmlint.rtfd.org/"
changelog="https://raw.githubusercontent.com/sahib/rmlint/master/CHANGELOG.md" changelog="https://raw.githubusercontent.com/sahib/rmlint/master/CHANGELOG.md"
distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz"
checksum=10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883 checksum=10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883
patch_args=-Np0
do_install() { do_install() {
scons install --prefix=${DESTDIR}/usr scons install --prefix=${DESTDIR}/usr

4
srcpkgs/rofs-filtered/patches/fix-cflags.patch
View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PA @@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PA
"${CMAKE_CURRENT_SOURCE_DIR}/cmake") "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

1
srcpkgs/rofs-filtered/template
View File

@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/gburca/rofs-filtered" homepage="https://github.com/gburca/rofs-filtered"
distfiles="https://github.com/gburca/rofs-filtered/archive/rel-${version}.tar.gz" distfiles="https://github.com/gburca/rofs-filtered/archive/rel-${version}.tar.gz"
checksum=d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8 checksum=d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8
patch_args=-Np0

4
srcpkgs/rpcbind/patches/musl-sunrpc.patch
View File

@ -3,8 +3,8 @@ aliases. As a workaround we use "sunprc" instead of "portmapper"
diff --git a/src/rpcbind.c b/src/rpcbind.c diff --git a/src/rpcbind.c b/src/rpcbind.c
index 83dbe93..9404df7 100644 index 83dbe93..9404df7 100644
--- src/rpcbind.c --- a/src/rpcbind.c
+++ src/rpcbind.c +++ b/src/rpcbind.c
@@ -416,7 +416,7 @@ init_transport(struct netconfig *nconf) @@ -416,7 +416,7 @@ init_transport(struct netconfig *nconf)
if ((aicode = getaddrinfo(hosts[nhostsbak], if ((aicode = getaddrinfo(hosts[nhostsbak],
servname, &hints, &res)) != 0) { servname, &hints, &res)) != 0) {

4
srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch
View File

@ -1,5 +1,5 @@
--- src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200 --- a/src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200
+++ src/rpcbind.c 2015-04-27 19:48:44.518124944 +0200 +++ b/src/rpcbind.c 2015-04-27 19:48:44.518124944 +0200
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
char *udp_uaddr; /* Universal UDP address */ char *udp_uaddr; /* Universal UDP address */
char *tcp_uaddr; /* Universal TCP address */ char *tcp_uaddr; /* Universal TCP address */

1
srcpkgs/rpcbind/template
View File

@ -14,7 +14,6 @@ homepage="https://rpcbind.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de checksum=5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de
system_accounts="rpc" system_accounts="rpc"
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

4
srcpkgs/rpi-imager/patches/disable-telemetry.patch
View File

@ -1,5 +1,5 @@
--- config.h.orig 2021-03-16 12:22:48.315849306 -0500 --- a/config.h 2021-03-16 12:22:48.315849306 -0500
+++ config.h 2021-03-16 12:23:00.273828304 -0500 +++ b/config.h 2021-03-16 12:23:00.273828304 -0500
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
/* Phone home the name of images downloaded for image popularity ranking */ /* Phone home the name of images downloaded for image popularity ranking */

1
srcpkgs/rpi-imager/template
View File

@ -13,7 +13,6 @@ license="Apache-2.0"
homepage="https://github.com/raspberrypi/rpi-imager" homepage="https://github.com/raspberrypi/rpi-imager"
distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz" distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz"
checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509" checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509"
patch_args=-Np0
pre_configure() { pre_configure() {
ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk

8
srcpkgs/rpm/patches/fix-musl.patch
View File

@ -1,5 +1,5 @@
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl]) @@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl])
# Check for libelf library. Prefer external, otherwise none. # Check for libelf library. Prefer external, otherwise none.
WITH_LIBELF_LIB= WITH_LIBELF_LIB=
@ -19,8 +19,8 @@
WITH_LIBDWARF=yes WITH_LIBDWARF=yes
diff --git rpmio/digest_nss.c rpmio/digest_nss.c diff --git rpmio/digest_nss.c rpmio/digest_nss.c
index 992d9ac..5f43b57 100644 index 992d9ac..5f43b57 100644
--- rpmio/digest_nss.c --- a/rpmio/digest_nss.c
+++ rpmio/digest_nss.c +++ b/rpmio/digest_nss.c
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
#include <keyhi.h> #include <keyhi.h>
#include <cryptohi.h> #include <cryptohi.h>

1
srcpkgs/rpm/template
View File

@ -18,7 +18,6 @@ distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2"
checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
python_version=3 python_version=3
conflicts="rpmextract>=0" # Both provide rpm2cpio conflicts="rpmextract>=0" # Both provide rpm2cpio
patch_args=-Np0
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss"

12
srcpkgs/rspamd/patches/vsx.patch
View File

@ -6,8 +6,8 @@ Date: Mon Jan 6 00:48:43 2020 +0100
diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c
index 4410578..c972b13 100644 index 4410578..c972b13 100644
--- contrib/lua-torch/torch7/lib/TH/THVector.c --- a/contrib/lua-torch/torch7/lib/TH/THVector.c
+++ contrib/lua-torch/torch7/lib/TH/THVector.c +++ b/contrib/lua-torch/torch7/lib/TH/THVector.c
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
#include "vector/NEON.c" #include "vector/NEON.c"
#endif #endif
@ -19,8 +19,8 @@ index 4410578..c972b13 100644
diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
index 5b88852..8ab4f67 100644 index 5b88852..8ab4f67 100644
--- contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c --- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
+++ contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c +++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c
@@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = { @@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = {
#endif #endif
#endif #endif
@ -50,8 +50,8 @@ index 5b88852..8ab4f67 100644
#endif #endif
diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
index 83c4c56..0919f73 100644 index 83c4c56..0919f73 100644
--- contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h --- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
+++ contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h +++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h
@@ -43,7 +43,7 @@ enum SIMDExtensions @@ -43,7 +43,7 @@ enum SIMDExtensions
{ {
#if defined(__NEON__) #if defined(__NEON__)

1
srcpkgs/rspamd/template
View File

@ -19,7 +19,6 @@ checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030
system_accounts="rspamd" system_accounts="rspamd"
rspamd_homedir=/var/lib/rspamd rspamd_homedir=/var/lib/rspamd
conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
aarch64*|arm*) configure_args+=" -DHAS_C11_ATOMICS_EXITCODE=0 aarch64*|arm*) configure_args+=" -DHAS_C11_ATOMICS_EXITCODE=0

4
srcpkgs/rsstail/patches/fix-1779.patch
View File

@ -1,5 +1,5 @@
--- Makefile.orig --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
-DEBUG=-g -DEBUG=-g

1
srcpkgs/rsstail/template
View File

@ -11,7 +11,6 @@ license="GPL-2.0-only"
homepage="http://www.vanheusden.com/rsstail/" homepage="http://www.vanheusden.com/rsstail/"
distfiles="http://www.vanheusden.com/${pkgname}/${pkgname}-${version}.tgz" distfiles="http://www.vanheusden.com/${pkgname}/${pkgname}-${version}.tgz"
checksum=42cb452178b21c15c470bafbe5b8b5339a7fb5b980bf8d93d36af89864776e71 checksum=42cb452178b21c15c470bafbe5b8b5339a7fb5b980bf8d93d36af89864776e71
patch_args=-Np0
do_install() { do_install() {
vmkdir usr/bin vmkdir usr/bin

12
srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch
View File

@ -14,8 +14,8 @@ is a nonstandard GNU extension
diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt
index 7395ff24ee..8cd1080ae8 100644 index 7395ff24ee..8cd1080ae8 100644
--- src/cpp/core/CMakeLists.txt --- a/src/cpp/core/CMakeLists.txt
+++ src/cpp/core/CMakeLists.txt +++ b/src/cpp/core/CMakeLists.txt
@@ -155,6 +155,7 @@ if (UNIX) @@ -155,6 +155,7 @@ if (UNIX)
check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1) check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1)
check_function_exists(getpeereid HAVE_GETPEEREID) check_function_exists(getpeereid HAVE_GETPEEREID)
@ -26,8 +26,8 @@ index 7395ff24ee..8cd1080ae8 100644
endif() endif()
diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in
index fbf5e6ffa3..cb4ef42be0 100644 index fbf5e6ffa3..cb4ef42be0 100644
--- src/cpp/core/config.h.in --- a/src/cpp/core/config.h.in
+++ src/cpp/core/config.h.in +++ b/src/cpp/core/config.h.in
@@ -24,4 +24,5 @@ @@ -24,4 +24,5 @@
#cmakedefine HAVE_PROCSELF #cmakedefine HAVE_PROCSELF
#cmakedefine HAVE_SETRESUID #cmakedefine HAVE_SETRESUID
@ -36,8 +36,8 @@ index fbf5e6ffa3..cb4ef42be0 100644
#cmakedefine RSTUDIO_SERVER #cmakedefine RSTUDIO_SERVER
diff --git src/cpp/core/r_util/RSessionContext.cpp src/cpp/core/r_util/RSessionContext.cpp diff --git src/cpp/core/r_util/RSessionContext.cpp src/cpp/core/r_util/RSessionContext.cpp
index a973b8b816..e36d661fd8 100644 index a973b8b816..e36d661fd8 100644
--- src/cpp/core/r_util/RSessionContext.cpp --- a/src/cpp/core/r_util/RSessionContext.cpp
+++ src/cpp/core/r_util/RSessionContext.cpp +++ b/src/cpp/core/r_util/RSessionContext.cpp
@@ -182,7 +182,7 @@ bool isSharedPath(const std::string& projectPath, @@ -182,7 +182,7 @@ bool isSharedPath(const std::string& projectPath,
if (st.st_gid == user.getGroupId()) if (st.st_gid == user.getGroupId())
return false; return false;

12
srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch
View File

@ -11,8 +11,8 @@ Subject: [PATCH 2/3] Check for backtrace function in cmake
diff --git src/cpp/core/Backtrace.cpp src/cpp/core/Backtrace.cpp diff --git src/cpp/core/Backtrace.cpp src/cpp/core/Backtrace.cpp
index a345648371..def1189eb0 100644 index a345648371..def1189eb0 100644
--- src/cpp/core/Backtrace.cpp --- a/src/cpp/core/Backtrace.cpp
+++ src/cpp/core/Backtrace.cpp +++ b/src/cpp/core/Backtrace.cpp
@@ -16,7 +16,9 @@ @@ -16,7 +16,9 @@
#include <core/Backtrace.hpp> #include <core/Backtrace.hpp>
#include <core/RegexUtils.hpp> #include <core/RegexUtils.hpp>
@ -44,8 +44,8 @@ index a345648371..def1189eb0 100644
diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt
index 8cd1080ae8..9a18bcae77 100644 index 8cd1080ae8..9a18bcae77 100644
--- src/cpp/core/CMakeLists.txt --- a/src/cpp/core/CMakeLists.txt
+++ src/cpp/core/CMakeLists.txt +++ b/src/cpp/core/CMakeLists.txt
@@ -156,6 +156,7 @@ if (UNIX) @@ -156,6 +156,7 @@ if (UNIX)
check_function_exists(getpeereid HAVE_GETPEEREID) check_function_exists(getpeereid HAVE_GETPEEREID)
check_function_exists(setresuid HAVE_SETRESUID) check_function_exists(setresuid HAVE_SETRESUID)
@ -56,8 +56,8 @@ index 8cd1080ae8..9a18bcae77 100644
endif() endif()
diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in
index cb4ef42be0..a2ec47c51f 100644 index cb4ef42be0..a2ec47c51f 100644
--- src/cpp/core/config.h.in --- a/src/cpp/core/config.h.in
+++ src/cpp/core/config.h.in +++ b/src/cpp/core/config.h.in
@@ -25,4 +25,5 @@ @@ -25,4 +25,5 @@
#cmakedefine HAVE_SETRESUID #cmakedefine HAVE_SETRESUID
#cmakedefine HAVE_SCANDIR_POSIX #cmakedefine HAVE_SCANDIR_POSIX

4
srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch
View File

@ -1,5 +1,5 @@
--- src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 --- a/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100
+++ - 2021-05-30 14:54:08.125365587 +0200 +++ b/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
#include <shared_core/system/Win32StringUtils.hpp> #include <shared_core/system/Win32StringUtils.hpp>
#else #else

4
srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch
View File

@ -12,8 +12,8 @@ instead.
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index cb45b35ecc..d0b41b13d2 100644 index cb45b35ecc..d0b41b13d2 100644
--- src/cpp/session/CMakeLists.txt --- a/src/cpp/session/CMakeLists.txt
+++ src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt
@@ -22,13 +22,13 @@ add_subdirectory(workers) @@ -22,13 +22,13 @@ add_subdirectory(workers)
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)") message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)")

4
srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch
View File

@ -11,8 +11,8 @@ the files.
diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index d0b41b13d2..69d6cb2b2b 100644 index d0b41b13d2..69d6cb2b2b 100644
--- src/cpp/session/CMakeLists.txt --- a/src/cpp/session/CMakeLists.txt
+++ src/cpp/session/CMakeLists.txt +++ b/src/cpp/session/CMakeLists.txt
@@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32) @@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32)
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries" install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")

4
srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch
View File

@ -10,8 +10,8 @@ Fix the path to the rstudio executable in the rstudio.desktop file.
diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
index ddd96ad34b..99b207ba7c 100644 index ddd96ad34b..99b207ba7c 100644
--- src/cpp/desktop/resources/freedesktop/rstudio.desktop.in --- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
+++ src/cpp/desktop/resources/freedesktop/rstudio.desktop.in +++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
-Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F -Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F

4
srcpkgs/rstudio/patches/0006-use-system-node.patch
View File

@ -9,8 +9,8 @@ Subject: [PATCH 7/8] use system node
diff --git a/src/gwt/build.xml b/src/gwt/build.xml diff --git a/src/gwt/build.xml b/src/gwt/build.xml
index 899ae7fecd..ac90566667 100644 index 899ae7fecd..ac90566667 100644
--- src/gwt/build.xml --- a/src/gwt/build.xml
+++ src/gwt/build.xml +++ b/src/gwt/build.xml
@@ -82,19 +82,7 @@ @@ -82,19 +82,7 @@
</target> </target>

16
srcpkgs/rstudio/patches/boost173.patch
View File

@ -1,5 +1,5 @@
--- src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 --- a/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200
+++ - 2020-05-01 18:29:14.359052359 +0200 +++ b/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
std::for_each(processes.begin(), std::for_each(processes.begin(),
processes.end(), processes.end(),
@ -9,8 +9,8 @@
} }
void ChildProcessTracker::attemptToReapProcess( void ChildProcessTracker::attemptToReapProcess(
--- src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 --- a/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100
+++ - 2021-05-30 14:55:58.926536572 +0200 +++ b/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100
@@ -104,13 +104,13 @@ @@ -104,13 +104,13 @@
if (dupStdoutFd != -1) if (dupStdoutFd != -1)
{ {
@ -27,8 +27,8 @@
} }
try try
--- src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 --- a/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200
+++ - 2021-05-30 15:28:55.005591660 +0200 +++ b/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
: boost::iostreams::regex_filter( : boost::iostreams::regex_filter(
boost::regex( boost::regex(
@ -47,8 +47,8 @@
basePath_(basePath) basePath_(basePath)
{ {
} }
--- src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 --- a/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100
+++ - 2021-05-30 15:38:43.302067745 +0200 +++ b/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100
@@ -577,7 +577,7 @@ @@ -577,7 +577,7 @@
try try
{ {

8
srcpkgs/rstudio/patches/boost176.patch
View File

@ -1,5 +1,5 @@
--- src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 --- a/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100
+++ - 2021-05-30 15:22:51.562342921 +0200 +++ b/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
#include <core/system/System.hpp> #include <core/system/System.hpp>
@ -8,8 +8,8 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
--- src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 --- a/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100
+++ - 2021-05-30 15:31:26.292309685 +0200 +++ b/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
#include <core/system/Environment.hpp> #include <core/system/Environment.hpp>
#include <core/system/Xdg.hpp> #include <core/system/Xdg.hpp>

1
srcpkgs/rstudio/template
View File

@ -28,7 +28,6 @@ checksum="ac84f77529501ea13f0708f0e8726b0bdfb592cd9217e869a0099031f9a888b8
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7" 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7"
skip_extraction="core-dictionaries.zip" skip_extraction="core-dictionaries.zip"
patch_args=-Np0
LDFLAGS="-Wl,-z,stack-size=2097152" LDFLAGS="-Wl,-z,stack-size=2097152"

4
srcpkgs/rsyslog/patches/musl-glob.patch
View File

@ -1,5 +1,5 @@
--- plugins/imfile/imfile.c.orig 2016-11-15 17:31:37.446892834 +0000 --- a/plugins/imfile/imfile.c 2016-11-15 17:31:37.446892834 +0000
+++ plugins/imfile/imfile.c 2016-11-15 17:34:49.629902749 +0000 +++ b/plugins/imfile/imfile.c 2016-11-15 17:34:49.629902749 +0000
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

4
srcpkgs/rsyslog/patches/musl.patch
View File

@ -1,5 +1,5 @@
--- tools/omfile.c.orig 2015-05-23 03:55:37.960658341 +0200 --- a/tools/omfile.c 2015-05-23 03:55:37.960658341 +0200
+++ tools/omfile.c 2015-05-23 03:55:53.471816125 +0200 +++ b/tools/omfile.c 2015-05-23 03:55:53.471816125 +0200
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
#include <ctype.h> #include <ctype.h>
#include <libgen.h> #include <libgen.h>

1
srcpkgs/rsyslog/template
View File

@ -23,7 +23,6 @@ conf_files="/etc/rsyslog.conf"
make_dirs="/etc/rsyslog.d 0755 root root" make_dirs="/etc/rsyslog.d 0755 root root"
lib32disabled=yes lib32disabled=yes
disable_parallel_build=yes disable_parallel_build=yes
patch_args=-Np0
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat" makedepends+=" musl-legacy-compat"

4
srcpkgs/rtl8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch
View File

@ -9,8 +9,8 @@ Subject: [PATCH] void arch-generic plumbing bits
diff --git Makefile Makefile diff --git Makefile Makefile
index c7d11ed..4529ac8 100755 index c7d11ed..4529ac8 100755
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -111,7 +111,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y @@ -111,7 +111,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT ####################### ###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n CONFIG_MP_VHT_HW_TX_MODE = n

1
srcpkgs/rtl8812au-dkms/template
View File

@ -13,7 +13,6 @@ homepage="http://www.dlink.com"
distfiles="https://github.com/gordboy/rtl8812au-${_modver}/archive/${_gitrev}.tar.gz" distfiles="https://github.com/gordboy/rtl8812au-${_modver}/archive/${_gitrev}.tar.gz"
checksum=72b04bb7e1ef01eae653222d6f75f71163f7442fa142198605ed495f30341bd9 checksum=72b04bb7e1ef01eae653222d6f75f71163f7442fa142198605ed495f30341bd9
dkms_modules="rtl8812au ${_modver}" dkms_modules="rtl8812au ${_modver}"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
x86_64*) _karch="x86_64";; x86_64*) _karch="x86_64";;

4
srcpkgs/rtl8822bu-dkms/patches/0001-void-arch-generic-plumbing-bits.patch
View File

@ -9,8 +9,8 @@ Subject: [PATCH] void arch-generic plumbing bits
diff --git Makefile Makefile diff --git Makefile Makefile
index 29da0bf..d58bc95 100644 index 29da0bf..d58bc95 100644
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -97,7 +97,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y @@ -97,7 +97,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT ####################### ###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n CONFIG_MP_VHT_HW_TX_MODE = n

1
srcpkgs/rtl8822bu-dkms/template
View File

@ -12,7 +12,6 @@ homepage="https://www.tp-link.com"
distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz" distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz"
checksum=fb2dbcd0385d558af6c74571aaac9020d7cbb9e56cc4780299bd420559f29bb1 checksum=fb2dbcd0385d558af6c74571aaac9020d7cbb9e56cc4780299bd420559f29bb1
dkms_modules="88x2bu ${version}" dkms_modules="88x2bu ${version}"
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
x86_64*) _karch="x86_64";; x86_64*) _karch="x86_64";;

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