[higan] 05/16: Refresh patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Feb 14 00:01:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository higan.
commit 47c1a33335035afa5d8ebfa83cffa95374b40188
Author: Tobias Hansen <thansen at debian.org>
Date: Mon Feb 13 21:42:36 2017 +0000
Refresh patches.
---
debian/changelog | 1 +
debian/patches/create_config.patch | 2 +-
debian/patches/disable-alsa-on-non-linux.patch | 2 +-
debian/patches/disable_long_double_size_check.patch | 15 ---------------
debian/patches/find_cairo.patch | 2 +-
debian/patches/ignore_manifests_by_default.patch | 2 +-
debian/patches/makefile-fixes.patch | 2 +-
debian/patches/nall-makefile-fixes.patch | 6 +++---
debian/patches/noopt.patch | 6 +++---
debian/patches/series | 1 -
debian/patches/sjlj-declare-xopen-source.patch | 4 ++--
debian/patches/use-XDG_CONFIG_HOME.patch | 14 +++++++-------
debian/patches/use_sharedpath.patch | 8 ++++----
13 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1e3225..3470eaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
higan (102-1) UNRELEASED; urgency=medium
* New upstream release. (Closes: #837553)
+ * Remove disable_long_double_size_check.patch (applied upstream).
-- Tobias Hansen <thansen at debian.org> Mon, 13 Feb 2017 21:23:07 +0000
diff --git a/debian/patches/create_config.patch b/debian/patches/create_config.patch
index e04536d..8491bdd 100644
--- a/debian/patches/create_config.patch
+++ b/debian/patches/create_config.patch
@@ -6,7 +6,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/higan/target-tomoko/configuration/configuration.cpp
+++ b/higan/target-tomoko/configuration/configuration.cpp
-@@ -48,5 +48,6 @@
+@@ -49,5 +49,6 @@
}
auto Settings::quit() -> void {
diff --git a/debian/patches/disable-alsa-on-non-linux.patch b/debian/patches/disable-alsa-on-non-linux.patch
index bb4fca9..61f210c 100644
--- a/debian/patches/disable-alsa-on-non-linux.patch
+++ b/debian/patches/disable-alsa-on-non-linux.patch
@@ -3,7 +3,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/higan/target-tomoko/GNUmakefile
+++ b/higan/target-tomoko/GNUmakefile
-@@ -25,7 +25,10 @@
+@@ -27,7 +27,10 @@
ruby += input.quartz input.carbon
else ifeq ($(platform),linux)
ruby += video.glx video.xv video.xshm video.sdl
diff --git a/debian/patches/disable_long_double_size_check.patch b/debian/patches/disable_long_double_size_check.patch
deleted file mode 100644
index 6a016db..0000000
--- a/debian/patches/disable_long_double_size_check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Disable a check for the size of long double
- This check fails on armel, armhf, mips and mipsel,
- where sizeof(long double) == 8.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/nall/stdint.hpp
-+++ b/nall/stdint.hpp
-@@ -47,7 +47,6 @@
-
- static_assert(sizeof(float) >= 4, "float32_t is not of the correct size");
- static_assert(sizeof(double) >= 8, "float64_t is not of the correct size");
--static_assert(sizeof(long double) >= 10, "float80_t is not of the correct size");
-
- using intmax = intmax_t;
- using intptr = intptr_t;
diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
index 463ebc7..05c222e 100644
--- a/debian/patches/find_cairo.patch
+++ b/debian/patches/find_cairo.patch
@@ -4,7 +4,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/higan/GNUmakefile
+++ b/higan/GNUmakefile
-@@ -33,7 +33,7 @@
+@@ -31,7 +31,7 @@
else ifeq ($(platform),macosx)
flags += -march=native
else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/ignore_manifests_by_default.patch b/debian/patches/ignore_manifests_by_default.patch
index 0a49b46..618781d 100644
--- a/debian/patches/ignore_manifests_by_default.patch
+++ b/debian/patches/ignore_manifests_by_default.patch
@@ -9,7 +9,7 @@ Author: Tobias Hansen <thansen at debian.org>
@@ -12,7 +12,7 @@
set("UserInterface/ShowStatusBar", true);
- set("Library/Location", {userpath(), "Emulation/"});
+ set("Library/Location", {Path::user(), "Emulation/"});
- set("Library/IgnoreManifests", false);
+ set("Library/IgnoreManifests", true);
diff --git a/debian/patches/makefile-fixes.patch b/debian/patches/makefile-fixes.patch
index d0910b7..2d6578f 100644
--- a/debian/patches/makefile-fixes.patch
+++ b/debian/patches/makefile-fixes.patch
@@ -11,7 +11,7 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/higan/GNUmakefile
+++ b/higan/GNUmakefile
-@@ -32,10 +32,10 @@
+@@ -30,10 +30,10 @@
else ifeq ($(platform),macosx)
flags += -march=native
else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/nall-makefile-fixes.patch b/debian/patches/nall-makefile-fixes.patch
index d698abc..3d3b992 100644
--- a/debian/patches/nall-makefile-fixes.patch
+++ b/debian/patches/nall-makefile-fixes.patch
@@ -19,9 +19,9 @@ Author: Tobias Hansen <thansen at debian.org>
endif
endif
--cflags := -x c -std=c99
-+cflags := -x c -std=c99 $(CFLAGS) $(CPPFLAGS)
- objcflags := -x objective-c -std=c99
+-cflags := -x c -std=c11
++cflags := -x c -std=c11 $(CFLAGS) $(CPPFLAGS)
+ objcflags := -x objective-c -std=c11
-cppflags := -x c++ -std=c++14
+cppflags := -x c++ -std=c++14 $(CFLAGS) $(CPPFLAGS)
objcppflags := -x objective-c++ -std=c++14
diff --git a/debian/patches/noopt.patch b/debian/patches/noopt.patch
index 2813d83..9ee9016 100644
--- a/debian/patches/noopt.patch
+++ b/debian/patches/noopt.patch
@@ -6,13 +6,13 @@ Bug-Debian: http://bugs.debian.org/737364
--- a/higan/GNUmakefile
+++ b/higan/GNUmakefile
-@@ -5,7 +5,8 @@
- profile := accuracy
+@@ -3,7 +3,8 @@
+ target := tomoko
# console := true
-flags += -I. -I.. -O3
+flags += -I. -I..
+flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3)
- objects := libco
+ objects := libco emulator audio video resource
# profile-guided optimization mode
diff --git a/debian/patches/series b/debian/patches/series
index cd82a04..63b29bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@ ignore_manifests_by_default.patch
create_config.patch
include_cmath.patch
disable-alsa-on-non-linux.patch
-disable_long_double_size_check.patch
diff --git a/debian/patches/sjlj-declare-xopen-source.patch b/debian/patches/sjlj-declare-xopen-source.patch
index 64d502c..a8698fe 100644
--- a/debian/patches/sjlj-declare-xopen-source.patch
+++ b/debian/patches/sjlj-declare-xopen-source.patch
@@ -5,8 +5,8 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/libco/sjlj.c
+++ b/libco/sjlj.c
-@@ -12,6 +12,7 @@
- */
+@@ -10,6 +10,7 @@
+ */
#define LIBCO_C
+#define _XOPEN_SOURCE 700
diff --git a/debian/patches/use-XDG_CONFIG_HOME.patch b/debian/patches/use-XDG_CONFIG_HOME.patch
index d3c9dfc..237fe98 100644
--- a/debian/patches/use-XDG_CONFIG_HOME.patch
+++ b/debian/patches/use-XDG_CONFIG_HOME.patch
@@ -4,20 +4,20 @@ Description: Use $XDG_CONFIG_HOME
Author: Michael Gold <michael at bitplane.org>
Bug-Debian: http://bugs.debian.org/738270
---- a/nall/string/platform.hpp
-+++ b/nall/string/platform.hpp
-@@ -78,7 +78,13 @@
+--- a/nall/path.hpp
++++ b/nall/path.hpp
+@@ -80,7 +80,13 @@
#elif defined(PLATFORM_MACOSX)
- string result = {userpath(), "Library/Application Support/"};
+ string result = {Path::user(), "Library/Application Support/"};
#else
-- string result = {userpath(), ".config/"};
+- string result = {Path::user(), ".config/"};
+ string result;
+ const char *env = getenv("XDG_CONFIG_HOME");
+ if(env) {
+ result.append(env);
+ } else {
-+ result = {userpath(), ".config/"};
++ result = {Path::user(), ".config/"};
+ }
#endif
if(!result) result = ".";
- if(result.endsWith("/") == false) result.append("/");
+ if(!result.endsWith("/")) result.append("/");
diff --git a/debian/patches/use_sharedpath.patch b/debian/patches/use_sharedpath.patch
index 0941c22..a4ee245 100644
--- a/debian/patches/use_sharedpath.patch
+++ b/debian/patches/use_sharedpath.patch
@@ -5,12 +5,12 @@ Author: Tobias Hansen <thansen at debian.org>
--- a/higan/target-tomoko/tomoko.cpp
+++ b/higan/target-tomoko/tomoko.cpp
@@ -11,6 +11,9 @@
- location = {configpath(), "higan/", name};
+ location = {Path::config(), "higan/", name};
if(inode::exists(location)) return location;
-+ location = {sharedpath(), "higan/", name};
++ location = {Path::shared(), "higan/", name};
+ if(inode::exists(location)) return location;
+
- directory::create({localpath(), "higan/"});
- return {localpath(), "higan/", name};
+ directory::create({Path::local(), "higan/"});
+ return {Path::local(), "higan/", name};
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/higan.git
More information about the Pkg-games-commits
mailing list