[higan] 05/34: Delete unused patches and write corresponding changelog entry.
Tobias Hansen
thansen at moszumanska.debian.org
Sun Jun 26 10:44:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository higan.
commit 0c9430ebb00fd0a6c676ccdc93b764ab73f7fe28
Author: Tobias Hansen <thansen at localhost.localdomain>
Date: Tue Mar 15 00:14:25 2016 +0000
Delete unused patches and write corresponding changelog entry.
---
debian/changelog | 15 +++++++
debian/patches/dt_lnk-dt_unknown.patch | 49 ----------------------
debian/patches/fc-heuristic-error.patch | 28 -------------
debian/patches/force-button-images.patch | 17 --------
debian/patches/handle-opengl-x-error.patch | 64 -----------------------------
debian/patches/load-private-libraries.patch | 19 ---------
6 files changed, 15 insertions(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8fe5059..ab8088a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,21 @@
higan (097-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Remove patches (no longer needed):
+ - load-private-libraries.patch
+ - force-button-images.patch
+ - fc-heuristic-error.patch
+ - dt_lnk-dt_unknown.patch
+ - handle-opengl-x-error.patch
+ * Change patches:
+ - noopt-nostrip.patch to noopt.patch:
+ Binaries are no longer stripped by default.
+ * Refresh/update patches:
+ - nall-makefile-fixes.patch
+ - makefile-fixes.patch
+ - desktop-file.patch
+ - sjlj-declare-xopen-source.patch
+ - use-XDG_CONFIG_HOME.patch
-- Tobias Hansen <thansen at debian.org> Mon, 14 Mar 2016 23:25:31 +0000
diff --git a/debian/patches/dt_lnk-dt_unknown.patch b/debian/patches/dt_lnk-dt_unknown.patch
deleted file mode 100644
index 7b71229..0000000
--- a/debian/patches/dt_lnk-dt_unknown.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Handle symlinks/DT_UNKNOWN correctly
- The game library and import dialog don't work at all on my system with
- the packaged version of higan:
- * I'm not able to navigate to the directories I want to use, because I
- have symlinks pointing to them: symlinks to directories are treated
- as files, and filtered out based on the filename pattern.
- * Even after navigating to the link's target, no directories are
- visible. Most of my filesystems use XFS, which doesn't fill d_type
- in readdir (it sets DT_UNKNOWN); so these are also treated as files
- and filtered out.
- * If I manage to import a file by navigating to its parent directory,
- it never appears in the Famicom / Super Famicom / etc. tabs, because
- files get converted to directories when imported and directories get
- filtered out as described above. (There's apparently no way to load
- things without going through the library--e.g., on the command line.)
-Author: Michael Gold <michael at bitplane.org>
-Bug-Debian: http://bugs.debian.org/737361
-
---- a/nall/directory.hpp
-+++ b/nall/directory.hpp
-@@ -190,10 +190,10 @@
- while(ep = readdir(dp)) {
- if(!strcmp(ep->d_name, ".")) continue;
- if(!strcmp(ep->d_name, "..")) continue;
-- bool is_directory = ep->d_type & DT_DIR;
-- if(ep->d_type & DT_UNKNOWN) {
-+ bool is_directory = (ep->d_type == DT_DIR);
-+ if(ep->d_type == DT_UNKNOWN || ep->d_type == DT_LNK) {
- struct stat sp = {0};
-- stat(string{pathname, ep->d_name}, &sp);
-+ fstatat(dirfd(dp), ep->d_name, &sp, 0);
- is_directory = S_ISDIR(sp.st_mode);
- }
- if(is_directory) {
-@@ -215,7 +215,13 @@
- while(ep = readdir(dp)) {
- if(!strcmp(ep->d_name, ".")) continue;
- if(!strcmp(ep->d_name, "..")) continue;
-- if((ep->d_type & DT_DIR) == 0) {
-+ bool is_file = (ep->d_type == DT_REG);
-+ if(ep->d_type == DT_UNKNOWN || ep->d_type == DT_LNK) {
-+ struct stat sp = {0};
-+ fstatat(dirfd(dp), ep->d_name, &sp, 0);
-+ is_file = S_ISREG(sp.st_mode);
-+ }
-+ if(is_file) {
- if(strmatch(ep->d_name, pattern)) list.append(ep->d_name);
- }
- }
diff --git a/debian/patches/fc-heuristic-error.patch b/debian/patches/fc-heuristic-error.patch
deleted file mode 100644
index 2553d7a..0000000
--- a/debian/patches/fc-heuristic-error.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Prevent crash when importing unheadered NES ROM
- higan segfaults when one tries to import a NES ROM without an iNES header.
- With this patch it shows an error instead if there's no header.
-Author: Michael Gold <michael at bitplane.org>
-Bug-Debian: http://bugs.debian.org/737363
-
---- a/ananke/famicom.cpp
-+++ b/ananke/famicom.cpp
-@@ -12,9 +12,18 @@
- nall::basename(information.name),
- ".fc/"
- };
-- directory::create(pathname);
-
- FamicomCartridge info(buffer.data(), buffer.size());
-+ if (info.markup.size() == 0) {
-+ if(thread::primary()) MessageWindow().setText({
-+ "Error: ", information.name, "\n\n",
-+ "The selected game could not be added to the library"
-+ " because it was not recognized and contains no header."
-+ }).error();
-+ return "";
-+ }
-+
-+ directory::create(pathname);
- string markup = {"unverified\n\n", info.markup};
- markup.append("\ninformation\n title: ", nall::basename(information.name), "\n");
- if(!information.manifest.empty()) markup = information.manifest; //override with embedded beat manifest, if one exists
diff --git a/debian/patches/force-button-images.patch b/debian/patches/force-button-images.patch
deleted file mode 100644
index 40ffa88..0000000
--- a/debian/patches/force-button-images.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Force button images
- Showing buttons or not is a user setting in GTK+.
- The default is not to show buttons. higan has buttons
- with only an image and no text, so the images are needed.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/hiro/gtk/application.cpp
-+++ b/hiro/gtk/application.cpp
-@@ -39,7 +39,7 @@
- gtk_init(&argc, &argvp);
-
- GtkSettings* gtkSettings = gtk_settings_get_default();
--//g_object_set(gtkSettings, "gtk-button-images", true, nullptr);
-+ g_object_set(gtkSettings, "gtk-button-images", true, nullptr);
-
- gtk_rc_parse_string(R"(
- style "phoenix-gtk"
diff --git a/debian/patches/handle-opengl-x-error.patch b/debian/patches/handle-opengl-x-error.patch
deleted file mode 100644
index cb73ffb..0000000
--- a/debian/patches/handle-opengl-x-error.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Description: Handle possible X error when creating OpenGL context
- Without this higan just crashes when the driver does
- not support OpenGL 3.2 and context creation fails.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/ruby/video/glx.cpp
-+++ b/ruby/video/glx.cpp
-@@ -1,10 +1,19 @@
- #include "opengl/opengl.hpp"
-+#include "emulator/emulator.hpp"
-+#include "target-ethos/interface/interface.hpp"
-
- #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
- #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
-
- namespace ruby {
-
-+static bool ctxErrorOccurred = false;
-+static int ctxErrorHandler( Display *dpy, XErrorEvent *ev )
-+{
-+ ctxErrorOccurred = true;
-+ return 0;
-+}
-+
- struct pVideoGLX : OpenGL {
- GLXContext (*glXCreateContextAttribs)(Display*, GLXFBConfig, GLXContext, int, const int*) = nullptr;
- int (*glXSwapInterval)(int) = nullptr;
-@@ -171,6 +180,10 @@
- XNextEvent(display, &event);
- }
-
-+ // Install X error handler to prevent a crash in case context creation fails.
-+ ctxErrorOccurred = false;
-+ int (*oldHandler)(Display*, XErrorEvent*) = XSetErrorHandler(&ctxErrorHandler);
-+
- glxcontext = glXCreateContext(display, vi, /* sharelist = */ 0, /* direct = */ GL_TRUE);
- glXMakeCurrent(display, glxwindow = xwindow, glxcontext);
-
-@@ -185,13 +198,24 @@
- None
- };
- GLXContext context = glXCreateContextAttribs(display, fbConfig[0], nullptr, true, attributes);
-- if(context) {
-+
-+ // Sync to ensure any errors generated are processed.
-+ XSync( display, False );
-+ if ( !ctxErrorOccurred && context ) {
- glXMakeCurrent(display, 0, nullptr);
- glXDestroyContext(display, glxcontext);
- glXMakeCurrent(display, glxwindow, glxcontext = context);
- }
- }
-
-+ XSync( display, False );
-+ // Restore the original error handler.
-+ XSetErrorHandler( oldHandler );
-+ if ( ctxErrorOccurred ) {
-+ interface->notify("Error: Creation of an OpenGL 3.2 context failed. Select another video driver on the Advanced Configuration tab and restart higan.\n");
-+ return false;
-+ }
-+
- if(glXSwapInterval) {
- glXSwapInterval(settings.synchronize);
- }
diff --git a/debian/patches/load-private-libraries.patch b/debian/patches/load-private-libraries.patch
deleted file mode 100644
index 5416461..0000000
--- a/debian/patches/load-private-libraries.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Search libs in private path
- Look for libraries first in LD_LIBRARY_PATH (as suggested
- by Michael Gold in http://bugs.debian.org/737365
- then in higans private lib path, then in the standard paths.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/nall/dl.hpp
-+++ b/nall/dl.hpp
-@@ -38,7 +38,9 @@
- #if defined(PLATFORM_X)
- inline bool library::open(const string& name, const string& path) {
- if(handle) close();
-- handle = (uintptr_t)dlopen(string(path, !path.empty() && !path.endsWith("/") ? "/" : "", "lib", name, ".so"), RTLD_LAZY);
-+ handle = (uintptr_t)dlopen(string("lib", name, ".so"), RTLD_LAZY);
-+ if(!handle) handle = (uintptr_t)dlopen(string("/usr/lib/higan/lib", name, ".so"), RTLD_LAZY);
-+ if(!handle) handle = (uintptr_t)dlopen(string(path, !path.empty() && !path.endsWith("/") ? "/" : "", "lib", name, ".so"), RTLD_LAZY);
- if(!handle) handle = (uintptr_t)dlopen(string("/usr/local/lib/lib", name, ".so"), RTLD_LAZY);
- return handle;
- }
--
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