r54514 - in /desktop/unstable/librsvg/debian: changelog patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Oct 21 02:43:17 2017
New Revision: 54514

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54514
Log:
Cherry-pick upstream fix to no longer pass deprecated --nogtkinit to
gtkdoc-scangobj. (Closes: #876615)

Added:
    desktop/unstable/librsvg/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch
Modified:
    desktop/unstable/librsvg/debian/changelog
    desktop/unstable/librsvg/debian/patches/series

Modified: desktop/unstable/librsvg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/changelog?rev=54514&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/changelog	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/changelog	[utf-8] Sat Oct 21 02:43:17 2017
@@ -3,6 +3,8 @@
   * Drop Build-Depends on libgsf-1-dev. It's no longer needed with GIO 2.24.
   * Mark the libgtk-3-dev Build-Depends as <!stage1> to make the source
     package easier to bootstrap. (Closes: #871535)
+  * Cherry-pick upstream fix to no longer pass deprecated --nogtkinit to
+    gtkdoc-scangobj. (Closes: #876615)
 
  -- Michael Biebl <biebl at debian.org>  Sat, 21 Oct 2017 04:37:44 +0200
 

Added: desktop/unstable/librsvg/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch?rev=54514&op=file
==============================================================================
--- desktop/unstable/librsvg/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch	(added)
+++ desktop/unstable/librsvg/debian/patches/20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch	[utf-8] Sat Oct 21 02:43:17 2017
@@ -0,0 +1,35 @@
+From dfe34c8757debd07d4ef2f6f0381b2bcac1addc0 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw44 at gmail.com>
+Date: Mon, 7 Aug 2017 21:43:10 -0500
+Subject: [PATCH] bgo#782098 - Don't pass deprecated --nogtkinit to
+ gtkdoc-scangobj
+
+---
+ doc/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 5db7716..5decdda 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -23,7 +23,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
+ DOC_SOURCE_DIR = ..
+ 
+ # Extra options to pass to gtkdoc-scangobj. Not normally needed.
+-SCANGOBJ_OPTIONS = --nogtkinit --type-init-func="g_type_init ()"
++SCANGOBJ_OPTIONS = --type-init-func="g_type_init ()"
+ 
+ # Extra options to supply to gtkdoc-scan.
+ # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
+@@ -96,7 +96,7 @@ HTML_IMAGES =
+ # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+ # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+ content_files = \
+- 	version.xml
++	version.xml
+ 
+ # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+ # These files must be listed here *and* in content_files
+-- 
+2.15.0.rc1
+

Modified: desktop/unstable/librsvg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/librsvg/debian/patches/series?rev=54514&op=diff
==============================================================================
--- desktop/unstable/librsvg/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/librsvg/debian/patches/series	[utf-8] Sat Oct 21 02:43:17 2017
@@ -1 +1,2 @@
 10_rsvg-gz.patch
+20_bgo-782098-Don-t-pass-deprecated-nogtkinit-to-gtkdoc.patch