srcpkgs/o*: 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 65749575ab
commit 2fd8d4df94
139 changed files with 250 additions and 296 deletions

View file

@ -1,7 +1,7 @@
diff --git a/bfb/CMakeLists.txt b/bfb/CMakeLists.txt diff --git a/bfb/CMakeLists.txt b/bfb/CMakeLists.txt
index 008241d..be233aa 100644 index 008241d..be233aa 100644
--- bfb/CMakeLists.txt --- a/bfb/CMakeLists.txt
+++ bfb/CMakeLists.txt +++ b/bfb/CMakeLists.txt
@@ -16,14 +16,17 @@ set ( bfb_HEADERS @@ -16,14 +16,17 @@ set ( bfb_HEADERS
${bfb_PUBLIC_HEADERS} ${bfb_PUBLIC_HEADERS}
) )
@ -29,8 +29,8 @@ index 008241d..be233aa 100644
diff --git apps/CMakeLists.txt apps/CMakeLists.txt diff --git apps/CMakeLists.txt apps/CMakeLists.txt
index b5c84e4..e43aaeb 100644 index b5c84e4..e43aaeb 100644
--- apps/CMakeLists.txt --- a/apps/CMakeLists.txt
+++ apps/CMakeLists.txt +++ b/apps/CMakeLists.txt
@@ -5,14 +5,21 @@ add_definitions( -DVERSION="${obexftp_VERSION}" ) @@ -5,14 +5,21 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
add_definitions ( -DHAVE_USB ) add_definitions ( -DHAVE_USB )
@ -57,8 +57,8 @@ index b5c84e4..e43aaeb 100644
) )
diff --git fuse/CMakeLists.txt fuse/CMakeLists.txt diff --git fuse/CMakeLists.txt fuse/CMakeLists.txt
index 0c80d3d..bba052b 100644 index 0c80d3d..bba052b 100644
--- fuse/CMakeLists.txt --- a/fuse/CMakeLists.txt
+++ fuse/CMakeLists.txt +++ b/fuse/CMakeLists.txt
@@ -14,6 +14,8 @@ if ( Fuse_FOUND ) @@ -14,6 +14,8 @@ if ( Fuse_FOUND )
target_link_libraries ( obexfs target_link_libraries ( obexfs

View file

@ -12,7 +12,6 @@ license="GPL-2.0-only"
homepage="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" homepage="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
distfiles="${SOURCEFORGE_SITE}/openobex/${pkgname}-${version}-Source.tar.gz" distfiles="${SOURCEFORGE_SITE}/openobex/${pkgname}-${version}-Source.tar.gz"
checksum=d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3 checksum=d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3
patch_args=-Np0
post_install() { post_install() {
# Do not require 'bluetooth', does not exist. # Do not require 'bluetooth', does not exist.

View file

@ -1,7 +1,7 @@
Index: CMakeLists.txt Index: CMakeLists.txt
=================================================================== ===================================================================
--- CMakeLists.txt.orig --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D @@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
set (CMAKE_SUPPRESS_REGENERATION TRUE) set (CMAKE_SUPPRESS_REGENERATION TRUE)

View file

@ -1,8 +1,8 @@
# fix regex for cmake Config file # fix regex for cmake Config file
# inspired by https://git.archlinux.org/svntogit/community.git/commit/trunk/cmake-fix-variable.patch?h=packages/opencascade&id=c99074d88da40ae59882aaf173de94cd0ec73ca7 # inspired by https://git.archlinux.org/svntogit/community.git/commit/trunk/cmake-fix-variable.patch?h=packages/opencascade&id=c99074d88da40ae59882aaf173de94cd0ec73ca7
--- adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500 --- a/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500
+++ adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500 +++ b/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)

View file

@ -1,8 +1,8 @@
# fix cmake install dir references # fix cmake install dir references
# source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9 # source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9
--- CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 --- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100
+++ CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 +++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100
@@ -906,7 +906,7 @@ @@ -906,7 +906,7 @@
endforeach() endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
@ -12,8 +12,8 @@
foreach (OCCT_MODULE ${OCCT_MODULES}) foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE}) if (BUILD_MODULE_${OCCT_MODULE})
--- adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 --- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100
+++ adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 +++ b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100
@@ -558,7 +558,7 @@ @@ -558,7 +558,7 @@
"cmake_policy(PUSH) "cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW) cmake_policy(SET CMP0007 NEW)

View file

@ -1,7 +1,7 @@
# gethostbyname returns a nullptr, because the host can't resolve itself # gethostbyname returns a nullptr, because the host can't resolve itself
--- src/OSD/OSD_Host.cxx --- a/src/OSD/OSD_Host.cxx
+++ src/OSD/OSD_Host.cxx +++ b/src/OSD/OSD_Host.cxx
@@ -124,7 +124,7 @@ TCollection_AsciiString OSD_Host::InternetAddress(){ @@ -124,7 +124,7 @@ TCollection_AsciiString OSD_Host::InternetAddress(){
host = HostName(); host = HostName();

View file

@ -5,8 +5,8 @@ is probably wrong, but I don't have a replacement for the
non-posix functions fegetexcept(3) and feenableexcept(3). non-posix functions fegetexcept(3) and feenableexcept(3).
""" """
--- src/OSD/OSD_signal.cxx.orig --- a/src/OSD/OSD_signal.cxx
+++ src/OSD/OSD_signal.cxx +++ b/src/OSD/OSD_signal.cxx
@@ -703,7 +703,7 @@ @@ -703,7 +703,7 @@
#include <signal.h> #include <signal.h>

View file

@ -1,7 +1,7 @@
In musl libc there is no struct mallinfo and no function mallinf() In musl libc there is no struct mallinfo and no function mallinf()
--- src/OSD/OSD_MemInfo.cxx.orig --- a/src/OSD/OSD_MemInfo.cxx
+++ src/OSD/OSD_MemInfo.cxx +++ b/src/OSD/OSD_MemInfo.cxx
@@ -147,8 +147,12 @@ @@ -147,8 +147,12 @@
} }
aFile.close(); aFile.close();

View file

@ -19,7 +19,6 @@ homepage="https://www.opencascade.com"
distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz" distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0 checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
conflicts="oce>=0" conflicts="oce>=0"
patch_args=-Np0
post_install() { post_install() {
rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt

View file

@ -60,8 +60,8 @@ Signed-off-by: David Howells <dhowells@redhat.com>
diff --git security/keys/process_keys.c security/keys/process_keys.c diff --git security/keys/process_keys.c security/keys/process_keys.c
index a3f85d2..e6d50172 100644 index a3f85d2..e6d50172 100644
--- security/keys/process_keys.c --- a/security/keys/process_keys.c
+++ security/keys/process_keys.c +++ b/security/keys/process_keys.c
@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) @@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
ret = PTR_ERR(keyring); ret = PTR_ERR(keyring);
goto error2; goto error2;

View file

@ -3,7 +3,6 @@
# Latest commit as of 20140809 # Latest commit as of 20140809
_githash="0c5ca23376fdddc43a08e5709e4d4bf18bc747f0" _githash="0c5ca23376fdddc43a08e5709e4d4bf18bc747f0"
_gitshort="${_githash:0:7}" _gitshort="${_githash:0:7}"
patch_args=-Np0
pkgname=odroid-u2-kernel pkgname=odroid-u2-kernel
version=3.8.13.28 version=3.8.13.28

View file

@ -1,7 +1,7 @@
diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c
index 54b18ac..5f924ca 100644 index 54b18ac..5f924ca 100644
--- drivers/mbimmodem/mbim.c --- a/drivers/mbimmodem/mbim.c
+++ drivers/mbimmodem/mbim.c +++ b/drivers/mbimmodem/mbim.c
@@ -41,6 +41,15 @@ @@ -41,6 +41,15 @@
#define HEADER_SIZE (sizeof(struct mbim_message_header) + \ #define HEADER_SIZE (sizeof(struct mbim_message_header) + \
sizeof(struct mbim_fragment_header)) sizeof(struct mbim_fragment_header))

View file

@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
homepage="https://01.org/ofono" homepage="https://01.org/ofono"
distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b checksum=a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b
patch_args=-Np0
post_install() { post_install() {
vsv ofonod vsv ofonod

View file

@ -2,8 +2,8 @@ Source: Arch Linux
Upstream: Unknown Upstream: Unknown
Reason: Fixes compilation with enchant-2 Reason: Fixes compilation with enchant-2
--- src/ogmrip-spell-dialog.c --- a/src/ogmrip-spell-dialog.c
+++ src/ogmrip-spell-dialog.c +++ b/src/ogmrip-spell-dialog.c
@@ -315,14 +315,14 @@ @@ -315,14 +315,14 @@
enchant_dict_add_to_session (dialog->priv->dict, word, len); enchant_dict_add_to_session (dialog->priv->dict, word, len);
break; break;

View file

@ -1,5 +1,5 @@
--- libogmrip/ogmrip-srt.c.orig 2015-01-10 14:39:43.000000000 +0100 --- a/libogmrip/ogmrip-srt.c 2015-01-10 14:39:43.000000000 +0100
+++ libogmrip/ogmrip-srt.c 2017-10-16 21:00:19.921665865 +0200 +++ b/libogmrip/ogmrip-srt.c 2017-10-16 21:00:19.921665865 +0200
@@ -228,7 +228,7 @@ @@ -228,7 +228,7 @@
g_return_val_if_fail (input != NULL, NULL); g_return_val_if_fail (input != NULL, NULL);

View file

@ -15,7 +15,6 @@ license="LGPL-2.1-or-later"
homepage="http://ogmrip.sourceforge.net/en/index.html" homepage="http://ogmrip.sourceforge.net/en/index.html"
distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/${version%.*}/${version}/ogmrip-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/${version%.*}/${version}/ogmrip-${version}.tar.gz"
checksum=4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff checksum=4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff
patch_args=-Np0
pre_configure() { pre_configure() {
sed -i 's/enchant >=/enchant-2 >=/' configure sed -i 's/enchant >=/enchant-2 >=/' configure

View file

@ -1,5 +1,5 @@
--- Makefile.am 2003-05-04 11:41:26.000000000 +0200 --- a/Makefile.am 2003-05-04 11:41:26.000000000 +0200
+++ Makefile.am 2015-08-30 13:35:53.976381119 +0200 +++ b/Makefile.am 2015-08-30 13:35:53.976381119 +0200
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
if HAVE_LIBDVDREAD if HAVE_LIBDVDREAD
DVDXCHAP=dvdxchap DVDXCHAP=dvdxchap

View file

@ -1,5 +1,5 @@
--- acinclude.m4 2003-05-04 11:41:26.000000000 +0200 --- a/acinclude.m4 2003-05-04 11:41:26.000000000 +0200
+++ acinclude.m4 2015-08-30 14:11:25.882425946 +0200 +++ b/acinclude.m4 2015-08-30 14:11:25.882425946 +0200
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
dnl PATH_AVILIB([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl PATH_AVILIB([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Test for avilib, and define AVILIB_CFLAGS and AVILIB_LIBS dnl Test for avilib, and define AVILIB_CFLAGS and AVILIB_LIBS

View file

@ -1,5 +1,5 @@
--- avilib/Makefile.am 2004-03-29 22:00:28.000000000 +0200 --- a/avilib/Makefile.am 2004-03-29 22:00:28.000000000 +0200
+++ avilib/Makefile.am 2015-08-30 13:57:05.720407860 +0200 +++ b/avilib/Makefile.am 2015-08-30 13:57:05.720407860 +0200
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
noinst_LIBRARIES = libavi.a noinst_LIBRARIES = libavi.a

View file

@ -1,5 +1,5 @@
--- configure.in 2004-11-07 11:01:34.000000000 +0100 --- a/configure.in 2004-11-07 11:01:34.000000000 +0100
+++ configure.in 2015-08-30 13:46:25.944394407 +0200 +++ b/configure.in 2015-08-30 13:46:25.944394407 +0200
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
dnl process this file with autoconf to generate the configure script dnl process this file with autoconf to generate the configure script

View file

@ -14,7 +14,6 @@ license="GPL-2.0-only"
homepage="http://www.bunkus.org/videotools/ogmtools/" homepage="http://www.bunkus.org/videotools/ogmtools/"
distfiles="http://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2" distfiles="http://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2"
checksum=c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea checksum=c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea
patch_args=-Np0
CFLAGS="-I./avilib" CFLAGS="-I./avilib"
CXXFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"

View file

@ -1,5 +1,5 @@
--- configure.orig --- a/configure
+++ configure +++ b/configure
@@ -932,7 +932,7 @@ @@ -932,7 +932,7 @@
fi fi

View file

@ -11,7 +11,6 @@ homepage="https://github.com/ibara/oksh"
distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz" distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz"
checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35 checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
register_shell="/bin/oksh" register_shell="/bin/oksh"
patch_args=-Np0
alternatives=" alternatives="
ksh:ksh:/usr/bin/oksh ksh:ksh:/usr/bin/oksh

View file

@ -1,7 +1,7 @@
upstream bug: https://bugs.kde.org/show_bug.cgi?id=436128 upstream bug: https://bugs.kde.org/show_bug.cgi?id=436128
--- kasten/controllers/CMakeLists.txt.ORIG 2021-03-29 13:51:56.000000000 +0200 --- a/kasten/controllers/CMakeLists.txt 2021-03-29 13:51:56.000000000 +0200
+++ kasten/controllers/CMakeLists.txt 2021-04-24 23:12:17.358195447 +0200 +++ b/kasten/controllers/CMakeLists.txt 2021-04-24 23:12:17.358195447 +0200
@@ -584,15 +584,12 @@ @@ -584,15 +584,12 @@
LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors
) )

View file

@ -16,7 +16,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://apps.kde.org/okteta/" homepage="https://apps.kde.org/okteta/"
distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz"
checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c
patch_args=-Np0
okteta-devel_package() { okteta-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"

View file

@ -1,5 +1,5 @@
--- core/synctex/synctex_parser.c 2017-12-05 23:07:10.000000000 +0100 --- a/core/synctex/synctex_parser.c 2017-12-05 23:07:10.000000000 +0100
+++ core/synctex/synctex_parser.c 2018-01-01 19:03:46.281593488 +0100 +++ b/core/synctex/synctex_parser.c 2018-01-01 19:03:46.281593488 +0100
@@ -8188,6 +8188,26 @@ @@ -8188,6 +8188,26 @@
} }

View file

@ -17,7 +17,6 @@ license="GPL-2.0-only"
homepage="https://kde.org/applications/en/graphics/org.kde.okular" homepage="https://kde.org/applications/en/graphics/org.kde.okular"
distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
checksum=330dbe847409bfc544093ac703754fb5f43398ea3dbea88b976dc393d3bda65c checksum=330dbe847409bfc544093ac703754fb5f43398ea3dbea88b976dc393d3bda65c
patch_args=-Np0
do_check() { do_check() {
cd build cd build

View file

@ -1,5 +1,5 @@
--- effects/internal/texteffect.cpp 2020-08-31 20:39:58.048701631 +0200 --- a/effects/internal/texteffect.cpp 2020-08-31 20:39:58.048701631 +0200
+++ effects/internal/texteffect.cpp 2019-11-11 07:05:02.000000000 +0100 +++ b/effects/internal/texteffect.cpp 2019-11-11 07:05:02.000000000 +0100
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <QOpenGLTexture> #include <QOpenGLTexture>
#include <QTextEdit> #include <QTextEdit>
@ -8,8 +8,8 @@
#include <QPushButton> #include <QPushButton>
#include <QColorDialog> #include <QColorDialog>
#include <QFontDatabase> #include <QFontDatabase>
--- effects/internal/timecodeeffect.cpp 2020-08-31 20:39:49.809701206 +0200 --- a/effects/internal/timecodeeffect.cpp 2020-08-31 20:39:49.809701206 +0200
+++ effects/internal/timecodeeffect.cpp 2019-11-11 07:05:02.000000000 +0100 +++ b/effects/internal/timecodeeffect.cpp 2019-11-11 07:05:02.000000000 +0100
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <QOpenGLTexture> #include <QOpenGLTexture>
#include <QTextEdit> #include <QTextEdit>
@ -18,8 +18,8 @@
#include <QPushButton> #include <QPushButton>
#include <QColorDialog> #include <QColorDialog>
#include <QFontDatabase> #include <QFontDatabase>
--- ui/graphview.cpp 2020-08-31 20:39:43.016700855 +0200 --- a/ui/graphview.cpp 2020-08-31 20:39:43.016700855 +0200
+++ ui/graphview.cpp 2019-11-11 07:05:02.000000000 +0100 +++ b/ui/graphview.cpp 2019-11-11 07:05:02.000000000 +0100
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include "graphview.h" #include "graphview.h"
@ -28,8 +28,8 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QtMath> #include <QtMath>
#include <cfloat> #include <cfloat>
--- ui/timelineheader.cpp 2020-08-31 20:39:36.992700545 +0200 --- a/ui/timelineheader.cpp 2020-08-31 20:39:36.992700545 +0200
+++ ui/timelineheader.cpp 2019-11-11 07:05:02.000000000 +0100 +++ b/ui/timelineheader.cpp 2019-11-11 07:05:02.000000000 +0100
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include "timelineheader.h" #include "timelineheader.h"

View file

@ -11,4 +11,3 @@ license="GPL-3.0-or-later"
homepage="https://www.olivevideoeditor.org" homepage="https://www.olivevideoeditor.org"
distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz" distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz"
checksum=cb9a5b109e67a47f03448633cbc7a257aa8e6c3c76a59c1fada77fd3d97875c1 checksum=cb9a5b109e67a47f03448633cbc7a257aa8e6c3c76a59c1fada77fd3d97875c1
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- src/cfgparser/local.mk.orig 2020-11-21 14:03:26.244348554 +0700 --- a/src/cfgparser/local.mk 2020-11-21 14:03:26.244348554 +0700
+++ src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700 +++ b/src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700
@@ -77,6 +77,7 @@ @@ -77,6 +77,7 @@
$(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<"
$(MAKECMDPREFIX)sed -e 's/register //' \ $(MAKECMDPREFIX)sed -e 's/register //' \

View file

@ -11,7 +11,6 @@ license="BSD-3-Clause"
homepage="http://www.olsr.org/" homepage="http://www.olsr.org/"
distfiles="https://github.com/OLSR/olsrd/archive/v${version}.tar.gz" distfiles="https://github.com/OLSR/olsrd/archive/v${version}.tar.gz"
checksum=9baf2e4993dbb53babf18eea9e81a2e92ce79686632711a16a5b4f7776e94451 checksum=9baf2e4993dbb53babf18eea9e81a2e92ce79686632711a16a5b4f7776e94451
patch_args=-Np0
conf_files="/etc/olsrd.conf" conf_files="/etc/olsrd.conf"

View file

@ -1,7 +1,7 @@
diff --git Makefile Makefile diff --git Makefile Makefile
index 5f4e414..c5b33f5 100644 index 5f4e414..c5b33f5 100644
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
-CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog -CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
+CFLAGS=-fomit-frame-pointer -mtune=arm1176jzf-s +CFLAGS=-fomit-frame-pointer -mtune=arm1176jzf-s

View file

@ -6,7 +6,6 @@ short_desc="Commandline OMX player for the Raspberry Pi"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2" license="GPL-2"
homepage="https://github.com/popcornmix/omxplayer" homepage="https://github.com/popcornmix/omxplayer"
patch_args=-Np0
_commit="f06235cc9690a6d58187514452df8cf8fcdaacec" _commit="f06235cc9690a6d58187514452df8cf8fcdaacec"
wrksrc="omxplayer-$_commit" wrksrc="omxplayer-$_commit"

View file

@ -7,8 +7,8 @@ that indicates an argument error.
Later check this flag and error out, if it is set. Later check this flag and error out, if it is set.
--- usr/iscsiadm.c 2016-09-29 20:33:24.000000000 +0200 --- a/usr/iscsiadm.c 2016-09-29 20:33:24.000000000 +0200
+++ usr/iscsiadm.c 2017-01-08 03:03:20.648496369 +0100 +++ b/usr/iscsiadm.c 2017-01-08 03:03:20.648496369 +0100
@@ -3263,7 +3263,8 @@ @@ -3263,7 +3263,8 @@
int packet_size=32, ping_count=1, ping_interval=0; int packet_size=32, ping_count=1, ping_interval=0;
int do_discover = 0, sub_mode = -1; int do_discover = 0, sub_mode = -1;
@ -40,8 +40,8 @@ Later check this flag and error out, if it is set.
rc = ISCSI_ERR_INVAL; rc = ISCSI_ERR_INVAL;
goto free_ifaces; goto free_ifaces;
} }
--- usr/mgmt_ipc.c.orig --- a/usr/mgmt_ipc.c
+++ usr/mgmt_ipc.c +++ b/usr/mgmt_ipc.c
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
* See the file COPYING included with this distribution for more details. * See the file COPYING included with this distribution for more details.
*/ */

View file

@ -1,5 +1,5 @@
--- usr/auth.c.orig --- a/usr/auth.c
+++ usr/auth.c +++ b/usr/auth.c
@@ -182,9 +182,11 @@ @@ -182,9 +182,11 @@
case AUTH_CHAP_ALG_SHA256: case AUTH_CHAP_ALG_SHA256:
digest = EVP_sha256(); digest = EVP_sha256();

View file

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="http://www.open-iscsi.com/" homepage="http://www.open-iscsi.com/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
checksum=5410474b23552016220d04aa181903cb50ae988f29e99cb03f3e2de86a109be4 checksum=5410474b23552016220d04aa181903cb50ae988f29e99cb03f3e2de86a109be4
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";; *-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";;

View file

@ -1,8 +1,8 @@
#inspired by alpine #inspired by alpine
#upstream: no #upstream: no
--- open-vm-tools/lib/include/guest_os.h --- a/open-vm-tools/lib/include/guest_os.h
+++ open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h
@@ -309,6 +309,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); @@ -309,6 +309,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
#define STR_OS_ULTRAPENGUIN "UltraPenguin" #define STR_OS_ULTRAPENGUIN "UltraPenguin"
#define STR_OS_UNITEDLINUX "UnitedLinux" #define STR_OS_UNITEDLINUX "UnitedLinux"
@ -13,8 +13,8 @@
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 6ac15412..ea898e24 100644 index 6ac15412..ea898e24 100644
--- open-vm-tools/lib/misc/hostinfoPosix.c --- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = { @@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = {
{"united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName}, {"united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName},
{"va linux", STR_OS_VALINUX, HostinfoGenericSetShortName}, {"va linux", STR_OS_VALINUX, HostinfoGenericSetShortName},

View file

@ -1,7 +1,7 @@
#upstream: no #upstream: no
--- open-vm-tools/configure.ac --- a/open-vm-tools/configure.ac
+++ open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac
@@ -1218,7 +1218,7 @@ @@ -1218,7 +1218,7 @@
### General flags / actions ### General flags / actions

View file

@ -19,8 +19,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c
index 23108279..603ea28d 100644 index 23108279..603ea28d 100644
--- open-vm-tools/lib/file/fileIOPosix.c --- a/open-vm-tools/lib/file/fileIOPosix.c
+++ open-vm-tools/lib/file/fileIOPosix.c +++ b/open-vm-tools/lib/file/fileIOPosix.c
@@ -198,7 +198,7 @@ static AlignedPool alignedPool; @@ -198,7 +198,7 @@ static AlignedPool alignedPool;
* are not available in any header file. * are not available in any header file.
*/ */

View file

@ -17,8 +17,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 367e4ff8..5dc0be2b 100644 index 367e4ff8..5dc0be2b 100644
--- open-vm-tools/configure.ac --- a/open-vm-tools/configure.ac
+++ open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac
@@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T @@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T
AC_TYPE_PID_T AC_TYPE_PID_T
AC_TYPE_SIZE_T AC_TYPE_SIZE_T
@ -29,8 +29,8 @@ index 367e4ff8..5dc0be2b 100644
AC_C_VOLATILE AC_C_VOLATILE
diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h
index 609f4c00..a3a022d4 100644 index 609f4c00..a3a022d4 100644
--- open-vm-tools/lib/include/hgfsUtil.h --- a/open-vm-tools/lib/include/hgfsUtil.h
+++ open-vm-tools/lib/include/hgfsUtil.h +++ b/open-vm-tools/lib/include/hgfsUtil.h
@@ -53,13 +53,7 @@ @@ -53,13 +53,7 @@
# include <time.h> # include <time.h>
# endif # endif

View file

@ -19,8 +19,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
index f2b7ce67..0e6351a9 100644 index f2b7ce67..0e6351a9 100644
--- open-vm-tools/lib/hgfsServer/hgfsServerLinux.c --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
+++ open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c
@@ -105,11 +105,13 @@ typedef struct DirectoryEntry { @@ -105,11 +105,13 @@ typedef struct DirectoryEntry {
#endif #endif
@ -40,8 +40,8 @@ index f2b7ce67..0e6351a9 100644
diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
index 89133652..7e9c3a91 100644 index 89133652..7e9c3a91 100644
--- open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c --- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
+++ open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
#define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO)

View file

@ -31,8 +31,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 9aa95abb..941195c1 100644 index 9aa95abb..941195c1 100644
--- open-vm-tools/configure.ac --- a/open-vm-tools/configure.ac
+++ open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac
@@ -879,6 +879,7 @@ AC_CHECK_FUNCS( @@ -879,6 +879,7 @@ AC_CHECK_FUNCS(
AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([ecvt])
@ -56,8 +56,8 @@ index 9aa95abb..941195c1 100644
AC_CHECK_HEADERS([sys/io.h]) AC_CHECK_HEADERS([sys/io.h])
diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c
index 1bb86f48..2116f2aa 100644 index 1bb86f48..2116f2aa 100644
--- open-vm-tools/lib/misc/idLinux.c --- a/open-vm-tools/lib/misc/idLinux.c
+++ open-vm-tools/lib/misc/idLinux.c +++ b/open-vm-tools/lib/misc/idLinux.c
@@ -27,12 +27,9 @@ @@ -27,12 +27,9 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <string.h> #include <string.h>
@ -119,8 +119,8 @@ index 1bb86f48..2116f2aa 100644
#endif #endif
diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
index 3363f3ac..b343196b 100644 index 3363f3ac..b343196b 100644
--- open-vm-tools/lib/nicInfo/nicInfoPosix.c --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
+++ open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
@@ -35,9 +35,13 @@ @@ -35,9 +35,13 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h> #include <errno.h>

View file

@ -15,8 +15,8 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
index e5273786..cabc4137 100644 index e5273786..cabc4137 100644
--- open-vm-tools/services/plugins/vix/vixTools.c --- a/open-vm-tools/services/plugins/vix/vixTools.c
+++ open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
#include <unistd.h> #include <unistd.h>
#endif #endif

View file

@ -12,8 +12,8 @@ Subject: [PATCH 10/12] use posix strerror_r unless gnu
diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c
index c81b4c13..a34e8190 100644 index c81b4c13..a34e8190 100644
--- open-vm-tools/lib/err/errPosix.c --- a/open-vm-tools/lib/err/errPosix.c
+++ open-vm-tools/lib/err/errPosix.c +++ b/open-vm-tools/lib/err/errPosix.c
@@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN @@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN
{ {
char *p; char *p;

View file

@ -14,8 +14,8 @@ Subject: [PATCH 11/12] use off64_t instead of loff_t
diff --git a/open-vm-tools/vmhgfs-fuse/file.c b/open-vm-tools/vmhgfs-fuse/file.c diff --git a/open-vm-tools/vmhgfs-fuse/file.c b/open-vm-tools/vmhgfs-fuse/file.c
index 389ebba8..d22b66df 100644 index 389ebba8..d22b66df 100644
--- open-vm-tools/vmhgfs-fuse/file.c --- a/open-vm-tools/vmhgfs-fuse/file.c
+++ open-vm-tools/vmhgfs-fuse/file.c +++ b/open-vm-tools/vmhgfs-fuse/file.c
@@ -535,7 +535,7 @@ static int @@ -535,7 +535,7 @@ static int
HgfsDoRead(HgfsHandle handle, // IN: Handle for this file HgfsDoRead(HgfsHandle handle, // IN: Handle for this file
char *buf, // OUT: Buffer to copy data into char *buf, // OUT: Buffer to copy data into
@ -64,8 +64,8 @@ index 389ebba8..d22b66df 100644
diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.c b/open-vm-tools/vmhgfs-fuse/fsutil.c diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.c b/open-vm-tools/vmhgfs-fuse/fsutil.c
index 042c223c..c3d581d3 100644 index 042c223c..c3d581d3 100644
--- open-vm-tools/vmhgfs-fuse/fsutil.c --- a/open-vm-tools/vmhgfs-fuse/fsutil.c
+++ open-vm-tools/vmhgfs-fuse/fsutil.c +++ b/open-vm-tools/vmhgfs-fuse/fsutil.c
@@ -680,7 +680,7 @@ HgfsStatusConvertToLinux(HgfsStatus hgfsStatus) // IN: Status code to convert @@ -680,7 +680,7 @@ HgfsStatusConvertToLinux(HgfsStatus hgfsStatus) // IN: Status code to convert
unsigned long unsigned long
HgfsCalcBlockSize(uint64 tsize) HgfsCalcBlockSize(uint64 tsize)
@ -77,8 +77,8 @@ index 042c223c..c3d581d3 100644
diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.h b/open-vm-tools/vmhgfs-fuse/fsutil.h diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.h b/open-vm-tools/vmhgfs-fuse/fsutil.h
index 34b6d489..a75cff82 100644 index 34b6d489..a75cff82 100644
--- open-vm-tools/vmhgfs-fuse/fsutil.h --- a/open-vm-tools/vmhgfs-fuse/fsutil.h
+++ open-vm-tools/vmhgfs-fuse/fsutil.h +++ b/open-vm-tools/vmhgfs-fuse/fsutil.h
@@ -32,10 +32,6 @@ @@ -32,10 +32,6 @@
#include "hgfsProto.h" #include "hgfsProto.h"
#include <fuse.h> #include <fuse.h>

View file

@ -2,8 +2,8 @@ reason: drop localversion in x.y.z_LOCALVERSION, else later numeric comparisons
on `micro_version` fail. on `micro_version` fail.
upstream: no upstream: no
--- open-vm-tools/configure.ac --- a/open-vm-tools/configure.ac
+++ open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
[AS_HELP_STRING([--with-kernel-release], [AS_HELP_STRING([--with-kernel-release],
[specifies the kernel release you want to build against])], [specifies the kernel release you want to build against])],

View file

@ -3,8 +3,8 @@
diff --git a/open-vm-tools/vgauth/common/VGAuthLog.c b/open-vm-tools/vgauth/common/VGAuthLog.c diff --git a/open-vm-tools/vgauth/common/VGAuthLog.c b/open-vm-tools/vgauth/common/VGAuthLog.c
index fb4261e..1b29536 100644 index fb4261e..1b29536 100644
--- open-vm-tools/vgauth/common/VGAuthLog.c --- a/open-vm-tools/vgauth/common/VGAuthLog.c
+++ open-vm-tools/vgauth/common/VGAuthLog.c +++ b/open-vm-tools/vgauth/common/VGAuthLog.c
@@ -210,7 +210,7 @@ LogErrorPosixCodeV(int code, @@ -210,7 +210,7 @@ LogErrorPosixCodeV(int code,
g_vsnprintf(buf, sizeof buf, fmt, args); g_vsnprintf(buf, sizeof buf, fmt, args);
buf[sizeof buf - 1] = '\0'; buf[sizeof buf - 1] = '\0';

View file

@ -48,8 +48,8 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff --git lib/asyncsocket/asyncsocket.c lib/asyncsocket/asyncsocket.c diff --git lib/asyncsocket/asyncsocket.c lib/asyncsocket/asyncsocket.c
index 102638cc9..01181a957 100644 index 102638cc9..01181a957 100644
--- open-vm-tools/lib/asyncsocket/asyncsocket.c --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c
+++ open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c
@@ -69,8 +69,8 @@ @@ -69,8 +69,8 @@
#else #else
#include <stddef.h> #include <stddef.h>
@ -71,8 +71,8 @@ index 102638cc9..01181a957 100644
#include "hostinfo.h" #include "hostinfo.h"
diff --git lib/hgfsServer/hgfsServer.c lib/hgfsServer/hgfsServer.c diff --git lib/hgfsServer/hgfsServer.c lib/hgfsServer/hgfsServer.c
index 462245511..fc6912860 100644 index 462245511..fc6912860 100644
--- open-vm-tools/lib/hgfsServer/hgfsServer.c --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
#include "hgfsServerOplock.h" #include "hgfsServerOplock.h"
#include "hgfsDirNotify.h" #include "hgfsDirNotify.h"
@ -84,8 +84,8 @@ index 462245511..fc6912860 100644
#include "unicodeOperations.h" #include "unicodeOperations.h"
diff --git lib/include/asyncsocket.h lib/include/asyncsocket.h diff --git lib/include/asyncsocket.h lib/include/asyncsocket.h
index 95a5e4643..a4b4e5aae 100644 index 95a5e4643..a4b4e5aae 100644
--- open-vm-tools/lib/include/asyncsocket.h --- a/open-vm-tools/lib/include/asyncsocket.h
+++ open-vm-tools/lib/include/asyncsocket.h +++ b/open-vm-tools/lib/include/asyncsocket.h
@@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; @@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket;
* Or the client can specify its favorite poll class and locking behavior. * Or the client can specify its favorite poll class and locking behavior.
* Use of IVmdbPoll is only supported for regular sockets and for Attach. * Use of IVmdbPoll is only supported for regular sockets and for Attach.
@ -97,8 +97,8 @@ index 95a5e4643..a4b4e5aae 100644
int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */
diff --git lib/include/pollImpl.h lib/include/pollImpl.h diff --git lib/include/pollImpl.h lib/include/pollImpl.h
index 46442e556..8bc669970 100644 index 46442e556..8bc669970 100644
--- open-vm-tools/lib/include/pollImpl.h --- a/open-vm-tools/lib/include/pollImpl.h
+++ open-vm-tools/lib/include/pollImpl.h +++ b/open-vm-tools/lib/include/pollImpl.h
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
#define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_USERLEVEL
#include "includeCheck.h" #include "includeCheck.h"
@ -114,8 +114,8 @@ rename from open-vm-tools/lib/include/poll.h
rename to open-vm-tools/lib/include/vm_poll.h rename to open-vm-tools/lib/include/vm_poll.h
diff --git lib/rpcIn/rpcin.c lib/rpcIn/rpcin.c diff --git lib/rpcIn/rpcin.c lib/rpcIn/rpcin.c
index 47a3380e4..660382c62 100644 index 47a3380e4..660382c62 100644
--- open-vm-tools/lib/rpcIn/rpcin.c --- a/open-vm-tools/lib/rpcIn/rpcin.c
+++ open-vm-tools/lib/rpcIn/rpcin.c +++ b/open-vm-tools/lib/rpcIn/rpcin.c
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
#if defined(VMTOOLS_USE_VSOCKET) #if defined(VMTOOLS_USE_VSOCKET)

View file

@ -15,8 +15,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 71e684bb..b76a7966 100644 index 71e684bb..b76a7966 100644
--- open-vm-tools/configure.ac --- a/open-vm-tools/configure.ac
+++ open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac
@@ -303,6 +303,7 @@ AC_ARG_ENABLE( @@ -303,6 +303,7 @@ AC_ARG_ENABLE(
[], [],
[enable_resolutionkms="auto"]) [enable_resolutionkms="auto"])

View file

@ -1,6 +1,6 @@
#upstream: no #upstream: no
--- open-vm-tools/lib/nicInfo/nicInfoPosix.c --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c
+++ open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c
@@ -66,6 +66,35 @@ @@ -66,6 +66,35 @@
# include <net/if.h> # include <net/if.h>
#endif #endif

View file

@ -20,7 +20,6 @@ homepage="https://github.com/vmware/open-vm-tools"
changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog" changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog"
distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz" distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz"
checksum=7c31bb8ef70a0e32b81cde6550cae390a53108e4abb28bb539b0ab5b9e4fc188 checksum=7c31bb8ef70a0e32b81cde6550cae390a53108e4abb28bb539b0ab5b9e4fc188
patch_args=-Np0
build_options="pam x11" build_options="pam x11"
build_options_default="pam x11" build_options_default="pam x11"

View file

@ -1,7 +1,7 @@
https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216 https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216
--- src/formats/pngformat.cpp.orig 2016-09-21 21:55:37.000000000 +0200 --- a/src/formats/pngformat.cpp 2016-09-21 21:55:37.000000000 +0200
+++ src/formats/pngformat.cpp 2018-01-04 08:22:33.377616730 +0100 +++ b/src/formats/pngformat.cpp 2018-01-04 08:22:33.377616730 +0100
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
_count=0; _count=0;
_hasInputPngFile=true; _hasInputPngFile=true;
@ -11,8 +11,8 @@ https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e
char readbytes[9]; char readbytes[9];
ifs.read(readbytes, 8); ifs.read(readbytes, 8);
--- src/formats/yasaraformat.cpp.orig 2016-09-21 21:55:37.000000000 +0200 --- a/src/formats/yasaraformat.cpp 2016-09-21 21:55:37.000000000 +0200
+++ src/formats/yasaraformat.cpp 2018-01-04 09:00:45.636003936 +0100 +++ b/src/formats/yasaraformat.cpp 2018-01-04 09:00:45.636003936 +0100
@@ -472,7 +472,7 @@ @@ -472,7 +472,7 @@
// bool hetatom; // bool hetatom;

View file

@ -14,7 +14,6 @@ license="GPL-2.0-only"
homepage="http://openbabel.org" homepage="http://openbabel.org"
distfiles="https://github.com/openbabel/openbabel/archive/openbabel-${_ver}.tar.gz" distfiles="https://github.com/openbabel/openbabel/archive/openbabel-${_ver}.tar.gz"
checksum=594c7f8a83f3502381469d643f7b185882da1dd4bc2280c16502ef980af2a776 checksum=594c7f8a83f3502381469d643f7b185882da1dd4bc2280c16502ef980af2a776
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python" hostmakedepends+=" python"

View file

@ -9,8 +9,8 @@ Subject: [PATCH] fix build on gcc9
diff --git driver/others/dynamic_power.c driver/others/dynamic_power.c diff --git driver/others/dynamic_power.c driver/others/dynamic_power.c
index a2f56d8..e79e7e9 100644 index a2f56d8..e79e7e9 100644
--- driver/others/dynamic_power.c --- a/driver/others/dynamic_power.c
+++ driver/others/dynamic_power.c +++ b/driver/others/dynamic_power.c
@@ -53,7 +53,7 @@ static gotoblas_t *get_coretype(void) { @@ -53,7 +53,7 @@ static gotoblas_t *get_coretype(void) {
return &gotoblas_POWER10; return &gotoblas_POWER10;
#endif #endif

View file

@ -14,7 +14,6 @@ homepage="https://www.openblas.net/"
changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt" changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt"
distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz" distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"
checksum=79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e checksum=79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e
patch_args=-Np0
case "${XBPS_TARGET_MACHINE}" in case "${XBPS_TARGET_MACHINE}" in
armv5*) make_build_args+=" TARGET=ARMV5" ;; armv5*) make_build_args+=" TARGET=ARMV5" ;;

View file

@ -1,5 +1,5 @@
--- openbox/client.c 2011-08-01 22:14:58.000000000 +0200 --- a/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
+++ openbox/client.c 2011-10-22 14:59:56.000000000 +0200 +++ b/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
@@ -883,7 +883,7 @@ @@ -883,7 +883,7 @@
!g_pattern_match(app->role, !g_pattern_match(app->role,
strlen(self->role), self->role, NULL)) strlen(self->role), self->role, NULL))

View file

@ -1,5 +1,5 @@
--- data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 --- a/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
+++ data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 +++ b/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
# #
#if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then

View file

@ -20,7 +20,6 @@ homepage="http://www.openbox.org"
distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz" distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz"
checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d
python_version=2 #unverified python_version=2 #unverified
patch_args=-Np0
# Package build options # Package build options
build_options="svg" build_options="svg"

View file

@ -1,5 +1,5 @@
--- file.c --- a/file.c
+++ file.c +++ b/file.c
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/mman.h> #include <sys/mman.h>
@ -8,8 +8,8 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
--- seccomp-sandbox.c --- a/seccomp-sandbox.c
+++ seccomp-sandbox.c +++ b/seccomp-sandbox.c
@@ -109,6 +109,9 @@ static const struct sock_filter filt_insns[] = { @@ -109,6 +109,9 @@ static const struct sock_filter filt_insns[] = {
#ifdef __NR_write #ifdef __NR_write
SC_ALLOW(__NR_write), SC_ALLOW(__NR_write),

View file

@ -1,5 +1,5 @@
--- seccomp-sandbox.c.orig 2020-01-30 15:59:29.517540311 +0100 --- a/seccomp-sandbox.c 2020-01-30 15:59:29.517540311 +0100
+++ seccomp-sandbox.c 2020-01-30 16:03:43.046273793 +0100 +++ b/seccomp-sandbox.c 2020-01-30 16:03:43.046273793 +0100
@@ -40,6 +40,16 @@ @@ -40,6 +40,16 @@
#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 #define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386
#elif defined __x86_64__ || defined __amd64__ #elif defined __x86_64__ || defined __amd64__

View file

@ -12,7 +12,6 @@ license="ISC"
homepage="https://github.com/brynet/file/" homepage="https://github.com/brynet/file/"
distfiles="https://github.com/brynet/file/archive/v${version}.tar.gz" distfiles="https://github.com/brynet/file/archive/v${version}.tar.gz"
checksum=f6bf601f513bd83038e343bbd93b7982f373669a2ffa76dc52d48fa7251515b2 checksum=f6bf601f513bd83038e343bbd93b7982f373669a2ffa76dc52d48fa7251515b2
patch_args=-Np0
system_accounts="_file" system_accounts="_file"

View file

@ -1,5 +1,5 @@
--- common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-23 00:57:35.000000000 +0100 --- a/common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-23 00:57:35.000000000 +0100
+++ common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-29 02:14:07.709567632 +0100 +++ b/common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-29 02:14:07.709567632 +0100
@@ -147,6 +147,7 @@ @@ -147,6 +147,7 @@
} }
} }

View file

@ -1,5 +1,5 @@
--- common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-23 00:57:35.000000000 +0100 --- a/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-23 00:57:35.000000000 +0100
+++ common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-29 02:18:38.673566829 +0100 +++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-29 02:18:38.673566829 +0100
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
typedef int64_t __int64; typedef int64_t __int64;
#else #else

View file

@ -1,5 +1,5 @@
--- common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-11 20:10:51.000000000 +0200 --- a/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-11 20:10:51.000000000 +0200
+++ common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-12 10:56:39.685988592 +0200 +++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-12 10:56:39.685988592 +0200
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
#ifdef __GNUC__ #ifdef __GNUC__
# include <cstdlib> /* size_t */ # include <cstdlib> /* size_t */

View file

@ -9,8 +9,8 @@ This fixes a compilation error with libpcre-8.42:
error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre' error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre'
``` ```
--- COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h --- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+++ COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
@@ -13,8 +13,7 @@ @@ -13,8 +13,7 @@
#include "COLLADABUPrerequisites.h" #include "COLLADABUPrerequisites.h"

View file

@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/KhronosGroup/OpenCOLLADA" homepage="https://github.com/KhronosGroup/OpenCOLLADA"
distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b checksum=d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b
patch_args=-Np0
CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then

View file

@ -1,7 +1,7 @@
diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt
index 1eb691b..cff9bd8 100644 index 1eb691b..cff9bd8 100644
--- src/core/CMakeLists.txt --- a/src/core/CMakeLists.txt
+++ src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt
@@ -23,8 +23,6 @@ if(WIN32) @@ -23,8 +23,6 @@ if(WIN32)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
@ -13,8 +13,8 @@ index 1eb691b..cff9bd8 100644
# SHARED # SHARED
diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt
index a90ca1c..b1f0361 100644 index a90ca1c..b1f0361 100644
--- src/pyglue/CMakeLists.txt --- a/src/pyglue/CMakeLists.txt
+++ src/pyglue/CMakeLists.txt +++ b/src/pyglue/CMakeLists.txt
@@ -20,12 +20,6 @@ if(WIN32) @@ -20,12 +20,6 @@ if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
endif() endif()

View file

@ -18,8 +18,8 @@ Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index a399d57a..473f1b79 100644 index a399d57a..473f1b79 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -60,6 +60,7 @@ endif() @@ -60,6 +60,7 @@ endif()
include(ParseArguments) include(ParseArguments)
include(OCIOMacros) include(OCIOMacros)
@ -63,8 +63,8 @@ index a399d57a..473f1b79 100644
+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO) +install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 5970db64..4d97f72c 100644 index 5970db64..4d97f72c 100644
--- docs/CMakeLists.txt --- a/docs/CMakeLists.txt
+++ docs/CMakeLists.txt +++ b/docs/CMakeLists.txt
@@ -138,7 +138,7 @@ add_custom_target(doc ALL @@ -138,7 +138,7 @@ add_custom_target(doc ALL
add_dependencies(doc Sphinx) add_dependencies(doc Sphinx)
@ -84,8 +84,8 @@ index 5970db64..4d97f72c 100644
endif() endif()
diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
index 81ab4ce3..c4553a4f 100644 index 81ab4ce3..c4553a4f 100644
--- export/pkgconfig/OpenColorIO.pc.in --- a/export/pkgconfig/OpenColorIO.pc.in
+++ export/pkgconfig/OpenColorIO.pc.in +++ b/export/pkgconfig/OpenColorIO.pc.in
@@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
-prefix=@CMAKE_INSTALL_PREFIX@ -prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@ -exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@

View file

@ -19,7 +19,6 @@ homepage="http://opencolorio.org"
changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog" changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog"
distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz" distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz"
checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8 checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
patch_args=-Np0
export CMAKE_GENERATOR="Unix Makefiles" export CMAKE_GENERATOR="Unix Makefiles"

View file

@ -2,8 +2,8 @@ This is necessary because otherwise conflicts are introduced in C++ code that
includes this. The header itself does not rely on the macros. The issue is not includes this. The header itself does not rely on the macros. The issue is not
visible on little endian because they undef the macros somewhere else. visible on little endian because they undef the macros somewhere else.
--- 3rdparty/include/opencl/1.2/CL/cl_platform.h --- a/3rdparty/include/opencl/1.2/CL/cl_platform.h
+++ 3rdparty/include/opencl/1.2/CL/cl_platform.h +++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h
@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; @@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum;
/* Define basic vector types */ /* Define basic vector types */
#if defined( __VEC__ ) #if defined( __VEC__ )

View file

@ -18,7 +18,6 @@ license="BSD-3-Clause"
homepage="https://opencv.org" homepage="https://opencv.org"
distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
checksum=1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2 checksum=1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2
patch_args=-Np0
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel" makedepends+=" libatomic-devel"

View file

@ -2,8 +2,8 @@ This is necessary because otherwise conflicts are introduced in C++ code that
includes this. The header itself does not rely on the macros. The issue is not includes this. The header itself does not rely on the macros. The issue is not
visible on little endian because they undef the macros somewhere else. visible on little endian because they undef the macros somewhere else.
--- 3rdparty/include/opencl/1.2/CL/cl_platform.h --- a/3rdparty/include/opencl/1.2/CL/cl_platform.h
+++ 3rdparty/include/opencl/1.2/CL/cl_platform.h +++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h
@@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; @@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum;
/* Define basic vector types */ /* Define basic vector types */
#if defined( __VEC__ ) #if defined( __VEC__ )

View file

@ -24,7 +24,6 @@ distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz
https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz"
checksum="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a checksum="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a
acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55" acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55"
patch_args=-Np0
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel" makedepends+=" libatomic-devel"

View file

@ -8,8 +8,8 @@ Forwarded: no
Reviewed-By: Scott Kitterman <scott@kitterman.com> Reviewed-By: Scott Kitterman <scott@kitterman.com>
Last-Update: <YYYY-MM-DD> Last-Update: <YYYY-MM-DD>
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -864,26 +864,28 @@ then @@ -864,26 +864,28 @@ then
AC_SEARCH_LIBS([ERR_peek_error], [crypto], , AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
AC_MSG_ERROR([libcrypto not found])) AC_MSG_ERROR([libcrypto not found]))
@ -58,8 +58,8 @@ Last-Update: <YYYY-MM-DD>
AC_CHECK_DECL([SHA256_DIGEST_LENGTH], AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
AC_DEFINE([HAVE_SHA256], 1, AC_DEFINE([HAVE_SHA256], 1,
--- opendkim/opendkim-crypto.c --- a/opendkim/opendkim-crypto.c
+++ opendkim/opendkim-crypto.c +++ b/opendkim/opendkim-crypto.c
@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr) @@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
{ {
assert(pthread_setspecific(id_key, ptr) == 0); assert(pthread_setspecific(id_key, ptr) == 0);

View file

@ -13,7 +13,6 @@ homepage="http://www.opendkim.org"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
python_version=2 #unverified python_version=2 #unverified
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -fi autoreconf -fi

View file

@ -1,5 +1,5 @@
--- IlmBase/IexMath/IexMathFpu.cpp.orig 2019-12-01 15:42:08.143387128 +0100 --- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100
+++ IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 +++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100
@@ -281,10 +281,18 @@ @@ -281,10 +281,18 @@
inline void inline void
restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)

View file

@ -1,5 +1,5 @@
--- OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200 --- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200
+++ OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100 +++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
prefix=@prefix@ prefix=@prefix@
-exec_prefix=@exec_prefix@ -exec_prefix=@exec_prefix@

View file

@ -12,7 +12,6 @@ license="BSD-3-Clause"
homepage="https://www.openexr.com/" homepage="https://www.openexr.com/"
distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1 checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
patch_args=-Np0
pre_configure() { pre_configure() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then

View file

@ -1,5 +1,5 @@
--- configure.orig 2015-05-09 05:42:21.144044831 +0200 --- a/configure 2015-05-09 05:42:21.144044831 +0200
+++ configure 2015-05-09 05:43:00.305016564 +0200 +++ b/configure 2015-05-09 05:43:00.305016564 +0200
@@ -8428,7 +8428,7 @@ linux-gnuoldld* | linux-gnuaout* | linux @@ -8428,7 +8428,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
;; ;;

View file

@ -1,5 +1,5 @@
--- Makefile.prog.in --- a/Makefile.prog.in
+++ Makefile.prog.in +++ b/Makefile.prog.in
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
ALL_LIBS = $(XLIBS) $(LIBS) ALL_LIBS = $(XLIBS) $(LIBS)
Makefile.lt: Makefile.lt:

View file

@ -1,8 +1,8 @@
Use Getopt::Std in place of getopts.pl. Use Getopt::Std in place of getopts.pl.
https://bugs.gentoo.org/show_bug.cgi?id=420083 https://bugs.gentoo.org/show_bug.cgi?id=420083
--- msggen.pl --- a/msggen.pl
+++ msggen.pl +++ b/msggen.pl
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
# See the file COPYING for copying permission. # See the file COPYING for copying permission.

View file

@ -2,8 +2,8 @@ $NetBSD: patch-jade_TeXFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $
Fix building with Clang. Fix building with Clang.
--- jade/TeXFOTBuilder.cxx.orig 2011-04-22 07:00:24.000000000 +0000 --- a/jade/TeXFOTBuilder.cxx 2011-04-22 07:00:24.000000000 +0000
+++ jade/TeXFOTBuilder.cxx +++ b/jade/TeXFOTBuilder.cxx
@@ -1873,8 +1873,8 @@ static OutputByteStream &operator<<(Outp @@ -1873,8 +1873,8 @@ static OutputByteStream &operator<<(Outp
FOTBuilder *makeTeXFOTBuilder(OutputByteStream *os, Messenger *mgr, FOTBuilder *makeTeXFOTBuilder(OutputByteStream *os, Messenger *mgr,
const FOTBuilder::Extension *&ext) const FOTBuilder::Extension *&ext)

View file

@ -2,8 +2,8 @@ $NetBSD: patch-jade_TransformFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $
Fix building with Clang. Fix building with Clang.
--- jade/TransformFOTBuilder.cxx.orig 2011-04-22 07:04:25.000000000 +0000 --- a/jade/TransformFOTBuilder.cxx 2011-04-22 07:04:25.000000000 +0000
+++ jade/TransformFOTBuilder.cxx +++ b/jade/TransformFOTBuilder.cxx
@@ -248,12 +248,12 @@ FOTBuilder *makeTransformFOTBuilder(CmdL @@ -248,12 +248,12 @@ FOTBuilder *makeTransformFOTBuilder(CmdL
const Vector<StringC> &options, const Vector<StringC> &options,
const FOTBuilder::Extension *&ext) const FOTBuilder::Extension *&ext)

View file

@ -19,7 +19,6 @@ homepage="http://openjade.sourceforge.net/"
license="MIT" license="MIT"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-$version.tar.gz" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-$version.tar.gz"
checksum=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 checksum=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
patch_args=-Np0
CXXFLAGS="-fno-lifetime-dse" CXXFLAGS="-fno-lifetime-dse"

View file

@ -13,8 +13,8 @@ DESTDIR usage).
diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
index 8a726697a..2925108ad 100644 index 8a726697a..2925108ad 100644
--- cmake/OpenJPEGConfig.cmake.in --- a/cmake/OpenJPEGConfig.cmake.in
+++ cmake/OpenJPEGConfig.cmake.in +++ b/cmake/OpenJPEGConfig.cmake.in
@@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) @@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
# This is an install tree # This is an install tree
include(${SELF_DIR}/OpenJPEGTargets.cmake) include(${SELF_DIR}/OpenJPEGTargets.cmake)

View file

@ -13,8 +13,8 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in
index 2925108ad..6e88036c6 100644 index 2925108ad..6e88036c6 100644
--- cmake/OpenJPEGConfig.cmake.in --- a/cmake/OpenJPEGConfig.cmake.in
+++ cmake/OpenJPEGConfig.cmake.in +++ b/cmake/OpenJPEGConfig.cmake.in
@@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) @@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@")
file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")

View file

@ -12,7 +12,6 @@ license="BSD-2-Clause"
homepage="http://www.openjpeg.org/" homepage="http://www.openjpeg.org/"
distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz" distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz"
checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

View file

@ -1,7 +1,7 @@
Index: CMakeOlxCommon.cmake Index: CMakeOlxCommon.cmake
=================================================================== ===================================================================
--- CMakeOlxCommon.cmake.orig --- a/CMakeOlxCommon.cmake
+++ CMakeOlxCommon.cmake +++ b/CMakeOlxCommon.cmake
@@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support @@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support
OPTION(DISABLE_JOYSTICK "Disable joystick support" No) OPTION(DISABLE_JOYSTICK "Disable joystick support" No)
OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No) OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No)

View file

@ -1,5 +1,5 @@
--- src/client/CrashHandler.cpp --- a/src/client/CrashHandler.cpp
+++ src/client/CrashHandler.cpp +++ b/src/client/CrashHandler.cpp
@@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
#include "../breakpad/BreakPad.h" #include "../breakpad/BreakPad.h"

View file

@ -17,7 +17,6 @@ distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar.
checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb
python_version=2 python_version=2
replaces="openlierox-data>=0" replaces="openlierox-data>=0"
patch_args=-Np0
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

View file

@ -6,8 +6,8 @@ https://github.com/open-mpi/ompi/pull/8892
diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am
index 5c0dd33564..8a03fcd387 100644 index 5c0dd33564..8a03fcd387 100644
--- orte/orted/orted-mpir/Makefile.am --- a/orte/orted/orted-mpir/Makefile.am
+++ orte/orted/orted-mpir/Makefile.am +++ b/orte/orted/orted-mpir/Makefile.am
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS) CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS)

View file

@ -19,7 +19,6 @@ distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${versi
checksum=e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda checksum=e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda
nocross="configure attempts to run target binaries" nocross="configure attempts to run target binaries"
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
post_extract() { post_extract() {
vsed -e 's,sys/unistd.h,unistd.h,g' -i opal/include/opal/sys/cma.h vsed -e 's,sys/unistd.h,unistd.h,g' -i opal/include/opal/sys/cma.h

View file

@ -1,5 +1,5 @@
--- configure.ac 2017-06-13 02:47:58.000000000 +0200 --- a/configure.ac 2017-06-13 02:47:58.000000000 +0200
+++ - 2021-03-09 20:37:29.357052132 +0100 +++ b/configure.ac 2017-06-13 02:47:58.000000000 +0200
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
# check for libtls # check for libtls

View file

@ -1,5 +1,5 @@
--- src/ntpd.h.orig --- a/src/ntpd.h
+++ src/ntpd.h +++ b/src/ntpd.h
@@ -33,6 +33,10 @@ @@ -33,6 +33,10 @@
#include "ntp.h" #include "ntp.h"
@ -11,8 +11,8 @@
#define MAXIMUM(a, b) ((a) > (b) ? (a) : (b)) #define MAXIMUM(a, b) ((a) > (b) ? (a) : (b))
#ifndef NTPD_USER #ifndef NTPD_USER
--- src/log.c.orig --- a/src/log.c
+++ src/log.c +++ b/src/log.c
@@ -24,6 +24,10 @@ @@ -24,6 +24,10 @@
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>

View file

@ -13,7 +13,6 @@ license="ISC"
homepage="http://openntpd.org/" homepage="http://openntpd.org/"
distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
patch_args=-Np0
conf_files="/etc/ntpd.conf" conf_files="/etc/ntpd.conf"
provides="ntp-daemon-0_1" provides="ntp-daemon-0_1"

View file

@ -1,6 +1,6 @@
diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h
--- a/include/complib/cl_debug_osd.h 2019-04-17 04:02:47.000000000 -0400 --- a/include/complib/cl_debug_osd.h 2019-04-17 04:02:47.000000000 -0400
+++ include/complib/cl_debug_osd.h 2019-04-17 11:56:45.870471013 -0400 +++ b/include/complib/cl_debug_osd.h 2019-04-17 11:56:45.870471013 -0400
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
#define _CL_DEBUG_OSD_H_ #define _CL_DEBUG_OSD_H_
@ -12,7 +12,7 @@ diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h
# define BEGIN_C_DECLS extern "C" { # define BEGIN_C_DECLS extern "C" {
diff -ru a/include/complib/cl_types.h include/complib/cl_types.h diff -ru a/include/complib/cl_types.h include/complib/cl_types.h
--- a/include/complib/cl_types.h 2019-04-17 04:02:47.000000000 -0400 --- a/include/complib/cl_types.h 2019-04-17 04:02:47.000000000 -0400
+++ include/complib/cl_types.h 2019-04-17 11:57:35.064280498 -0400 +++ b/include/complib/cl_types.h 2019-04-17 11:57:35.064280498 -0400
@@ -56,6 +56,9 @@ @@ -56,6 +56,9 @@
BEGIN_C_DECLS BEGIN_C_DECLS
#include <complib/cl_types_osd.h> #include <complib/cl_types_osd.h>
@ -25,7 +25,7 @@ diff -ru a/include/complib/cl_types.h include/complib/cl_types.h
typedef uint64_t net64_t; typedef uint64_t net64_t;
diff -ru a/opensm/osm_db_files.c opensm/osm_db_files.c diff -ru a/opensm/osm_db_files.c opensm/osm_db_files.c
--- a/opensm/osm_db_files.c 2019-04-17 04:02:47.000000000 -0400 --- a/opensm/osm_db_files.c 2019-04-17 04:02:47.000000000 -0400
+++ opensm/osm_db_files.c 2019-04-17 11:58:57.600529423 -0400 +++ b/opensm/osm_db_files.c 2019-04-17 11:58:57.600529423 -0400
@@ -394,7 +394,7 @@ @@ -394,7 +394,7 @@
p_accum_val); p_accum_val);

View file

@ -11,7 +11,6 @@ license="GPL-2.0-only"
homepage="https://github.com/linux-rdma/opensm" homepage="https://github.com/linux-rdma/opensm"
distfiles="https://github.com/linux-rdma/opensm/releases/download/${version}/opensm-${version}.tar.gz" distfiles="https://github.com/linux-rdma/opensm/releases/download/${version}/opensm-${version}.tar.gz"
checksum=1e0dc56a5cf5f8e5cd68bd534591405a5f5f1975ace40509f61a43cc2fe74ca7 checksum=1e0dc56a5cf5f8e5cd68bd534591405a5f5f1975ace40509f61a43cc2fe74ca7
patch_args=-Np0
pre_configure() { pre_configure() {
./autogen.sh ./autogen.sh

View file

@ -1,7 +1,7 @@
diff --git a/extras/tables/table-ldap/ber.h b/extras/tables/table-ldap/ber.h diff --git a/extras/tables/table-ldap/ber.h b/extras/tables/table-ldap/ber.h
index d656508..b92656c 100644 index d656508..b92656c 100644
--- extras/tables/table-ldap/ber.h --- a/extras/tables/table-ldap/ber.h
+++ extras/tables/table-ldap/ber.h +++ b/extras/tables/table-ldap/ber.h
@@ -75,7 +75,9 @@ struct ber_oid { @@ -75,7 +75,9 @@ struct ber_oid {
size_t bo_n; size_t bo_n;
}; };

View file

@ -16,7 +16,6 @@ license="ISC"
homepage="https://www.opensmtpd.org" homepage="https://www.opensmtpd.org"
distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz" distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz"
checksum=126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf checksum=126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf
patch_args=-Np0
CFLAGS="-D_DEFAULT_SOURCE" CFLAGS="-D_DEFAULT_SOURCE"

View file

@ -1,5 +1,5 @@
--- configure.ac.orig --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -1207,8 +1207,8 @@ @@ -1207,8 +1207,8 @@
dnl # stripping any trailing slash. If for some strage reason our program dnl # stripping any trailing slash. If for some strage reason our program
dnl # does not find what it needs, we default to /var/spool/mail. dnl # does not find what it needs, we default to /var/spool/mail.

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