[Pkg-wmaker-commits] [wmshutdown] 88/173: fix ftbfs when using clang

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmshutdown.

commit fedef1e8e4255a1cf2cbb461767e8e34805608b2
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Wed Jul 23 02:34:34 2014 -0500

    fix ftbfs when using clang
---
 debian/patches/30-clang_ftbfs_Wreturn-type.patch | 19 +++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/30-clang_ftbfs_Wreturn-type.patch b/debian/patches/30-clang_ftbfs_Wreturn-type.patch
new file mode 100644
index 0000000..2b9d95e
--- /dev/null
+++ b/debian/patches/30-clang_ftbfs_Wreturn-type.patch
@@ -0,0 +1,19 @@
+Description: Non-void function should return a value.
+ The function button_press should return an int, but was returning a void.
+ This caused the build to fail when clang was used instead of gcc.
+Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
+Bug-Debian: http://bugs.debian.org/740964
+Reviewed-By: Doug Torrance <dtorrance at monmouthcollege.edu>
+Last-Update: <2014-07-23>
+
+--- wmshutdown-0.2.orig/wmShutdown.c
++++ wmshutdown-0.2/wmShutdown.c
+@@ -98,7 +98,7 @@ int button_press(GtkWidget *widget, GdkE
+ 			case 1:
+ 
+ 				if (dialog != NULL)
+-			        	return;
++			        	return 1;
+ 				message = "Shutdown confirmation";
+ 				dialog = gtk_dialog_new();
+ 		    		label = gtk_label_new (message);
diff --git a/debian/patches/series b/debian/patches/series
index 90eb6f2..5c41517 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 10-makefile.patch
 20-name-change.patch
 20-name-change=my.21-compile-fixes.patch
+30-clang_ftbfs_Wreturn-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmshutdown.git