tags 577310 + patch
thanks
I've attached a trivial patch to get rid of the deprecated
GTK_WIDGET_STATE macro (replaced by gtk_widget_get_state).
I've also attached a debdiff that incorporates the patch into
the package with help of quilt.
It would be a good idea to convince upstream to not use
G*_DISABLE_DEPRECATED at all in *release* tarballs,
since it silently introduces FTBFS bugs when new
versions of Gtk+ gets uploaded with new deprecations.
Regards,
Andreas Henriksson
Replace macro deprecated in Gtk+ 2.20 with new function.
Fixes debian bug #577310
diff -uriNp mysql-gui-tools-5.0r14+openSUSE.orig//query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c
--- mysql-gui-tools-5.0r14+openSUSE.orig//query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c 2009-10-03 00:20:51.000000000 +0200
+++ mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c 2010-04-19 11:39:13.000000000 +0200
@@ -1167,7 +1167,7 @@ gtk_source_view_paint_margin (GtkSourceV
gtk_paint_layout (GTK_WIDGET (view)->style,
win,
- GTK_WIDGET_STATE (view),
+ gtk_widget_get_state (view),
FALSE,
NULL,
GTK_WIDGET (view),
@@ -1450,7 +1450,7 @@ gtk_source_view_expose (GtkWidget *
gtk_paint_vline (widget->style,
event->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
&redraw_rect,
widget,
"margin",
diff -u mysql-gui-tools-5.0r14+openSUSE/debian/changelog
mysql-gui-tools-5.0r14+openSUSE/debian/changelog
--- mysql-gui-tools-5.0r14+openSUSE/debian/changelog
+++ mysql-gui-tools-5.0r14+openSUSE/debian/changelog
@@ -1,3 +1,14 @@
+mysql-gui-tools (5.0r14+openSUSE-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/gtk-deprecated-220.patch: added. (Closes: #577310)
+ * debian/patches/series: added, see above.
+ * debian/control: added build-dependency on quilt.
+ * debian/rules: include quilt and adjust rules to depend on quilt for
+ patching/unpatching.
+
+ -- Andreas Henriksson <andr...@fatal.se> Mon, 19 Apr 2010 11:52:42 +0200
+
mysql-gui-tools (5.0r14+openSUSE-2) unstable; urgency=low
* debian/control:
diff -u mysql-gui-tools-5.0r14+openSUSE/debian/control
mysql-gui-tools-5.0r14+openSUSE/debian/control
--- mysql-gui-tools-5.0r14+openSUSE/debian/control
+++ mysql-gui-tools-5.0r14+openSUSE/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adam Majer <ad...@zombino.com>
Build-Depends: debhelper (>=7), libmysqlclient-dev, libxml2-dev,
libglade2-dev,
- libgtkmm-2.4-dev (>=1:2.6), libpcre3-dev, scrollkeeper, autotools-dev,
+ libgtkmm-2.4-dev (>=1:2.6), libpcre3-dev, scrollkeeper, autotools-dev, quilt,
libgtkhtml3.14-dev, libxml-parser-perl, liblualib50-dev,
libgnomeprint2.2-dev,
libglu-dev | libglu1-mesa-dev, uuid-dev
diff -u mysql-gui-tools-5.0r14+openSUSE/debian/rules
mysql-gui-tools-5.0r14+openSUSE/debian/rules
--- mysql-gui-tools-5.0r14+openSUSE/debian/rules
+++ mysql-gui-tools-5.0r14+openSUSE/debian/rules
@@ -3,6 +3,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
# This has to be exported to make some magic below work.
export DH_OPTIONS
@@ -80,17 +82,17 @@
build: build-arch build-indep
build-arch: build-arch-stamp
-build-arch-stamp: build-common-stamp build-admin-stamp
build-query-browser-stamp # build-workbench-stamp
+build-arch-stamp: $(QUILT_STAMPFN) build-common-stamp build-admin-stamp
build-query-browser-stamp # build-workbench-stamp
touch build-arch-stamp
build-indep: build-arch-stamp build-indep-stamp
-build-indep-stamp: configure-stamp
+build-indep-stamp: $(QUILT_STAMPFN) configure-stamp
# Add here commands to compile the indep part of the package.
#$(MAKE) doc
touch build-indep-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
only in patch2:
unchanged:
--- mysql-gui-tools-5.0r14+openSUSE.orig/debian/patches/series
+++ mysql-gui-tools-5.0r14+openSUSE/debian/patches/series
@@ -0,0 +1 @@
+gtk-deprecated-220.patch
only in patch2:
unchanged:
--- mysql-gui-tools-5.0r14+openSUSE.orig/debian/patches/gtk-deprecated-220.patch
+++ mysql-gui-tools-5.0r14+openSUSE/debian/patches/gtk-deprecated-220.patch
@@ -0,0 +1,24 @@
+Replace macro deprecated in Gtk+ 2.20 with new function.
+Fixes debian bug #577310
+
+diff -uriNp
mysql-gui-tools-5.0r14+openSUSE.orig//query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c
mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c
+---
mysql-gui-tools-5.0r14+openSUSE.orig//query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c
2009-10-03 00:20:51.000000000 +0200
++++
mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/gtksourceview.c
2010-04-19 11:39:13.000000000 +0200
+@@ -1167,7 +1167,7 @@ gtk_source_view_paint_margin (GtkSourceV
+
+ gtk_paint_layout (GTK_WIDGET (view)->style,
+ win,
+- GTK_WIDGET_STATE (view),
++ gtk_widget_get_state (view),
+ FALSE,
+ NULL,
+ GTK_WIDGET (view),
+@@ -1450,7 +1450,7 @@ gtk_source_view_expose (GtkWidget *
+
+ gtk_paint_vline (widget->style,
+ event->window,
+- GTK_WIDGET_STATE (widget),
++ gtk_widget_get_state (widget),
+ &redraw_rect,
+ widget,
+ "margin",
