r15087 - in packages/trunk/slashem/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2014-05-12 08:01:28 +0000 (Mon, 12 May 2014)
New Revision: 15087

Added:
   packages/trunk/slashem/debian/patches/clang_FTBFS_Wreturn-type.patch
Modified:
   packages/trunk/slashem/debian/changelog
   packages/trunk/slashem/debian/patches/series
Log:
Fix FTBFS with clang


Modified: packages/trunk/slashem/debian/changelog
===================================================================
--- packages/trunk/slashem/debian/changelog	2014-05-12 07:59:30 UTC (rev 15086)
+++ packages/trunk/slashem/debian/changelog	2014-05-12 08:01:28 UTC (rev 15087)
@@ -6,6 +6,7 @@
   [ Vincent Cheng ]
   * Fix broken macro causing LINUX to not be defined on Linux systems.
     (Closes: #747274)
+  * Fix FTBFS with clang. (Closes: #741371)
   * Add native systemd support.
     - Factor out the recovery logic from the slashem-common init script into a
       new script /usr/lib/games/slashem/recover-all.

Added: packages/trunk/slashem/debian/patches/clang_FTBFS_Wreturn-type.patch
===================================================================
--- packages/trunk/slashem/debian/patches/clang_FTBFS_Wreturn-type.patch	                        (rev 0)
+++ packages/trunk/slashem/debian/patches/clang_FTBFS_Wreturn-type.patch	2014-05-12 08:01:28 UTC (rev 15087)
@@ -0,0 +1,14 @@
+Description: fix FTBFS with clang instead of gcc [-Wreturn-type]
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Last-Update: 2014-03-11
+--- a/win/gtk/gtkmap.c
++++ b/win/gtk/gtkmap.c
+@@ -615,7 +615,7 @@
+ nh_set_map_font(gchar *name)
+ {
+     PangoFontDescription *desc;
+-    g_return_if_fail(name != NULL);
++    g_return_val_if_fail(name != NULL, 0);
+     if (map_font_name) {
+ 	if (!strcmp(name, map_font_name))
+ 	    return 0;

Modified: packages/trunk/slashem/debian/patches/series
===================================================================
--- packages/trunk/slashem/debian/patches/series	2014-05-12 07:59:30 UTC (rev 15086)
+++ packages/trunk/slashem/debian/patches/series	2014-05-12 08:01:28 UTC (rev 15087)
@@ -1,3 +1,4 @@
 fix-libpng15-ftbfs.patch
 spelling-error.patch
 slashem-debian.patch
+clang_FTBFS_Wreturn-type.patch