Bug#777888: Patch for GCC 5 build issue

[Martin Pitt]

Control: tag -1 patch

Hello again,

Martin Pitt [2015-08-06  8:59 +0200]:
> This is fine with a transitioned libxapian, but after that it *still*
> fails:
> 
> | g++ -DHAVE_CONFIG_H -I. -I.. -I.. -I/usr/include/tagcoll-2.0.14  `fltk-config --cxxflags --use-images` `curl-config --cflags` -Wall -Wextra -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wformat -Werror=format-security -ggdb    -g -O2 -c -o Engine.o Engine.cpp
> | Engine.cpp:369:35: fatal error: ept/debtags/debtags.tcc: No such file or directory
> 
> BTW, Matthias' NMU patch has a lot of cruft in it which certainly
> wasn't intended. Removing patch tag as AFAICS there is still no
> solution for building goplay right now.

Ah, this was due to building against experimental's libept. So
Matthias' (cleaned up) patch is fine for unstable.

Attached patch is for building against experimental's libept.

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru goplay-0.9/debian/changelog goplay-0.9ubuntu1/debian/changelog
--- goplay-0.9/debian/changelog	2014-10-09 21:26:20.000000000 +0200
+++ goplay-0.9ubuntu1/debian/changelog	2015-08-10 08:33:21.000000000 +0200
@@ -1,3 +1,14 @@
+goplay (0.9ubuntu1) wily; urgency=medium
+
+  [ Matthias Klose ]
+  * Fix build error with GCC 5. Closes: #777888.
+
+  [ Martin Pitt ]
+  * src/goplay.cpp, src/Engine.cpp: Drop debtags.tcc inclusion, it does not
+    exist any more in the rearranged libept.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 10 Aug 2015 08:33:20 +0200
+
 goplay (0.9) unstable; urgency=low
 
   * Update Standards-Version from 3.9.4 to 3.9.6.
diff -Nru goplay-0.9/debian/control goplay-0.9ubuntu1/debian/control
--- goplay-0.9/libxdgutils/XDGDesktopEntry.cpp	2012-02-12 06:31:32.000000000 +0100
+++ goplay-0.9ubuntu1/libxdgutils/XDGDesktopEntry.cpp	2015-08-10 08:30:40.000000000 +0200
@@ -468,7 +468,7 @@
 
     // Now find missing required keys
     for(i = 0; registeredEntries[i].name != NULL; i++) {
-	if (!registeredEntries[i].type & type)
+	if (!(registeredEntries[i].type & type))
 	    continue;
 
 	if (registeredEntries[i].required) {
diff -Nru goplay-0.9/src/Engine.cpp goplay-0.9ubuntu1/src/Engine.cpp
--- goplay-0.9/src/Engine.cpp	2014-09-29 10:30:52.000000000 +0200
+++ goplay-0.9ubuntu1/src/Engine.cpp	2015-08-10 08:31:36.000000000 +0200
@@ -366,6 +366,4 @@
 	m_dirty = true;
 }
 
-#include <ept/debtags/debtags.tcc>
-
 // vim:set ts=4 sw=4:
diff -Nru goplay-0.9/src/goplay.cpp goplay-0.9ubuntu1/src/goplay.cpp
--- goplay-0.9/src/goplay.cpp	2014-10-05 08:34:50.000000000 +0200
+++ goplay-0.9ubuntu1/src/goplay.cpp	2015-08-10 08:31:25.000000000 +0200
@@ -569,6 +569,4 @@
 }
 #endif
 
-#include <ept/debtags/debtags.tcc>
-
 // vim:set ts=4 sw=4:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-games-devel/attachments/20150810/28745e07/attachment.sig>