https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109162
Revision: 109162
Author: mah
Date: 2012-01-17 16:45:38 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
rsvg patches restored
Modified Paths:
--------------
trunk/debs/librsvg2/debian/changelog
trunk/debs/librsvg2/debian/compat
trunk/debs/librsvg2/debian/control.in
trunk/debs/librsvg2/debian/librsvg2-2.install
trunk/debs/librsvg2/debian/librsvg2-common.install
trunk/debs/librsvg2/debian/librsvg2-common.postinst.in
trunk/debs/librsvg2/debian/librsvg2-dev.install
trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch
trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch
trunk/debs/librsvg2/debian/rules
Added Paths:
-----------
trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch
trunk/debs/librsvg2/debian/patches/manpage.patch
trunk/debs/librsvg2/debian/patches/no-external-files.patch
trunk/debs/librsvg2/debian/patches/rsvg-gz.patch
trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch
trunk/debs/librsvg2/debian/shlibs.local
Modified: trunk/debs/librsvg2/debian/changelog
===================================================================
--- trunk/debs/librsvg2/debian/changelog 2012-01-17 16:42:53 UTC (rev
109161)
+++ trunk/debs/librsvg2/debian/changelog 2012-01-17 16:45:38 UTC (rev
109162)
@@ -1,3 +1,37 @@
+librsvg (2.34.2-1wmf1) unstable; urgency=low
+
+ * Recover wmf patches
+
+ -- Mark A. Hershberger <m...@wikimedia.org> Sat, 24 Dec 2011 01:28:00 +0500
+
+librsvg (2.34.2-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Remove incorrect M-A: same statement for the debug package.
+
+ [ Martin Pitt ]
+ * New upstream release.
+ * Drop 01_null_crash.patch, accepted upstream.
+ * This version supports introspection, enable it:
+ - debian/control.in: Add gir1.2-rsvg-2.0 binary package,
+ g-i/libgirepository-dev build dependencies, and add gir1.2-rsvg-2.0
+ dependency to -dev.
+ - debian/rules: Configure with --enable-introspection.
+ - Add debian/gir1.2-rsvg-2.0.install: Install typelib.
+ - debian/librsvg2-dev.install: Install *.gir.
+
+ -- Martin Pitt <mp...@debian.org> Thu, 17 Nov 2011 09:38:21 +0100
+
+librsvg (2.34.1-3) unstable; urgency=low
+
+ * debian/librsvg2-common.postinst.in: Simplify by merely activating the
+ triggers of interested packages again instead of copy&paste'ing the
+ gdk-pixbuf-loader code snippets. Also add a more detailled comment about
+ why this is necessary. Also fix the glob to only catch directories.
+ (Closes: #640955)
+
+ -- Martin Pitt <mp...@debian.org> Wed, 26 Oct 2011 12:43:35 +0200
+
librsvg (2.34.1-2) unstable; urgency=low
* debian/control.in: Add libgtk-3-dev build dependency to also build the
@@ -179,6 +213,22 @@
-- Emilio Pozuelo Monfort <po...@ubuntu.com> Tue, 21 Oct 2008 11:52:06 +0200
+librsvg (2.22.2-100wm2) unstable; urgency=low
+
+ * (WM bug 16014) Fixed UTF-8 command-line input
+ * Fixed missing newline in rsvg-convert error display
+
+ -- Tim Starling <tstarl...@wikimedia.org> Mon, 20 Oct 2008 16:42:45 +1100
+
+librsvg (2.22.2-100wm1) unstable; urgency=low
+
+ * Wikimedia fork. Applied security patch by Brion Vibber.
+ * Added Wikimedia tag to rsvg --version and rsvg-convert --version. This is
+ for Wikimedia's internal convenience only and is not a requirement of
+ distribution.
+
+ -- Tim Starling <tstarl...@wikimedia.org> Wed, 20 Aug 2008 12:28:43 +1000
+
librsvg (2.22.2-2) unstable; urgency=low
* debian/control.in:
Modified: trunk/debs/librsvg2/debian/compat
===================================================================
--- trunk/debs/librsvg2/debian/compat 2012-01-17 16:42:53 UTC (rev 109161)
+++ trunk/debs/librsvg2/debian/compat 2012-01-17 16:45:38 UTC (rev 109162)
@@ -1 +1 @@
-8
+7
Modified: trunk/debs/librsvg2/debian/control.in
===================================================================
--- trunk/debs/librsvg2/debian/control.in 2012-01-17 16:42:53 UTC (rev
109161)
+++ trunk/debs/librsvg2/debian/control.in 2012-01-17 16:45:38 UTC (rev
109162)
@@ -1,32 +1,32 @@
Source: librsvg
Section: libdevel
Priority: optional
-Maintainer: Josselin Mouette <j...@debian.org>
-Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93),
- debhelper (>= 8.1.3),
+Maintainer: Tim Starling <tstarl...@wikimedia.org>
+Build-Depends: cdbs,
+ debhelper (>= 7),
libfreetype6-dev,
libfontconfig1-dev (>= 1.0.1),
libxml2-dev (>= 2.6.22),
libglib2.0-dev (>= 2.24.0),
libcairo2-dev (>= 1.2.0),
libpango1.0-dev (>= 1.10.0),
- libgdk-pixbuf2.0-dev (>= 2.23.5-2),
- libgtk2.0-dev (>= 2.21.5),
- libgtk-3-dev (>= 2.90.0),
+ libgtk2.0-dev,
libgsf-1-dev (>= 1.13.2-2),
gnome-pkg-tools (>= 0.10),
libcroco3-dev (>= 0.6.1),
gtk-doc-tools (>= 1.13),
+ libgirepository1.0-dev,
+ gir1.0-glib-2.0,
+ gir1.0-freedesktop,
python,
python-support,
libglib2.0-doc,
libgtk2.0-doc,
libcairo2-doc
-Standards-Version: 3.9.2
+Standards-Version: 3.8.4
Homepage: http://librsvg.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/librsvg
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/librsvg
+Vcs-Svn: svn+ssh://svn.wikimedia.org/svnroot/mediawiki/trunk/debs/librsvg2
+Vcs-Browser: https://svn.wikimedia.org/viewvc/mediawiki/trunk/debs/librsvg2/
XS-Python-Version: >= 2.5
Package: librsvg2-dev
@@ -34,10 +34,9 @@
Architecture: any
Depends: ${misc:Depends},
librsvg2-2 (= ${binary:Version}),
- libglib2.0-dev (>= 2.12.0),
- libgdk-pixbuf2.0-dev (>= 2.21.6),
+ libglib2.0-dev,
libcairo2-dev (>= 1.2.0),
- libgtk2.0-dev (>= 2.21.5)
+ libgtk2.0-dev
Multi-Arch: same
Description: SAX-based renderer library for SVG files (development)
The rsvg library is an efficient renderer for Scalable Vector Graphics
@@ -45,6 +44,8 @@
.
This package provides the necessary development libraries and include
files to allow you to develop with librsvg.
+ .
+ With Wikimedia patch to disallow external files.
Package: librsvg2-2
Section: libs
@@ -60,6 +61,8 @@
.
This package contains the runtime library, necessary to run
applications using librsvg.
+ .
+ With Wikimedia patch to disallow external files.
Package: librsvg2-common
Section: libs
@@ -67,7 +70,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
-Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.24.5-4)
+Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.20.0-0)
Multi-Arch: same
Description: SAX-based renderer library for SVG files (extra runtime)
The rsvg library is an efficient renderer for Scalable Vector Graphics
@@ -75,6 +78,8 @@
.
This package includes the gdk-pixbuf loader and a GTK+ engine, allowing
to load SVG images transparently inside GTK+ applications.
+ .
+ With Wikimedia patch to disallow external files.
Package: librsvg2-dbg
Section: debug
@@ -83,12 +88,13 @@
Depends: ${misc:Depends},
${shlibs:Depends},
librsvg2-2 (= ${binary:Version})
-Multi-Arch: same
Description: SAX-based renderer library for SVG files (debug)
The rsvg library is an efficient renderer for Scalable Vector Graphics
(SVG) pictures.
.
This package contains the debugging symbols.
+ .
+ With Wikimedia patch to disallow external files.
Package: librsvg2-bin
Section: graphics
@@ -104,3 +110,5 @@
.
This package includes a command-line utility to convert the SVG files
to the PNG format and a graphical SVG viewer.
+ .
+ With Wikimedia patch to disallow external files.
Modified: trunk/debs/librsvg2/debian/librsvg2-2.install
===================================================================
--- trunk/debs/librsvg2/debian/librsvg2-2.install 2012-01-17 16:42:53 UTC
(rev 109161)
+++ trunk/debs/librsvg2/debian/librsvg2-2.install 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+usr/lib/lib*.so.*
Modified: trunk/debs/librsvg2/debian/librsvg2-common.install
===================================================================
--- trunk/debs/librsvg2/debian/librsvg2-common.install 2012-01-17 16:42:53 UTC
(rev 109161)
+++ trunk/debs/librsvg2/debian/librsvg2-common.install 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -1,2 +1 @@
-usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/*.so
-usr/lib/*/gtk-2.0/*/engines/*.so
+usr/lib/gtk-2.0/*/engines/*.so
Modified: trunk/debs/librsvg2/debian/librsvg2-common.postinst.in
===================================================================
--- trunk/debs/librsvg2/debian/librsvg2-common.postinst.in 2012-01-17
16:42:53 UTC (rev 109161)
+++ trunk/debs/librsvg2/debian/librsvg2-common.postinst.in 2012-01-17
16:45:38 UTC (rev 109162)
@@ -4,13 +4,12 @@
#DEBHELPER#
if [ "$1" = configure ]; then
- # run an update there because the trigger might not work; see
+ # gdk-pixbuf's triggers already trigger on "interest" which happens after
+ # unpack. At that time the SVG loader might not work yet due to
+ # unconfigured/missing dependencies, so we need to run the gdk pixbuf
+ # loader query again after we are configured, as that is the only time when
+ # our library is guaranteed to work. see #
# https://launchpad.net/bugs/719861 comment 9 for details
- GDKPIXDIR=/usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/
- if [ -d $GDKPIXDIR ]; then
- for VERSION in `ls $GDKPIXDIR`; do
- $GDKPIXDIR/gdk-pixbuf-query-loaders
$GDKPIXDIR/$VERSION/loaders/*.so /usr/lib/gdk-pixbuf-2.0/$VERSION/loaders/*.so
> $GDKPIXDIR/$VERSION/loaders.cache 2>/dev/null || true
- done
- fi
+ dpkg-trigger --no-await /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/*/loaders
fi
Modified: trunk/debs/librsvg2/debian/librsvg2-dev.install
===================================================================
--- trunk/debs/librsvg2/debian/librsvg2-dev.install 2012-01-17 16:42:53 UTC
(rev 109161)
+++ trunk/debs/librsvg2/debian/librsvg2-dev.install 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -1,5 +1,5 @@
usr/include
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig
usr/share/gtk-doc/html/rsvg-2.0/* usr/share/doc/librsvg2-dev/html/
Modified: trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch 2012-01-17 16:42:53 UTC
(rev 109161)
+++ trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -10,13 +10,3 @@
+{
+ return rsvg_handle_new ();
+}
---- a/librsvg.def
-+++ b/librsvg.def
-@@ -7,6 +7,7 @@
- rsvg_handle_set_dpi
- rsvg_handle_set_dpi_x_y
- rsvg_handle_new
-+rsvg_handle_new_gz
- rsvg_handle_write
- rsvg_handle_close
- rsvg_handle_get_pixbuf
Modified: trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch
2012-01-17 16:42:53 UTC (rev 109161)
+++ trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch
2012-01-17 16:45:38 UTC (rev 109162)
@@ -1,7 +1,7 @@
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -4716,6 +4716,11 @@
- arg=$func_stripname_result
+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
;;
+ -Wl,--as-needed)
@@ -10,9 +10,9 @@
+ ;;
+
-Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -5067,6 +5072,15 @@
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2137,6 +2142,15 @@
lib=
found=no
case $deplib in
Added: trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch
(rev 0)
+++ trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch 2012-01-17
16:45:38 UTC (rev 109162)
@@ -0,0 +1,29 @@
+--- librsvg-2.22.2~/rsvg-convert.c 2007-07-01 23:43:44.000000000 +1000
++++ librsvg-2.22.2/rsvg-convert.c 2008-10-20 16:52:27.000000000 +1100
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <locale.h>
+
+ #include "rsvg.h"
+ #include "rsvg-cairo.h"
+@@ -52,7 +53,7 @@
+ display_error (GError * err)
+ {
+ if (err) {
+- g_print ("%s", err->message);
++ g_print ("%s\n", err->message);
+ g_error_free (err);
+ }
+ }
+@@ -165,6 +166,9 @@
+ {NULL}
+ };
+
++ /* Set the locale so that UTF-8 filenames work */
++ setlocale(LC_ALL, "");
++
+ g_thread_init(NULL);
+
+ g_option_context = g_option_context_new (_("- SVG Converter"));
Added: trunk/debs/librsvg2/debian/patches/manpage.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/manpage.patch
(rev 0)
+++ trunk/debs/librsvg2/debian/patches/manpage.patch 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -0,0 +1,11 @@
+--- librsvg2-2.8.1.orig/rsvg.1
++++ librsvg2-2.8.1/rsvg.1
+@@ -6,7 +6,7 @@
+ [options] in.svg out.png
+ .I ""
+ .SH DESCRIPTION
+-RSVG coverts SVG images into PNG, JPEG, and ICO raster images.
++RSVG converts SVG images into PNG, JPEG, and ICO raster images.
+ .SS OPTIONS
+ .TP
+ .I "\-d \-\-dpi-x number"
Added: trunk/debs/librsvg2/debian/patches/no-external-files.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/no-external-files.patch
(rev 0)
+++ trunk/debs/librsvg2/debian/patches/no-external-files.patch 2012-01-17
16:45:38 UTC (rev 109162)
@@ -0,0 +1,58 @@
+diff --git a/rsvg-base-file-util.c b/rsvg-base-file-util.c
+index 902c436..a3cc7c5 100644
+--- a/rsvg-base-file-util.c
++++ b/rsvg-base-file-util.c
+@@ -91,7 +91,7 @@ rsvg_handle_new_from_file (const gchar * file_name, GError
** error)
+ rsvg_return_val_if_fail (file_name != NULL, NULL, error);
+
+ base_uri = rsvg_get_base_uri_from_filename (file_name);
+- f = _rsvg_acquire_xlink_href_resource (file_name, base_uri, error);
++ f = _rsvg_acquire_file_resource (file_name, base_uri, error);
+
+ if (f) {
+ handle = rsvg_handle_new ();
+diff --git a/rsvg-image.c b/rsvg-image.c
+index 02882bd..5e74a1e 100644
+--- a/rsvg-image.c
++++ b/rsvg-image.c
+@@ -160,6 +160,26 @@ rsvg_acquire_vfs_resource (const char *filename, const
char *base_uri, GError **
+ }
+
+ GByteArray *
++_rsvg_acquire_file_resource (const char *href, const char *base_uri, GError
** err)
++{
++ GByteArray *arr = NULL;
++
++ if (!(href && *href))
++ return NULL;
++
++ if (!strncmp (href, "data:", 5))
++ arr = rsvg_acquire_base64_resource (href, NULL);
++
++ if (!arr)
++ arr = rsvg_acquire_file_resource (href, base_uri, NULL);
++
++ if (!arr)
++ arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
++
++ return arr;
++}
++
++GByteArray *
+ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri,
GError ** err)
+ {
+ GByteArray *arr = NULL;
+@@ -170,11 +190,13 @@ _rsvg_acquire_xlink_href_resource (const char *href,
const char *base_uri, GErro
+ if (!strncmp (href, "data:", 5))
+ arr = rsvg_acquire_base64_resource (href, NULL);
+
++#ifdef ALLOW_EXTERNAL
+ if (!arr)
+ arr = rsvg_acquire_file_resource (href, base_uri, NULL);
+
+ if (!arr)
+ arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
++#endif
+
+ return arr;
+ }
Added: trunk/debs/librsvg2/debian/patches/rsvg-gz.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/rsvg-gz.patch
(rev 0)
+++ trunk/debs/librsvg2/debian/patches/rsvg-gz.patch 2012-01-17 16:45:38 UTC
(rev 109162)
@@ -0,0 +1,22 @@
+--- rsvg-gobject.c 2006-02-06 05:41:56.000000000 +0100
++++ rsvg-gobject.c.new 2006-04-01 17:42:25.000000000 +0200
+@@ -317,3 +317,9 @@
+ {
+ return RSVG_HANDLE (g_object_new (RSVG_TYPE_HANDLE, NULL));
+ }
++
++RsvgHandle *
++rsvg_handle_new_gz (void)
++{
++ return rsvg_handle_new ();
++}
+--- librsvg.def.orig 2006-09-05 23:46:41.000000000 +0200
++++ librsvg.def 2006-09-05 23:46:48.000000000 +0200
+@@ -7,6 +7,7 @@
+ rsvg_handle_set_dpi
+ rsvg_handle_set_dpi_x_y
+ rsvg_handle_new
++rsvg_handle_new_gz
+ rsvg_handle_write
+ rsvg_handle_close
+ rsvg_handle_get_pixbuf
Added: trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch
===================================================================
--- trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch
(rev 0)
+++ trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch 2012-01-17
16:45:38 UTC (rev 109162)
@@ -0,0 +1,24 @@
+diff -ru librsvg-2.22.2~/rsvg-convert.c librsvg-2.22.2/rsvg-convert.c
+--- librsvg-2.22.2~/rsvg-convert.c 2007-07-01 23:43:44.000000000 +1000
++++ librsvg-2.22.2/rsvg-convert.c 2008-08-20 13:15:06.000000000 +1000
+@@ -178,7 +178,7 @@
+ g_option_context_free (g_option_context);
+
+ if (bVersion != 0) {
+- printf (_("rsvg-convert version %s\n"), VERSION);
++ printf (_("rsvg-convert version %s (Wikimedia)\n"), VERSION);
+ return 0;
+ }
+
+diff -ru librsvg-2.22.2~/rsvg.in librsvg-2.22.2/rsvg.in
+--- librsvg-2.22.2~/rsvg.in 2007-04-24 08:45:56.000000000 +1000
++++ librsvg-2.22.2/rsvg.in 2008-08-20 13:14:41.000000000 +1000
+@@ -45,7 +45,7 @@
+
+ for o, a in opts:
+ if o in ("-v", "--version"):
+- print "rsvg version %s" % ("@VERSION@")
++ print "rsvg version %s (Wikimedia)" % ("@VERSION@")
+ sys.exit(0)
+ elif o in ("--usage"):
+ usage()
Modified: trunk/debs/librsvg2/debian/rules
===================================================================
--- trunk/debs/librsvg2/debian/rules 2012-01-17 16:42:53 UTC (rev 109161)
+++ trunk/debs/librsvg2/debian/rules 2012-01-17 16:45:38 UTC (rev 109162)
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
Added: trunk/debs/librsvg2/debian/shlibs.local
===================================================================
--- trunk/debs/librsvg2/debian/shlibs.local (rev 0)
+++ trunk/debs/librsvg2/debian/shlibs.local 2012-01-17 16:45:38 UTC (rev
109162)
@@ -0,0 +1 @@
+librsvg-2 2
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
