This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository higan.
commit df6150bbd0733d417ec6a3c6c4def2525ea485d7 Author: Tobias Hansen <thansen@localhost.localdomain> Date: Tue Mar 15 00:07:09 2016 +0000 Refresh/disable patches. --- debian/patches/desktop-file.patch | 4 +-- debian/patches/force-button-images.patch | 4 +-- debian/patches/makefile-fixes.patch | 22 +++++++------- debian/patches/nall-makefile-fixes.patch | 42 ++++++++++++++------------ debian/patches/noopt-nostrip.patch | 39 ------------------------ debian/patches/noopt.patch | 18 +++++++++++ debian/patches/series | 7 +---- debian/patches/sjlj-declare-xopen-source.patch | 2 +- debian/patches/use-XDG_CONFIG_HOME.patch | 36 +--------------------- 9 files changed, 58 insertions(+), 116 deletions(-) diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch index 60ac5c2..ff344b1 100644 --- a/debian/patches/desktop-file.patch +++ b/debian/patches/desktop-file.patch @@ -2,8 +2,8 @@ Description: Enhance desktop file * Add keywords entry. Author: Tobias Hansen <than...@debian.org> ---- a/data/higan.desktop -+++ b/data/higan.desktop +--- a/higan/data/higan.desktop ++++ b/higan/data/higan.desktop @@ -6,3 +6,4 @@ Terminal=false Type=Application diff --git a/debian/patches/force-button-images.patch b/debian/patches/force-button-images.patch index 068cb1f..40ffa88 100644 --- a/debian/patches/force-button-images.patch +++ b/debian/patches/force-button-images.patch @@ -4,8 +4,8 @@ Description: Force button images with only an image and no text, so the images are needed. Author: Tobias Hansen <than...@debian.org> ---- a/phoenix/gtk/application.cpp -+++ b/phoenix/gtk/application.cpp +--- a/hiro/gtk/application.cpp ++++ b/hiro/gtk/application.cpp @@ -39,7 +39,7 @@ gtk_init(&argc, &argvp); diff --git a/debian/patches/makefile-fixes.patch b/debian/patches/makefile-fixes.patch index 065e7e2..aadc7d5 100644 --- a/debian/patches/makefile-fixes.patch +++ b/debian/patches/makefile-fixes.patch @@ -9,18 +9,18 @@ Description: Makefile fixes Author: Tobias Hansen <than...@debian.org> ---- a/Makefile -+++ b/Makefile -@@ -44,11 +44,9 @@ +--- a/higan/GNUmakefile ++++ b/higan/GNUmakefile +@@ -36,10 +36,10 @@ else ifeq ($(platform),macosx) flags += -march=native - else ifeq ($(platform),linux) -- flags += -march=native - link += -s -Wl,-export-dynamic -lX11 -lXext -ldl - else ifeq ($(platform),bsd) -- flags += -march=native -- link += -s -Wl,-export-dynamic -lX11 -lXext -+ link += -s -Wl,-export-dynamic -lX11 -lXext -ldl + else ifneq ($(filter $(platform),linux bsd),) +- flags += -march=native -fopenmp ++ flags += -fopenmp + link += -fopenmp + link += -Wl,-export-dynamic +- link += -lX11 -lXext ++ link += -lX11 -lXext -ldl else - $(error unsupported platform.) + $(error "unsupported platform") endif diff --git a/debian/patches/nall-makefile-fixes.patch b/debian/patches/nall-makefile-fixes.patch index c4c6a37..981644c 100644 --- a/debian/patches/nall-makefile-fixes.patch +++ b/debian/patches/nall-makefile-fixes.patch @@ -4,27 +4,29 @@ Description: nall/Makefile fixes Author: Tobias Hansen <than...@debian.org> ---- a/nall/Makefile -+++ b/nall/Makefile -@@ -44,18 +44,15 @@ - compiler := clang++ - flags := -w -stdlib=libc++ - link := -lc++ -lobjc -- else ifeq ($(platform),bsd) -- compiler := clang++ -- flags := -w -I/usr/local/include +--- a/nall/GNUmakefile ++++ b/nall/GNUmakefile +@@ -29,19 +29,19 @@ + platform := linux + delete = rm -f $1 + else ifneq ($(findstring BSD,$(uname)),) +- platform := bsd ++ platform := linux + delete = rm -f $1 else - compiler := g++ - flags := -- link := -+ link := $(LDFLAGS) + $(error unknown platform, please specify manually.) endif - -- cflags := -x c -std=c99 -+ cflags := -x c -std=c99 $(CFLAGS) $(CPPFLAGS) - objcflags := -x objective-c -std=c99 -- cppflags := -x c++ -std=c++11 -+ cppflags := -x c++ -std=c++11 $(CFLAGS) $(CPPFLAGS) - objcppflags := -x objective-c++ -std=c++11 endif +-cflags := -x c -std=c99 ++cflags := -x c -std=c99 $(CFLAGS) $(CPPFLAGS) + objcflags := -x objective-c -std=c99 +-cppflags := -x c++ -std=c++14 ++cppflags := -x c++ -std=c++14 $(CFLAGS) $(CPPFLAGS) + objcppflags := -x objective-c++ -std=c++14 + flags := +-link := ++link := $(LDFLAGS) + + # compiler detection + ifeq ($(compiler),) diff --git a/debian/patches/noopt-nostrip.patch b/debian/patches/noopt-nostrip.patch deleted file mode 100644 index f81e5a6..0000000 --- a/debian/patches/noopt-nostrip.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Support DEB_BUILD_OPTIONS='noopt nostrip' - This patch adds support for DEB_BUILD_OPTIONS=noopt and - DEB_BUILD_OPTIONS=nostrip, which are convenient for debugging. -Author: Michael Gold <mich...@bitplane.org> -Bug-Debian: http://bugs.debian.org/737364 - ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,8 @@ - # console := true - - # compiler --flags += -I. -O3 -fomit-frame-pointer -+flags += -I. -+flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3 -fomit-frame-pointer) - link += - objects := libco - -@@ -39,14 +40,17 @@ - else - link += -mwindows - endif -- link += -s -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32 -+ link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s) -+ link += -mthreads -luuid -lkernel32 -luser32 -lgdi32 -lcomctl32 -lcomdlg32 -lshell32 -lole32 -lws2_32 - link += -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc - else ifeq ($(platform),macosx) - flags += -march=native - else ifeq ($(platform),linux) -- link += -s -Wl,-export-dynamic -lX11 -lXext -ldl -+ link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s) -+ link += -Wl,-export-dynamic -lX11 -lXext -ldl - else ifeq ($(platform),bsd) -- link += -s -Wl,-export-dynamic -lX11 -lXext -ldl -+ link += $(if $(filter nostrip,$(DEB_BUILD_OPTIONS)),,-s) -+ link += -Wl,-export-dynamic -lX11 -lXext -ldl - else - $(error unsupported platform.) - endif diff --git a/debian/patches/noopt.patch b/debian/patches/noopt.patch new file mode 100644 index 0000000..fc41c4f --- /dev/null +++ b/debian/patches/noopt.patch @@ -0,0 +1,18 @@ +Description: Support DEB_BUILD_OPTIONS='noopt' + This patch adds support for DEB_BUILD_OPTIONS=noopt, + which is convenient for debugging. +Author: Michael Gold <mich...@bitplane.org> +Bug-Debian: http://bugs.debian.org/737364 + +--- a/higan/GNUmakefile ++++ b/higan/GNUmakefile +@@ -9,7 +9,8 @@ + target := tomoko + # console := true + +-flags += -I. -I.. -O3 ++flags += -I. -I.. ++flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3) + objects := libco + + # profile-guided optimization mode diff --git a/debian/patches/series b/debian/patches/series index 8fd4f61..a9cf3fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,6 @@ nall-makefile-fixes.patch makefile-fixes.patch -load-private-libraries.patch desktop-file.patch -force-button-images.patch sjlj-declare-xopen-source.patch -noopt-nostrip.patch -fc-heuristic-error.patch -dt_lnk-dt_unknown.patch +noopt.patch use-XDG_CONFIG_HOME.patch -handle-opengl-x-error.patch diff --git a/debian/patches/sjlj-declare-xopen-source.patch b/debian/patches/sjlj-declare-xopen-source.patch index de8d323..64d502c 100644 --- a/debian/patches/sjlj-declare-xopen-source.patch +++ b/debian/patches/sjlj-declare-xopen-source.patch @@ -11,5 +11,5 @@ Author: Tobias Hansen <than...@debian.org> #define LIBCO_C +#define _XOPEN_SOURCE 700 #include "libco.h" + #include <stdlib.h> - #include <signal.h> diff --git a/debian/patches/use-XDG_CONFIG_HOME.patch b/debian/patches/use-XDG_CONFIG_HOME.patch index c957c2e..8e88738 100644 --- a/debian/patches/use-XDG_CONFIG_HOME.patch +++ b/debian/patches/use-XDG_CONFIG_HOME.patch @@ -6,7 +6,7 @@ Bug-Debian: http://bugs.debian.org/738270 --- a/nall/string/platform.hpp +++ b/nall/string/platform.hpp -@@ -50,7 +50,13 @@ +@@ -64,7 +64,13 @@ #elif defined(PLATFORM_MACOSX) string result = {userpath(), "Library/Application Support/"}; #else @@ -21,37 +21,3 @@ Bug-Debian: http://bugs.debian.org/738270 #endif if(result.empty()) result = "."; if(result.endsWith("/") == false) result.append("/"); ---- a/phoenix/gtk/settings.cpp -+++ b/phoenix/gtk/settings.cpp -@@ -3,12 +3,12 @@ - static Settings* settings = nullptr; - - void Settings::load() { -- string path = {userpath(), ".config/phoenix/"}; -+ string path = {configpath(), "phoenix/"}; - Configuration::Document::load({path, "gtk.bml"}); - } - - void Settings::save() { -- string path = {userpath(), ".config/phoenix/"}; -+ string path = {configpath(), "phoenix/"}; - directory::create(path, 0755); - Configuration::Document::save({path, "gtk.bml"}); - } ---- a/phoenix/qt/settings.cpp -+++ b/phoenix/qt/settings.cpp -@@ -3,12 +3,12 @@ - static Settings *settings = nullptr; - - void Settings::load() { -- string path = {userpath(), ".config/phoenix/"}; -+ string path = {configpath(), "phoenix/"}; - Configuration::Document::load({path, "qt.bml"}); - } - - void Settings::save() { -- string path = {userpath(), ".config/phoenix/"}; -+ string path = {configpath(), "phoenix/"}; - directory::create(path, 0755); - Configuration::Document::save({path, "qt.bml"}); - } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/higan.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits