Bug#746195: aqualung: FTBFS with clang instead of gcc

2014-04-30 Thread Andrei POPESCU
Control: reassign -1 aqualung

On Du, 27 apr 14, 16:57:20, Arthur Marble wrote:
 Package: pkg-name
 Severity: minor
 Usertags: clang-ftbfs
 User: pkg-llvm-t...@lists.alioth.debian.org
 Tag: patch
 
 
 Hello,
 
 Using the rebuild infrastructure, your package fails to build with clang 
 (instead of gcc).
 
 Thanks,
 Arthur

 diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/changelog 
 aqualung/aqualung-0.9~beta11/debian/changelog
 --- aqualung.orig/aqualung-0.9~beta11/debian/changelog2014-04-27 
 16:47:55.566353688 -0500
 +++ aqualung/aqualung-0.9~beta11/debian/changelog 2014-04-27 
 16:53:26.450359450 -0500
 @@ -1,3 +1,11 @@
 +aqualung (0.9~beta11-3) unstable; urgency=medium
 +
 +  * Fix FTBFS with clang
 +- Fixed the Function definition is not allowed here bug in
 +  src/gui_main.c
 +
 + -- Arthur Marble art...@info9.net  Sun, 27 Apr 2014 16:53:26 -0500
 +
  aqualung (0.9~beta11-2) unstable; urgency=medium
  
* QA upload
 diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff 
 aqualung/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff 
 --- aqualung.orig/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff 
 1969-12-31 18:00:00.0 -0600
 +++ aqualung/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff  
 2014-04-27 16:55:43.662361840 -0500
 @@ -0,0 +1,37 @@
 +--- a/src/gui_main.c
  b/src/gui_main.c
 +@@ -3229,22 +3229,23 @@ systray_activate_cb(GtkStatusIcon * syst
 + }
 + }
 + 
 ++
 ++GtkScrollType reverse_direction(GtkScrollType scroll_type) {
 ++switch (scroll_type) {
 ++case GTK_SCROLL_STEP_BACKWARD:
 ++return GTK_SCROLL_STEP_FORWARD;
 ++case GTK_SCROLL_STEP_FORWARD:
 ++return GTK_SCROLL_STEP_BACKWARD;
 ++default:
 ++return scroll_type;
 ++}
 ++}
 ++
 + #if (GTK_CHECK_VERSION(2,15,0))
 + gboolean
 + systray_mouse_wheel(int mouse_wheel_option, gboolean vertical_wheel,
 + guint32 time_since_last_event, GtkScrollType scroll_type) {
 + 
 +-GtkScrollType reverse_direction(GtkScrollType scroll_type) {
 +-switch (scroll_type) {
 +-case GTK_SCROLL_STEP_BACKWARD:
 +-return GTK_SCROLL_STEP_FORWARD;
 +-case GTK_SCROLL_STEP_FORWARD:
 +-return GTK_SCROLL_STEP_BACKWARD;
 +-default:
 +-return scroll_type;
 +-}
 +-}
 +-
 + switch (mouse_wheel_option) {
 + case SYSTRAY_MW_CMD_VOLUME:
 + if (time_since_last_event  100) {
 diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/patches/series 
 aqualung/aqualung-0.9~beta11/debian/patches/series 
 --- aqualung.orig/aqualung-0.9~beta11/debian/patches/series   2014-04-27 
 16:47:55.566353688 -0500
 +++ aqualung/aqualung-0.9~beta11/debian/patches/series2014-04-27 
 16:49:38.858355487 -0500
 @@ -3,3 +3,4 @@
  003-autogen.sh.dpatch
  004_missing-library.dpatch
  005_libav-0.7.dpatch
 +clang-ftbfs.diff


-- 
http://wiki.debian.org/FAQsFromDebianUser
Offtopic discussions among Debian users and developers:
http://lists.alioth.debian.org/mailman/listinfo/d-community-offtopic
http://nuvreauspam.ro/gpg-transition.txt


signature.asc
Description: Digital signature


Bug#746195: aqualung: FTBFS with clang instead of gcc

2014-04-27 Thread Arthur Marble
Package: pkg-name
Severity: minor
Usertags: clang-ftbfs
User: pkg-llvm-t...@lists.alioth.debian.org
Tag: patch


Hello,

Using the rebuild infrastructure, your package fails to build with clang 
(instead of gcc).

Thanks,
Arthur
diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/changelog aqualung/aqualung-0.9~beta11/debian/changelog
--- aqualung.orig/aqualung-0.9~beta11/debian/changelog	2014-04-27 16:47:55.566353688 -0500
+++ aqualung/aqualung-0.9~beta11/debian/changelog	2014-04-27 16:53:26.450359450 -0500
@@ -1,3 +1,11 @@
+aqualung (0.9~beta11-3) unstable; urgency=medium
+
+  * Fix FTBFS with clang
+- Fixed the Function definition is not allowed here bug in
+  src/gui_main.c
+
+ -- Arthur Marble art...@info9.net  Sun, 27 Apr 2014 16:53:26 -0500
+
 aqualung (0.9~beta11-2) unstable; urgency=medium
 
   * QA upload
diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff aqualung/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff 
--- aqualung.orig/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff	1969-12-31 18:00:00.0 -0600
+++ aqualung/aqualung-0.9~beta11/debian/patches/clang-ftbfs.diff	2014-04-27 16:55:43.662361840 -0500
@@ -0,0 +1,37 @@
+--- a/src/gui_main.c
 b/src/gui_main.c
+@@ -3229,22 +3229,23 @@ systray_activate_cb(GtkStatusIcon * syst
+ 	}
+ }
+ 
++
++GtkScrollType reverse_direction(GtkScrollType scroll_type) {
++	switch (scroll_type) {
++	case GTK_SCROLL_STEP_BACKWARD:
++		return GTK_SCROLL_STEP_FORWARD;
++	case GTK_SCROLL_STEP_FORWARD:
++		return GTK_SCROLL_STEP_BACKWARD;
++	default:
++		return scroll_type;
++	}
++}
++
+ #if (GTK_CHECK_VERSION(2,15,0))
+ gboolean
+ systray_mouse_wheel(int mouse_wheel_option, gboolean vertical_wheel,
+	guint32 time_since_last_event, GtkScrollType scroll_type) {
+ 
+-	GtkScrollType reverse_direction(GtkScrollType scroll_type) {
+-		switch (scroll_type) {
+-		case GTK_SCROLL_STEP_BACKWARD:
+-			return GTK_SCROLL_STEP_FORWARD;
+-		case GTK_SCROLL_STEP_FORWARD:
+-			return GTK_SCROLL_STEP_BACKWARD;
+-		default:
+-			return scroll_type;
+-		}
+-	}
+-
+ 	switch (mouse_wheel_option) {
+ 	case SYSTRAY_MW_CMD_VOLUME:
+ 		if (time_since_last_event  100) {
diff -Naur aqualung.orig/aqualung-0.9~beta11/debian/patches/series aqualung/aqualung-0.9~beta11/debian/patches/series 
--- aqualung.orig/aqualung-0.9~beta11/debian/patches/series	2014-04-27 16:47:55.566353688 -0500
+++ aqualung/aqualung-0.9~beta11/debian/patches/series	2014-04-27 16:49:38.858355487 -0500
@@ -3,3 +3,4 @@
 003-autogen.sh.dpatch
 004_missing-library.dpatch
 005_libav-0.7.dpatch
+clang-ftbfs.diff