r15313 - in /desktop/unstable/eel2/debian: changelog patches/03_glib-2.16-ftbfs.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Mar 19 09:55:35 2008
New Revision: 15313

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15313
Log:
* debian/patches/03_glib-2.16-ftbfs.patch:
  + Fix build with glib 2.16 by not using the deprecated G_GNUC_FUNCTION
    anymore (Closes: #471636).

Added:
    desktop/unstable/eel2/debian/patches/03_glib-2.16-ftbfs.patch
Modified:
    desktop/unstable/eel2/debian/changelog
    desktop/unstable/eel2/debian/patches/series

Modified: desktop/unstable/eel2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/changelog?rev=15313&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/changelog (original)
+++ desktop/unstable/eel2/debian/changelog Wed Mar 19 09:55:35 2008
@@ -1,3 +1,11 @@
+eel2 (2.20.0-5) unstable; urgency=low
+
+  * debian/patches/03_glib-2.16-ftbfs.patch:
+    + Fix build with glib 2.16 by not using the deprecated G_GNUC_FUNCTION
+      anymore (Closes: #471636).
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 19 Mar 2008 10:54:24 +0100
+
 eel2 (2.20.0-4) unstable; urgency=low
 
   * Add missing build-dependency on intltool. Closes: #459319.

Added: desktop/unstable/eel2/debian/patches/03_glib-2.16-ftbfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/03_glib-2.16-ftbfs.patch?rev=15313&op=file
==============================================================================
--- desktop/unstable/eel2/debian/patches/03_glib-2.16-ftbfs.patch (added)
+++ desktop/unstable/eel2/debian/patches/03_glib-2.16-ftbfs.patch Wed Mar 19 09:55:35 2008
@@ -1,0 +1,65 @@
+--- test/test-eel-image-table.c.old	2008-03-19 10:53:27.000000000 +0100
++++ test/test-eel-image-table.c	2008-03-19 10:53:38.000000000 +0100
+@@ -90,7 +90,7 @@
+ 
+ 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
+ 
+-	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
++	g_print ("%s(%s)\n", G_STRFUNC, text);
+ #endif
+ }
+ 
+@@ -107,7 +107,7 @@
+ 
+ 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
+ 
+-	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
++	g_print ("%s(%s)\n", G_STRFUNC, text);
+ #endif
+ }
+ 
+@@ -123,7 +123,7 @@
+ 
+ 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
+ 
+-	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
++	g_print ("%s(%s)\n", G_STRFUNC, text);
+ }
+ 
+ static void
+@@ -138,7 +138,7 @@
+ 
+ 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
+ 
+-	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
++	g_print ("%s(%s)\n", G_STRFUNC, text);
+ }
+ 
+ static void
+@@ -153,7 +153,7 @@
+ 
+ 	text = eel_labeled_image_get_text (EEL_LABELED_IMAGE (item));
+ 
+-	g_print ("%s(%s)\n", G_GNUC_FUNCTION, text);
++	g_print ("%s(%s)\n", G_STRFUNC, text);
+ }
+ 
+ static int
+@@ -164,7 +164,7 @@
+ 
+ 	recursion_count++;
+ 
+-	g_print ("%s(%d)\n", G_GNUC_FUNCTION, recursion_count);
++	g_print ("%s(%d)\n", G_STRFUNC, recursion_count);
+ 	gtk_widget_queue_resize (GTK_WIDGET (callback_data));
+ 
+ 	recursion_count--;
+@@ -192,7 +192,7 @@
+ 	if (0) gtk_widget_size_allocate (GTK_WIDGET (image_table),
+ 					 &GTK_WIDGET (image_table)->allocation);
+ 	
+-	g_print ("%s(%d)\n", G_GNUC_FUNCTION, recursion_count);
++	g_print ("%s(%d)\n", G_STRFUNC, recursion_count);
+ 
+ 	recursion_count--;
+ }

Modified: desktop/unstable/eel2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/series?rev=15313&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/patches/series (original)
+++ desktop/unstable/eel2/debian/patches/series Wed Mar 19 09:55:35 2008
@@ -1,4 +1,5 @@
 01_libtool_release.patch
 02_ldflags_libadd.patch
+03_glib-2.16-ftbfs.patch -p0
 10_open-with_install.patch
 99_ltmain_as-needed.patch