srcpkgs/w*: convert patches to -Np1
* wine 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
Đoàn Trần Công Danh
parent
76acfa2dd2
commit
04b9978a29
81 changed files with 174 additions and 198 deletions
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile.in 2014-11-22 12:00:00.000000000 +0100
|
||||
+++ Makefile.in 2016-05-03 23:44:44.859376553 +0200
|
||||
--- a/Makefile.in 2014-11-22 12:00:00.000000000 +0100
|
||||
+++ b/Makefile.in 2016-05-03 23:44:44.859376553 +0200
|
||||
@@ -836,7 +836,7 @@
|
||||
@echo "/* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */" > version.h
|
||||
@echo "#ifndef W_SCAN_VERSION_H" >> version.h
|
||||
|
|
@ -9,8 +9,8 @@
|
|||
@echo "#endif" >> version.h
|
||||
@echo "" >> version.h
|
||||
@chmod a-x version.h
|
||||
--- version.h 2014-11-22 11:59:56.000000000 +0100
|
||||
+++ version.h 2016-05-03 23:42:59.612376864 +0200
|
||||
--- a/version.h 2014-11-22 11:59:56.000000000 +0100
|
||||
+++ b/version.h 2016-05-03 23:42:59.612376864 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
/* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */
|
||||
#ifndef W_SCAN_VERSION_H
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- dump-xml.c 2014-11-22 09:49:26.000000000 +0100
|
||||
+++ dump-xml.c 2016-05-03 23:36:55.792377942 +0200
|
||||
--- a/dump-xml.c 2014-11-22 09:49:26.000000000 +0100
|
||||
+++ b/dump-xml.c 2016-05-03 23:36:55.792377942 +0200
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include "si_types.h"
|
||||
#include "dump-xml.h"
|
||||
--- scan.c 2014-11-23 10:59:26.000000000 +0100
|
||||
+++ scan.c 2016-05-03 23:39:03.783377563 +0200
|
||||
--- a/scan.c 2014-11-23 10:59:26.000000000 +0100
|
||||
+++ b/scan.c 2016-05-03 23:39:03.783377563 +0200
|
||||
@@ -51,6 +51,7 @@
|
||||
-#include <sys/poll.h>
|
||||
+#include <poll.h>
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
#include <signal.h>
|
||||
#include <assert.h>
|
||||
#include <getopt.h>
|
||||
--- emulate.c 2014-11-22 09:49:26.000000000 +0100
|
||||
+++ emulate.c 2016-05-03 23:40:41.457377274 +0200
|
||||
--- a/emulate.c 2014-11-22 09:49:26.000000000 +0100
|
||||
+++ b/emulate.c 2016-05-03 23:40:41.457377274 +0200
|
||||
@@ -3,6 +3,7 @@
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ license="GPL-2.0-only"
|
|||
homepage="http://wirbel.htpc-forum.de/w_scan/index2.html"
|
||||
distfiles="http://wirbel.htpc-forum.de/w_scan/w_scan-${version}.tar.bz2"
|
||||
checksum="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe"
|
||||
patch_args=-Np0
|
||||
|
||||
CFLAGS="-fcommon"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 12884cc..6139ae2 100644
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -36,7 +36,14 @@ if(UNIX OR MINGW)
|
||||
set(FILE_SYSTEM_LIB "stdc++fs")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/threadPool.cpp 2019-03-25 11:44:59.000000000 +0100
|
||||
+++ src/threadPool.cpp 2020-08-23 21:43:43.087489818 +0200
|
||||
--- a/src/threadPool.cpp 2019-03-25 11:44:59.000000000 +0100
|
||||
+++ b/src/threadPool.cpp 2020-08-23 21:43:43.087489818 +0200
|
||||
@@ -1,3 +1,4 @@
|
||||
+#include <cstdio>
|
||||
#include <thread>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ license="MIT"
|
|||
homepage="https://github.com/DeadSix27/waifu2x-converter-cpp"
|
||||
distfiles="${homepage}/archive/v${version}.tar.gz"
|
||||
checksum=e10bd5c64015553d1340988cf886aa51ed3cf4108f1a3ba864b3ea818426de7d
|
||||
patch_args=-Np0
|
||||
|
||||
# silly workaround to prevent vector/bool/etc from being defined
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ Closes: https://github.com/cyclopsian/wdisplays/issues/18
|
|||
|
||||
diff --git a/src/outputs.c b/src/outputs.c
|
||||
index 9ebf7e5..40410ec 100644
|
||||
--- src/outputs.c
|
||||
+++ src/outputs.c
|
||||
--- a/src/outputs.c
|
||||
+++ b/src/outputs.c
|
||||
@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry,
|
||||
|
||||
if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) {
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://cyclopsian.github.io/wdisplays/"
|
||||
distfiles="https://github.com/cyclopsian/wdisplays/archive/${version}.tar.gz"
|
||||
checksum=fa34d5bdfd87d833e18a89b2acacc27833d7297374719773a705f2d3e89cdddf
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Updated by @q66.
|
|||
|
||||
diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
|
||||
index dbe211d..4da5fbd 100644
|
||||
--- Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
|
||||
+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
|
||||
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
|
||||
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "JSArrayBufferView.h"
|
||||
#include "ThrowScope.h"
|
||||
|
|
@ -115,8 +115,8 @@ index dbe211d..4da5fbd 100644
|
|||
{
|
||||
diff --git Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
|
||||
index 126f33c..0913af5 100644
|
||||
--- Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
|
||||
+++ Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
|
||||
--- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
|
||||
+++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewPrototypeFunctions.h
|
||||
@@ -208,9 +208,36 @@ ALWAYS_INLINE EncodedJSValue genericTypedArrayViewProtoFuncIncludes(VM& vm, JSGl
|
||||
scope.assertNoException();
|
||||
RELEASE_ASSERT(!thisObject->isDetached());
|
||||
|
|
@ -158,8 +158,8 @@ index 126f33c..0913af5 100644
|
|||
} else {
|
||||
diff --git Source/WTF/wtf/FlipBytes.h Source/WTF/wtf/FlipBytes.h
|
||||
index 6cd7126..24708f7 100644
|
||||
--- Source/WTF/wtf/FlipBytes.h
|
||||
+++ Source/WTF/wtf/FlipBytes.h
|
||||
--- a/Source/WTF/wtf/FlipBytes.h
|
||||
+++ b/Source/WTF/wtf/FlipBytes.h
|
||||
@@ -24,6 +24,7 @@
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
This should fix a recent regression in JSC CLoop on BE/32bit.
|
||||
|
||||
--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
@@ -425,7 +425,7 @@ end)
|
||||
op(llint_get_host_call_return_value, macro ()
|
||||
functionPrologue()
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Fix code emitted for armv6l to not use movw/movt but ldr.
|
|||
See https://bugs.webkit.org/show_bug.cgi?id=131612
|
||||
and https://bugs.webkit.org/show_bug.cgi?id=141288
|
||||
|
||||
--- Source/JavaScriptCore/offlineasm/arm.rb 2015-07-22 14:37:57.000000000 +0200
|
||||
+++ Source/JavaScriptCore/offlineasm/arm.rb 2015-08-08 00:31:21.011824644 +0200
|
||||
--- a/Source/JavaScriptCore/offlineasm/arm.rb 2015-07-22 14:37:57.000000000 +0200
|
||||
+++ b/Source/JavaScriptCore/offlineasm/arm.rb 2015-08-08 00:31:21.011824644 +0200
|
||||
@@ -546,8 +546,16 @@
|
||||
$asm.puts "mov #{armFlippedOperands(operands)}"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Subject: [PATCH] portable little endian check
|
|||
|
||||
diff --git Source/ThirdParty/xdgmime/src/xdgmimemagic.c Source/ThirdParty/xdgmime/src/xdgmimemagic.c
|
||||
index 3a62b9d..9bd4e1d 100644
|
||||
--- Source/ThirdParty/xdgmime/src/xdgmimemagic.c
|
||||
+++ Source/ThirdParty/xdgmime/src/xdgmimemagic.c
|
||||
--- a/Source/ThirdParty/xdgmime/src/xdgmimemagic.c
|
||||
+++ b/Source/ThirdParty/xdgmime/src/xdgmimemagic.c
|
||||
@@ -485,8 +485,7 @@ _xdg_mime_magic_parse_magic_line (FILE *magic_file,
|
||||
_xdg_mime_magic_matchlet_free (matchlet);
|
||||
return XDG_MIME_MAGIC_ERROR;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Source: Debian
|
||||
--- Source/cmake/WebKitCompilerFlags.cmake.orig 2020-12-15 15:29:50.240722972 +0700
|
||||
+++ Source/cmake/WebKitCompilerFlags.cmake 2020-12-15 15:29:59.659853014 +0700
|
||||
--- a/Source/cmake/WebKitCompilerFlags.cmake 2020-12-15 15:29:50.240722972 +0700
|
||||
+++ b/Source/cmake/WebKitCompilerFlags.cmake 2020-12-15 15:29:59.659853014 +0700
|
||||
@@ -141,15 +141,6 @@
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ homepage="https://webkitgtk.org/"
|
|||
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
|
||||
checksum=136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917
|
||||
make_check=no
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser
|
||||
clang lto"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git src/wfuzz/__init__.py src/wfuzz/__init__.py
|
||||
index 05f04af..7e8a4a8 100644
|
||||
--- src/wfuzz/__init__.py
|
||||
+++ src/wfuzz/__init__.py
|
||||
--- a/src/wfuzz/__init__.py
|
||||
+++ b/src/wfuzz/__init__.py
|
||||
@@ -30,9 +30,9 @@ warnings.formatwarning = warning_on_one_line
|
||||
try:
|
||||
import pycurl
|
||||
|
|
|
|||
|
|
@ -12,4 +12,3 @@ license="GPL-2.0-only"
|
|||
homepage="http://wfuzz.org"
|
||||
distfiles="https://github.com/xmendez/wfuzz/archive/v${version}.tar.gz"
|
||||
checksum=60798e56274a377f8770d162935a040d4d6e27919bfbb46cf13a7a0a34896be9
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git src/agran_oscillator.c src/agran_oscillator.c
|
||||
index 6630215..3168469 100644
|
||||
--- src/agran_oscillator.c
|
||||
+++ src/agran_oscillator.c
|
||||
--- a/src/agran_oscillator.c
|
||||
+++ b/src/agran_oscillator.c
|
||||
@@ -421,6 +421,9 @@ create_grain_envelopes(unsigned long sample_rate)
|
||||
env[e].data[Y_CONTROL_PERIOD + peak + i] = ampl;
|
||||
env[e].data[Y_CONTROL_PERIOD + peak - i] = ampl;
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
|
|||
homepage="http://smbolton.com/whysynth.html"
|
||||
distfiles="http://smbolton.com/whysynth/whysynth-${version}.tar.bz2"
|
||||
checksum=a602d685a6bf48b01a82e1c077a50fe3d115805865ecfe49f531d8bd20b00b0b
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100
|
||||
+++ curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100
|
||||
--- a/curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100
|
||||
+++ b/curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100
|
||||
@@ -538,11 +538,12 @@
|
||||
self.bitrates = wireless.GetAvailableBitrates()
|
||||
self.bitrates.append('auto')
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300
|
||||
+++ curses/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300
|
||||
--- a/curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300
|
||||
+++ b/curses/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300
|
||||
@@ -1153,9 +1153,10 @@
|
||||
if not ui._started:
|
||||
return False
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'curses/wicd-curses.py'
|
||||
--- curses/wicd-curses.py 2014-12-21 16:57:33 +0000
|
||||
+++ curses/wicd-curses.py 2015-02-24 23:41:01 +0000
|
||||
--- a/curses/wicd-curses.py 2014-12-21 16:57:33 +0000
|
||||
+++ b/curses/wicd-curses.py 2015-02-24 23:41:01 +0000
|
||||
@@ -532,7 +532,10 @@
|
||||
def get_selected_profile(self):
|
||||
"""Get the selected wired profile"""
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ homepage="http://wicd.sourceforge.net"
|
|||
distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.tar.gz"
|
||||
checksum=67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62
|
||||
python_version=2
|
||||
patch_args=-Np0
|
||||
|
||||
do_build() {
|
||||
python2 setup.py configure --verbose --no-install-init \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -202,7 +202,7 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "RelWit
|
||||
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
|
||||
option(OPTION_ASAN "Build with AddressSanitizer" ON)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ reason: Our SDL2-devel package has a for cross broken sdl2-config.cmake,
|
|||
this patches switched back to a find module cmake script
|
||||
|
||||
---
|
||||
--- CMakeLists.txt 2020-07-19 19:54:00.744509368 +0200
|
||||
+++ - 2020-07-19 19:57:03.761863497 +0200
|
||||
--- a/CMakeLists.txt 2020-07-19 19:54:00.744509368 +0200
|
||||
+++ b/CMakeLists.txt 2020-07-19 19:54:00.744509368 +0200
|
||||
@@ -110,7 +110,7 @@
|
||||
find_package(PNG REQUIRED)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: cmake/WlFunctions.cmake
|
||||
===================================================================
|
||||
--- cmake/WlFunctions.cmake.orig
|
||||
+++ cmake/WlFunctions.cmake
|
||||
--- a/cmake/WlFunctions.cmake
|
||||
+++ b/cmake/WlFunctions.cmake
|
||||
@@ -289,5 +289,5 @@ function(wl_binary NAME)
|
||||
|
||||
#Quoting the CMake documentation on DESTINATION:
|
||||
|
|
@ -11,8 +11,8 @@ Index: cmake/WlFunctions.cmake
|
|||
endfunction()
|
||||
Index: xdg/CMakeLists.txt
|
||||
===================================================================
|
||||
--- xdg/CMakeLists.txt.orig
|
||||
+++ xdg/CMakeLists.txt
|
||||
--- a/xdg/CMakeLists.txt
|
||||
+++ b/xdg/CMakeLists.txt
|
||||
@@ -6,19 +6,19 @@ set(XDG_APPLICATION_ID "org.widelands.Wi
|
||||
list(APPEND icon_sizes "16" "32" "48" "64" "128")
|
||||
foreach (icon_size ${icon_sizes})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 018d9ea0..827bf33e 100644
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -312,19 +312,15 @@ IF (WIN32)
|
||||
endif (CMAKE_SIZEOF_VOID_P EQUAL 4)
|
||||
endif (WIN32)
|
||||
|
|
@ -33,8 +33,8 @@ index 018d9ea0..827bf33e 100644
|
|||
include (${CMAKE_SOURCE_DIR}/cmake/BzrRevision.cmake)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 31f5a76e..1f27495f 100644
|
||||
--- src/CMakeLists.txt
|
||||
+++ src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -140,9 +140,9 @@ wl_library(widelands_options
|
||||
logic_filesystem_constants
|
||||
)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ homepage="http://www.widelands.org/"
|
|||
distfiles="https://github.com/widelands/widelands/archive/build${version}.tar.gz>${pkgname}-${version}.tar.gz"
|
||||
checksum=601e0e4c6f91b3fb0ece2cd1b83ecfb02344a1b9194fbb70ef3f70e06994e357
|
||||
replaces="widelands-data>=0"
|
||||
patch_args=-Np0
|
||||
|
||||
CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git src/wildmidi.c src/wildmidi.c
|
||||
index a9ae0f1..fd9c5e7 100644
|
||||
--- src/wildmidi.c
|
||||
+++ src/wildmidi.c
|
||||
--- a/src/wildmidi.c
|
||||
+++ b/src/wildmidi.c
|
||||
@@ -1997,7 +1997,7 @@ int main(int argc, char **argv) {
|
||||
WildMidi_ClearError();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ license="GPL-3.0-or-later, LGPL-3.0-only"
|
|||
homepage="https://www.mindwerks.net/projects/wildmidi"
|
||||
distfiles="https://github.com/Mindwerks/${pkgname}/archive/${pkgname}-${version}.tar.gz"
|
||||
checksum=6f267c8d331e9859906837e2c197093fddec31829d2ebf7b958cf6b7ae935430
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
vsconf ${FILESDIR}/wildmidi.cfg
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ Reason: wine/unicode.h does not exist anymore and also strrchrW()
|
|||
scan over the application_path array to find the rightmost
|
||||
backslash (\) and period (.) for creating the application_name.
|
||||
|
||||
--- wineasio/asio.c 2013-10-28 15:22:00.000000000 +0100
|
||||
+++ wineasio/asio.c 2021-02-07 21:18:46.741180398 +0100
|
||||
--- a/wineasio/asio.c 2013-10-28 15:22:00.000000000 +0100
|
||||
+++ b/wineasio/asio.c 2021-02-07 21:18:46.741180398 +0100
|
||||
@@ -24,6 +24,7 @@
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz
|
|||
https://www.steinberg.net/sdk_downloads/asiosdk2.3.zip"
|
||||
checksum="9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b
|
||||
69225020e9144af568784c6076b55939a55369edaf0ffcdf4d5e5b5898f31b9b"
|
||||
patch_args=-Np0
|
||||
|
||||
pre_configure() {
|
||||
cp -v ../ASIOSDK2.3/common/asio.h asio.h
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/findFile.cpp 2013-03-27 22:57:44.000000000 +0100
|
||||
+++ src/findFile.cpp 2014-02-17 17:16:01.256683107 +0100
|
||||
--- a/src/findFile.cpp 2013-03-27 22:57:44.000000000 +0100
|
||||
+++ b/src/findFile.cpp 2014-02-17 17:16:01.256683107 +0100
|
||||
@@ -37,14 +37,14 @@
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="http://en.congelli.eu/prog_info_winusb.html"
|
||||
distfiles="http://ponce.cc/slackware/sources/repo/${pkgname}-${version}.tar.gz"
|
||||
checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9
|
||||
patch_args=-Np0
|
||||
|
||||
case "${XBPS_TARGET_MACHINE}" in
|
||||
x86_64*) depends+=" grub-x86_64-efi"; makedepends+=" grub-x86_64-efi" ;;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Source: Johannes (@jnbr)
|
||||
Upstream: no
|
||||
|
||||
--- tools/lemon/CMakeLists.txt 2019-02-28 18:56:38.000000000 +0100
|
||||
+++ tools/lemon/CMakeLists.txt 2019-03-11 20:41:14.211616335 +0100
|
||||
--- a/tools/lemon/CMakeLists.txt 2019-02-28 18:56:38.000000000 +0100
|
||||
+++ b/tools/lemon/CMakeLists.txt 2019-03-11 20:41:14.211616335 +0100
|
||||
@@ -7,6 +7,14 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#
|
||||
|
|
@ -27,8 +27,8 @@ Upstream: no
|
|||
# Editor modelines - https://www.wireshark.org/tools/modelines.html
|
||||
#
|
||||
|
||||
--- cmake/modules/UseLemon.cmake 2019-02-28 18:56:38.000000000 +0100
|
||||
+++ cmake/modules/UseLemon.cmake 2019-03-11 21:19:28.352163076 +0100
|
||||
--- a/cmake/modules/UseLemon.cmake 2019-02-28 18:56:38.000000000 +0100
|
||||
+++ b/cmake/modules/UseLemon.cmake 2019-03-11 21:19:28.352163076 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
# These files are generated as side-effect
|
||||
${_out}.h
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
# see: https://travis-ci.org/Piraty/void-packages/jobs/562765059#L5398-L5411
|
||||
# upstream: no
|
||||
|
||||
--- ui/qt/CMakeLists.txt
|
||||
+++ ui/qt/CMakeLists.txt
|
||||
--- a/ui/qt/CMakeLists.txt
|
||||
+++ b/ui/qt/CMakeLists.txt
|
||||
@@ -601,7 +601,7 @@
|
||||
# so this has no unwanted side effects. This mtime started appearing in
|
||||
# Qt 5.8. The option to force the old file format without mtime was
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ homepage="https://www.wireshark.org"
|
|||
distfiles="https://www.wireshark.org/download/src/${pkgname}-${version}.tar.xz"
|
||||
checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
|
||||
system_groups="wireshark"
|
||||
patch_args=-Np0
|
||||
|
||||
CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
|
||||
CXXFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -ur Client.C Client.C
|
||||
--- Client.C 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ Client.C 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/Client.C 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/Client.C 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -400,7 +400,7 @@
|
||||
}
|
||||
|
||||
|
|
@ -20,8 +20,8 @@ diff -ur Client.C Client.C
|
|||
|
||||
|
||||
diff -ur Client.h Client.h
|
||||
--- Client.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ Client.h 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/Client.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/Client.h 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -2,6 +2,8 @@
|
||||
#ifndef _CLIENT_H_
|
||||
#define _CLIENT_H_
|
||||
|
|
@ -41,8 +41,8 @@ diff -ur Client.h Client.h
|
|||
|
||||
// accessors
|
||||
diff -ur General.h General.h
|
||||
--- General.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ General.h 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/General.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/General.h 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -32,7 +32,7 @@
|
||||
#define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
|
||||
|
||||
|
|
@ -53,8 +53,8 @@ diff -ur General.h General.h
|
|||
|
||||
#define signal(x,y) \
|
||||
diff -ur Makefile Makefile
|
||||
--- Makefile 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ Makefile 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/Makefile 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/Makefile 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -1,8 +1,6 @@
|
||||
|
||||
-LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm
|
||||
|
|
@ -67,8 +67,8 @@ diff -ur Makefile Makefile
|
|||
OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
|
||||
|
||||
diff -ur Manager.C Manager.C
|
||||
--- Manager.C 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ Manager.C 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/Manager.C 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/Manager.C 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -368,7 +368,7 @@
|
||||
return m_currentTime;
|
||||
}
|
||||
|
|
@ -79,8 +79,8 @@ diff -ur Manager.C Manager.C
|
|||
m_signalled = True;
|
||||
}
|
||||
diff -ur Manager.h Manager.h
|
||||
--- Manager.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ Manager.h 2007-06-30 16:56:10.000000000 +0200
|
||||
--- a/Manager.h 1997-03-21 12:12:30.000000000 +0100
|
||||
+++ b/Manager.h 2007-06-30 16:56:10.000000000 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
static Boolean m_initialising;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile.bck 2016-06-20 11:50:20.743169924 -0400
|
||||
+++ Makefile 2016-06-20 11:50:28.302087497 -0400
|
||||
--- a/Makefile.bck 2016-06-20 11:50:20.743169924 -0400
|
||||
+++ b/Makefile 2016-06-20 11:50:28.302087497 -0400
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
wm2: $(OBJECTS)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ license="BSD"
|
|||
homepage="http://www.all-day-breakfast.com/wm2"
|
||||
distfiles="http://www.all-day-breakfast.com/wm2/wm2-${version}.tar.gz"
|
||||
checksum=a6c3352390f958c5033408ce73e1abd9677372a7c8c5949e39a62fda433b054d
|
||||
patch_args=-Np0
|
||||
|
||||
do_install() {
|
||||
vbin wm2
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Description: Correct 64 Architecture implementation of 32 bit data
|
|||
Author: Chris Donoghue <cdonoghu@gmail.com>
|
||||
Bug-Debian: http://bugs.debian.org/362068
|
||||
|
||||
--- main.c
|
||||
+++ main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis
|
||||
*
|
||||
* long_length = Specifies the length in 32-bit multiples of the
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://sites.google.com/site/tstyblo/wmctrl/"
|
||||
distfiles="https://sites.google.com/site/tstyblo/wmctrl/wmctrl-${version}.tar.gz"
|
||||
checksum=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Subject: [PATCH] Always install executables
|
|||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ecfbb83..29c45b9 100644
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -260,12 +260,10 @@ generate_pkg_config ("${CMAKE_CURRENT_BINARY_DIR}/libwoff2enc.pc"
|
||||
LIBRARIES woff2enc)
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Subject: [PATCH] Don't set rpath
|
|||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ecfbb83..da8ecf1 100644
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -21,16 +21,6 @@ option(NOISY_LOGGING "Noisy logging" ON)
|
||||
# Version information
|
||||
set(WOFF2_VERSION 1.0.2)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://github.com/google/woff2"
|
||||
distfiles="https://github.com/google/woff2/archive/v${version}.tar.gz"
|
||||
checksum=add272bb09e6384a4833ffca4896350fdb16e0ca22df68c0384773c67a175594
|
||||
patch_args=-Np0
|
||||
|
||||
libwoff2common1.0.2_package() {
|
||||
short_desc+=" - common library"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# Parent ac8dc17ab751b13b6d4ddcc1a1467e4beb8d7d26
|
||||
The mode thread will not be joined multiple times as this causes segfaults under musl
|
||||
|
||||
--- src/wofi.c
|
||||
+++ src/wofi.c
|
||||
--- a/src/wofi.c
|
||||
+++ b/src/wofi.c
|
||||
@@ -103,6 +103,7 @@
|
||||
static bool dynamic_lines;
|
||||
static struct wl_list mode_list;
|
||||
|
|
|
|||
|
|
@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://hg.sr.ht/~scoopta/wofi"
|
||||
distfiles="https://hg.sr.ht/~scoopta/wofi/archive/v${version}.tar.gz"
|
||||
checksum=@fee85efc35e97946d3a94562775b902982c4ab1f521208308ecc4bb41547a5e3
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -97,7 +97,7 @@
|
||||
|
||||
hide = @
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/c/arch/unix/x11/x11.h.orig
|
||||
+++ src/c/arch/unix/x11/x11.h
|
||||
--- a/src/c/arch/unix/x11/x11.h
|
||||
+++ b/src/c/arch/unix/x11/x11.h
|
||||
@@ -7,7 +7,7 @@
|
||||
#define X11_H
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/c/arch/unix/cursesw/dpy.c
|
||||
+++ src/c/arch/unix/cursesw/dpy.c
|
||||
--- a/src/c/arch/unix/cursesw/dpy.c
|
||||
+++ b/src/c/arch/unix/cursesw/dpy.c
|
||||
@@ -12,6 +12,8 @@
|
||||
|
||||
#define KEY_TIMEOUT (KEY_MAX + 1)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ license="MIT"
|
|||
homepage="http://cowlark.com/wordgrinder"
|
||||
distfiles="https://github.com/davidgiven/wordgrinder/archive/${version}.tar.gz"
|
||||
checksum=856cbed2b4ccd5127f61c4997a30e642d414247970f69932f25b4b5a81b18d3f
|
||||
patch_args=-Np0
|
||||
|
||||
do_configure() {
|
||||
export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- common/src/Locale.cc.orig 2021-03-27 14:52:02.000000000 +0100
|
||||
+++ common/src/Locale.cc 2021-05-28 14:21:29.997236437 +0200
|
||||
--- a/common/src/Locale.cc 2021-03-27 14:52:02.000000000 +0100
|
||||
+++ b/common/src/Locale.cc 2021-05-28 14:21:29.997236437 +0200
|
||||
@@ -253,7 +253,7 @@
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="http://www.workrave.org/"
|
||||
distfiles="https://github.com/rcaelers/${pkgname}/archive/v${_realversion}.tar.gz"
|
||||
checksum=b9c8d1aaae16ca55c98d361a392f879a306a4ecf6db28663a7e96d0c205dabc0
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="pulseaudio"
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ Signed-off-by: Reed Wade <reedwade@misterbanal.net>
|
|||
|
||||
diff --git a/main.c b/main.c
|
||||
index cbdbb0f..cec1cc2 100644
|
||||
--- main.c
|
||||
+++ main.c
|
||||
--- a/main.c
|
||||
+++ b/main.c
|
||||
@@ -1,6 +1,4 @@
|
||||
|
||||
-#define _GNU_SOURCE
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="MIT"
|
|||
homepage="https://github.com/atx/wtype"
|
||||
distfiles="https://github.com/atx/${pkgname}/archive/v${version}.tar.gz"
|
||||
checksum=35615e61e57576a240d10308f9101ceb2ec7b3554fac60119b1416b84c1694b2
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile.in.orig 2014-12-11 02:14:39.418518774 +0100
|
||||
+++ Makefile.in 2014-12-11 02:16:30.418510467 +0100
|
||||
--- a/Makefile.in 2014-12-11 02:14:39.418518774 +0100
|
||||
+++ b/Makefile.in 2014-12-11 02:16:30.418510467 +0100
|
||||
@@ -21,6 +21,8 @@ ifeq ($(PC_LIBS),)
|
||||
endif
|
||||
LIBS+=$(PC_LIBS)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'Makefile.in'
|
||||
--- Makefile.in 2010-05-27 13:08:26 +0000
|
||||
+++ Makefile.in 2010-05-27 13:08:41 +0000
|
||||
--- a/Makefile.in 2010-05-27 13:08:26 +0000
|
||||
+++ b/Makefile.in 2010-05-27 13:08:41 +0000
|
||||
@@ -3,7 +3,7 @@
|
||||
WVPACKAGE_TARNAME=@PACKAGE_TARNAME@
|
||||
WVPACKAGE_VERSION=@PACKAGE_VERSION@
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
|
||||
=== modified file 'config.defaults.mk'
|
||||
--- config.defaults.mk 2010-05-27 13:08:26 +0000
|
||||
+++ config.defaults.mk 2010-05-27 13:43:03 +0000
|
||||
--- a/config.defaults.mk 2010-05-27 13:08:26 +0000
|
||||
+++ b/config.defaults.mk 2010-05-27 13:43:03 +0000
|
||||
@@ -13,7 +13,7 @@
|
||||
LIBS_PAM=-lpam
|
||||
LIBS_TCL=
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- wvrules-posix.mk
|
||||
+++ wvrules-posix.mk
|
||||
--- a/wvrules-posix.mk
|
||||
+++ b/wvrules-posix.mk
|
||||
@@ -85,12 +85,15 @@
|
||||
$(AR) s $1
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- wvmodemscan.cc.orig 2009-09-29 13:27:28.000000000 -0400
|
||||
+++ wvmodemscan.cc 2015-09-22 08:46:19.575860993 -0400
|
||||
--- a/wvmodemscan.cc 2009-09-29 13:27:28.000000000 -0400
|
||||
+++ b/wvmodemscan.cc 2015-09-22 08:46:19.575860993 -0400
|
||||
@@ -495,16 +495,8 @@
|
||||
// (no internal ISDN support) || !strncmp(e->d_name, "ttyI", 4);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,4 +13,3 @@ homepage="https://code.google.com/p/wvstreams/"
|
|||
distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
|
||||
checksum=5753d2005115aa4e365a1638f4eb6c076d4e2deafa46c3de38964918e7f62709
|
||||
conf_files="/etc/ppp/peers/wvdial /etc/ppp/peers/wvdial-pipe"
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- streams/wvstream.cc.orig 2016-11-30 11:01:20.506154631 +0400
|
||||
+++ streams/wvstream.cc 2016-11-30 11:09:08.821961476 +0400
|
||||
--- a/streams/wvstream.cc 2016-11-30 11:01:20.506154631 +0400
|
||||
+++ b/streams/wvstream.cc 2016-11-30 11:09:08.821961476 +0400
|
||||
@@ -907,9 +907,9 @@
|
||||
|
||||
if (forceable)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- argp/argp-fmtstream.h.orig 2016-11-30 11:59:03.981286513 +0400
|
||||
+++ argp/argp-fmtstream.h 2016-11-30 12:00:49.524271289 +0400
|
||||
--- a/argp/argp-fmtstream.h 2016-11-30 11:59:03.981286513 +0400
|
||||
+++ b/argp/argp-fmtstream.h 2016-11-30 12:00:49.524271289 +0400
|
||||
@@ -199,8 +199,8 @@
|
||||
extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
|
||||
extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
|
|||
|
||||
Index: argp/Makefile.in
|
||||
===================================================================
|
||||
--- argp/Makefile.in.old
|
||||
+++ argp/Makefile.in
|
||||
--- a/argp/Makefile.in.old
|
||||
+++ b/argp/Makefile.in
|
||||
@@ -137,7 +137,7 @@ AUTOMAKE = @AUTOMAKE@
|
||||
AWK = @AWK@
|
||||
CC = @CC@
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ See -gcc47-patch and -magic.patch in Fedora git:
|
|||
|
||||
http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
|
||||
|
||||
--- include/wvtask.h
|
||||
+++ include/wvtask.h
|
||||
--- a/include/wvtask.h
|
||||
+++ b/include/wvtask.h
|
||||
@@ -45,7 +45,8 @@
|
||||
typedef void TaskFunc(void *userdata);
|
||||
|
||||
|
|
@ -26,8 +26,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
|
|||
static WvTaskList all_tasks, free_tasks;
|
||||
|
||||
static void get_stack(WvTask &task, size_t size);
|
||||
--- include/wvuid.h
|
||||
+++ include/wvuid.h
|
||||
--- a/include/wvuid.h
|
||||
+++ b/include/wvuid.h
|
||||
@@ -7,6 +7,7 @@
|
||||
#ifndef __WVUID_H
|
||||
#define __WVUID_H
|
||||
|
|
@ -36,8 +36,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree
|
|||
#include "wvstring.h"
|
||||
|
||||
#if WIN32
|
||||
--- utils/wvtask.cc
|
||||
+++ utils/wvtask.cc
|
||||
--- a/utils/wvtask.cc
|
||||
+++ b/utils/wvtask.cc
|
||||
@@ -58,7 +58,8 @@
|
||||
int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
http://bugs.gentoo.org/333301
|
||||
|
||||
--- ipstreams/wvunixdgsocket.cc
|
||||
+++ ipstreams/wvunixdgsocket.cc
|
||||
--- a/ipstreams/wvunixdgsocket.cc
|
||||
+++ b/ipstreams/wvunixdgsocket.cc
|
||||
@@ -1,5 +1,5 @@
|
||||
#include "wvunixdgsocket.h"
|
||||
-#ifdef MACOS
|
||||
|
|
@ -9,8 +9,8 @@ http://bugs.gentoo.org/333301
|
|||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
--- streams/wvatomicfile.cc
|
||||
+++ streams/wvatomicfile.cc
|
||||
--- a/streams/wvatomicfile.cc
|
||||
+++ b/streams/wvatomicfile.cc
|
||||
@@ -11,7 +11,8 @@
|
||||
#include "wvfileutils.h"
|
||||
#include "wvstrutils.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- xplc/modulemgr.cc.old 2015-09-23 21:09:18.684676331 -0400
|
||||
+++ xplc/modulemgr.cc 2015-09-23 21:07:19.369914303 -0400
|
||||
--- a/xplc/modulemgr.cc.old 2015-09-23 21:09:18.684676331 -0400
|
||||
+++ b/xplc/modulemgr.cc 2015-09-23 21:07:19.369914303 -0400
|
||||
@@ -30,7 +30,5 @@
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
http://bugs.gentoo.org/304283
|
||||
|
||||
--- crypto/wvx509.cc
|
||||
+++ crypto/wvx509.cc
|
||||
--- a/crypto/wvx509.cc
|
||||
+++ b/crypto/wvx509.cc
|
||||
@@ -1157,7 +1157,11 @@
|
||||
|
||||
if (ext)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git crypto/wvcrl.cc crypto/wvcrl.cc
|
||||
index fa00c76..880ad85 100644
|
||||
--- crypto/wvcrl.cc
|
||||
+++ crypto/wvcrl.cc
|
||||
--- a/crypto/wvcrl.cc
|
||||
+++ b/crypto/wvcrl.cc
|
||||
@@ -357,31 +357,19 @@ bool WvCRL::isrevoked(WvStringParm serial_number) const
|
||||
ASN1_INTEGER *serial = serial_to_int(serial_number);
|
||||
if (serial)
|
||||
|
|
@ -49,8 +49,8 @@ index fa00c76..880ad85 100644
|
|||
debug(WvLog::Warning, "Can't convert serial number to ASN1 format. "
|
||||
diff --git crypto/wvdiffiehellman.cc crypto/wvdiffiehellman.cc
|
||||
index 7c0bf32..15cd104 100644
|
||||
--- crypto/wvdiffiehellman.cc
|
||||
+++ crypto/wvdiffiehellman.cc
|
||||
--- a/crypto/wvdiffiehellman.cc
|
||||
+++ b/crypto/wvdiffiehellman.cc
|
||||
@@ -39,24 +39,25 @@ WvDiffieHellman::WvDiffieHellman(const unsigned char *_key, int _keylen,
|
||||
{
|
||||
int problems;
|
||||
|
|
@ -133,8 +133,8 @@ index 7c0bf32..15cd104 100644
|
|||
info);
|
||||
diff --git crypto/wvdigest.cc crypto/wvdigest.cc
|
||||
index 150edee..73ebb5d 100644
|
||||
--- crypto/wvdigest.cc
|
||||
+++ crypto/wvdigest.cc
|
||||
--- a/crypto/wvdigest.cc
|
||||
+++ b/crypto/wvdigest.cc
|
||||
@@ -13,10 +13,10 @@
|
||||
|
||||
/***** WvEVPMDDigest *****/
|
||||
|
|
@ -203,8 +203,8 @@ index 150edee..73ebb5d 100644
|
|||
}
|
||||
diff --git crypto/wvocsp.cc crypto/wvocsp.cc
|
||||
index ddb2de4..8325ff2 100644
|
||||
--- crypto/wvocsp.cc
|
||||
+++ crypto/wvocsp.cc
|
||||
--- a/crypto/wvocsp.cc
|
||||
+++ b/crypto/wvocsp.cc
|
||||
@@ -118,9 +118,10 @@ bool WvOCSPResp::check_nonce(const WvOCSPReq &req) const
|
||||
|
||||
bool WvOCSPResp::signedbycert(const WvX509 &cert) const
|
||||
|
|
@ -248,8 +248,8 @@ index ddb2de4..8325ff2 100644
|
|||
|
||||
diff --git crypto/wvx509.cc crypto/wvx509.cc
|
||||
index e9dad0b..a9a47bc 100644
|
||||
--- crypto/wvx509.cc
|
||||
+++ crypto/wvx509.cc
|
||||
--- a/crypto/wvx509.cc
|
||||
+++ b/crypto/wvx509.cc
|
||||
@@ -974,7 +974,7 @@ static void add_aia(WvStringParm type, WvString identifier,
|
||||
sk_ACCESS_DESCRIPTION_push(ainfo, acc);
|
||||
acc->method = OBJ_txt2obj(type.cstr(), 0);
|
||||
|
|
@ -351,8 +351,8 @@ index e9dad0b..a9a47bc 100644
|
|||
|
||||
diff --git crypto/wvx509mgr.cc crypto/wvx509mgr.cc
|
||||
index f249eec..b504a9f 100644
|
||||
--- crypto/wvx509mgr.cc
|
||||
+++ crypto/wvx509mgr.cc
|
||||
--- a/crypto/wvx509mgr.cc
|
||||
+++ b/crypto/wvx509mgr.cc
|
||||
@@ -350,6 +350,13 @@ bool WvX509Mgr::signcert(WvX509 &unsignedcert) const
|
||||
return false;
|
||||
}
|
||||
|
|
@ -446,8 +446,8 @@ index f249eec..b504a9f 100644
|
|||
debug("Signature size: %s\n", buf.used());
|
||||
diff --git include/wvdiffiehellman.h include/wvdiffiehellman.h
|
||||
index af75ffa..a2d001f 100644
|
||||
--- include/wvdiffiehellman.h
|
||||
+++ include/wvdiffiehellman.h
|
||||
--- a/include/wvdiffiehellman.h
|
||||
+++ b/include/wvdiffiehellman.h
|
||||
@@ -27,7 +27,7 @@ public:
|
||||
bool create_secret(WvBuf &inbuf, size_t in_len, WvBuf& outbuf);
|
||||
|
||||
|
|
@ -459,8 +459,8 @@ index af75ffa..a2d001f 100644
|
|||
private:
|
||||
diff --git include/wvdigest.h include/wvdigest.h
|
||||
index fdc39bd..ce41dd8 100644
|
||||
--- include/wvdigest.h
|
||||
+++ include/wvdigest.h
|
||||
--- a/include/wvdigest.h
|
||||
+++ b/include/wvdigest.h
|
||||
@@ -9,10 +9,8 @@
|
||||
|
||||
#include "wvencoder.h"
|
||||
|
|
@ -512,8 +512,8 @@ index fdc39bd..ce41dd8 100644
|
|||
public:
|
||||
diff --git include/wvtripledes.h include/wvtripledes.h
|
||||
index 185fe8a..a442e7a 100644
|
||||
--- include/wvtripledes.h
|
||||
+++ include/wvtripledes.h
|
||||
--- a/include/wvtripledes.h
|
||||
+++ b/include/wvtripledes.h
|
||||
@@ -70,11 +70,11 @@ protected:
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile
|
||||
+++ Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -131,12 +131,19 @@
|
||||
# libwvstreams: stream/event handling library
|
||||
#
|
||||
|
|
@ -34,8 +34,8 @@
|
|||
TESTS += $(call tests_cc,dbus/tests)
|
||||
libwvdbus_OBJS += $(call objects,dbus)
|
||||
libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
|
||||
--- wvrules-posix.mk
|
||||
+++ wvrules-posix.mk
|
||||
--- a/wvrules-posix.mk
|
||||
+++ b/wvrules-posix.mk
|
||||
@@ -85,12 +85,15 @@
|
||||
$(AR) s $1
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- uniconf/wvconfemu.cc.old 2015-09-22 02:07:38.395970444 -0400
|
||||
+++ uniconf/wvconfemu.cc 2015-09-22 02:02:26.111102649 -0400
|
||||
--- a/uniconf/wvconfemu.cc.old 2015-09-22 02:07:38.395970444 -0400
|
||||
+++ b/uniconf/wvconfemu.cc 2015-09-22 02:02:26.111102649 -0400
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "strutils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- utils/wvcrash.cc.old 2015-09-22 02:27:09.219293510 -0400
|
||||
+++ utils/wvcrash.cc 2015-09-22 02:37:15.577967752 -0400
|
||||
--- a/utils/wvcrash.cc.old 2015-09-22 02:27:09.219293510 -0400
|
||||
+++ b/utils/wvcrash.cc 2015-09-22 02:37:15.577967752 -0400
|
||||
@@ -409,7 +409,7 @@
|
||||
void wvcrash_setup(const char *_argv0, const char *_desc)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- utils/wvcrash.cc.old 2015-09-22 01:51:19.515241821 -0400
|
||||
+++ utils/wvcrash.cc 2015-09-22 01:53:44.101443017 -0400
|
||||
--- a/utils/wvcrash.cc.old 2015-09-22 01:51:19.515241821 -0400
|
||||
+++ b/utils/wvcrash.cc 2015-09-22 01:53:44.101443017 -0400
|
||||
@@ -28,7 +28,10 @@
|
||||
// FIXME: this file mostly only works in Linux
|
||||
#ifdef __linux
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- utils/wvtask.cc.old 2015-09-22 05:49:32.911132004 -0400
|
||||
+++ utils/wvtask.cc 2015-09-22 05:50:36.230115961 -0400
|
||||
--- a/utils/wvtask.cc.old 2015-09-22 05:49:32.911132004 -0400
|
||||
+++ b/utils/wvtask.cc 2015-09-22 05:50:36.230115961 -0400
|
||||
@@ -540,7 +540,7 @@
|
||||
|
||||
const void *WvTaskMan::current_top_of_stack()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- utils/wvtask.cc.old 2015-09-22 05:49:32.911132004 -0400
|
||||
+++ utils/wvtask.cc 2015-09-22 06:48:44.627809854 -0400
|
||||
--- a/utils/wvtask.cc.old 2015-09-22 05:49:32.911132004 -0400
|
||||
+++ b/utils/wvtask.cc 2015-09-22 06:48:44.627809854 -0400
|
||||
@@ -200,7 +200,9 @@
|
||||
stacktop = (char *)alloca(0);
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
|
|||
configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
|
||||
conf_files="/etc/uniconf.conf"
|
||||
replaces="uniconf>=0"
|
||||
patch_args=-Np0
|
||||
|
||||
CXXFLAGS="-Wno-narrowing"
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Subject: [PATCH] Switch to wx-config-gtk3 to avoid conflict with
|
|||
|
||||
diff --git build.py build.py
|
||||
index 3cd5b828..57dbd384 100755
|
||||
--- build.py
|
||||
+++ build.py
|
||||
--- a/build.py
|
||||
+++ b/build.py
|
||||
@@ -400,7 +400,7 @@ def makeOptionParser():
|
||||
("mac_arch", ("", "Comma separated list of architectures to build on Mac")),
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ license="custom:wxWindows"
|
|||
homepage="http://www.wxpython.org/"
|
||||
distfiles="${PYPI_SITE}/w/wxPython/wxPython-${version}.tar.gz"
|
||||
checksum=3be608bfdede3063678cc703453850ab0a018b82bafd5ee057302250b18f0233
|
||||
patch_args=-Np0
|
||||
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Taken from
|
|||
https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch
|
||||
|
||||
diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
|
||||
--- src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
|
||||
+++ src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
|
||||
--- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
|
||||
+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
|
||||
@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
|
||||
msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
|
||||
lib.c_str(), progName.c_str(), prog.c_str());
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ license="custom:wxWindows"
|
|||
homepage="https://www.wxwidgets.org"
|
||||
distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
|
||||
checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
local _config="gtk3-unicode-3.0"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Taken from
|
|||
https://github.com/archlinux/svntogit-packages/blob/71ee17d529f8e0dc5c44d2fffb0dfa69b71daa0b/repos/extra-x86_64/make-abicheck-non-fatal.patch
|
||||
|
||||
diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
|
||||
--- src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
|
||||
+++ src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
|
||||
--- a/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
|
||||
+++ b/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
|
||||
@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
|
||||
msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
|
||||
lib.c_str(), progName.c_str(), prog.c_str());
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -Naur Makefile.in Makefile.in
|
||||
--- Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ Makefile.in 2014-11-19 10:48:18.752319058 +0100
|
||||
--- a/Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ b/Makefile.in 2014-11-19 10:48:18.752319058 +0100
|
||||
@@ -15258,9 +15258,11 @@
|
||||
|
||||
install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
|
||||
|
|
@ -15,8 +15,8 @@ diff -Naur Makefile.in Makefile.in
|
|||
$(DYLIB_RPATH_INSTALL)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
|
||||
for f in setup.h $(RCDEFS_H); do \
|
||||
--- Makefile.in.orig 2020-04-30 21:43:35.176560163 +0200
|
||||
+++ Makefile.in 2020-04-30 21:45:48.927132300 +0200
|
||||
--- a/Makefile.in.orig 2020-04-30 21:43:35.176560163 +0200
|
||||
+++ b/Makefile.in 2020-04-30 21:45:48.927132300 +0200
|
||||
@@ -16177,7 +16177,7 @@
|
||||
$(INSTALL_DIR) $(DESTDIR)$(bindir)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
|
||||
|
|
@ -45,8 +45,8 @@ diff -Naur Makefile.in Makefile.in
|
|||
done
|
||||
|
||||
diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl
|
||||
--- build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100
|
||||
--- a/build/bakefiles/wx.bkl 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ b/build/bakefiles/wx.bkl 2014-11-19 10:32:21.692283955 +0100
|
||||
@@ -137,7 +137,7 @@
|
||||
<using module="gettext"/>
|
||||
<gettext-catalogs id="locale">
|
||||
|
|
@ -57,8 +57,8 @@ diff -Naur build/bakefiles/wx.bkl build/bakefiles/wx.bkl
|
|||
ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
|
||||
zh zh_CN zh_TW
|
||||
diff -Naur src/common/translation.cpp src/common/translation.cpp
|
||||
--- src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100
|
||||
--- a/src/common/translation.cpp 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ b/src/common/translation.cpp 2014-11-19 11:02:21.067788665 +0100
|
||||
@@ -1471,7 +1471,7 @@
|
||||
|
||||
bool wxTranslations::AddStdCatalog()
|
||||
|
|
@ -69,8 +69,8 @@ diff -Naur src/common/translation.cpp src/common/translation.cpp
|
|||
|
||||
// there may be a catalog with toolkit specific overrides, it is not
|
||||
diff -Naur utils/wxrc/Makefile.in utils/wxrc/Makefile.in
|
||||
--- utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100
|
||||
--- a/utils/wxrc/Makefile.in 2014-10-06 23:33:44.000000000 +0200
|
||||
+++ b/utils/wxrc/Makefile.in 2014-11-19 10:49:55.410110669 +0100
|
||||
@@ -125,7 +125,6 @@
|
||||
@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
|
||||
@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ license="wxWindows"
|
|||
homepage="https://www.wxwidgets.org/"
|
||||
distfiles="https://github.com/wxWidgets/wxWidgets/releases/download/v${version}/wxWidgets-${version}.tar.bz2"
|
||||
checksum=440f6e73cf5afb2cbf9af10cec8da6cdd3d3998d527598a53db87099524ac807
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
local _config="gtk2-unicode-3.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue