r15308 - in packages/trunk/warzone2100/debian: . patches

[Paul Wise]

Author: pabs
Date: 2014-10-26 01:28:48 +0000 (Sun, 26 Oct 2014)
New Revision: 15308

Added:
   packages/trunk/warzone2100/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch
Modified:
   packages/trunk/warzone2100/debian/patches/fix-yacc.diff
   packages/trunk/warzone2100/debian/patches/series
   packages/trunk/warzone2100/debian/rules
Log:
Fix the build

Modified: packages/trunk/warzone2100/debian/patches/fix-yacc.diff
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-yacc.diff	2014-10-25 02:04:20 UTC (rev 15307)
+++ packages/trunk/warzone2100/debian/patches/fix-yacc.diff	2014-10-26 01:28:48 UTC (rev 15308)
@@ -97,6 +97,15 @@
  								return QTEXT_T;
 --- a/lib/framework/strresly.h
 +++ b/lib/framework/strresly.h
+@@ -29,7 +29,7 @@
+ extern void strres_set_extra(YY_EXTRA_TYPE user_defined);
+
+ /* Call the yacc parser */
+-extern int strres_parse(void* psStrRes);
++extern int strres_parse(struct STR_RES *psStrRes);
+
+ /* Destroy the lexer */
+ extern int strres_lex_destroy(void);
 @@ -34,7 +34,7 @@
  /* Destroy the lexer */
  extern int strres_lex_destroy(void);

Added: packages/trunk/warzone2100/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch	                        (rev 0)
+++ packages/trunk/warzone2100/debian/patches/revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch	2014-10-26 01:28:48 UTC (rev 15308)
@@ -0,0 +1,68 @@
+Description: revert some things missed in revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch
+Origin: reversion of https://github.com/Warzone2100/warzone2100/commit/e397b24d4724d835d6cdc39a92800e64c0551dab.patch
+Bug: http://developer.wz2100.net/ticket/4151
+--- a/lib/framework/Makefile.am
++++ b/lib/framework/Makefile.am
+@@ -11,6 +11,9 @@
+ %_moc.cpp: %.h
+ 	$(MOC4) -o $@ $<
+ 
++BUILT_SOURCES = \
++	resource_parser.h \
++	strres_parser.h
+ 
+ CLEANFILES = \
+ 	$(MOCEDFILES)
+@@ -43,11 +46,9 @@
+ 	physfs_ext.h \
+ 	rational.h \
+ 	resly.h \
+-	resource_parser.h \
+ 	stdio_ext.h \
+ 	string_ext.h \
+ 	strres.h \
+-	strres_parser.h \
+ 	strresly.h \
+ 	treap.h \
+ 	trig.h \
+--- a/lib/gamelib/Makefile.am
++++ b/lib/gamelib/Makefile.am
+@@ -4,12 +4,13 @@
+ AM_LFLAGS = $(FLEX_FLAGS)
+ AM_YFLAGS = -d
+ 
++BUILT_SOURCES = \
++	audp_parser.h
+ 
+ noinst_LIBRARIES = libgamelib.a
+ noinst_HEADERS = \
+ 	anim.h \
+ 	animobj.h \
+-	audp_parser.h \
+ 	gtime.h \
+ 	hashtable.h \
+ 	parser.h
+--- a/lib/script/Makefile.am
++++ b/lib/script/Makefile.am
+@@ -4,10 +4,12 @@
+ AM_LFLAGS = $(FLEX_FLAGS)
+ AM_YFLAGS = -d
+ 
++BUILT_SOURCES = \
++	chat_parser.h \
++	script_parser.h
+ 
+ noinst_LIBRARIES = libscript.a
+ noinst_HEADERS = \
+-	chat_parser.h \
+ 	chat_processing.h \
+ 	codeprint.h \
+ 	event.h \
+@@ -15,7 +17,6 @@
+ 	interpreter.h \
+ 	parse.h \
+ 	script.h \
+-	script_parser.h \
+ 	stack.h
+ 
+ libscript_a_SOURCES = \

Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series	2014-10-25 02:04:20 UTC (rev 15307)
+++ packages/trunk/warzone2100/debian/patches/series	2014-10-26 01:28:48 UTC (rev 15308)
@@ -1,3 +1,4 @@
 use-system-libraries.patch
 revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch
+revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch
 fix-yacc.diff

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2014-10-25 02:04:20 UTC (rev 15307)
+++ packages/trunk/warzone2100/debian/rules	2014-10-26 01:28:48 UTC (rev 15308)
@@ -19,9 +19,6 @@
 	src/scriptvals_lexer.cpp \
 	src/scriptvals_parser.cpp \
 	src/scriptvals_parser.h \
-	src/message_lexer.cpp \
-	src/message_parser.cpp \
-	src/message_parser.h \
 	src/level_lexer.cpp \
 	lib/framework/resource_lexer.cpp \
 	lib/framework/resource_parser.cpp \
@@ -47,6 +44,12 @@
 	    --disable-debug
 
 override_dh_auto_build:
+	make -C lib/framework strres_parser.h
+	make -C lib/gamelib audp_parser.h
+	make -C lib/script chat_parser.h
+	make -C lib/script script_parser.h
+	make -C lib/framework resource_parser.h
+	make -C src scriptvals_parser.h
 	# The HTML to PDF converter needs an X server
 	# The default bit depth is too low for the images in the PDF
 	xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" dh_auto_build