r14727 - packages/trunk/warzone2100/debian/patches

[Paul Wise]

Author: pabs
Date: 2013-12-25 02:28:17 +0000 (Wed, 25 Dec 2013)
New Revision: 14727

Modified:
   packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
Log:
Refresh patch to remove fuzz

Modified: packages/trunk/warzone2100/debian/patches/use-system-libraries.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/use-system-libraries.patch	2013-12-25 02:24:35 UTC (rev 14726)
+++ packages/trunk/warzone2100/debian/patches/use-system-libraries.patch	2013-12-25 02:28:17 UTC (rev 14727)
@@ -3,7 +3,7 @@
 Forwarded: no
 --- a/configure.ac
 +++ b/configure.ac
-@@ -379,6 +379,12 @@
+@@ -382,6 +382,12 @@
  
  # Checks for modules:
  
@@ -16,7 +16,7 @@
  if test "$backend" = "sdl"; then
  	PKG_CHECK_MODULES([SDL], [sdl >= 1.2])
  fi
-@@ -456,9 +462,6 @@
+@@ -459,9 +465,6 @@
  WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
  WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"
  
@@ -26,7 +26,7 @@
  
  AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
  AC_SUBST([WZ_CFLAGS], [${WZ_CFLAGS}])
-@@ -476,8 +479,6 @@
+@@ -479,8 +482,6 @@
  		pkg/nsis/Makefile
  		win32/Makefile
  		tests/Makefile
@@ -63,8 +63,8 @@
 +AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(VORBISFILE_CFLAGS) $(VORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS) $(GLEW_CFLAGS) $(MINIUPNPC_CFLAGS) $(QUESOGLC_CFLAGS)
  AM_CFLAGS = $(WZ_CFLAGS)
  AM_CXXFLAGS = $(WZ_CXXFLAGS) $(QT4_CFLAGS)
- AM_LFLAGS = $(FLEX_FLAGS)
-@@ -270,9 +270,7 @@
+ 
+@@ -277,9 +277,7 @@
  	$(top_builddir)/lib/ivis_opengl/libivis_opengl.a \
  	$(top_builddir)/lib/gamelib/libgamelib.a \
  	$(top_builddir)/lib/framework/libframework.a \
@@ -73,13 +73,13 @@
 -	$(top_builddir)/3rdparty/quesoglc/libquesoglc.a
 +	$(top_builddir)/lib/exceptionhandler/libexceptionhandler.a
  
- if BACKEND_QT
- warzone2100_LIBS += $(top_builddir)/lib/qtgame/libqtgame.a
-@@ -284,6 +282,7 @@
- 
+ if PORTABLE
+ warzone2100_portable_SOURCES = $(COMMONSOURCES) $(nodist_COMMONSOURCES)
+@@ -313,6 +311,7 @@
+ else
  warzone2100_LDADD = $(warzone2100_LIBS) $(LTLIBINTL) $(SDL_LIBS) $(PHYSFS_LIBS) $(PNG_LIBS) $(VORBISFILE_LIBS) $(VORBIS_LIBS) \
  	$(THEORA_LIBS) $(OPENAL_LIBS) $(OPENGLC_LIBS) $(OPENGL_LIBS) $(QT4_LIBS) $(GLEW_LIBS) \
 +	$(MINIUPNPC_LIBS) $(QUESOGLC_LIBS) \
  	$(X_LIBS) $(X_EXTRA_LIBS) $(LDFLAGS)
+ endif
  
- if MINGW32