diff options
| author | Ørjan Malde <red@foxi.me> | 2021-08-27 13:21:10 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2021-08-27 13:21:10 +0200 |
| commit | a7749acadb4bf0523a36e7e66d7e063d6421c75a (patch) | |
| tree | 72096135683086cbf86afb149c366d809b583aa1 /patches | |
| parent | 7cc54a06b0f4760dae3547a0516df00286ec1329 (diff) | |
| download | midipix_build-a7749acadb4bf0523a36e7e66d7e063d6421c75a.tar.bz2 midipix_build-a7749acadb4bf0523a36e7e66d7e063d6421c75a.tar.xz | |
patches/{bochs,gtk3}: drop obsolete patches
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bochs-2.6.9.local.patch | 50 | ||||
| -rw-r--r-- | patches/gtk3-3.22.28.local.patch | 12 |
2 files changed, 0 insertions, 62 deletions
diff --git a/patches/bochs-2.6.9.local.patch b/patches/bochs-2.6.9.local.patch deleted file mode 100644 index 457fba8d..00000000 --- a/patches/bochs-2.6.9.local.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -ru bochs-2.6.9.orig/main.cc bochs-2.6.9/main.cc ---- bochs-2.6.9.orig/main.cc 2017-02-18 17:28:04.318635000 +0100 -+++ bochs-2.6.9/main.cc 2021-07-18 01:15:37.859411673 +0200 -@@ -1525,5 +1525,9 @@ - } - #endif - -+ /* FIXME: this works, but definitely isn't right! */ -+ if(signum == 0) -+ return; -+ - BX_PANIC(("SIGNAL %u caught", signum)); - } -diff -ru bochs-2.6.9.orig/configure bochs-2.6.9/configure ---- bochs-2.6.9.orig/configure 2017-04-09 08:46:13.780213000 +0200 -+++ bochs-2.6.9/configure 2021-07-17 23:41:23.537634378 +0200 -@@ -23665,7 +23665,7 @@ - - fi - case "$target" in -- *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32*) -+ *-pc-windows* | *-pc-winnt* | *-cygwin* | *-mingw32* | *-midipix*) - NETLOW_OBJS="$NETLOW_OBJS eth_win32.o" - ethernet_modules="$ethernet_modules win32" - $as_echo "#define BX_NETMOD_WIN32 1" >>confdefs.h -@@ -24629,10 +24629,10 @@ - SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_SDL)" - # GUI_*FLAGS are added to the compilation of every bochs file, not just - # the files in gui/*.cc. -- SDL_CFLAGS=`sdl-config --cflags` -+ SDL_CFLAGS=`$PKG_CONFIG --cflags sdl` - GUI_CFLAGS="$GUI_CFLAGS $SDL_CFLAGS" - GUI_CXXFLAGS="$GUI_CXXFLAGS $SDL_CFLAGS" -- GUI_LINK_OPTS_SDL="`sdl-config --libs`" -+ GUI_LINK_OPTS_SDL=`$PKG_CONFIG --libs sdl` - GUI_LINK_OPTS="$GUI_LINK_OPTS \$(GUI_LINK_OPTS_SDL)" - # The enhanced X debugger depends on GTK2 - if test "$gui_debugger" = 1 -a "$DEFAULT_GUI" != win32; then -diff -ru bochs-2.6.9.orig/gui/term.cc bochs-2.6.9/gui/term.cc ---- bochs-2.6.9.orig/gui/term.cc 2017-01-15 12:44:43.207284000 +0100 -+++ bochs-2.6.9/gui/term.cc 2019-11-04 21:23:25.102021241 +0100 -@@ -29,7 +29,7 @@ - #if BX_WITH_TERM - - extern "C" { --#include <curses.h> -+#include <ncurses.h> - #include <signal.h> - }; - diff --git a/patches/gtk3-3.22.28.local.patch b/patches/gtk3-3.22.28.local.patch deleted file mode 100644 index f60454f8..00000000 --- a/patches/gtk3-3.22.28.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru gtk+-3.22.28.orig/Makefile.in gtk+-3.22.28/Makefile.in ---- gtk+-3.22.28.orig/Makefile.in 2018-02-14 19:22:34.000000000 +0100 -+++ gtk+-3.22.28/Makefile.in 2018-03-07 00:17:36.646939857 +0100 -@@ -566,7 +566,7 @@ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY - --SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples -+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests examples - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - MAINTAINERCLEANFILES = \ |