r52370 - in /desktop/experimental/gtk-doc/debian: changelog patches/fix-gtk4-build.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Tue May  2 21:24:27 2017
New Revision: 52370

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52370
Log:
Don't use "list style properties" with GTK4 since that API was removed

Added:
    desktop/experimental/gtk-doc/debian/patches/fix-gtk4-build.patch
Modified:
    desktop/experimental/gtk-doc/debian/changelog
    desktop/experimental/gtk-doc/debian/patches/series

Modified: desktop/experimental/gtk-doc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk-doc/debian/changelog?rev=52370&op=diff
==============================================================================
--- desktop/experimental/gtk-doc/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk-doc/debian/changelog	[utf-8] Tue May  2 21:24:27 2017
@@ -1,3 +1,10 @@
+gtk-doc (1.25-8) UNRELEASED; urgency=medium
+
+  * Add fix-gtk4-build.patch:
+    - Don't use "list style properties" with GTK4 since that API was removed
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 02 May 2017 08:45:20 -0400
+
 gtk-doc (1.25-7) unstable; urgency=medium
 
   * Fix installation of HTML images for out-of-tree builds.

Added: desktop/experimental/gtk-doc/debian/patches/fix-gtk4-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk-doc/debian/patches/fix-gtk4-build.patch?rev=52370&op=file
==============================================================================
--- desktop/experimental/gtk-doc/debian/patches/fix-gtk4-build.patch	(added)
+++ desktop/experimental/gtk-doc/debian/patches/fix-gtk4-build.patch	[utf-8] Tue May  2 21:24:27 2017
@@ -0,0 +1,29 @@
+From 5bd7638ba5c521d82f148a4f4a6c030951f5eeb7 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Mon, 13 Feb 2017 21:23:04 +0000
+Subject: scangobj: Protect style property inspection
+
+The API to list style properties on GtkWidget was removed in GTK+ 3.89.
+
+We need to protect the call to gtk_widget_class_list_style_properties()
+with a version check.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=778144
+---
+ gtkdoc-scangobj.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
+index 0fb3c2e..a2d91b0 100644
+--- a/gtkdoc-scangobj.in
++++ b/gtkdoc-scangobj.in
+@@ -1270,7 +1270,7 @@ output_object_args (FILE *fp, GType object_type)
+ #endif
+ 
+ #ifdef GTK_IS_WIDGET_CLASS
+-#if GTK_CHECK_VERSION(2,1,0)
++#if GTK_CHECK_VERSION(2,1,0) && !GTK_CHECK_VERSION(3,89,2)
+     if (!style_prop && GTK_IS_WIDGET_CLASS (class)) {
+       properties = gtk_widget_class_list_style_properties (GTK_WIDGET_CLASS (class), &n_properties);
+       style_prop = TRUE;
+

Modified: desktop/experimental/gtk-doc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk-doc/debian/patches/series?rev=52370&op=diff
==============================================================================
--- desktop/experimental/gtk-doc/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gtk-doc/debian/patches/series	[utf-8] Tue May  2 21:24:27 2017
@@ -1,2 +1,3 @@
 0001-mkpdf-fix-exitcode.patch
 0002-Fix-installation-of-HTML-images.patch
+fix-gtk4-build.patch