[higan] 04/05: Refresh patches.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository higan.

commit 97a1d9050364bc46dbfc5d37f528dd81196645b4
Author: Tobias Hansen <thansen at debian.org>
Date:   Sat Jul 22 12:30:05 2017 +0100

    Refresh patches.
---
 debian/patches/find_cairo.patch            |  2 +-
 debian/patches/makefile-fixes.patch        |  2 +-
 debian/patches/noopt.patch                 | 21 ++++++++++-----------
 debian/patches/tomoko-makefile-fixes.patch | 10 +---------
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/debian/patches/find_cairo.patch b/debian/patches/find_cairo.patch
index 05c222e..a8047c7 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
-@@ -31,7 +31,7 @@
+@@ -19,7 +19,7 @@
  else ifeq ($(platform),macosx)
    flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/makefile-fixes.patch b/debian/patches/makefile-fixes.patch
index 2d6578f..373dac4 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
-@@ -30,10 +30,10 @@
+@@ -19,10 +19,10 @@
  else ifeq ($(platform),macosx)
    flags += -march=native
  else ifneq ($(filter $(platform),linux bsd),)
diff --git a/debian/patches/noopt.patch b/debian/patches/noopt.patch
index 9ee9016..35c774c 100644
--- a/debian/patches/noopt.patch
+++ b/debian/patches/noopt.patch
@@ -4,15 +4,14 @@ Description: Support DEB_BUILD_OPTIONS='noopt'
 Author: Michael Gold <michael at bitplane.org>
 Bug-Debian: http://bugs.debian.org/737364
 
---- a/higan/GNUmakefile
-+++ b/higan/GNUmakefile
-@@ -3,7 +3,8 @@
- target := tomoko
- # console := true
+--- a/nall/GNUmakefile
++++ b/nall/GNUmakefile
+@@ -61,7 +61,7 @@
  
--flags += -I. -I.. -O3
-+flags += -I. -I..
-+flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3)
- objects := libco emulator audio video resource
- 
- # profile-guided optimization mode
+ # build settings
+ ifeq ($(build),release)
+-  flags += -O3
++  flags += $(if $(filter noopt,$(DEB_BUILD_OPTIONS)),-O0,-O3)
+ else ifeq ($(build),stable)
+   flags += -O1
+ else ifeq ($(build),debug)
diff --git a/debian/patches/tomoko-makefile-fixes.patch b/debian/patches/tomoko-makefile-fixes.patch
index f559b23..4b4aa5b 100644
--- a/debian/patches/tomoko-makefile-fixes.patch
+++ b/debian/patches/tomoko-makefile-fixes.patch
@@ -5,7 +5,7 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/higan/target-tomoko/GNUmakefile
 +++ b/higan/target-tomoko/GNUmakefile
-@@ -81,9 +81,7 @@
+@@ -84,9 +84,7 @@
  endif
  
  install:
@@ -16,11 +16,3 @@ Author: Tobias Hansen <thansen at debian.org>
  else ifeq ($(platform),macosx)
  	mkdir -p ~/Library/Application\ Support/$(name)/
  	mkdir -p ~/Emulation/System/
-@@ -92,6 +90,7 @@
- 	cp -R systems/* ~/Library/Application\ Support/$(name)/
- else ifneq ($(filter $(platform),linux bsd),)
- 	mkdir -p $(prefix)/bin/
-+	mkdir -p $(prefix)/share/applications/
- 	mkdir -p $(prefix)/share/icons/
- 	mkdir -p $(prefix)/share/$(name)/
- 	cp out/$(name) $(prefix)/bin/$(name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/higan.git