r959 - in /unstable/gtkhtml3.8/debian: changelog patches/60_glib-2.15-g-gnuc-function.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Feb 15 09:16:36 2008
New Revision: 959

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=959
Log:
* New patch, 60_glib-2.15-g-gnuc-function, use G_STRFUNC instead of
  G_GNUC_FUNCTION; fixes build with newer glib (2.15 and up) where this is
  deprecated.

Added:
    unstable/gtkhtml3.8/debian/patches/60_glib-2.15-g-gnuc-function.patch
Modified:
    unstable/gtkhtml3.8/debian/changelog

Modified: unstable/gtkhtml3.8/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.8/debian/changelog?rev=959&op=diff
==============================================================================
--- unstable/gtkhtml3.8/debian/changelog (original)
+++ unstable/gtkhtml3.8/debian/changelog Fri Feb 15 09:16:36 2008
@@ -1,7 +1,10 @@
-gtkhtml3.8 (3.12.3-2ubuntu1) UNRELEASED; urgency=low
+gtkhtml3.8 (3.12.3-2ubuntu1) unstable; urgency=low
 
   * Include gnome-get-source.mk from gnome-pkg-tools if available and set
     GNOME_MODULE to gtkhtml.
+  * New patch, 60_glib-2.15-g-gnuc-function, use G_STRFUNC instead of
+    G_GNUC_FUNCTION; fixes build with newer glib (2.15 and up) where this is
+    deprecated.
 
  -- Loic Minier <lool at dooz.org>  Fri, 15 Feb 2008 10:04:53 +0100
 

Added: unstable/gtkhtml3.8/debian/patches/60_glib-2.15-g-gnuc-function.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml3.8/debian/patches/60_glib-2.15-g-gnuc-function.patch?rev=959&op=file
==============================================================================
--- unstable/gtkhtml3.8/debian/patches/60_glib-2.15-g-gnuc-function.patch (added)
+++ unstable/gtkhtml3.8/debian/patches/60_glib-2.15-g-gnuc-function.patch Fri Feb 15 09:16:36 2008
@@ -1,0 +1,39 @@
+diff -Nur gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c
+--- gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c	2007-01-29 10:50:59.000000000 +0100
++++ gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c	2008-02-15 10:07:22.000000000 +0100
+@@ -175,7 +175,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (obj->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (obj->parent)));
+ 			break;
+ 		}
+@@ -209,7 +209,7 @@
+ 				/* This should not happen.  */
+ 				g_warning ("(%s:%s)  There were not enough paragraphs for "
+ 					   "setting the paragraph style.",
+-					   __FILE__, G_GNUC_FUNCTION);
++					   __FILE__, G_STRFUNC);
+ 				break;
+ 			}
+ 		} while (obj != NULL && HTML_CLUEFLOW (obj->parent) == clueflow);
+@@ -217,7 +217,7 @@
+ 
+ 	if (prop_list == NULL) {
+ 		/* This should not happen.  */
+-		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_GNUC_FUNCTION);
++		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_STRFUNC);
+ 		return;
+ 	}
+ 
+@@ -280,7 +280,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (p->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (p->parent)));
+ 			break;
+ 		}