[yquake2] 04/09: d/patches: Refresh

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository yquake2.

commit fb0a680dddf9a7b593b7762f30e43c1fda8ccd4d
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Jun 18 14:17:08 2017 +0100

    d/patches: Refresh
---
 debian/changelog                                   |  1 +
 ...-LD-FLAGS-instead-of-overriding-them-to-o.patch | 35 ++++++++++------
 .../Remove-unwanted-rpaths-from-LDFLAGS.patch      | 46 +++++++++++-----------
 3 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5ddaa4..8171345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ yquake2 (7.00~dfsg1-1) UNRELEASED; urgency=medium
   * Increase debhelper compat level to 10 for parallel build
   * New upstream release (Closes: #864483)
     - d/copyright: Update
+    - d/patches: Refresh
 
  -- Simon McVittie <smcv at debian.org>  Wed, 22 Feb 2017 10:32:04 +0000
 
diff --git a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
index 102cb82..28f50e8 100644
--- a/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
+++ b/debian/patches/Append-to-C-LD-FLAGS-instead-of-overriding-them-to-o.patch
@@ -8,38 +8,47 @@ but yquake2 doesn't.
 
 [Updated for yquake2/5.21, added commit message -Simon McVittie]
 ---
- Makefile | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+ Makefile | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index d085c83..54ade51 100755
+index 6d654bb..3c65958 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -156,12 +156,13 @@ endif
+@@ -155,12 +155,13 @@ endif
  #
  # -MMD to generate header dependencies. (They cannot be
  #  generated if building universal binaries on OSX)
 +CFLAGS += $(CPPFLAGS)
- ifeq ($(OSTYPE), Darwin)
+ ifeq ($(YQ2_OSTYPE), Darwin)
 -CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
 +CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
  		  -Wall -pipe -g -fwrapv
  CFLAGS += $(OSX_ARCH)
  else
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
-+CFLAGS += -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
++CFLAGS += -std=gnu99 -O2 -fno-strict-aliasing \
  		  -Wall -pipe -g -ggdb -MMD -fwrapv
  endif
  
-@@ -241,9 +242,9 @@ endif
+@@ -237,15 +238,15 @@ GLAD_INCLUDE = -Isrc/client/refresh/gl3/glad/include
  
  # Base LDFLAGS.
- ifeq ($(OSTYPE),Linux)
+ ifeq ($(YQ2_OSTYPE),Linux)
 -LDFLAGS := -L/usr/lib -lm -ldl -rdynamic
 +LDFLAGS += -L/usr/lib -lm -ldl -rdynamic
- else ifeq ($(OSTYPE),FreeBSD)
+ else ifeq ($(YQ2_OSTYPE),FreeBSD)
+-LDFLAGS := -L/usr/local/lib -lm
++LDFLAGS += -L/usr/local/lib -lm
+ else ifeq ($(YQ2_OSTYPE),OpenBSD)
 -LDFLAGS := -L/usr/local/lib -lm
 +LDFLAGS += -L/usr/local/lib -lm
- else ifeq ($(OSTYPE),OpenBSD)
- LDFLAGS := -L/usr/local/lib -lm
- else ifeq ($(OSTYPE),Windows)
+ else ifeq ($(YQ2_OSTYPE),Windows)
+-LDFLAGS := -L/usr/lib -lws2_32 -lwinmm
++LDFLAGS += -L/usr/lib -lws2_32 -lwinmm
+ else ifeq ($(YQ2_OSTYPE), Darwin)
+-LDFLAGS := $(OSX_ARCH) -lm
++LDFLAGS += $(OSX_ARCH) -lm
+ endif
+ 
+ CFLAGS += -fvisibility=hidden
diff --git a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
index 1eca900..73c13c0 100644
--- a/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
+++ b/debian/patches/Remove-unwanted-rpaths-from-LDFLAGS.patch
@@ -4,40 +4,38 @@ Subject: Remove unwanted rpaths from LDFLAGS
 
 Forwarded: no, Debian-specific
 ---
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ Makefile | 21 ---------------------
+ 1 file changed, 21 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 54ade51..ffbb8f8 100755
+index 3c65958..6d5aeac 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -446,23 +446,23 @@ release/quake2 : LDFLAGS += -lGL
+@@ -453,27 +453,6 @@ ifneq ($(YQ2_OSTYPE), Darwin)
+ release/ref_gl1.so : LDFLAGS += -lGL
  endif
  
- ifeq ($(OSTYPE), FreeBSD)
+-ifeq ($(YQ2_OSTYPE), FreeBSD)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- else ifeq ($(OSTYPE), Linux)
+-else ifeq ($(YQ2_OSTYPE), Linux)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$$ORIGIN/lib'
- endif
- 
- ifeq ($(WITH_SYSTEMWIDE),yes)
- ifneq ($(WITH_SYSTEMDIR),"")
- ifeq ($(OSTYPE), FreeBSD)
+-endif
+-
+-ifeq ($(WITH_SYSTEMWIDE),yes)
+-ifneq ($(WITH_SYSTEMDIR),"")
+-ifeq ($(YQ2_OSTYPE), FreeBSD)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- else ifeq ($(OSTYPE), Linux)
+-else ifeq ($(YQ2_OSTYPE), Linux)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='$(WITH_SYSTEMDIR)/lib'
- endif
- else
- ifeq ($(OSTYPE), FreeBSD)
+-endif
+-else
+-ifeq ($(YQ2_OSTYPE), FreeBSD)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- else ifeq ($(OSTYPE), Linux)
+-else ifeq ($(YQ2_OSTYPE), Linux)
 -release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
-+#release/quake2 : LDFLAGS += -Wl,-z,origin,-rpath='/usr/share/games/quake2/lib'
- endif
- endif
+-endif
+-endif
+-endif
  endif
+ 
+ # ----------

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