srcpkgs/[A-Z]*: 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 e2a21ccfd6
commit ec4c2d75fa
117 changed files with 367 additions and 407 deletions

View file

@ -21,8 +21,8 @@ distance(_InputIter __first, _InputIter __last)
diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
index 594c21e5e..14c71680d 100644 index 594c21e5e..14c71680d 100644
--- src/search_replace_engine.cpp --- a/src/search_replace_engine.cpp
+++ src/search_replace_engine.cpp +++ b/src/search_replace_engine.cpp
@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() { @@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
if (MatchState ms = matches(&diag, 0)) { if (MatchState ms = matches(&diag, 0)) {
auto& diag_field = diag.*get_dialogue_field(settings.field); auto& diag_field = diag.*get_dialogue_field(settings.field);

View file

@ -14,8 +14,8 @@ Fix Aegisub/Aegisub#93
diff --git a/src/colour_button.cpp b/src/colour_button.cpp diff --git a/src/colour_button.cpp b/src/colour_button.cpp
index c0b1c5d58..48a87856c 100644 index c0b1c5d58..48a87856c 100644
--- src/colour_button.cpp --- a/src/colour_button.cpp
+++ src/colour_button.cpp +++ b/src/colour_button.cpp
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
#include "dialogs.h" #include "dialogs.h"
@ -27,8 +27,8 @@ index c0b1c5d58..48a87856c 100644
diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
index efb5cb481..fb62e3334 100644 index efb5cb481..fb62e3334 100644
--- src/subtitles_provider_libass.cpp --- a/src/subtitles_provider_libass.cpp
+++ src/subtitles_provider_libass.cpp +++ b/src/subtitles_provider_libass.cpp
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
#include <libaegisub/util.h> #include <libaegisub/util.h>
@ -40,8 +40,8 @@ index efb5cb481..fb62e3334 100644
diff --git a/src/video_frame.cpp b/src/video_frame.cpp diff --git a/src/video_frame.cpp b/src/video_frame.cpp
index 610005879..c51f929ac 100644 index 610005879..c51f929ac 100644
--- src/video_frame.cpp --- a/src/video_frame.cpp
+++ src/video_frame.cpp +++ b/src/video_frame.cpp
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
#include "video_frame.h" #include "video_frame.h"
@ -53,8 +53,8 @@ index 610005879..c51f929ac 100644
namespace { namespace {
diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
index b68b206b7..eca5ac261 100644 index b68b206b7..eca5ac261 100644
--- src/video_provider_dummy.cpp --- a/src/video_provider_dummy.cpp
+++ src/video_provider_dummy.cpp +++ b/src/video_provider_dummy.cpp
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
#include <boost/algorithm/string/predicate.hpp> #include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>

View file

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no Upstream: no
Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
--- src/ffmpegsource_common.cpp 2014-12-08 01:07:09.000000000 +0100 --- a/src/ffmpegsource_common.cpp 2014-12-08 01:07:09.000000000 +0100
+++ src/ffmpegsource_common.cpp 2021-01-18 21:12:42.209582337 +0100 +++ b/src/ffmpegsource_common.cpp 2021-01-18 21:12:42.209582337 +0100
@@ -98,7 +98,6 @@ @@ -98,7 +98,6 @@
ps->SetProgress(Current, Total); ps->SetProgress(Current, Total);
return ps->IsCancelled(); return ps->IsCancelled();
@ -13,8 +13,8 @@ Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
+ Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo); + Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
}); });
--- src/video_provider_ffmpegsource.cpp 2014-12-08 01:07:09.000000000 +0100 --- a/src/video_provider_ffmpegsource.cpp 2014-12-08 01:07:09.000000000 +0100
+++ src/video_provider_ffmpegsource.cpp 2021-01-18 21:07:47.205800051 +0100 +++ b/src/video_provider_ffmpegsource.cpp 2021-01-18 21:07:47.205800051 +0100
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
#include <libaegisub/fs.h> #include <libaegisub/fs.h>

View file

@ -1,8 +1,8 @@
Upstream: Yes Upstream: Yes
Author: sidneys <sidneys.github.io@outlook.com> Author: sidneys <sidneys.github.io@outlook.com>
Reason: fix build w/ ICU >= 60 Reason: fix build w/ ICU >= 60
--- libaegisub/common/character_count.cpp --- a/libaegisub/common/character_count.cpp
+++ libaegisub/common/character_count.cpp +++ b/libaegisub/common/character_count.cpp
@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) { @@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
static std::once_flag token; static std::once_flag token;
std::call_once(token, [&] { std::call_once(token, [&] {
@ -30,8 +30,8 @@ Reason: fix build w/ ICU >= 60
return str.size(); return str.size();
if (n == 0) if (n == 0)
return pos; return pos;
--- src/utils.cpp --- a/src/utils.cpp
+++ src/utils.cpp +++ b/src/utils.cpp
@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio @@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
} }
@ -44,8 +44,8 @@ Reason: fix build w/ ICU >= 60
iculoc.getDisplayName(iculoc, ustr); iculoc.getDisplayName(iculoc, ustr);
#ifdef _MSC_VER #ifdef _MSC_VER
return wxString(ustr.getBuffer()); return wxString(ustr.getBuffer());
--- src/utils.cpp --- a/src/utils.cpp
+++ src/utils.cpp +++ b/src/utils.cpp
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
#include <map> #include <map>

View file

@ -1,5 +1,5 @@
--- configure.ac 2021-01-18 20:39:16.546501531 +0100 --- a/configure.ac 2021-01-18 20:39:16.546501531 +0100
+++ configure.ac 2021-01-18 20:57:43.667587518 +0100 +++ b/configure.ac 2021-01-18 20:57:43.667587518 +0100
@@ -142,7 +142,8 @@ @@ -142,7 +142,8 @@
CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g" CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g" CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"

View file

@ -1,5 +1,5 @@
--- Makefile.inc.in --- a/Makefile.inc.in
+++ Makefile.inc.in +++ b/Makefile.inc.in
@@ -8,6 +8,7 @@ HAVE_OSS = @with_oss@ @@ -8,6 +8,7 @@ HAVE_OSS = @with_oss@
HAVE_PORTAUDIO = @with_portaudio@ HAVE_PORTAUDIO = @with_portaudio@
HAVE_FFMS2 = @with_ffms2@ HAVE_FFMS2 = @with_ffms2@
@ -8,8 +8,8 @@
############## ##############
# BUILD OUTPUT # BUILD OUTPUT
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp @@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support]) AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support]) AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
@ -20,8 +20,8 @@
###################################################### ######################################################
# Debugging support # Debugging support
###################################################### ######################################################
--- src/Makefile --- a/src/Makefile
+++ src/Makefile +++ b/src/Makefile
@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL) @@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
src_OBJ += $(d)spellchecker_hunspell.o src_OBJ += $(d)spellchecker_hunspell.o
endif endif

View file

@ -8,8 +8,8 @@ Applied-upstream: yes
Index: libaegisub/lua/modules/lpeg.c Index: libaegisub/lua/modules/lpeg.c
=================================================================== ===================================================================
--- libaegisub/lua/modules/lpeg.c --- a/libaegisub/lua/modules/lpeg.c
+++ libaegisub/lua/modules/lpeg.c +++ b/libaegisub/lua/modules/lpeg.c
@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) { @@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
} }
@ -30,8 +30,8 @@ Index: libaegisub/lua/modules/lpeg.c
{"__sub", diff_l}, {"__sub", diff_l},
Index: vendor/luabins/AUTHORS Index: vendor/luabins/AUTHORS
=================================================================== ===================================================================
--- vendor/luabins/AUTHORS --- a/vendor/luabins/AUTHORS
+++ vendor/luabins/AUTHORS +++ b/vendor/luabins/AUTHORS
@@ -2,3 +2,4 @@ Luabins authors: @@ -2,3 +2,4 @@ Luabins authors:
---------------- ----------------
@ -39,8 +39,8 @@ Index: vendor/luabins/AUTHORS
+hanxi <hanxi@gmail.com> +hanxi <hanxi@gmail.com>
Index: vendor/luabins/README.md Index: vendor/luabins/README.md
=================================================================== ===================================================================
--- vendor/luabins/README.md --- a/vendor/luabins/README.md
+++ vendor/luabins/README.md +++ b/vendor/luabins/README.md
@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib @@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
Allows to save tuples of primitive Lua types into binary chunks Allows to save tuples of primitive Lua types into binary chunks
and to load saved data back. and to load saved data back.
@ -52,8 +52,8 @@ Index: vendor/luabins/README.md
Index: vendor/luabins/src/luabins.c Index: vendor/luabins/src/luabins.c
=================================================================== ===================================================================
--- vendor/luabins/src/luabins.c --- a/vendor/luabins/src/luabins.c
+++ vendor/luabins/src/luabins.c +++ b/vendor/luabins/src/luabins.c
@@ -54,7 +54,7 @@ static int l_load(lua_State * L) @@ -54,7 +54,7 @@ static int l_load(lua_State * L)
} }
@ -65,8 +65,8 @@ Index: vendor/luabins/src/luabins.c
{ "load", l_load }, { "load", l_load },
Index: vendor/luabins/src/luaheaders.h Index: vendor/luabins/src/luaheaders.h
=================================================================== ===================================================================
--- vendor/luabins/src/luaheaders.h --- a/vendor/luabins/src/luaheaders.h
+++ vendor/luabins/src/luaheaders.h +++ b/vendor/luabins/src/luaheaders.h
@@ -7,6 +7,16 @@ extern "C" { @@ -7,6 +7,16 @@ extern "C" {
#include <lua.h> #include <lua.h>
@ -86,8 +86,8 @@ Index: vendor/luabins/src/luaheaders.h
#endif #endif
Index: vendor/luabins/src/luainternals.h Index: vendor/luabins/src/luainternals.h
=================================================================== ===================================================================
--- vendor/luabins/src/luainternals.h --- a/vendor/luabins/src/luainternals.h
+++ vendor/luabins/src/luainternals.h +++ b/vendor/luabins/src/luainternals.h
@@ -7,6 +7,24 @@ @@ -7,6 +7,24 @@
#ifndef LUABINS_LUAINTERNALS_H_INCLUDED_ #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
#define LUABINS_LUAINTERNALS_H_INCLUDED_ #define LUABINS_LUAINTERNALS_H_INCLUDED_
@ -124,7 +124,7 @@ Index: vendor/luabins/src/luainternals.h
Index: vendor/luabins/src/lualess.c Index: vendor/luabins/src/lualess.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ vendor/luabins/src/lualess.c +++ b/vendor/luabins/src/lualess.c
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
+/* +/*
+* lualess.h +* lualess.h
@ -160,8 +160,8 @@ Index: vendor/luabins/src/lualess.c
+} +}
Index: vendor/luabins/test/test.lua Index: vendor/luabins/test/test.lua
=================================================================== ===================================================================
--- vendor/luabins/test/test.lua --- a/vendor/luabins/test/test.lua
+++ vendor/luabins/test/test.lua +++ b/vendor/luabins/test/test.lua
@@ -6,6 +6,8 @@ @@ -6,6 +6,8 @@
package.cpath = "./?.so;"..package.cpath package.cpath = "./?.so;"..package.cpath

View file

@ -10,8 +10,8 @@ Fix Aegisub/Aegisub#171
diff --git a/Makefile.target b/Makefile.target diff --git a/Makefile.target b/Makefile.target
index 516ef3c24..5c4c5d259 100644 index 516ef3c24..5c4c5d259 100644
--- Makefile.target --- a/Makefile.target
+++ Makefile.target +++ b/Makefile.target
@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $< @@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
# Libraries contain all object files they depend on (but they may depend on other files) # Libraries contain all object files they depend on (but they may depend on other files)
# Not using libtool on OS X because it has an unsilenceable warning about a # Not using libtool on OS X because it has an unsilenceable warning about a

View file

@ -5,8 +5,8 @@ Last-Update: 2014-08-06
Upstream: Yes Upstream: Yes
Reason: Use system luajit Reason: Use system luajit
--- header.mk --- a/header.mk
+++ header.mk +++ b/header.mk
@@ -13,7 +13,6 @@ @@ -13,7 +13,6 @@
tests \ tests \
tools \ tools \
@ -15,8 +15,8 @@ Reason: Use system luajit
vendor/universalchardet vendor/universalchardet
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
--- Makefile.inc.in --- a/Makefile.inc.in
+++ Makefile.inc.in +++ b/Makefile.inc.in
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
CFLAGS_ICU = @ICU_I18N_CFLAGS@ CFLAGS_ICU = @ICU_I18N_CFLAGS@
CFLAGS_LIBASS = @LIBASS_CFLAGS@ CFLAGS_LIBASS = @LIBASS_CFLAGS@
@ -35,8 +35,8 @@ Reason: Use system luajit
LIBS_OPENAL = @OPENAL_LIBS@ LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@ LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
LIBS_PTHREAD = @PTHREAD_LIBS@ LIBS_PTHREAD = @PTHREAD_LIBS@
--- tools/Makefile --- a/tools/Makefile
+++ tools/Makefile +++ b/tools/Makefile
@@ -12,6 +12,4 @@ @@ -12,6 +12,4 @@
PROGRAM += $(d)repack-thes-dict PROGRAM += $(d)repack-thes-dict
@ -44,8 +44,8 @@ Reason: Use system luajit
-$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua -$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
- -
include $(TOP)Makefile.target include $(TOP)Makefile.target
--- tools/respack.lua --- a/tools/respack.lua
+++ tools/respack.lua +++ b/tools/respack.lua
@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n') @@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
for line in manifest:lines() do for line in manifest:lines() do
if line:find('.') then if line:find('.') then
@ -55,8 +55,8 @@ Reason: Use system luajit
out_cpp:write("const unsigned char " .. id .. "[] = {") out_cpp:write("const unsigned char " .. id .. "[] = {")
local len = 0 local len = 0
--- src/libresrc/Makefile --- a/src/libresrc/Makefile
+++ src/libresrc/Makefile +++ b/src/libresrc/Makefile
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
$(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp

View file

@ -3,8 +3,8 @@ Upstream: Yes
Reason: Use system luajit Reason: Use system luajit
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index be657b0..2c03951 100644 index be657b0..2c03951 100644
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp @@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support]) AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support]) AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])

View file

@ -11,8 +11,8 @@ directly.
diff --git a/src/frame_main.cpp b/src/frame_main.cpp diff --git a/src/frame_main.cpp b/src/frame_main.cpp
index b35c32960..df115b27c 100644 index b35c32960..df115b27c 100644
--- src/frame_main.cpp --- a/src/frame_main.cpp
+++ src/frame_main.cpp +++ b/src/frame_main.cpp
@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) { @@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
TopSizer->Show(videoBox, showVideo, true); TopSizer->Show(videoBox, showVideo, true);
ToolsSizer->Show(audioBox, showAudio, true); ToolsSizer->Show(audioBox, showAudio, true);

View file

@ -17,7 +17,6 @@ license="BSD-3-Clause, MIT"
homepage="http://www.aegisub.org" homepage="http://www.aegisub.org"
distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz" distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
patch_args=-Np0
build_options="fftw openal portaudio" build_options="fftw openal portaudio"
build_options_default="fftw" build_options_default="fftw"

View file

@ -1,5 +1,5 @@
--- Makefile 2018-11-04 13:26:07.744752852 -0700 --- a/Makefile 2018-11-04 13:26:07.744752852 -0700
+++ Makefile 2018-11-04 13:27:46.074222441 -0700 +++ b/Makefile 2018-11-04 13:27:46.074222441 -0700
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
-CFLAGS=-O3 --std=gnu++11 -CFLAGS=-O3 --std=gnu++11
-LFLAGS=-s -lpng -LFLAGS=-s -lpng

View file

@ -12,7 +12,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/GReaperEx/Brainfunk" homepage="https://github.com/GReaperEx/Brainfunk"
distfiles="${homepage}/archive/v${version}-beta.tar.gz" distfiles="${homepage}/archive/v${version}-beta.tar.gz"
checksum=6b48bd1fbe0dbce20f3e8af5c799023ea820ddc45aca8fac0ccecfa2de359ee2 checksum=6b48bd1fbe0dbce20f3e8af5c799023ea820ddc45aca8fac0ccecfa2de359ee2
patch_args=-Np0
do_install() { do_install() {
vbin bfk vbin bfk

View file

@ -1,5 +1,5 @@
--- src/util.c --- a/src/util.c
+++ src/util.c +++ b/src/util.c
@@ -35,6 +35,12 @@ @@ -35,6 +35,12 @@
#include <libintl.h> #include <libintl.h>
#include <sys/types.h> #include <sys/types.h>

View file

@ -1,6 +1,6 @@
This shouldn't exist and erroneously fails for us. This shouldn't exist and erroneously fails for us.
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -35,12 +35,6 @@ @@ -35,12 +35,6 @@
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")

View file

@ -1,5 +1,5 @@
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -25,11 +25,11 @@ @@ -25,11 +25,11 @@
set(APP_EXEC ${CMAKE_PROJECT_NAME}) set(APP_EXEC ${CMAKE_PROJECT_NAME})
set(DAEMON_EXEC ${CMAKE_PROJECT_NAME}-daemon) set(DAEMON_EXEC ${CMAKE_PROJECT_NAME}-daemon)

View file

@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
homepage="https://x0rg.github.io/CPU-X/" homepage="https://x0rg.github.io/CPU-X/"
distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz" distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf checksum=c41fbb3000e3e6f79e5228aa0237fde4f98b11df8ccb4c9a46f7e63a4a7011bf
patch_args=-Np0
build_options="gtk3" build_options="gtk3"
build_options_default="gtk3" build_options_default="gtk3"

View file

@ -1,5 +1,5 @@
--- source/Makefile.mk --- a/source/Makefile.mk
+++ source/Makefile.mk +++ b/source/Makefile.mk
@@ -233,10 +233,7 @@ @@ -233,10 +233,7 @@
# Check for optional libs (special non-pkgconfig tests) # Check for optional libs (special non-pkgconfig tests)

View file

@ -1,5 +1,5 @@
--- source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200 --- a/source/theme/CarlaStyle.cpp 2020-04-13 05:29:06.000000000 +0200
+++ source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200 +++ b/source/theme/CarlaStyle.cpp 2020-08-23 20:32:26.157269175 +0200
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))

View file

@ -18,7 +18,6 @@ homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz" distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963 checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
python_version=3 python_version=3
patch_args=-Np0
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in
x86_64* | i686*);; x86_64* | i686*);;

View file

@ -1,5 +1,5 @@
--- data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100 --- a/data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100
+++ - 2019-10-22 16:03:45.682652708 +0200 +++ b/data/CMakeLists.txt 2019-03-08 04:34:43.000000000 +0100
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
${CMAKE_SOURCE_DIR}/data/motd ${CMAKE_SOURCE_DIR}/data/motd
${CMAKE_SOURCE_DIR}/data/credits ${CMAKE_SOURCE_DIR}/data/credits

View file

@ -10,8 +10,8 @@ This fixes the build on ARM.
diff --git CMakeLists.txt CMakeLists.txt diff --git CMakeLists.txt CMakeLists.txt
index 095d6e23b20..d0f5e0cc7f3 100644 index 095d6e23b20..d0f5e0cc7f3 100644
--- CMakeLists.txt --- a/CMakeLists.txt
+++ CMakeLists.txt +++ b/CMakeLists.txt
@@ -240,9 +240,10 @@ ELSE() @@ -240,9 +240,10 @@ ELSE()
IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows) IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls") SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")

View file

@ -15,7 +15,6 @@ license="CC-BY-SA-3.0, CC-BY-3.0"
homepage="https://cataclysmdda.org/" homepage="https://cataclysmdda.org/"
distfiles="https://github.com/CleverRaven/Cataclysm-DDA/archive/${version}.tar.gz" distfiles="https://github.com/CleverRaven/Cataclysm-DDA/archive/${version}.tar.gz"
checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3 checksum=b0af9a9292929e17332edcea770bca9a91f1d08ea47726d78a47e09281a42fa3
patch_args=-Np0
build_options="tiles backtrace" build_options="tiles backtrace"
build_options_default="tiles" build_options_default="tiles"

View file

@ -10,8 +10,8 @@ Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass,
diff --git src/cpBody.c src/cpBody.c diff --git src/cpBody.c src/cpBody.c
index a8e0797..8ad2bc9 100644 index a8e0797..8ad2bc9 100644
--- src/cpBody.c --- a/src/cpBody.c
+++ src/cpBody.c +++ b/src/cpBody.c
@@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass) @@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass)
cpBodyActivate(body); cpBodyActivate(body);

View file

@ -1,7 +1,7 @@
diff --git src/cpHastySpace.c src/cpHastySpace.c diff --git src/cpHastySpace.c src/cpHastySpace.c
index 8dca425..e087df8 100644 index 8dca425..e087df8 100644
--- src/cpHastySpace.c --- a/src/cpHastySpace.c
+++ src/cpHastySpace.c +++ b/src/cpHastySpace.c
@@ -8,7 +8,9 @@ @@ -8,7 +8,9 @@
//#include <sys/param.h > //#include <sys/param.h >

View file

@ -11,7 +11,6 @@ license="MIT"
homepage="http://chipmunk-physics.net/" homepage="http://chipmunk-physics.net/"
distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz" distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz"
checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE.txt vlicense LICENSE.txt

View file

@ -1,5 +1,5 @@
--- src/utils/log.c.orig --- a/src/utils/log.c
+++ src/utils/log.c +++ b/src/utils/log.c
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
+#include <sys/types.h> +#include <sys/types.h>
#include <sys/file.h> #include <sys/file.h>

View file

@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
homepage="https://github.com/FedeDP/Clight" homepage="https://github.com/FedeDP/Clight"
distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz" distfiles="https://github.com/FedeDP/Clight/archive/${version}.tar.gz"
checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e checksum=2ce204edd58284c178b99e2ffec0105fc8e78d8a076350f64424b66c9878e91e
patch_args=-Np0
post_install() { post_install() {
vcompletion Extra/completions/_clight zsh vcompletion Extra/completions/_clight zsh

View file

@ -7,8 +7,8 @@ We need it disabled on x86_64 because we're generic (and AVX is sandybridge
and newer, but the enabled code was for haswell and newer), and on other and newer, but the enabled code was for haswell and newer), and on other
arches it's disabled for obvious reasons. arches it's disabled for obvious reasons.
--- Clp/src/ClpPackedMatrix.cpp --- a/Clp/src/ClpPackedMatrix.cpp
+++ Clp/src/ClpPackedMatrix.cpp +++ b/Clp/src/ClpPackedMatrix.cpp
@@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3() @@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3()
} }
#ifdef _MSC_VER #ifdef _MSC_VER
@ -30,8 +30,8 @@ arches it's disabled for obvious reasons.
#ifndef COIN_AVX2 #ifndef COIN_AVX2
#define COIN_AVX2 4 #define COIN_AVX2 4
#else #else
--- Clp/src/ClpSimplexDual.cpp --- a/Clp/src/ClpSimplexDual.cpp
+++ Clp/src/ClpSimplexDual.cpp +++ b/Clp/src/ClpSimplexDual.cpp
@@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra) @@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra)
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER

View file

@ -10,7 +10,6 @@ license="EPL-1.0"
homepage="http://projects.coin-or.org/Clp" homepage="http://projects.coin-or.org/Clp"
distfiles="https://www.coin-or.org/Tarballs/${pkgname}/${pkgname}-${version}.tgz" distfiles="https://www.coin-or.org/Tarballs/${pkgname}/${pkgname}-${version}.tgz"
checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573 checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573
patch_args=-Np0
libClp-devel_package() { libClp-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"

View file

@ -1,5 +1,5 @@
--- CoinMP/src/CoinProblem.c 2011-11-03 04:43:29.000000000 +0100 --- a/CoinMP/src/CoinProblem.c 2011-11-03 04:43:29.000000000 +0100
+++ CoinMP/src/CoinProblem.c 2019-05-20 12:06:36.762510299 +0200 +++ b/CoinMP/src/CoinProblem.c 2019-05-20 12:06:36.762510299 +0200
@@ -126,14 +126,8 @@ @@ -126,14 +126,8 @@
void coinSetProblemName(PPROBLEM pProblem, const char *ProblemName) void coinSetProblemName(PPROBLEM pProblem, const char *ProblemName)

View file

@ -1,7 +1,7 @@
Avoid `mips' as a parameter name. It is a reserved name for mips* targets. Avoid `mips' as a parameter name. It is a reserved name for mips* targets.
--- Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200 --- a/Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200
+++ Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100 +++ b/Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100
@@ -2394,8 +2394,8 @@ @@ -2394,8 +2394,8 @@
void redoWalkBack(); void redoWalkBack();
//@} //@}

View file

@ -10,7 +10,6 @@ license="CPL-1.0"
homepage="https://projects.coin-or.org/CoinMP" homepage="https://projects.coin-or.org/CoinMP"
distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz" distfiles="http://www.coin-or.org/download/source/${pkgname}/${pkgname}-${version}.tgz"
checksum=3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d checksum=3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d
patch_args=-Np0
post_configure() { post_configure() {
# remove erroneous cross base prefix from include paths # remove erroneous cross base prefix from include paths

View file

@ -1,7 +1,7 @@
Index: external/hamlib/hamlib/rig.h Index: external/hamlib/hamlib/rig.h
=================================================================== ===================================================================
--- external/hamlib/hamlib/rig.h --- a/external/hamlib/hamlib/rig.h
+++ external/hamlib/hamlib/rig.h +++ b/external/hamlib/hamlib/rig.h
@@ -147,7 +147,7 @@ typedef struct rig RIG; @@ -147,7 +147,7 @@ typedef struct rig RIG;
#define RIGNAMSIZ 30 #define RIGNAMSIZ 30
@ -23,8 +23,8 @@ Index: external/hamlib/hamlib/rig.h
Index: src/rig/RigThread.cpp Index: src/rig/RigThread.cpp
=================================================================== ===================================================================
--- src/rig/RigThread.cpp --- a/src/rig/RigThread.cpp
+++ src/rig/RigThread.cpp +++ b/src/rig/RigThread.cpp
@@ -114,7 +114,7 @@ void RigThread::run() { @@ -114,7 +114,7 @@ void RigThread::run() {
std::cout << "Rig thread starting." << std::endl; std::cout << "Rig thread starting." << std::endl;

View file

@ -41,8 +41,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
src/visual/WaterfallCanvas.h | 2 +- src/visual/WaterfallCanvas.h | 2 +-
34 files changed, 57 insertions(+), 73 deletions(-) 34 files changed, 57 insertions(+), 73 deletions(-)
--- src/AppFrame.cpp --- a/src/AppFrame.cpp
+++ src/AppFrame.cpp +++ b/src/AppFrame.cpp
@@ -88,10 +88,10 @@ AppFrame::AppFrame() : @@ -88,10 +88,10 @@ AppFrame::AppFrame() :
wxBoxSizer *demodScopeTray = new wxBoxSizer(wxVERTICAL); wxBoxSizer *demodScopeTray = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *demodTunerTray = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *demodTunerTray = new wxBoxSizer(wxHORIZONTAL);
@ -58,8 +58,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
mainSplitter = new wxSplitterWindow( this, wxID_MAIN_SPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH | wxSP_LIVE_UPDATE ); mainSplitter = new wxSplitterWindow( this, wxID_MAIN_SPLITTER, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH | wxSP_LIVE_UPDATE );
mainSplitter->SetSashGravity(10.0f / 37.0f); mainSplitter->SetSashGravity(10.0f / 37.0f);
--- src/CubicSDR.cpp --- a/src/CubicSDR.cpp
+++ src/CubicSDR.cpp +++ b/src/CubicSDR.cpp
@@ -206,14 +206,6 @@ CubicSDR::CubicSDR() : frequency(0), off @@ -206,14 +206,6 @@ CubicSDR::CubicSDR() : frequency(0), off
shuttingDown.store(false); shuttingDown.store(false);
fdlgTarget = FrequencyDialog::FDIALOG_TARGET_DEFAULT; fdlgTarget = FrequencyDialog::FDIALOG_TARGET_DEFAULT;
@ -95,8 +95,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void CubicSDR::OnInitCmdLine(wxCmdLineParser& parser) { void CubicSDR::OnInitCmdLine(wxCmdLineParser& parser) {
parser.SetDesc (commandLineInfo); parser.SetDesc (commandLineInfo);
parser.SetSwitchChars (wxT("-")); parser.SetSwitchChars (wxT("-"));
--- src/CubicSDR.h --- a/src/CubicSDR.h
+++ src/CubicSDR.h +++ b/src/CubicSDR.h
@@ -71,7 +71,6 @@ public: @@ -71,7 +71,6 @@ public:
CubicSDR(); CubicSDR();
@ -123,8 +123,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
std::vector<SDRDeviceInfo *> *devs = nullptr; std::vector<SDRDeviceInfo *> *devs = nullptr;
DemodulatorMgr demodMgr; DemodulatorMgr demodMgr;
--- src/ui/UITestCanvas.cpp --- a/src/ui/UITestCanvas.cpp
+++ src/ui/UITestCanvas.cpp +++ b/src/ui/UITestCanvas.cpp
@@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLe @@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(UITestCanvas::OnMouseLe
EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow) EVT_ENTER_WINDOW(UITestCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -138,8 +138,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
} }
UITestCanvas::~UITestCanvas() { UITestCanvas::~UITestCanvas() {
--- src/ui/UITestCanvas.h --- a/src/ui/UITestCanvas.h
+++ src/ui/UITestCanvas.h +++ b/src/ui/UITestCanvas.h
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
class UITestCanvas: public InteractiveCanvas { class UITestCanvas: public InteractiveCanvas {
@ -149,8 +149,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~UITestCanvas(); ~UITestCanvas();
private: private:
--- src/ui/UITestContext.cpp --- a/src/ui/UITestContext.cpp
+++ src/ui/UITestContext.cpp +++ b/src/ui/UITestContext.cpp
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
#include "UITestCanvas.h" #include "UITestCanvas.h"
#include "ColorTheme.h" #include "ColorTheme.h"
@ -162,8 +162,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
testPanel.setPosition(0.0, 0.0); testPanel.setPosition(0.0, 0.0);
testPanel.setSize(1.0, 1.0); testPanel.setSize(1.0, 1.0);
--- src/ui/UITestContext.h --- a/src/ui/UITestContext.h
+++ src/ui/UITestContext.h +++ b/src/ui/UITestContext.h
@@ -11,7 +11,7 @@ class UITestCanvas; @@ -11,7 +11,7 @@ class UITestCanvas;
class UITestContext: public PrimaryGLContext { class UITestContext: public PrimaryGLContext {
@ -173,8 +173,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void DrawBegin(); void DrawBegin();
void Draw(); void Draw();
--- src/util/GLExt.cpp --- a/src/util/GLExt.cpp
+++ src/util/GLExt.cpp +++ b/src/util/GLExt.cpp
@@ -46,8 +46,7 @@ void initGLExtensions() { @@ -46,8 +46,7 @@ void initGLExtensions() {
#ifdef _WIN32 #ifdef _WIN32
@ -185,8 +185,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT"); wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC) wglGetProcAddress("wglGetSwapIntervalEXT"); wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC) wglGetProcAddress("wglGetSwapIntervalEXT");
--- src/visual/GainCanvas.cpp --- a/src/visual/GainCanvas.cpp
+++ src/visual/GainCanvas.cpp +++ b/src/visual/GainCanvas.cpp
@@ -29,10 +29,10 @@ EVT_ENTER_WINDOW(GainCanvas::OnMouseEnte @@ -29,10 +29,10 @@ EVT_ENTER_WINDOW(GainCanvas::OnMouseEnte
EVT_MOUSEWHEEL(GainCanvas::OnMouseWheelMoved) EVT_MOUSEWHEEL(GainCanvas::OnMouseWheelMoved)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -200,8 +200,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
bgPanel.setCoordinateSystem(GLPanel::GLPANEL_Y_UP); bgPanel.setCoordinateSystem(GLPanel::GLPANEL_Y_UP);
bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_X); bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_X);
--- src/visual/GainCanvas.h --- a/src/visual/GainCanvas.h
+++ src/visual/GainCanvas.h +++ b/src/visual/GainCanvas.h
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
class GainCanvas: public InteractiveCanvas { class GainCanvas: public InteractiveCanvas {
@ -211,8 +211,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~GainCanvas(); ~GainCanvas();
void setHelpTip(std::string tip); void setHelpTip(std::string tip);
--- src/visual/InteractiveCanvas.cpp --- a/src/visual/InteractiveCanvas.cpp
+++ src/visual/InteractiveCanvas.cpp +++ b/src/visual/InteractiveCanvas.cpp
@@ -20,9 +20,9 @@ @@ -20,9 +20,9 @@
#include <wx/numformatter.h> #include <wx/numformatter.h>
@ -226,8 +226,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
false) { false) {
mouseTracker.setTarget(this); mouseTracker.setTarget(this);
} }
--- src/visual/InteractiveCanvas.h --- a/src/visual/InteractiveCanvas.h
+++ src/visual/InteractiveCanvas.h +++ b/src/visual/InteractiveCanvas.h
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
class InteractiveCanvas: public wxGLCanvas { class InteractiveCanvas: public wxGLCanvas {
@ -237,8 +237,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
virtual ~InteractiveCanvas(); virtual ~InteractiveCanvas();
long long getFrequencyAt(float x); long long getFrequencyAt(float x);
--- src/visual/MeterCanvas.cpp --- a/src/visual/MeterCanvas.cpp
+++ src/visual/MeterCanvas.cpp +++ b/src/visual/MeterCanvas.cpp
@@ -30,10 +30,10 @@ EVT_LEAVE_WINDOW(MeterCanvas::OnMouseLef @@ -30,10 +30,10 @@ EVT_LEAVE_WINDOW(MeterCanvas::OnMouseLef
EVT_ENTER_WINDOW(MeterCanvas::OnMouseEnterWindow) EVT_ENTER_WINDOW(MeterCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -252,8 +252,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
} }
MeterCanvas::~MeterCanvas() { MeterCanvas::~MeterCanvas() {
--- src/visual/MeterCanvas.h --- a/src/visual/MeterCanvas.h
+++ src/visual/MeterCanvas.h +++ b/src/visual/MeterCanvas.h
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
class MeterCanvas: public InteractiveCanvas { class MeterCanvas: public InteractiveCanvas {
@ -263,8 +263,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~MeterCanvas(); ~MeterCanvas();
void setLevel(float level_in); void setLevel(float level_in);
--- src/visual/MeterContext.cpp --- a/src/visual/MeterContext.cpp
+++ src/visual/MeterContext.cpp +++ b/src/visual/MeterContext.cpp
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
#include "MeterCanvas.h" #include "MeterCanvas.h"
#include "ColorTheme.h" #include "ColorTheme.h"
@ -276,8 +276,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
} }
void MeterContext::DrawBegin() { void MeterContext::DrawBegin() {
--- src/visual/MeterContext.h --- a/src/visual/MeterContext.h
+++ src/visual/MeterContext.h +++ b/src/visual/MeterContext.h
@@ -12,7 +12,7 @@ class MeterCanvas; @@ -12,7 +12,7 @@ class MeterCanvas;
class MeterContext: public PrimaryGLContext { class MeterContext: public PrimaryGLContext {
@ -287,8 +287,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void DrawBegin(); void DrawBegin();
void Draw(float r, float g, float b, float a, float level); void Draw(float r, float g, float b, float a, float level);
--- src/visual/ModeSelectorCanvas.cpp --- a/src/visual/ModeSelectorCanvas.cpp
+++ src/visual/ModeSelectorCanvas.cpp +++ b/src/visual/ModeSelectorCanvas.cpp
@@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(ModeSelectorCanvas::OnM @@ -27,10 +27,10 @@ EVT_LEAVE_WINDOW(ModeSelectorCanvas::OnM
EVT_ENTER_WINDOW(ModeSelectorCanvas::OnMouseEnterWindow) EVT_ENTER_WINDOW(ModeSelectorCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -302,8 +302,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
highlightColor = RGBA4f(1.0,1.0,1.0,1.0); highlightColor = RGBA4f(1.0,1.0,1.0,1.0);
} }
--- src/visual/ModeSelectorCanvas.h --- a/src/visual/ModeSelectorCanvas.h
+++ src/visual/ModeSelectorCanvas.h +++ b/src/visual/ModeSelectorCanvas.h
@@ -27,7 +27,7 @@ public: @@ -27,7 +27,7 @@ public:
class ModeSelectorCanvas: public InteractiveCanvas { class ModeSelectorCanvas: public InteractiveCanvas {
@ -313,8 +313,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~ModeSelectorCanvas(); ~ModeSelectorCanvas();
int getHoveredSelection(); int getHoveredSelection();
--- src/visual/ModeSelectorContext.cpp --- a/src/visual/ModeSelectorContext.cpp
+++ src/visual/ModeSelectorContext.cpp +++ b/src/visual/ModeSelectorContext.cpp
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
#include "ColorTheme.h" #include "ColorTheme.h"
@ -326,8 +326,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
--- src/visual/ModeSelectorContext.h --- a/src/visual/ModeSelectorContext.h
+++ src/visual/ModeSelectorContext.h +++ b/src/visual/ModeSelectorContext.h
@@ -12,7 +12,7 @@ class ModeSelectorCanvas; @@ -12,7 +12,7 @@ class ModeSelectorCanvas;
class ModeSelectorContext: public PrimaryGLContext { class ModeSelectorContext: public PrimaryGLContext {
@ -337,8 +337,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void DrawBegin(); void DrawBegin();
void DrawSelector(std::string label, int c, int cMax, bool on, float r, float g, float b, float a, float padx, float pady); void DrawSelector(std::string label, int c, int cMax, bool on, float r, float g, float b, float a, float padx, float pady);
--- src/visual/PrimaryGLContext.cpp --- a/src/visual/PrimaryGLContext.cpp
+++ src/visual/PrimaryGLContext.cpp +++ b/src/visual/PrimaryGLContext.cpp
@@ -50,11 +50,8 @@ void PrimaryGLContext::CheckGLError() { @@ -50,11 +50,8 @@ void PrimaryGLContext::CheckGLError() {
} }
} }
@ -353,8 +353,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
//#ifndef __linux__ //#ifndef __linux__
// SetCurrent(*canvas); // SetCurrent(*canvas);
// // Pre-load fonts // // Pre-load fonts
--- src/visual/PrimaryGLContext.h --- a/src/visual/PrimaryGLContext.h
+++ src/visual/PrimaryGLContext.h +++ b/src/visual/PrimaryGLContext.h
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
class PrimaryGLContext: public wxGLContext { class PrimaryGLContext: public wxGLContext {
@ -364,8 +364,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
static wxString glGetwxString(GLenum name); static wxString glGetwxString(GLenum name);
static void CheckGLError(); static void CheckGLError();
--- src/visual/ScopeCanvas.cpp --- a/src/visual/ScopeCanvas.cpp
+++ src/visual/ScopeCanvas.cpp +++ b/src/visual/ScopeCanvas.cpp
@@ -31,9 +31,9 @@ EVT_LEAVE_WINDOW(ScopeCanvas::OnMouseLef @@ -31,9 +31,9 @@ EVT_LEAVE_WINDOW(ScopeCanvas::OnMouseLef
EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow) EVT_ENTER_WINDOW(ScopeCanvas::OnMouseEnterWindow)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -378,8 +378,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
inputData->set_max_num_items(2); inputData->set_max_num_items(2);
bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_Y); bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_Y);
bgPanel.setSize(1.0, 0.5f); bgPanel.setSize(1.0, 0.5f);
--- src/visual/ScopeCanvas.h --- a/src/visual/ScopeCanvas.h
+++ src/visual/ScopeCanvas.h +++ b/src/visual/ScopeCanvas.h
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
class ScopeCanvas: public InteractiveCanvas { class ScopeCanvas: public InteractiveCanvas {
@ -389,8 +389,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~ScopeCanvas(); ~ScopeCanvas();
//This is public because it is indeed forwarded from //This is public because it is indeed forwarded from
--- src/visual/ScopeContext.cpp --- a/src/visual/ScopeContext.cpp
+++ src/visual/ScopeContext.cpp +++ b/src/visual/ScopeContext.cpp
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
#include "ScopeCanvas.h" #include "ScopeCanvas.h"
#include "ColorTheme.h" #include "ColorTheme.h"
@ -402,8 +402,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
glDisable (GL_CULL_FACE); glDisable (GL_CULL_FACE);
glDisable (GL_DEPTH_TEST); glDisable (GL_DEPTH_TEST);
--- src/visual/ScopeContext.h --- a/src/visual/ScopeContext.h
+++ src/visual/ScopeContext.h +++ b/src/visual/ScopeContext.h
@@ -12,7 +12,7 @@ class ScopeCanvas; @@ -12,7 +12,7 @@ class ScopeCanvas;
class ScopeContext: public PrimaryGLContext { class ScopeContext: public PrimaryGLContext {
@ -413,8 +413,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void DrawBegin(bool clear=true); void DrawBegin(bool clear=true);
void DrawTunerTitles(bool ppmMode=false); void DrawTunerTitles(bool ppmMode=false);
--- src/visual/SpectrumCanvas.cpp --- a/src/visual/SpectrumCanvas.cpp
+++ src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp
@@ -32,10 +32,10 @@ EVT_RIGHT_DOWN(SpectrumCanvas::OnMouseRi @@ -32,10 +32,10 @@ EVT_RIGHT_DOWN(SpectrumCanvas::OnMouseRi
EVT_RIGHT_UP(SpectrumCanvas::OnMouseRightReleased) EVT_RIGHT_UP(SpectrumCanvas::OnMouseRightReleased)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -428,8 +428,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
visualDataQueue->set_max_num_items(1); visualDataQueue->set_max_num_items(1);
--- src/visual/SpectrumCanvas.h --- a/src/visual/SpectrumCanvas.h
+++ src/visual/SpectrumCanvas.h +++ b/src/visual/SpectrumCanvas.h
@@ -17,7 +17,7 @@ class WaterfallCanvas; @@ -17,7 +17,7 @@ class WaterfallCanvas;
class SpectrumCanvas: public InteractiveCanvas { class SpectrumCanvas: public InteractiveCanvas {
@ -439,8 +439,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~SpectrumCanvas(); ~SpectrumCanvas();
//This is public because it is indeed forwarded from //This is public because it is indeed forwarded from
--- src/visual/TuningCanvas.cpp --- a/src/visual/TuningCanvas.cpp
+++ src/visual/TuningCanvas.cpp +++ b/src/visual/TuningCanvas.cpp
@@ -33,10 +33,10 @@ EVT_MOUSEWHEEL(TuningCanvas::OnMouseWhee @@ -33,10 +33,10 @@ EVT_MOUSEWHEEL(TuningCanvas::OnMouseWhee
//EVT_KEY_UP(TuningCanvas::OnKeyUp) //EVT_KEY_UP(TuningCanvas::OnKeyUp)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -462,8 +462,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
} }
void TuningCanvas::OnMouseMoved(wxMouseEvent& event) { void TuningCanvas::OnMouseMoved(wxMouseEvent& event) {
--- src/visual/TuningCanvas.h --- a/src/visual/TuningCanvas.h
+++ src/visual/TuningCanvas.h +++ b/src/visual/TuningCanvas.h
@@ -20,7 +20,7 @@ public: @@ -20,7 +20,7 @@ public:
enum ActiveState { enum ActiveState {
TUNING_HOVER_NONE, TUNING_HOVER_FREQ, TUNING_HOVER_BW, TUNING_HOVER_PPM, TUNING_HOVER_CENTER TUNING_HOVER_NONE, TUNING_HOVER_FREQ, TUNING_HOVER_BW, TUNING_HOVER_PPM, TUNING_HOVER_CENTER
@ -473,8 +473,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
~TuningCanvas(); ~TuningCanvas();
void setHelpTip(std::string tip); void setHelpTip(std::string tip);
--- src/visual/TuningContext.cpp --- a/src/visual/TuningContext.cpp
+++ src/visual/TuningContext.cpp +++ b/src/visual/TuningContext.cpp
@@ -18,8 +18,8 @@ protected: @@ -18,8 +18,8 @@ protected:
} }
}; };
@ -486,8 +486,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
--- src/visual/TuningContext.h --- a/src/visual/TuningContext.h
+++ src/visual/TuningContext.h +++ b/src/visual/TuningContext.h
@@ -12,7 +12,7 @@ class TuningCanvas; @@ -12,7 +12,7 @@ class TuningCanvas;
class TuningContext: public PrimaryGLContext { class TuningContext: public PrimaryGLContext {
@ -497,8 +497,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
void DrawBegin(); void DrawBegin();
void Draw(float r, float g, float b, float a, float p1, float p2); void Draw(float r, float g, float b, float a, float p1, float p2);
--- src/visual/WaterfallCanvas.cpp --- a/src/visual/WaterfallCanvas.cpp
+++ src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp
@@ -39,11 +39,11 @@ EVT_ENTER_WINDOW(WaterfallCanvas::OnMous @@ -39,11 +39,11 @@ EVT_ENTER_WINDOW(WaterfallCanvas::OnMous
EVT_MOUSEWHEEL(WaterfallCanvas::OnMouseWheelMoved) EVT_MOUSEWHEEL(WaterfallCanvas::OnMouseWheelMoved)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@ -521,8 +521,8 @@ This reverts commit e46d7f9735579d651664b6a1243d4b63a39bf109.
} }
void WaterfallCanvas::updateHoverState() { void WaterfallCanvas::updateHoverState() {
--- src/visual/WaterfallCanvas.h --- a/src/visual/WaterfallCanvas.h
+++ src/visual/WaterfallCanvas.h +++ b/src/visual/WaterfallCanvas.h
@@ -21,7 +21,7 @@ public: @@ -21,7 +21,7 @@ public:
WF_DRAG_NONE, WF_DRAG_BANDWIDTH_LEFT, WF_DRAG_BANDWIDTH_RIGHT, WF_DRAG_FREQUENCY, WF_DRAG_RANGE WF_DRAG_NONE, WF_DRAG_BANDWIDTH_LEFT, WF_DRAG_BANDWIDTH_RIGHT, WF_DRAG_FREQUENCY, WF_DRAG_RANGE
}; };

View file

@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
homepage="https://cubicsdr.com" homepage="https://cubicsdr.com"
distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz" distfiles="https://github.com/cjcliffe/CubicSDR/archive/${version}.tar.gz"
checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d
patch_args=-Np0
build_options="alsa pulseaudio jack" build_options="alsa pulseaudio jack"
build_options_default="alsa pulseaudio" build_options_default="alsa pulseaudio"

View file

@ -1,5 +1,5 @@
--- test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200 --- a/test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200
+++ - 2021-05-03 17:29:15.242919282 +0200 +++ b/test/CMakeLists.txt 2021-05-01 12:10:44.000000000 +0200
@@ -47,6 +47,4 @@ @@ -47,6 +47,4 @@
${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES}
${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES} ${SIGC_LIBRARIES} ${GLEW_LIBRARIES} ${X11_LIBRARIES}

View file

@ -1,5 +1,5 @@
--- radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200 --- a/radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200
+++ - 2021-05-04 19:37:03.411760291 +0200 +++ b/radiantcore/log/SegFaultHandler.cpp 2021-05-01 12:10:44.000000000 +0200
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
#include "itextstream.h" #include "itextstream.h"

View file

@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
homepage="https://github.com/codereader/DarkRadiant/" homepage="https://github.com/codereader/DarkRadiant/"
distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz" distfiles="https://github.com/codereader/DarkRadiant/archive/${version}.tar.gz"
checksum=8c5dc0f7d160dea7e9c735f9739e36462dd8c8719a3022156f9584250fc3b867 checksum=8c5dc0f7d160dea7e9c735f9739e36462dd8c8719a3022156f9584250fc3b867
patch_args=-Np0
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0" CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/lib/wx/include/gtk3-unicode-3.0"

View file

@ -2,8 +2,8 @@ this fixes the serial driver on musl as well as on ppc
diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp diff --git src/hardware/serialDriver.cpp src/hardware/serialDriver.cpp
index 0bb0228..d935c63 100644 index 0bb0228..d935c63 100644
--- src/hardware/serialDriver.cpp --- a/src/hardware/serialDriver.cpp
+++ src/hardware/serialDriver.cpp +++ b/src/hardware/serialDriver.cpp
@@ -2,20 +2,31 @@ @@ -2,20 +2,31 @@
#ifdef __WIN32__ #ifdef __WIN32__
#include <windows.h> #include <windows.h>
@ -156,8 +156,8 @@ index 0bb0228..d935c63 100644
return ""; return "";
diff --git src/hardware/serialDriver.h src/hardware/serialDriver.h diff --git src/hardware/serialDriver.h src/hardware/serialDriver.h
index 29cc0b5..9513457 100644 index 29cc0b5..9513457 100644
--- src/hardware/serialDriver.h --- a/src/hardware/serialDriver.h
+++ src/hardware/serialDriver.h +++ b/src/hardware/serialDriver.h
@@ -14,7 +14,7 @@ private: @@ -14,7 +14,7 @@ private:
#ifdef __WIN32__ #ifdef __WIN32__
HANDLE handle; HANDLE handle;

View file

@ -22,4 +22,3 @@ distfiles="https://github.com/daid/EmptyEpsilon/archive/EE-${version}.tar.gz
https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz" https://github.com/daid/SeriousProton/archive/EE-${version}.tar.gz>SP-${version}.tar.gz"
checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24 checksum="c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24
62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7" 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7"
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- Makefile 2018-01-04 07:11:48.000000000 +0100 --- a/Makefile 2018-01-04 07:11:48.000000000 +0100
+++ Makefile 2018-01-05 09:47:57.905760414 +0100 +++ b/Makefile 2018-01-05 09:47:57.905760414 +0100
@@ -316,8 +316,7 @@ @@ -316,8 +316,7 @@
echo "Kopiere das Programm" echo "Kopiere das Programm"
mkdir -p $(DESTDIR)$(BIN_DIRECTORY) mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
@ -57,8 +57,8 @@
.PHONY: uninstall .PHONY: uninstall
--- Makefile.install.directories 2018-01-04 07:11:48.000000000 +0100 --- a/Makefile.install.directories 2018-01-04 07:11:48.000000000 +0100
+++ Makefile.install.directories 2018-01-05 09:49:04.236760414 +0100 +++ b/Makefile.install.directories 2018-01-05 09:49:04.236760414 +0100
@@ -4,14 +4,14 @@ @@ -4,14 +4,14 @@
# the different directories for the files # the different directories for the files
@ -100,8 +100,8 @@
# release # release
# where the temporary release files are saved # where the temporary release files are saved
--- data/Makefile 2018-01-04 07:11:48.000000000 +0100 --- a/data/Makefile 2018-01-04 07:11:48.000000000 +0100
+++ data/Makefile 2018-01-05 09:49:28.201760414 +0100 +++ b/data/Makefile 2018-01-05 09:49:28.201760414 +0100
@@ -32,8 +32,7 @@ @@ -32,8 +32,7 @@
for d in cardsets iconsets backgrounds sounds; do \ for d in cardsets iconsets backgrounds sounds; do \
$(MAKE) -C $$d install; \ $(MAKE) -C $$d install; \
@ -113,8 +113,8 @@
ifeq ($(SHELLTYPE), sh) ifeq ($(SHELLTYPE), sh)
--- doc/Makefile 2018-01-04 07:11:48.000000000 +0100 --- a/doc/Makefile 2018-01-04 07:11:48.000000000 +0100
+++ doc/Makefile 2018-01-05 09:49:46.401760414 +0100 +++ b/doc/Makefile 2018-01-05 09:49:46.401760414 +0100
@@ -34,8 +34,7 @@ @@ -34,8 +34,7 @@
fi fi
cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/ cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
@ -126,8 +126,8 @@
endif endif
--- src/Makefile 2018-01-04 07:11:48.000000000 +0100 --- a/src/Makefile 2018-01-04 07:11:48.000000000 +0100
+++ src/Makefile 2018-01-05 09:50:07.057760414 +0100 +++ b/src/Makefile 2018-01-05 09:50:07.057760414 +0100
@@ -282,7 +282,6 @@ @@ -282,7 +282,6 @@
-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \ -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \ -DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \

View file

@ -13,4 +13,3 @@ homepage="http://free-doko.sourceforge.net/en/FreeDoko.html"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
distfiles="${SOURCEFORGE_SITE}/free-doko/FreeDoko_${version}.src.zip" distfiles="${SOURCEFORGE_SITE}/free-doko/FreeDoko_${version}.src.zip"
checksum=5b9ca3ad915f36dba17a4bd22b3d7d68ac2526cf125d045a819aa8d4a2cceb4c checksum=5b9ca3ad915f36dba17a4bd22b3d7d68ac2526cf125d045a819aa8d4a2cceb4c
patch_args=-Np0

View file

@ -2,8 +2,8 @@ make compatible with libgit2 >= 0.24.0
https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef https://github.com/fritzing/fritzing-app/commit/4cb5185d464bf98e9da5ceca72d5af907ff824ef
https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079 https://github.com/fritzing/fritzing-app/commit/472951243d70eeb40a53b1f7e16e6eab0588d079
--- src/version/partschecker.cpp.orig 2016-06-01 21:48:27.000000000 +0200 --- a/src/version/partschecker.cpp 2016-06-01 21:48:27.000000000 +0200
+++ src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100 +++ b/src/version/partschecker.cpp 2018-01-13 11:30:34.895137270 +0100
@@ -121,7 +121,13 @@ @@ -121,7 +121,13 @@
/** /**
* Connect to the remote. * Connect to the remote.

View file

@ -16,7 +16,6 @@ distfiles="https://github.com/${pkgname}/${pkgname}-app/archive/${version}.tar.g
https://github.com/${pkgname}/${pkgname}-parts/archive/${_partshash}.tar.gz>fritzing-parts-${_partshash}.tar.gz" https://github.com/${pkgname}/${pkgname}-parts/archive/${_partshash}.tar.gz>fritzing-parts-${_partshash}.tar.gz"
checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8 checksum="2475a95aad2c1536eef3fdb72665c5c16590644b45bd110a0cde223c916625b8
2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd" 2d5882f0180d04c582ef418fd286bf1d04142409d316a4cd5c9ce3e2d91434dd"
patch_args=-Np0
post_extract() { post_extract() {
# looks for libgit2 and boost in the source tree # looks for libgit2 and boost in the source tree

View file

@ -1,8 +1,8 @@
# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks. # Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
# Ubuntu: https://bugs.launchpad.net/bugs/123025 # Ubuntu: https://bugs.launchpad.net/bugs/123025
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
--- backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 --- a/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400
+++ backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +++ b/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400
@@ -52,6 +52,7 @@ struct _MarkupEntry @@ -52,6 +52,7 @@ struct _MarkupEntry
char *schema_name; char *schema_name;
char *mod_user; char *mod_user;
@ -115,8 +115,8 @@
if (stype == GCONF_VALUE_LIST) if (stype == GCONF_VALUE_LIST)
{ {
diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
--- doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 --- a/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400
+++ doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +++ b/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<!-- A single schema. What I am trying to say is "this set of <!-- A single schema. What I am trying to say is "this set of
elements, in any order". Duplicate elements (apart from <locale>) are elements, in any order". Duplicate elements (apart from <locale>) are
@ -127,8 +127,8 @@ diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
<!-- The key for this schema (e.g. /schemas/apps/foo/bar) --> <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
<!ELEMENT key (#PCDATA)> <!ELEMENT key (#PCDATA)>
diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
--- gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 --- a/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400
+++ gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +++ b/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400
@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem @@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
@ -153,8 +153,8 @@ diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-i
GConfValue* val; GConfValue* val;
diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
--- gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 --- a/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400
+++ gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +++ b/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400
@@ -32,9 +32,10 @@ typedef struct { @@ -32,9 +32,10 @@ typedef struct {
GConfValueType car_type; /* Pair car type of the described entry */ GConfValueType car_type; /* Pair car type of the described entry */
GConfValueType cdr_type; /* Pair cdr type of the described entry */ GConfValueType cdr_type; /* Pair cdr type of the described entry */
@ -276,8 +276,8 @@ diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-sche
const char* const char*
diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
--- gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 --- a/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400
+++ gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +++ b/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400
@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type @@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type
GConfValueType type); GConfValueType type);
void gconf_schema_set_locale (GConfSchema *sc, void gconf_schema_set_locale (GConfSchema *sc,
@ -296,8 +296,8 @@ diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-sche
const char* gconf_schema_get_long_desc (const GConfSchema *schema); const char* gconf_schema_get_long_desc (const GConfSchema *schema);
const char* gconf_schema_get_owner (const GConfSchema *schema); const char* gconf_schema_get_owner (const GConfSchema *schema);
diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
--- gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 --- a/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400
+++ gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +++ b/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400
@@ -3295,6 +3295,7 @@ struct _SchemaInfo { @@ -3295,6 +3295,7 @@ struct _SchemaInfo {
GConfValueType cdr_type; GConfValueType cdr_type;
GConfValue* global_default; GConfValue* global_default;
@ -350,8 +350,8 @@ diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
{ {
process_locale_info(iter, &info); process_locale_info(iter, &info);
diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
--- gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 --- a/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400
+++ gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +++ b/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400
@@ -16,6 +16,7 @@ struct ConfigSchema { @@ -16,6 +16,7 @@ struct ConfigSchema {
string short_desc; string short_desc;
string long_desc; string long_desc;

View file

@ -1,5 +1,5 @@
--- gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000 --- a/gconf/gconftool.c 2006-10-14 17:37:14.000000000 +0000
+++ gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000 +++ b/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000
@@ -963,6 +963,8 @@ main (int argc, char** argv) @@ -963,6 +963,8 @@ main (int argc, char** argv)
gconf_engine_unref (conf); gconf_engine_unref (conf);

View file

@ -1,7 +1,7 @@
Index: configure Index: configure
=================================================================== ===================================================================
--- configure.orig --- a/configure
+++ configure +++ b/configure
@@ -18589,8 +18589,8 @@ fi @@ -18589,8 +18589,8 @@ fi
DATADIRNAME=share DATADIRNAME=share
;; ;;

View file

@ -22,7 +22,6 @@ make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root /etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root /etc/gconf/gconf.xml.mandatory 0755 root root
/etc/gconf/gconf.xml.system 0755 root root" /etc/gconf/gconf.xml.system 0755 root root"
patch_args=-Np0
# Package build options # Package build options
build_options="gir" build_options="gir"

View file

@ -1,5 +1,5 @@
--- src/Makefile.in 2019-12-13 22:50:49.000000000 +0100 --- a/src/Makefile.in 2019-12-13 22:50:49.000000000 +0100
+++ src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200 +++ b/src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@

View file

@ -15,7 +15,6 @@ alternatives="
scheme:scheme:/usr/bin/gauche scheme:scheme:/usr/bin/gauche
scheme:scheme.1:/usr/share/man/man1/gauche.1 scheme:scheme.1:/usr/share/man/man1/gauche.1
" "
patch_args=-Np0
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
# Gauche needs itself to bootstrap for cross compilation. # Gauche needs itself to bootstrap for cross compilation.

View file

@ -1,7 +1,7 @@
# workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/ # workaround for https://sourceforge.net/p/graphicsmagick/bugs/580/
--- Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800 --- a/Makefile.am.orig 2021-02-14 00:46:02.239418403 -0800
+++ Makefile.am 2021-02-14 00:46:48.431547444 -0800 +++ b/Makefile.am 2021-02-14 00:46:48.431547444 -0800
@@ -79,7 +79,6 @@ @@ -79,7 +79,6 @@
# Tests to run # Tests to run
@ -11,8 +11,8 @@
$(MAGICKPP_TESTS) \ $(MAGICKPP_TESTS) \
$(WAND_TESTS) \ $(WAND_TESTS) \
--- Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800 --- a/Makefile.in.orig 2021-02-14 00:49:51.414058625 -0800
+++ Makefile.in 2021-02-14 00:50:19.996138472 -0800 +++ b/Makefile.in 2021-02-14 00:50:19.996138472 -0800
@@ -4767,7 +4767,7 @@ @@ -4767,7 +4767,7 @@
@WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl @WITH_PERL_TRUE@PERLMAGICK_DISTCLEAN_LOCAL_TARGETS = clean-perl
@WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local @WITH_PERL_TRUE@PERLMAGICK_MAINTAINER_CLEAN_LOCAL_TARGETS = distclean-local

View file

@ -21,7 +21,6 @@ changelog="http://www.graphicsmagick.org/NEWS.html"
distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/graphicsmagick/graphicsmagick/${version}/${pkgname}-${version}.tar.gz"
checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563 checksum=1e6723c48c4abbb31197fadf8396b2d579d97e197123edc70a4f057f0533d563
keep_libtool_archives=yes keep_libtool_archives=yes
patch_args=-Np0
post_install() { post_install() {
vlicense Copyright.txt LICENSE vlicense Copyright.txt LICENSE

View file

@ -10,8 +10,8 @@ also deleted two line ending spaces
diff --git src/hpdf_image_png.c src/hpdf_image_png.c diff --git src/hpdf_image_png.c src/hpdf_image_png.c
index 3a35f5c..3f20a77 100644 index 3a35f5c..3f20a77 100644
--- src/hpdf_image_png.c --- a/src/hpdf_image_png.c
+++ src/hpdf_image_png.c +++ b/src/hpdf_image_png.c
@@ -280,8 +280,8 @@ ReadTransparentPngData (HPDF_Dict image, @@ -280,8 +280,8 @@ ReadTransparentPngData (HPDF_Dict image,
case PNG_COLOR_TYPE_RGB_ALPHA: case PNG_COLOR_TYPE_RGB_ALPHA:
row_len = 3 * width * sizeof(png_byte); row_len = 3 * width * sizeof(png_byte);

View file

@ -12,7 +12,6 @@ license="Zlib"
homepage="http://libharu.org/" homepage="http://libharu.org/"
distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz" distfiles="https://github.com/libharu/libharu/archive/RELEASE_${version//./_}.tar.gz"
checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2 checksum=8f9e68cc5d5f7d53d1bc61a1ed876add1faf4f91070dbc360d8b259f46d9a4d2
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr" configure_args="--with-zlib=${XBPS_CROSS_BASE}/usr"

View file

@ -22,8 +22,8 @@ Subject: [PATCH] fix for GCC 9 build issue, as reported in #1111 and #1117
diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.cpp librecad/src/actions/rs_actiondrawcircletan1_2p.cpp diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.cpp librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
index c14da00e..f305408a 100644 index c14da00e..f305408a 100644
--- librecad/src/actions/rs_actiondrawcircletan1_2p.cpp --- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
+++ librecad/src/actions/rs_actiondrawcircletan1_2p.cpp +++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -38,8 +38,8 @@ index c14da00e..f305408a 100644
RS_CircleData cData; RS_CircleData cData;
diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.h librecad/src/actions/rs_actiondrawcircletan1_2p.h diff --git librecad/src/actions/rs_actiondrawcircletan1_2p.h librecad/src/actions/rs_actiondrawcircletan1_2p.h
index a6f40a6e..b5976c9f 100644 index a6f40a6e..b5976c9f 100644
--- librecad/src/actions/rs_actiondrawcircletan1_2p.h --- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h
+++ librecad/src/actions/rs_actiondrawcircletan1_2p.h +++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h
@@ -79,6 +79,9 @@ protected: @@ -79,6 +79,9 @@ protected:
private: private:
struct Points; struct Points;
@ -52,8 +52,8 @@ index a6f40a6e..b5976c9f 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawcircletan2.cpp librecad/src/actions/rs_actiondrawcircletan2.cpp diff --git librecad/src/actions/rs_actiondrawcircletan2.cpp librecad/src/actions/rs_actiondrawcircletan2.cpp
index d0558f05..820e4226 100644 index d0558f05..820e4226 100644
--- librecad/src/actions/rs_actiondrawcircletan2.cpp --- a/librecad/src/actions/rs_actiondrawcircletan2.cpp
+++ librecad/src/actions/rs_actiondrawcircletan2.cpp +++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp
@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -67,8 +67,8 @@ index d0558f05..820e4226 100644
RS_Vector coord; RS_Vector coord;
diff --git librecad/src/actions/rs_actiondrawcircletan2.h librecad/src/actions/rs_actiondrawcircletan2.h diff --git librecad/src/actions/rs_actiondrawcircletan2.h librecad/src/actions/rs_actiondrawcircletan2.h
index bed56897..5b2040e9 100644 index bed56897..5b2040e9 100644
--- librecad/src/actions/rs_actiondrawcircletan2.h --- a/librecad/src/actions/rs_actiondrawcircletan2.h
+++ librecad/src/actions/rs_actiondrawcircletan2.h +++ b/librecad/src/actions/rs_actiondrawcircletan2.h
@@ -77,6 +77,9 @@ protected: @@ -77,6 +77,9 @@ protected:
private: private:
struct Points; struct Points;
@ -81,8 +81,8 @@ index bed56897..5b2040e9 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.cpp librecad/src/actions/rs_actiondrawcircletan2_1p.cpp diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.cpp librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
index 324c1668..51cd29a1 100644 index 324c1668..51cd29a1 100644
--- librecad/src/actions/rs_actiondrawcircletan2_1p.cpp --- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
+++ librecad/src/actions/rs_actiondrawcircletan2_1p.cpp +++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -96,8 +96,8 @@ index 324c1668..51cd29a1 100644
RS_CircleData cData; RS_CircleData cData;
diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.h librecad/src/actions/rs_actiondrawcircletan2_1p.h diff --git librecad/src/actions/rs_actiondrawcircletan2_1p.h librecad/src/actions/rs_actiondrawcircletan2_1p.h
index 40c23903..e44a56c3 100644 index 40c23903..e44a56c3 100644
--- librecad/src/actions/rs_actiondrawcircletan2_1p.h --- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h
+++ librecad/src/actions/rs_actiondrawcircletan2_1p.h +++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h
@@ -73,6 +73,9 @@ protected: @@ -73,6 +73,9 @@ protected:
private: private:
struct Points; struct Points;
@ -110,8 +110,8 @@ index 40c23903..e44a56c3 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawcircletan3.cpp librecad/src/actions/rs_actiondrawcircletan3.cpp diff --git librecad/src/actions/rs_actiondrawcircletan3.cpp librecad/src/actions/rs_actiondrawcircletan3.cpp
index 026ed30e..eaca13d6 100644 index 026ed30e..eaca13d6 100644
--- librecad/src/actions/rs_actiondrawcircletan3.cpp --- a/librecad/src/actions/rs_actiondrawcircletan3.cpp
+++ librecad/src/actions/rs_actiondrawcircletan3.cpp +++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp
@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -125,8 +125,8 @@ index 026ed30e..eaca13d6 100644
std::shared_ptr<RS_CircleData> cData{std::make_shared<RS_CircleData>()}; std::shared_ptr<RS_CircleData> cData{std::make_shared<RS_CircleData>()};
diff --git librecad/src/actions/rs_actiondrawcircletan3.h librecad/src/actions/rs_actiondrawcircletan3.h diff --git librecad/src/actions/rs_actiondrawcircletan3.h librecad/src/actions/rs_actiondrawcircletan3.h
index d0cabfa2..3201c5f8 100644 index d0cabfa2..3201c5f8 100644
--- librecad/src/actions/rs_actiondrawcircletan3.h --- a/librecad/src/actions/rs_actiondrawcircletan3.h
+++ librecad/src/actions/rs_actiondrawcircletan3.h +++ b/librecad/src/actions/rs_actiondrawcircletan3.h
@@ -78,6 +78,8 @@ public: @@ -78,6 +78,8 @@ public:
struct Points; struct Points;
std::unique_ptr<Points> pPoints; std::unique_ptr<Points> pPoints;
@ -138,8 +138,8 @@ index d0cabfa2..3201c5f8 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawlinerelangle.cpp librecad/src/actions/rs_actiondrawlinerelangle.cpp diff --git librecad/src/actions/rs_actiondrawlinerelangle.cpp librecad/src/actions/rs_actiondrawlinerelangle.cpp
index 8415dd60..b9ce996f 100644 index 8415dd60..b9ce996f 100644
--- librecad/src/actions/rs_actiondrawlinerelangle.cpp --- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp
+++ librecad/src/actions/rs_actiondrawlinerelangle.cpp +++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp
@@ -38,11 +38,6 @@ @@ -38,11 +38,6 @@
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -154,8 +154,8 @@ index 8415dd60..b9ce996f 100644
RS_GraphicView& graphicView, RS_GraphicView& graphicView,
diff --git librecad/src/actions/rs_actiondrawlinerelangle.h librecad/src/actions/rs_actiondrawlinerelangle.h diff --git librecad/src/actions/rs_actiondrawlinerelangle.h librecad/src/actions/rs_actiondrawlinerelangle.h
index 1e102792..71e5185b 100644 index 1e102792..71e5185b 100644
--- librecad/src/actions/rs_actiondrawlinerelangle.h --- a/librecad/src/actions/rs_actiondrawlinerelangle.h
+++ librecad/src/actions/rs_actiondrawlinerelangle.h +++ b/librecad/src/actions/rs_actiondrawlinerelangle.h
@@ -110,6 +110,9 @@ private: @@ -110,6 +110,9 @@ private:
* Is the angle fixed? * Is the angle fixed?
*/ */
@ -168,8 +168,8 @@ index 1e102792..71e5185b 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawlinetangent1.cpp librecad/src/actions/rs_actiondrawlinetangent1.cpp diff --git librecad/src/actions/rs_actiondrawlinetangent1.cpp librecad/src/actions/rs_actiondrawlinetangent1.cpp
index 197b0cb6..47a93c76 100644 index 197b0cb6..47a93c76 100644
--- librecad/src/actions/rs_actiondrawlinetangent1.cpp --- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp
+++ librecad/src/actions/rs_actiondrawlinetangent1.cpp +++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp
@@ -36,12 +36,6 @@ @@ -36,12 +36,6 @@
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -185,8 +185,8 @@ index 197b0cb6..47a93c76 100644
RS_GraphicView& graphicView) RS_GraphicView& graphicView)
diff --git librecad/src/actions/rs_actiondrawlinetangent1.h librecad/src/actions/rs_actiondrawlinetangent1.h diff --git librecad/src/actions/rs_actiondrawlinetangent1.h librecad/src/actions/rs_actiondrawlinetangent1.h
index 0f76b368..d20d302d 100644 index 0f76b368..d20d302d 100644
--- librecad/src/actions/rs_actiondrawlinetangent1.h --- a/librecad/src/actions/rs_actiondrawlinetangent1.h
+++ librecad/src/actions/rs_actiondrawlinetangent1.h +++ b/librecad/src/actions/rs_actiondrawlinetangent1.h
@@ -66,6 +66,12 @@ private: @@ -66,6 +66,12 @@ private:
std::unique_ptr<RS_Vector> point; std::unique_ptr<RS_Vector> point;
/** Chosen entity */ /** Chosen entity */
@ -202,8 +202,8 @@ index 0f76b368..d20d302d 100644
#endif #endif
diff --git librecad/src/actions/rs_actiondrawlinetangent2.cpp librecad/src/actions/rs_actiondrawlinetangent2.cpp diff --git librecad/src/actions/rs_actiondrawlinetangent2.cpp librecad/src/actions/rs_actiondrawlinetangent2.cpp
index fed3545e..0f1600e5 100644 index fed3545e..0f1600e5 100644
--- librecad/src/actions/rs_actiondrawlinetangent2.cpp --- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp
+++ librecad/src/actions/rs_actiondrawlinetangent2.cpp +++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp
@@ -35,10 +35,6 @@ @@ -35,10 +35,6 @@
#include "rs_preview.h" #include "rs_preview.h"
#include "rs_debug.h" #include "rs_debug.h"
@ -217,8 +217,8 @@ index fed3545e..0f1600e5 100644
RS_GraphicView& graphicView) RS_GraphicView& graphicView)
diff --git librecad/src/actions/rs_actiondrawlinetangent2.h librecad/src/actions/rs_actiondrawlinetangent2.h diff --git librecad/src/actions/rs_actiondrawlinetangent2.h librecad/src/actions/rs_actiondrawlinetangent2.h
index b0d884cd..95d82465 100644 index b0d884cd..95d82465 100644
--- librecad/src/actions/rs_actiondrawlinetangent2.h --- a/librecad/src/actions/rs_actiondrawlinetangent2.h
+++ librecad/src/actions/rs_actiondrawlinetangent2.h +++ b/librecad/src/actions/rs_actiondrawlinetangent2.h
@@ -68,6 +68,9 @@ private: @@ -68,6 +68,9 @@ private:
/** 2nd chosen entity */ /** 2nd chosen entity */
RS_Entity* circle2; RS_Entity* circle2;

View file

@ -1,5 +1,5 @@
--- librecad/src/lib/engine/lc_splinepoints.h 2016-09-23 07:34:43.000000000 +0200 --- a/librecad/src/lib/engine/lc_splinepoints.h 2016-09-23 07:34:43.000000000 +0200
+++ librecad/src/lib/engine/lc_splinepoints.h 2020-10-26 19:40:13.317774271 +0100 +++ b/librecad/src/lib/engine/lc_splinepoints.h 2020-10-26 19:40:13.317774271 +0100
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <vector> #include <vector>
@ -8,8 +8,8 @@
class QPolygonF; class QPolygonF;
struct RS_LineTypePattern; struct RS_LineTypePattern;
--- librecad/src/lib/gui/rs_painterqt.h 2016-09-23 07:34:43.000000000 +0200 --- a/librecad/src/lib/gui/rs_painterqt.h 2016-09-23 07:34:43.000000000 +0200
+++ librecad/src/lib/gui/rs_painterqt.h 2020-10-26 19:43:13.804763513 +0100 +++ b/librecad/src/lib/gui/rs_painterqt.h 2020-10-26 19:43:13.804763513 +0100
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
#define RS_PAINTERQT_H #define RS_PAINTERQT_H

View file

@ -1,5 +1,5 @@
--- librecad/src/ui/generic/widgetcreator.cpp --- a/librecad/src/ui/generic/widgetcreator.cpp
+++ librecad/src/ui/generic/widgetcreator.cpp +++ b/librecad/src/ui/generic/widgetcreator.cpp
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#include <QSettings> #include <QSettings>
#include <QLineEdit> #include <QLineEdit>

View file

@ -11,7 +11,6 @@ license="GPL-2.0-only"
homepage="http://librecad.org" homepage="http://librecad.org"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06 checksum=74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06
patch_args=-Np0
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr" configure_args+=" BOOST_DIR=${XBPS_CROSS_BASE}/usr"

View file

@ -8,8 +8,8 @@ Subject: Fix register allocation bug in arm64
diff --git src/lj_asm_arm64.h src/lj_asm_arm64.h diff --git src/lj_asm_arm64.h src/lj_asm_arm64.h
index 8fd92e7..549f8a6 100644 index 8fd92e7..549f8a6 100644
--- src/lj_asm_arm64.h --- a/src/lj_asm_arm64.h
+++ src/lj_asm_arm64.h +++ b/src/lj_asm_arm64.h
@@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir) @@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
int bigofs = !emit_checkofs(A64I_LDRx, ofs); int bigofs = !emit_checkofs(A64I_LDRx, ofs);
RegSet allow = RSET_GPR; RegSet allow = RSET_GPR;

View file

@ -8,8 +8,8 @@ Subject: Enable debugging symbols in the build
diff --git src/Makefile src/Makefile diff --git src/Makefile src/Makefile
index 8a38efd..6b73a89 100644 index 8a38efd..6b73a89 100644
--- src/Makefile --- a/src/Makefile
+++ src/Makefile +++ b/src/Makefile
@@ -54,9 +54,9 @@ CCOPT_arm64= @@ -54,9 +54,9 @@ CCOPT_arm64=
CCOPT_ppc= CCOPT_ppc=
CCOPT_mips= CCOPT_mips=

View file

@ -1,5 +1,5 @@
--- src/jit/bcsave.lua.orig 2018-12-17 19:06:27.215042417 +0100 --- a/src/jit/bcsave.lua 2018-12-17 19:06:27.215042417 +0100
+++ src/jit/bcsave.lua 2018-12-17 19:17:12.982477945 +0100 +++ b/src/jit/bcsave.lua 2018-12-17 19:17:12.982477945 +0100
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
local map_arch = { local map_arch = {

View file

@ -10,8 +10,8 @@ Subject: Get rid of LUAJIT_VERSION_SYM that changes ABI on every patch release
diff --git src/lj_dispatch.c src/lj_dispatch.c diff --git src/lj_dispatch.c src/lj_dispatch.c
index 5d6795f..e865a78 100644 index 5d6795f..e865a78 100644
--- src/lj_dispatch.c --- a/src/lj_dispatch.c
+++ src/lj_dispatch.c +++ b/src/lj_dispatch.c
@@ -319,11 +319,6 @@ int luaJIT_setmode(lua_State *L, int idx, int mode) @@ -319,11 +319,6 @@ int luaJIT_setmode(lua_State *L, int idx, int mode)
return 1; /* OK. */ return 1; /* OK. */
} }
@ -26,8 +26,8 @@ index 5d6795f..e865a78 100644
/* This function can be called asynchronously (e.g. during a signal). */ /* This function can be called asynchronously (e.g. during a signal). */
diff --git src/luajit.c src/luajit.c diff --git src/luajit.c src/luajit.c
index 1ca2430..ccf425e 100644 index 1ca2430..ccf425e 100644
--- src/luajit.c --- a/src/luajit.c
+++ src/luajit.c +++ b/src/luajit.c
@@ -516,8 +516,6 @@ static int pmain(lua_State *L) @@ -516,8 +516,6 @@ static int pmain(lua_State *L)
globalL = L; globalL = L;
if (argv[0] && argv[0][0]) progname = argv[0]; if (argv[0] && argv[0][0]) progname = argv[0];
@ -39,8 +39,8 @@ index 1ca2430..ccf425e 100644
print_usage(); print_usage();
diff --git src/luajit.h src/luajit.h diff --git src/luajit.h src/luajit.h
index 708a5a1..35ae02c 100644 index 708a5a1..35ae02c 100644
--- src/luajit.h --- a/src/luajit.h
+++ src/luajit.h +++ b/src/luajit.h
@@ -73,7 +73,4 @@ LUA_API void luaJIT_profile_stop(lua_State *L); @@ -73,7 +73,4 @@ LUA_API void luaJIT_profile_stop(lua_State *L);
LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt, LUA_API const char *luaJIT_profile_dumpstack(lua_State *L, const char *fmt,
int depth, size_t *len); int depth, size_t *len);

View file

@ -8,8 +8,8 @@ Subject: Make ccall_copy_struct static to unpollute global library namespace
diff --git src/lj_ccall.c src/lj_ccall.c diff --git src/lj_ccall.c src/lj_ccall.c
index b891591..a7dcc1b 100644 index b891591..a7dcc1b 100644
--- src/lj_ccall.c --- a/src/lj_ccall.c
+++ src/lj_ccall.c +++ b/src/lj_ccall.c
@@ -960,7 +960,7 @@ noth: /* Not a homogeneous float/double aggregate. */ @@ -960,7 +960,7 @@ noth: /* Not a homogeneous float/double aggregate. */
return 0; /* Struct is in GPRs. */ return 0; /* Struct is in GPRs. */
} }

View file

@ -12,7 +12,6 @@ license="MIT"
homepage="http://www.luajit.org" homepage="http://www.luajit.org"
distfiles="http://luajit.org/download/${pkgname}-${_dist_version}.tar.gz" distfiles="http://luajit.org/download/${pkgname}-${_dist_version}.tar.gz"
checksum=1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3 checksum=1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
patch_args=-Np0
build_options="lua52compat" build_options="lua52compat"

View file

@ -1,5 +1,5 @@
--- src/include.am 2019-09-15 11:19:21.139430520 +0300 --- a/src/include.am 2019-09-15 11:19:21.139430520 +0300
+++ - 2019-09-15 11:20:24.234994345 +0300 +++ b/src/include.am 2019-09-15 11:19:21.139430520 +0300
@@ -7,9 +7,9 @@ @@ -7,9 +7,9 @@
MEGACMD = mega-cmd mega-exec mega-cmd-server MEGACMD = mega-cmd mega-exec mega-cmd-server

View file

@ -14,7 +14,6 @@ homepage="https://github.com/meganz/MEGAcmd"
distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz" distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz"
checksum=2a3626a9f1d22303fe2123f984a8ecf3779d6d59ac6c67c1bf43c2423dcb832d checksum=2a3626a9f1d22303fe2123f984a8ecf3779d6d59ac6c67c1bf43c2423dcb832d
replaces="megacmd>=0" replaces="megacmd>=0"
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
configure_args="--with-libtool-sysroot=${XBPS_CROSS_BASE}" configure_args="--with-libtool-sysroot=${XBPS_CROSS_BASE}"

View file

@ -1,5 +1,5 @@
--- Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100 --- a/Maelstrom-netd.c 2021-02-01 16:46:31.000000000 +0100
+++ Maelstrom-netd.c 2021-02-08 10:34:17.661600013 +0100 +++ b/Maelstrom-netd.c 2021-02-08 10:34:17.661600013 +0100
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>

View file

@ -1,5 +1,5 @@
--- buttonlist.h 2000-01-25 17:41:32.000000000 +0100 --- a/buttonlist.h 2000-01-25 17:41:32.000000000 +0100
+++ buttonlist.h 2021-02-08 10:38:39.377296739 +0100 +++ b/buttonlist.h 2021-02-08 10:38:39.377296739 +0100
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height,

View file

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="https://www.libsdl.org/projects/Maelstrom/" homepage="https://www.libsdl.org/projects/Maelstrom/"
distfiles="${homepage}/src/${pkgname}-${version}.tar.gz" distfiles="${homepage}/src/${pkgname}-${version}.tar.gz"
checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036 checksum=93680322f4b04d4727ea8e0b461f259b604dc69e7465cb91d2b9aad378a9a036
patch_args=-Np0
CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result" CXXFLAGS="-Wno-error -Wno-write-strings -Wno-unused-result"

View file

@ -9,8 +9,8 @@ Subject: [PATCH] fix build on big endian
diff --git Source/MACLib/MD5.cpp Source/MACLib/MD5.cpp diff --git Source/MACLib/MD5.cpp Source/MACLib/MD5.cpp
index c122fb5..89079b2 100644 index c122fb5..89079b2 100644
--- Source/MACLib/MD5.cpp --- a/Source/MACLib/MD5.cpp
+++ Source/MACLib/MD5.cpp +++ b/Source/MACLib/MD5.cpp
@@ -35,11 +35,11 @@ CopyToLittleEndian ( uint32_t* dst, @@ -35,11 +35,11 @@ CopyToLittleEndian ( uint32_t* dst,
const uint8_t* src, const uint8_t* src,
size_t length ) size_t length )

View file

@ -11,8 +11,8 @@ Subject: [PATCH] MonkeysAudio: patch out bad endian definitions breaking
diff --git Shared/All.h Shared/All.h diff --git Shared/All.h Shared/All.h
index 6dfb669..cc9a988 100644 index 6dfb669..cc9a988 100644
--- Shared/All.h --- a/Shared/All.h
+++ Shared/All.h +++ b/Shared/All.h
@@ -45,6 +45,7 @@ Global includes @@ -45,6 +45,7 @@ Global includes
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -37,8 +37,8 @@ index 6dfb669..cc9a988 100644
*****************************************************************************************/ *****************************************************************************************/
diff --git Source/Shared/All.h Source/Shared/All.h diff --git Source/Shared/All.h Source/Shared/All.h
index 6dfb669..cc9a988 100644 index 6dfb669..cc9a988 100644
--- Source/Shared/All.h --- a/Source/Shared/All.h
+++ Source/Shared/All.h +++ b/Source/Shared/All.h
@@ -45,6 +45,7 @@ Global includes @@ -45,6 +45,7 @@ Global includes
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

View file

@ -10,8 +10,8 @@ Subject: [PATCH] add powerpc64 in 64-bit platforms to unbreak build
diff --git Shared/All.h Shared/All.h diff --git Shared/All.h Shared/All.h
index cc9a988..615e3d1 100644 index cc9a988..615e3d1 100644
--- Shared/All.h --- a/Shared/All.h
+++ Shared/All.h +++ b/Shared/All.h
@@ -123,7 +123,7 @@ Global compiler settings (useful for porting) @@ -123,7 +123,7 @@ Global compiler settings (useful for porting)
#endif #endif
#endif #endif
@ -23,8 +23,8 @@ index cc9a988..615e3d1 100644
#endif #endif
diff --git Source/Shared/All.h Source/Shared/All.h diff --git Source/Shared/All.h Source/Shared/All.h
index cc9a988..615e3d1 100644 index cc9a988..615e3d1 100644
--- Source/Shared/All.h --- a/Source/Shared/All.h
+++ Source/Shared/All.h +++ b/Source/Shared/All.h
@@ -123,7 +123,7 @@ Global compiler settings (useful for porting) @@ -123,7 +123,7 @@ Global compiler settings (useful for porting)
#endif #endif
#endif #endif

View file

@ -14,7 +14,6 @@ distfiles="https://monkeysaudio.com/files/MAC_SDK_${version//./}.zip
checksum="0000cbfad5f008014bf3d963b72039c518a1e93ded55b23da715d912c830623e checksum="0000cbfad5f008014bf3d963b72039c518a1e93ded55b23da715d912c830623e
7d60dabaf760f32180e272b5955d5f1a2febcf9930eff13e49a1934a286a5819" 7d60dabaf760f32180e272b5955d5f1a2febcf9930eff13e49a1934a286a5819"
skip_extraction="license.html" skip_extraction="license.html"
patch_args=-Np0
do_build() { do_build() {
cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/license.html ${wrksrc} cp -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/license.html ${wrksrc}

View file

@ -2,8 +2,8 @@ $NetBSD: patch-linc2_src_Makefile.in,v 1.1 2013/04/19 14:28:54 prlw1 Exp $
Avoid compilation error caused by use of deprecated g_thread API Avoid compilation error caused by use of deprecated g_thread API
--- linc2/src/Makefile.in.orig 2010-09-28 09:39:39.000000000 +0000 --- a/linc2/src/Makefile.in 2010-09-28 09:39:39.000000000 +0000
+++ linc2/src/Makefile.in +++ b/linc2/src/Makefile.in
@@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la @@ -244,7 +244,7 @@ noinst_LTLIBRARIES = liblinc.la
# -I$(top_srcdir)/include # -I$(top_srcdir)/include
INCLUDES = -I$(top_builddir)/linc2/include \ INCLUDES = -I$(top_builddir)/linc2/include \

View file

@ -13,7 +13,6 @@ homepage="http://projects.gnome.org/ORBit2/"
distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2" distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2"
checksum=55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 checksum=55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
disable_parallel_build=yes disable_parallel_build=yes
patch_args=-Np0
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" ORBit2" hostmakedepends+=" ORBit2"

View file

@ -1,5 +1,5 @@
--- cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200 --- a/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200
+++ - 2020-07-25 17:12:30.624868454 +0200 +++ b/cmake/GetArch.cmake 2020-07-15 20:02:29.000000000 +0200
@@ -14,6 +14,25 @@ @@ -14,6 +14,25 @@
# default # default
set (ARCH "i386") set (ARCH "i386")

View file

@ -1,5 +1,5 @@
--- include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200 --- a/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200
+++ - 2020-07-25 18:04:24.579351335 +0200 +++ b/include/zeroconf-detail.hpp 2020-07-15 20:02:29.000000000 +0200
@@ -20,9 +20,7 @@ @@ -20,9 +20,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <winsock2.h> #include <winsock2.h>
@ -18,8 +18,8 @@
-#endif // ZEROCONF_DETAIL_HPP -#endif // ZEROCONF_DETAIL_HPP
\ No newline at end of file \ No newline at end of file
+#endif // ZEROCONF_DETAIL_HPP +#endif // ZEROCONF_DETAIL_HPP
--- include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200 --- a/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200
+++ - 2020-07-25 18:10:40.700768834 +0200 +++ b/include/zeroconf-detail.hpp 2020-07-25 18:05:08.714098962 +0200
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>

View file

@ -20,7 +20,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, WxWindows-e
homepage="https://opencpn.org/" homepage="https://opencpn.org/"
distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz" distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7 checksum=f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7
patch_args=-Np0
build_options="lzma libarchive exif crashreport" build_options="lzma libarchive exif crashreport"
build_options_default="lzma libarchive exif" build_options_default="lzma libarchive exif"

View file

@ -1,7 +1,7 @@
Disambiguate abs() for gcc6 Disambiguate abs() for gcc6
--- src/Geoscape/Globe.cpp 2014-06-13 21:14:43.000000000 +0200 --- a/src/Geoscape/Globe.cpp 2014-06-13 21:14:43.000000000 +0200
+++ src/Geoscape/Globe.cpp 2016-10-03 16:35:38.988290974 +0200 +++ b/src/Geoscape/Globe.cpp 2016-10-03 16:35:38.988290974 +0200
@@ -1390,12 +1390,12 @@ @@ -1390,12 +1390,12 @@
if (fabs(sx)<0.01) if (fabs(sx)<0.01)

View file

@ -1,6 +1,6 @@
diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h
--- src/Basescape/BaseInfoState.h 2018-03-14 15:06:59.665628271 +0000 --- a/src/Basescape/BaseInfoState.h 2018-03-14 15:06:59.665628271 +0000
+++ src/Basescape/BaseInfoState.h 2018-03-14 15:43:22.067605905 +0000 +++ b/src/Basescape/BaseInfoState.h 2018-03-14 15:43:22.067605905 +0000
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#ifndef OPENXCOM_BASEINFOSTATE_H #ifndef OPENXCOM_BASEINFOSTATE_H
#define OPENXCOM_BASEINFOSTATE_H #define OPENXCOM_BASEINFOSTATE_H
@ -10,8 +10,8 @@ diff -aur src/Basescape/BaseInfoState.h src/Basescape/BaseInfoState.h
namespace OpenXcom namespace OpenXcom
diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h
--- src/Basescape/CraftInfoState.h 2018-03-14 15:02:09.783729176 +0000 --- a/src/Basescape/CraftInfoState.h 2018-03-14 15:02:09.783729176 +0000
+++ src/Basescape/CraftInfoState.h 2018-03-14 15:43:16.476703036 +0000 +++ b/src/Basescape/CraftInfoState.h 2018-03-14 15:43:16.476703036 +0000
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#ifndef OPENXCOM_CRAFTINFOSTATE_H #ifndef OPENXCOM_CRAFTINFOSTATE_H
#define OPENXCOM_CRAFTINFOSTATE_H #define OPENXCOM_CRAFTINFOSTATE_H
@ -21,8 +21,8 @@ diff -aur src/Basescape/CraftInfoState.h src/Basescape/CraftInfoState.h
namespace OpenXcom namespace OpenXcom
diff -aur src/Engine/Language.h src/Engine/Language.h diff -aur src/Engine/Language.h src/Engine/Language.h
--- src/Engine/Language.h 2018-03-14 15:11:37.236763021 +0000 --- a/src/Engine/Language.h 2018-03-14 15:11:37.236763021 +0000
+++ src/Engine/Language.h 2018-03-14 15:42:14.751775215 +0000 +++ b/src/Engine/Language.h 2018-03-14 15:42:14.751775215 +0000
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
@ -32,8 +32,8 @@ diff -aur src/Engine/Language.h src/Engine/Language.h
#include "../Savegame/Soldier.h" #include "../Savegame/Soldier.h"
diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h
--- src/Engine/OptionInfo.h 2018-03-14 15:14:50.346384845 +0000 --- a/src/Engine/OptionInfo.h 2018-03-14 15:14:50.346384845 +0000
+++ src/Engine/OptionInfo.h 2018-03-14 15:42:14.750775233 +0000 +++ b/src/Engine/OptionInfo.h 2018-03-14 15:42:14.750775233 +0000
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
#include <string> #include <string>
#include <map> #include <map>
@ -43,8 +43,8 @@ diff -aur src/Engine/OptionInfo.h src/Engine/OptionInfo.h
namespace OpenXcom namespace OpenXcom
{ {
diff -aur src/Savegame/CraftWeapon.h src/Savegame/CraftWeapon.h diff -aur src/Savegame/CraftWeapon.h src/Savegame/CraftWeapon.h
--- src/Savegame/CraftWeapon.h 2018-03-14 15:27:14.695387913 +0000 --- a/src/Savegame/CraftWeapon.h 2018-03-14 15:27:14.695387913 +0000
+++ src/Savegame/CraftWeapon.h 2018-03-14 15:42:14.748775267 +0000 +++ b/src/Savegame/CraftWeapon.h 2018-03-14 15:42:14.748775267 +0000
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include <string> #include <string>

View file

@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
homepage="http://openxcom.org/" homepage="http://openxcom.org/"
distfiles="https://github.com/SupSuper/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/SupSuper/${pkgname}/archive/v${version}.tar.gz"
checksum=45acb280010a01d60506b1c5f2951ae501c012cc6161aac470bd15c1e6981246 checksum=45acb280010a01d60506b1c5f2951ae501c012cc6161aac470bd15c1e6981246
patch_args=-Np0
pre_configure() { pre_configure() {
aclocal --install -Im4 aclocal --install -Im4

View file

@ -10,8 +10,8 @@ fixes #37
diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp diff --git a/src/pamix_ui.cpp b/src/pamix_ui.cpp
index ed2d65e..16a2e34 100644 index ed2d65e..16a2e34 100644
--- src/pamix_ui.cpp --- a/src/pamix_ui.cpp
+++ src/pamix_ui.cpp +++ b/src/pamix_ui.cpp
@@ -1,13 +1,5 @@ @@ -1,13 +1,5 @@
#include <pamix_ui.hpp> #include <pamix_ui.hpp>

View file

@ -13,7 +13,6 @@ license="MIT"
homepage="https://github.com/patroclos/PAmix" homepage="https://github.com/patroclos/PAmix"
distfiles="${homepage}/archive/${version}.tar.gz" distfiles="${homepage}/archive/${version}.tar.gz"
checksum=b63522889d70920d64229c66e2ab6929950476538443af297f6b242f7e9dc406 checksum=b63522889d70920d64229c66e2ab6929950476538443af297f6b242f7e9dc406
patch_args=-Np0
case "${XBPS_TARGET_MACHINE}" in case "${XBPS_TARGET_MACHINE}" in
*-musl) broken="Parts of ncurses, not available on musl";; *-musl) broken="Parts of ncurses, not available on musl";;

View file

@ -9,8 +9,8 @@ Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
index 601719b50..43dab2390 100644 index 601719b50..43dab2390 100644
--- src/slic3r/Utils/Serial.cpp --- a/src/slic3r/Utils/Serial.cpp
+++ src/slic3r/Utils/Serial.cpp +++ b/src/slic3r/Utils/Serial.cpp
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <sys/ioctl.h> #include <sys/ioctl.h>

View file

@ -1,5 +1,5 @@
--- src/libslic3r/Thread.cpp.orig 2021-01-24 13:50:00.469444149 +0100 --- a/src/libslic3r/Thread.cpp 2021-01-24 13:50:00.469444149 +0100
+++ src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100 +++ b/src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100
@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre @@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre
return true; return true;
} }

View file

@ -1,5 +1,5 @@
--- src/avrdude/CMakeLists.txt.orig 2020-06-04 09:19:26.017251215 +0200 --- a/src/avrdude/CMakeLists.txt 2020-06-04 09:19:26.017251215 +0200
+++ src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200 +++ b/src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200
@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen @@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen
add_custom_command( add_custom_command(
DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf

View file

@ -18,7 +18,6 @@ homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5 checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio" nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
patch_args=-Np0
Slic3rPE_package() { Slic3rPE_package() {
build_style=meta build_style=meta

View file

@ -1,5 +1,5 @@
--- plugins/velleman/src/velleman_mock.cpp.orig 2020-07-05 16:57:25.002161999 -0700 --- a/plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:57:25.002161999 -0700
+++ plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:58:10.053165244 -0700 +++ b/plugins/velleman/src/velleman_mock.cpp 2020-07-05 16:58:10.053165244 -0700
@@ -18,9 +18,7 @@ @@ -18,9 +18,7 @@
*/ */

View file

@ -14,7 +14,6 @@ license="Apache-2.0"
homepage="https://www.qlcplus.org/" homepage="https://www.qlcplus.org/"
distfiles="https://github.com/mcallegari/qlcplus/archive/QLC+_$version.tar.gz" distfiles="https://github.com/mcallegari/qlcplus/archive/QLC+_$version.tar.gz"
checksum=cefb5e84dee04b3567733fcaf4f8125069eec859b506e790ba8a9d921f1e75cc checksum=cefb5e84dee04b3567733fcaf4f8125069eec859b506e790ba8a9d921f1e75cc
patch_args=-Np0
pre_build() { pre_build() {
vsed -i 's/QMAKE_CXXFLAGS/#QMAKE_CXXFLAGS/' variables.pri vsed -i 's/QMAKE_CXXFLAGS/#QMAKE_CXXFLAGS/' variables.pri

View file

@ -2,8 +2,8 @@ Makes SDL-1.2 SDL_WM_GrabInput() non-blocking in case of SDL window is not
viewable. Patch provided by <pbonzini@redhat.com>. viewable. Patch provided by <pbonzini@redhat.com>.
See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>. See <http://bugzilla.libsdl.org/show_bug.cgi?id=1155>.
--- src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000 --- a/src/video/x11/SDL_x11wm.c 2007-12-31 04:48:13.000000000 +0000
+++ src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000 +++ b/src/video/x11/SDL_x11wm.c 2009-01-15 10:27:14.000000000 +0000
@@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS, @@ -351,13 +351,14 @@ SDL_GrabMode X11_GrabInputNoLock(_THIS,
result = XGrabPointer(SDL_Display, SDL_Window, True, 0, result = XGrabPointer(SDL_Display, SDL_Window, True, 0,
GrabModeAsync, GrabModeAsync, GrabModeAsync, GrabModeAsync,

View file

@ -1,5 +1,5 @@
--- sdl-config.in.multilib 2007-07-20 07:52:45.000000000 +0200 --- a/sdl-config.in.multilib 2007-07-20 07:52:45.000000000 +0200
+++ sdl-config.in 2007-11-06 17:07:25.000000000 +0100 +++ b/sdl-config.in 2007-11-06 17:07:25.000000000 +0100
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@

View file

@ -1,5 +1,5 @@
--- configure 2012-01-19 07:30:12.000000000 +0100 --- a/configure 2012-01-19 07:30:12.000000000 +0100
+++ configure 2018-11-27 22:58:07.344753821 +0100 +++ b/configure 2018-11-27 22:58:07.344753821 +0100
@@ -1514,6 +1514,7 @@ @@ -1514,6 +1514,7 @@
--disable-esdtest Do not try to compile and run a test ESD program --disable-esdtest Do not try to compile and run a test ESD program
--enable-esd-shared dynamically load ESD audio support [default=yes] --enable-esd-shared dynamically load ESD audio support [default=yes]
@ -40,8 +40,8 @@
CheckESD CheckESD
CheckPulseAudio CheckPulseAudio
CheckNAS CheckNAS
--- include/SDL_config.h.in 2018-11-27 21:52:07.645177938 +0100 --- a/include/SDL_config.h.in 2018-11-27 21:52:07.645177938 +0100
+++ include/SDL_config.h.in 2018-11-27 22:03:06.217107399 +0100 +++ b/include/SDL_config.h.in 2018-11-27 22:03:06.217107399 +0100
@@ -184,6 +184,7 @@ @@ -184,6 +184,7 @@
#undef SDL_AUDIO_DRIVER_QNXNTO #undef SDL_AUDIO_DRIVER_QNXNTO
#undef SDL_AUDIO_DRIVER_SNDMGR #undef SDL_AUDIO_DRIVER_SNDMGR
@ -50,8 +50,8 @@
#undef SDL_AUDIO_DRIVER_WAVEOUT #undef SDL_AUDIO_DRIVER_WAVEOUT
/* Enable various cdrom drivers */ /* Enable various cdrom drivers */
--- src/audio/SDL_audio.c 2018-11-27 21:52:07.646177937 +0100 --- a/src/audio/SDL_audio.c 2018-11-27 21:52:07.646177937 +0100
+++ src/audio/SDL_audio.c 2018-11-27 22:04:37.977097571 +0100 +++ b/src/audio/SDL_audio.c 2018-11-27 22:04:37.977097571 +0100
@@ -42,6 +42,9 @@ @@ -42,6 +42,9 @@
#if SDL_AUDIO_DRIVER_ALSA #if SDL_AUDIO_DRIVER_ALSA
&ALSA_bootstrap, &ALSA_bootstrap,
@ -62,8 +62,8 @@
#if SDL_AUDIO_DRIVER_BSD #if SDL_AUDIO_DRIVER_BSD
&BSD_AUDIO_bootstrap, &BSD_AUDIO_bootstrap,
#endif #endif
--- src/audio/SDL_sysaudio.h 2018-11-27 21:52:07.647177937 +0100 --- a/src/audio/SDL_sysaudio.h 2018-11-27 21:52:07.647177937 +0100
+++ src/audio/SDL_sysaudio.h 2018-11-27 22:05:13.697093745 +0100 +++ b/src/audio/SDL_sysaudio.h 2018-11-27 22:05:13.697093745 +0100
@@ -105,6 +105,9 @@ @@ -105,6 +105,9 @@
#if SDL_AUDIO_DRIVER_BSD #if SDL_AUDIO_DRIVER_BSD
extern AudioBootStrap BSD_AUDIO_bootstrap; extern AudioBootStrap BSD_AUDIO_bootstrap;
@ -74,8 +74,8 @@
#if SDL_AUDIO_DRIVER_PULSE #if SDL_AUDIO_DRIVER_PULSE
extern AudioBootStrap PULSE_bootstrap; extern AudioBootStrap PULSE_bootstrap;
#endif #endif
--- src/audio/sndio/SDL_sndioaudio.c 1970-01-01 01:00:00.000000000 +0100 --- a/src/audio/sndio/SDL_sndioaudio.c 1970-01-01 01:00:00.000000000 +0100
+++ src/audio/sndio/SDL_sndioaudio.c 2013-12-19 10:24:18.000000000 +0100 +++ b/src/audio/sndio/SDL_sndioaudio.c 2013-12-19 10:24:18.000000000 +0100
@@ -0,0 +1,243 @@ @@ -0,0 +1,243 @@
+/* +/*
+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org> + * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>
@ -320,8 +320,8 @@
+ /* We're ready to rock and roll. :-) */ + /* We're ready to rock and roll. :-) */
+ return(0); + return(0);
+} +}
--- src/audio/sndio/SDL_sndioaudio.h 1970-01-01 01:00:00.000000000 +0100 --- a/src/audio/sndio/SDL_sndioaudio.h 1970-01-01 01:00:00.000000000 +0100
+++ src/audio/sndio/SDL_sndioaudio.h 2013-12-15 02:57:55.000000000 +0100 +++ b/src/audio/sndio/SDL_sndioaudio.h 2013-12-15 02:57:55.000000000 +0100
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+/* +/*
+ * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org> + * Copyright (c) 2008 Jacob Meuser <jakemsr@sdf.lonestar.org>

View file

@ -19,7 +19,6 @@ license="LGPL-2.1-only"
homepage="http://www.libsdl.org/" homepage="http://www.libsdl.org/"
distfiles="http://www.libsdl.org/release/SDL-${version}.tar.gz" distfiles="http://www.libsdl.org/release/SDL-${version}.tar.gz"
checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
patch_args=-Np0
# Package build options # Package build options
build_options="x11 opengl aalib pulseaudio" build_options="x11 opengl aalib pulseaudio"

View file

@ -1,5 +1,5 @@
--- include/SDL_opengl_glext.h 2019-07-25 06:32:36.000000000 +0200 --- a/include/SDL_opengl_glext.h 2019-07-25 06:32:36.000000000 +0200
+++ include/SDL_opengl_glext.h 2019-12-13 01:24:33.908796188 +0100 +++ b/include/SDL_opengl_glext.h 2019-12-13 01:24:33.908796188 +0100
@@ -469,9 +469,10 @@ @@ -469,9 +469,10 @@
typedef long GLsizeiptr; typedef long GLsizeiptr;
typedef long GLintptr; typedef long GLintptr;

View file

@ -15,7 +15,6 @@ license="Zlib"
homepage="http://www.libsdl.org/" homepage="http://www.libsdl.org/"
distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz" distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
patch_args=-Np0
# Package build options # Package build options
build_options="gles opengl pulseaudio sndio vulkan wayland x11" build_options="gles opengl pulseaudio sndio vulkan wayland x11"

View file

@ -1,5 +1,5 @@
--- src/External/sol/sol.hpp --- a/src/External/sol/sol.hpp
+++ src/External/sol/sol.hpp +++ b/src/External/sol/sol.hpp
@@ -6818,7 +6818,7 @@ @@ -6818,7 +6818,7 @@
} }

View file

@ -1,6 +1,6 @@
lzma is p7zip not liblzma lzma is p7zip not liblzma
--- src/External/CMakeLists.txt --- a/src/External/CMakeLists.txt
+++ src/External/CMakeLists.txt +++ b/src/External/CMakeLists.txt
@@ -24,12 +24,10 @@ @@ -24,12 +24,10 @@
file(GLOB_RECURSE EXTERNAL_SOURCES file(GLOB_RECURSE EXTERNAL_SOURCES
*.cpp *.cpp

View file

@ -15,7 +15,6 @@ homepage="https://github.com/sirjuddington/SLADE"
changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}" changelog="https://github.com/sirjuddington/SLADE/releases/tag/${version}"
distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz" distfiles="https://github.com/sirjuddington/SLADE/archive/${version}.tar.gz"
checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60 checksum=7dc8a0089855f6321d2ec185fa5c97fcb7cc54857033aa3adec9a5ec8226ed60
patch_args=-Np0
pre_configure() { pre_configure() {
case $XBPS_TARGET_MACHINE in case $XBPS_TARGET_MACHINE in

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