This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository higan.
commit ce4abd12671eddca2da5ec73d0c1271346657b9f Author: Tobias Hansen <[email protected]> Date: Sat Sep 2 18:58:34 2017 +0100 Refresh patches. --- debian/changelog | 1 + debian/patches/create_config.patch | 4 ++-- debian/patches/disable-alsa-and-udev-on-non-linux.patch | 12 ++++++------ debian/patches/ignore_manifests_by_default.patch | 2 +- debian/patches/series | 1 - debian/patches/sjlj-declare-xopen-source.patch | 4 ++-- debian/patches/sjlj-ftbfs.patch | 14 -------------- debian/patches/tomoko-makefile-fixes.patch | 2 +- 8 files changed, 13 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1392fd..9b7ac1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ higan (104-1) UNRELEASED; urgency=medium * New upstream release. + * Remove sjlj-ftbfs.patch (applied upstream). -- Tobias Hansen <[email protected]> Sat, 02 Sep 2017 18:46:23 +0100 diff --git a/debian/patches/create_config.patch b/debian/patches/create_config.patch index 1c096fb..a8c5fb3 100644 --- a/debian/patches/create_config.patch +++ b/debian/patches/create_config.patch @@ -6,10 +6,10 @@ Author: Tobias Hansen <[email protected]> --- a/higan/target-tomoko/configuration/configuration.cpp +++ b/higan/target-tomoko/configuration/configuration.cpp -@@ -49,5 +49,6 @@ +@@ -60,5 +60,6 @@ } - auto Settings::quit() -> void { + auto Settings::save() -> void { - file::write(locate("settings.bml"), BML::serialize(*this)); + directory::create({Path::config(), "higan/"}); + file::write({Path::config(), "higan/", "settings.bml"}, BML::serialize(*this)); diff --git a/debian/patches/disable-alsa-and-udev-on-non-linux.patch b/debian/patches/disable-alsa-and-udev-on-non-linux.patch index 350df17..4c0ee92 100644 --- a/debian/patches/disable-alsa-and-udev-on-non-linux.patch +++ b/debian/patches/disable-alsa-and-udev-on-non-linux.patch @@ -6,17 +6,17 @@ Author: Tobias Hansen <[email protected]> @@ -27,8 +27,14 @@ ruby += input.quartz input.carbon else ifeq ($(platform),linux) - ruby += video.glx video.xv video.xshm video.sdl -- ruby += audio.alsa audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao -- ruby += input.udev input.sdl input.xlib + ruby += video.glx video.xvideo video.xshm video.sdl +- ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao +- ruby += input.sdl input.xlib input.udev + ifneq ($(findstring Linux,$(uname)),) + ruby += audio.alsa + endif -+ ruby += audio.openal audio.oss audio.pulseaudio audio.pulseaudiosimple audio.ao ++ ruby += audio.oss audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao + ifneq ($(findstring Linux,$(uname)),) + ruby += input.udev + endif + ruby += input.sdl input.xlib else ifeq ($(platform),bsd) - ruby += video.glx video.xv video.xshm video.sdl - ruby += audio.openal audio.oss + ruby += video.glx video.xvideo video.xshm video.sdl + ruby += audio.oss audio.openal diff --git a/debian/patches/ignore_manifests_by_default.patch b/debian/patches/ignore_manifests_by_default.patch index 618781d..dea2cbd 100644 --- a/debian/patches/ignore_manifests_by_default.patch +++ b/debian/patches/ignore_manifests_by_default.patch @@ -13,5 +13,5 @@ Author: Tobias Hansen <[email protected]> - set("Library/IgnoreManifests", false); + set("Library/IgnoreManifests", true); - set("Video/Driver", ruby::Video::optimalDriver()); + set("Video/Driver", ruby::Video::safestDriver()); set("Video/Synchronize", false); diff --git a/debian/patches/series b/debian/patches/series index 54ade30..ca59900 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,3 @@ create_config.patch include_cmath.patch disable-alsa-and-udev-on-non-linux.patch tomoko-makefile-fixes.patch -sjlj-ftbfs.patch diff --git a/debian/patches/sjlj-declare-xopen-source.patch b/debian/patches/sjlj-declare-xopen-source.patch index a8698fe..1550e33 100644 --- a/debian/patches/sjlj-declare-xopen-source.patch +++ b/debian/patches/sjlj-declare-xopen-source.patch @@ -5,11 +5,11 @@ Author: Tobias Hansen <[email protected]> --- a/libco/sjlj.c +++ b/libco/sjlj.c -@@ -10,6 +10,7 @@ +@@ -4,6 +4,7 @@ */ #define LIBCO_C +#define _XOPEN_SOURCE 700 #include "libco.h" + #include "settings.h" - #include <stdlib.h> diff --git a/debian/patches/sjlj-ftbfs.patch b/debian/patches/sjlj-ftbfs.patch deleted file mode 100644 index ae38878..0000000 --- a/debian/patches/sjlj-ftbfs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: sjlj.c needs settings.h for thread_local -Author: Adrian Bunk <[email protected]> -Bug-Debian: https://bugs.debian.org/869385 - ---- a/libco/sjlj.c -+++ b/libco/sjlj.c -@@ -12,6 +12,7 @@ - #define LIBCO_C - #define _XOPEN_SOURCE 700 - #include "libco.h" -+#include "settings.h" - - #include <stdlib.h> - #include <signal.h> diff --git a/debian/patches/tomoko-makefile-fixes.patch b/debian/patches/tomoko-makefile-fixes.patch index 4b4aa5b..8008084 100644 --- a/debian/patches/tomoko-makefile-fixes.patch +++ b/debian/patches/tomoko-makefile-fixes.patch @@ -5,7 +5,7 @@ Author: Tobias Hansen <[email protected]> --- a/higan/target-tomoko/GNUmakefile +++ b/higan/target-tomoko/GNUmakefile -@@ -84,9 +84,7 @@ +@@ -85,9 +85,7 @@ endif install: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/higan.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
