[trigger-rally] 06/14: Update patch to use system tinyxml.

[Bertrand Marc]

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

bmarc pushed a commit to branch master
in repository trigger-rally.

commit 49f136d0d29354e4b4e694c28e79bf253df8f7be
Author: Bertrand Marc <bmarc at debian.org>
Date:   Wed Aug 31 09:53:09 2016 +0200

    Update patch to use system tinyxml.
---
 debian/patches/20_system_tinyxml.patch | 39 ++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/debian/patches/20_system_tinyxml.patch b/debian/patches/20_system_tinyxml.patch
index ef07704..f039f45 100644
--- a/debian/patches/20_system_tinyxml.patch
+++ b/debian/patches/20_system_tinyxml.patch
@@ -1,20 +1,23 @@
 Description: trigger-rally ships an internal copy of tinyxml
- This patch enables trigger to use the system tinxml library.
- .
- It's not clean enough yet to be committed upstream.
- Author: Stefan Potyra <sistpoty at ubuntu.com>
+Author: Bertrand Marc <bmarc at debian.org>
 
-Index: trigger-rally-0.6.0/configure.ac
-===================================================================
---- trigger-rally-0.6.0.orig/configure.ac	2011-11-18 22:54:53.000000000 +0100
-+++ trigger-rally-0.6.0/configure.ac	2011-11-18 23:10:10.963885333 +0100
-@@ -129,6 +129,9 @@
- AC_SUBST([HAVE_GLEW])
- AC_SEARCH_LIBS([__glewActiveTextureARB], [GLEW])
- 
-+# link against system tinyxml (if toElement() is available)
-+AC_SEARCH_LIBS([_ZN12TiXmlElement9ToElementEv], [tinyxml])
-+
- # Um, can't get this to substitute [app]datadir :/
- #AC_DEFINE([DATADIR], [$(datadir)], [comment])
- 
+--- a/src/GNUmakefile
++++ b/src/GNUmakefile
+@@ -16,7 +16,7 @@
+ TR_CFGFILE      := $(TR_BINDIR)/$(TR_CFGNAME)
+ TR_DATAFILES    := $(shell cd $(TR_DATADIR); find * -type f)
+ TR_DOCFILES     := $(shell cd $(TR_DOCDIR); find * -type f)
+-PROJDIRS        := PEngine PSim TinyXML Trigger
++PROJDIRS        := PEngine PSim Trigger
+ SRCFILES        := $(shell find $(PROJDIRS) -type f -name "*.cpp")
+ OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
+@@ -25,7 +25,7 @@
+ DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
+ INCDIRS         := -I"./include"
+ CXXFLAGS        := -std=c++11 $(WARNINGS) $(OPTIMS) $(DMACROS) $(INCDIRS)
+-EXTRA_LIBS      := -lGL -lGLU -lGLEW -lSDL -lSDL_image -lphysfs -lopenal -lalut -lpthread
++EXTRA_LIBS      := -lGL -lGLU -lGLEW -lSDL -lSDL_image -lphysfs -lopenal -lalut -lpthread -ltinyxml
+ LDFLAGS         := $(EXTRA_LIBS)
+ INSTALL_PROGRAM := install --mode=0755
+ INSTALL_DATA    := install --mode=0644

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