tag 622005 + patch
user ubuntu-de...@lists.ubuntu.com
usertags 622005 + origin-ubuntu natty ubuntu-patch
thanks
*** /tmp/tmpJpiFAK
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/ftbfs_werror.patch: Don't compile with -Werror
* debian/patches/ftbfs_gtkfunction.patch: Don't use deprecated GtkFunction
Both patches fix a FTBFS (LP: #755940) (Closes: #622005)
Thanks for considering the patch.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty
APT policy: (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-8-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
=== added file 'debian/patches/ftbfs_gtkfunction.patch'
--- debian/patches/ftbfs_gtkfunction.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/ftbfs_gtkfunction.patch 2011-04-15 21:21:03 +0000
@@ -0,0 +1,15 @@
+## Description: GtkFunction has been replaced by GSourceFunc
+## Origin/Author: Andreas Moog <am...@ubuntu.com>
+Index: xsensors/src/gui.c
+===================================================================
+--- xsensors.orig/src/gui.c 2011-04-15 23:19:34.115653460 +0200
++++ xsensors/src/gui.c 2011-04-15 23:19:30.965817661 +0200
+@@ -261,7 +261,7 @@
+
+ /* Setup timer for updates. */
+ timer = g_timeout_add( update_time * 1000,
+- (GtkFunction) update_sensor_data,
++ (GSourceFunc) update_sensor_data,
+ (gpointer) data );
+
+ return SUCCESS;
=== added file 'debian/patches/ftbfs_werror.patch'
--- debian/patches/ftbfs_werror.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/ftbfs_werror.patch 2011-04-15 21:13:01 +0000
@@ -0,0 +1,65 @@
+## Description: Don't compile with -Werror
+## Origin/Author: Andreas Moog <am...@ubuntu.com>
+## Bug-Ubuntu: https://bugs.launchpad.net/bugs/755940
+## Bug-Debian: http://bugs.debian.org/622005
+Index: xsensors/configure
+===================================================================
+--- xsensors.orig/configure 2011-04-15 23:10:53.982935901 +0200
++++ xsensors/configure 2011-04-15 23:10:35.583902258 +0200
+@@ -3415,7 +3415,7 @@
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
++ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+@@ -5136,7 +5136,7 @@
+ rm -f conf.gtktest
+
+
+-XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror"
++XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` "
+ XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`"
+
+
+Index: xsensors/configure.in
+===================================================================
+--- xsensors.orig/configure.in 2011-04-15 23:10:54.042932750 +0200
++++ xsensors/configure.in 2011-04-15 23:10:37.263814026 +0200
+@@ -28,7 +28,7 @@
+ *** development headers installed. The latest version of GTK+ is
+ *** always available at http://www.gtk.org/.]))
+
+-XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` -Werror"
++XSENSORS_CFLAGS="`pkg-config --cflags gtk+-2.0` "
+ XSENSORS_LIBS="`pkg-config --libs gtk+-2.0`"
+ AC_SUBST(XSENSORS_CFLAGS)
+ AC_SUBST(XSENSORS_LIBS)
+Index: xsensors/src/Makefile.am
+===================================================================
+--- xsensors.orig/src/Makefile.am 2011-04-15 23:10:54.092930123 +0200
++++ xsensors/src/Makefile.am 2011-04-15 23:10:44.583429583 +0200
+@@ -7,7 +7,7 @@
+ -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -ansi -Wall -Wmissing-prototypes -Wmissing-declarations \
+- -Werror
++
+
+ bin_PROGRAMS = xsensors
+
+Index: xsensors/src/Makefile.in
+===================================================================
+--- xsensors.orig/src/Makefile.in 2011-04-15 23:10:54.142927497 +0200
++++ xsensors/src/Makefile.in 2011-04-15 23:10:46.413333475 +0200
+@@ -164,7 +164,7 @@
+ -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -ansi -Wall -Wmissing-prototypes -Wmissing-declarations \
+- -Werror
++
+
+ xsensors_SOURCES = \
+ main.c \
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-05-08 01:47:59 +0000
+++ debian/patches/series 2011-04-15 21:19:07 +0000
@@ -1 +1,3 @@
deprecated_GTK.patch
+ftbfs_werror.patch
+ftbfs_gtkfunction.patch
