r109162 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r109161‎ | r109162 | r109163 >
Date:16:45, 17 January 2012
Author:mah
Status:reverted (Comments)
Tags:
Comment:
rsvg patches restored
Modified paths:
  • /trunk/debs/librsvg2/debian/changelog (modified) (history)
  • /trunk/debs/librsvg2/debian/compat (modified) (history)
  • /trunk/debs/librsvg2/debian/control.in (modified) (history)
  • /trunk/debs/librsvg2/debian/librsvg2-2.install (modified) (history)
  • /trunk/debs/librsvg2/debian/librsvg2-common.install (modified) (history)
  • /trunk/debs/librsvg2/debian/librsvg2-common.postinst.in (modified) (history)
  • /trunk/debs/librsvg2/debian/librsvg2-dev.install (modified) (history)
  • /trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch (modified) (history)
  • /trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch (modified) (history)
  • /trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch (added) (history)
  • /trunk/debs/librsvg2/debian/patches/manpage.patch (added) (history)
  • /trunk/debs/librsvg2/debian/patches/no-external-files.patch (added) (history)
  • /trunk/debs/librsvg2/debian/patches/rsvg-gz.patch (added) (history)
  • /trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch (added) (history)
  • /trunk/debs/librsvg2/debian/rules (modified) (history)
  • /trunk/debs/librsvg2/debian/shlibs.local (added) (history)

Diff [purge]

Index: trunk/debs/librsvg2/debian/compat
——@@ -1 +1 @@
2 -8
 2+7
Index: trunk/debs/librsvg2/debian/control.in
——@@ -1,32 +1,32 @@
22 Source: librsvg
33 Section: libdevel
44 Priority: optional
5 -Maintainer: Josselin Mouette <joss@debian.org>
6 -Uploaders: @GNOME_TEAM@
7 -Build-Depends: cdbs (>= 0.4.93),
8 - debhelper (>= 8.1.3),
 5+Maintainer: Tim Starling <tstarling@wikimedia.org>
 6+Build-Depends: cdbs,
 7+ debhelper (>= 7),
98 libfreetype6-dev,
109 libfontconfig1-dev (>= 1.0.1),
1110 libxml2-dev (>= 2.6.22),
1211 libglib2.0-dev (>= 2.24.0),
1312 libcairo2-dev (>= 1.2.0),
1413 libpango1.0-dev (>= 1.10.0),
15 - libgdk-pixbuf2.0-dev (>= 2.23.5-2),
16 - libgtk2.0-dev (>= 2.21.5),
17 - libgtk-3-dev (>= 2.90.0),
 14+ libgtk2.0-dev,
1815 libgsf-1-dev (>= 1.13.2-2),
1916 gnome-pkg-tools (>= 0.10),
2017 libcroco3-dev (>= 0.6.1),
2118 gtk-doc-tools (>= 1.13),
 19+ libgirepository1.0-dev,
 20+ gir1.0-glib-2.0,
 21+ gir1.0-freedesktop,
2222 python,
2323 python-support,
2424 libglib2.0-doc,
2525 libgtk2.0-doc,
2626 libcairo2-doc
27 -Standards-Version: 3.9.2
 27+Standards-Version: 3.8.4
2828 Homepage: http://librsvg.sourceforge.net/
29 -Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/librsvg
30 -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/librsvg
 29+Vcs-Svn: svn+ssh://svn.wikimedia.org/svnroot/mediawiki/trunk/debs/librsvg2
 30+Vcs-Browser: https://svn.wikimedia.org/viewvc/mediawiki/trunk/debs/librsvg2/
3131 XS-Python-Version: >= 2.5
3232
3333 Package: librsvg2-dev
——@@ -34,10 +34,9 @@
3535 Architecture: any
3636 Depends: ${misc:Depends},
3737 librsvg2-2 (= ${binary:Version}),
38 - libglib2.0-dev (>= 2.12.0),
39 - libgdk-pixbuf2.0-dev (>= 2.21.6),
 38+ libglib2.0-dev,
4039 libcairo2-dev (>= 1.2.0),
41 - libgtk2.0-dev (>= 2.21.5)
 40+ libgtk2.0-dev
4241 Multi-Arch: same
4342 Description: SAX-based renderer library for SVG files (development)
4443 The rsvg library is an efficient renderer for Scalable Vector Graphics
——@@ -45,6 +44,8 @@
4645 .
4746 This package provides the necessary development libraries and include
4847 files to allow you to develop with librsvg.
 48+ .
 49+ With Wikimedia patch to disallow external files.
4950
5051 Package: librsvg2-2
5152 Section: libs
——@@ -60,6 +61,8 @@
6162 .
6263 This package contains the runtime library, necessary to run
6364 applications using librsvg.
 65+ .
 66+ With Wikimedia patch to disallow external files.
6467
6568 Package: librsvg2-common
6669 Section: libs
——@@ -67,7 +70,7 @@
6871 Depends: ${misc:Depends},
6972 ${shlibs:Depends},
7073 librsvg2-2 (= ${binary:Version})
71 -Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.24.5-4)
 74+Breaks: libgdk-pixbuf2.0-0 (<< 2.23.5-2), libgtk2.0-0 (<< 2.20.0-0)
7275 Multi-Arch: same
7376 Description: SAX-based renderer library for SVG files (extra runtime)
7477 The rsvg library is an efficient renderer for Scalable Vector Graphics
——@@ -75,6 +78,8 @@
7679 .
7780 This package includes the gdk-pixbuf loader and a GTK+ engine, allowing
7881 to load SVG images transparently inside GTK+ applications.
 82+ .
 83+ With Wikimedia patch to disallow external files.
7984
8085 Package: librsvg2-dbg
8186 Section: debug
——@@ -83,12 +88,13 @@
8489 Depends: ${misc:Depends},
8590 ${shlibs:Depends},
8691 librsvg2-2 (= ${binary:Version})
87 -Multi-Arch: same
8892 Description: SAX-based renderer library for SVG files (debug)
8993 The rsvg library is an efficient renderer for Scalable Vector Graphics
9094 (SVG) pictures.
9195 .
9296 This package contains the debugging symbols.
 97+ .
 98+ With Wikimedia patch to disallow external files.
9399
94100 Package: librsvg2-bin
95101 Section: graphics
——@@ -104,3 +110,5 @@
105111 .
106112 This package includes a command-line utility to convert the SVG files
107113 to the PNG format and a graphical SVG viewer.
 114+ .
 115+ With Wikimedia patch to disallow external files.
Index: trunk/debs/librsvg2/debian/librsvg2-common.install
——@@ -1,2 +1 @@
2 -usr/lib/*/gdk-pixbuf-2.0/2.10.0/loaders/*.so
3 -usr/lib/*/gtk-2.0/*/engines/*.so
 2+usr/lib/gtk-2.0/*/engines/*.so
Index: trunk/debs/librsvg2/debian/changelog
——@@ -1,3 +1,37 @@
 2+librsvg (2.34.2-1wmf1) unstable; urgency=low
 3+
 4+ * Recover wmf patches
 5+
 6+ -- Mark A. Hershberger <mah@wikimedia.org> Sat, 24 Dec 2011 01:28:00 +0500
 7+
 8+librsvg (2.34.2-1) unstable; urgency=low
 9+
 10+ [ Josselin Mouette ]
 11+ * Remove incorrect M-A: same statement for the debug package.
 12+
 13+ [ Martin Pitt ]
 14+ * New upstream release.
 15+ * Drop 01_null_crash.patch, accepted upstream.
 16+ * This version supports introspection, enable it:
 17+ - debian/control.in: Add gir1.2-rsvg-2.0 binary package,
 18+ g-i/libgirepository-dev build dependencies, and add gir1.2-rsvg-2.0
 19+ dependency to -dev.
 20+ - debian/rules: Configure with --enable-introspection.
 21+ - Add debian/gir1.2-rsvg-2.0.install: Install typelib.
 22+ - debian/librsvg2-dev.install: Install *.gir.
 23+
 24+ -- Martin Pitt <mpitt@debian.org> Thu, 17 Nov 2011 09:38:21 +0100
 25+
 26+librsvg (2.34.1-3) unstable; urgency=low
 27+
 28+ * debian/librsvg2-common.postinst.in: Simplify by merely activating the
 29+ triggers of interested packages again instead of copy&paste'ing the
 30+ gdk-pixbuf-loader code snippets. Also add a more detailled comment about
 31+ why this is necessary. Also fix the glob to only catch directories.
 32+ (Closes: #640955)
 33+
 34+ -- Martin Pitt <mpitt@debian.org> Wed, 26 Oct 2011 12:43:35 +0200
 35+
236 librsvg (2.34.1-2) unstable; urgency=low
337
438 * debian/control.in: Add libgtk-3-dev build dependency to also build the
——@@ -179,6 +213,22 @@
180214
181215 -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Tue, 21 Oct 2008 11:52:06 +0200
182216
 217+librsvg (2.22.2-100wm2) unstable; urgency=low
 218+
 219+ * (WM bug 16014) Fixed UTF-8 command-line input
 220+ * Fixed missing newline in rsvg-convert error display
 221+
 222+ -- Tim Starling <tstarling@wikimedia.org> Mon, 20 Oct 2008 16:42:45 +1100
 223+
 224+librsvg (2.22.2-100wm1) unstable; urgency=low
 225+
 226+ * Wikimedia fork. Applied security patch by Brion Vibber.
 227+ * Added Wikimedia tag to rsvg --version and rsvg-convert --version. This is
 228+ for Wikimedia's internal convenience only and is not a requirement of
 229+ distribution.
 230+
 231+ -- Tim Starling <tstarling@wikimedia.org> Wed, 20 Aug 2008 12:28:43 +1000
 232+
183233 librsvg (2.22.2-2) unstable; urgency=low
184234
185235 * debian/control.in:
Index: trunk/debs/librsvg2/debian/patches/cmdline-bugfixes.patch
——@@ -0,0 +1,29 @@
 2+--- librsvg-2.22.2~/rsvg-convert.c 2007-07-01 23:43:44.000000000 +1000
 3+@@ -31,6 +31,7 @@
 4+ #include <stdio.h>
 5+ #include <stdlib.h>
 6+ #include <string.h>
 7++#include <locale.h>
 8+
 9+ #include "rsvg.h"
 10+ #include "rsvg-cairo.h"
 11+@@ -52,7 +53,7 @@
 12+ display_error (GError * err)
 13+ {
 14+ if (err) {
 15+- g_print ("%s", err->message);
 16++ g_print ("%s\n", err->message);
 17+ g_error_free (err);
 18+ }
 19+ }
 20+@@ -165,6 +166,9 @@
 21+ {NULL}
 22+ };
 23+
 24++ /* Set the locale so that UTF-8 filenames work */
 25++ setlocale(LC_ALL, "");
 26++
 27+ g_thread_init(NULL);
 28+
 29+ g_option_context = g_option_context_new (_("- SVG Converter"));
Index: trunk/debs/librsvg2/debian/patches/wikimedia-brand.patch
——@@ -0,0 +1,24 @@
 2+diff -ru librsvg-2.22.2~/rsvg-convert.c librsvg-2.22.2/rsvg-convert.c
 3+--- librsvg-2.22.2~/rsvg-convert.c 2007-07-01 23:43:44.000000000 +1000
 4+@@ -178,7 +178,7 @@
 5+ g_option_context_free (g_option_context);
 6+
 7+ if (bVersion != 0) {
 8+- printf (_("rsvg-convert version %s\n"), VERSION);
 9++ printf (_("rsvg-convert version %s (Wikimedia)\n"), VERSION);
 10+ return 0;
 11+ }
 12+
 13+diff -ru librsvg-2.22.2~/rsvg.in librsvg-2.22.2/rsvg.in
 14+--- librsvg-2.22.2~/rsvg.in 2007-04-24 08:45:56.000000000 +1000
 15+@@ -45,7 +45,7 @@
 16+
 17+ for o, a in opts:
 18+ if o in ("-v", "--version"):
 19+- print "rsvg version %s" % ("@VERSION@")
 20++ print "rsvg version %s (Wikimedia)" % ("@VERSION@")
 21+ sys.exit(0)
 22+ elif o in ("--usage"):
 23+ usage()
Index: trunk/debs/librsvg2/debian/patches/manpage.patch
——@@ -0,0 +1,11 @@
 2+--- librsvg2-2.8.1.orig/rsvg.1
 3+@@ -6,7 +6,7 @@
 4+ [options] in.svg out.png
 5+ .I ""
 6+ .SH DESCRIPTION
 7+-RSVG coverts SVG images into PNG, JPEG, and ICO raster images.
 8++RSVG converts SVG images into PNG, JPEG, and ICO raster images.
 9+ .SS OPTIONS
 10+ .TP
 11+ .I "\-d \-\-dpi-x number"
Index: trunk/debs/librsvg2/debian/patches/99_ltmain_as-needed.patch
——@@ -1,7 +1,7 @@
2 -+++ b/ltmain.sh
3 -@@ -4716,6 +4716,11 @@
4 - arg=$func_stripname_result
 2+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
 3+@@ -1794,6 +1794,11 @@
 4+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
55 ;;
66
77 + -Wl,--as-needed)
——@@ -10,9 +10,9 @@
1111 + ;;
1212 +
1313 -Wl,*)
14 - func_stripname '-Wl,' '' "$arg"
15 - args=$func_stripname_result
16 -@@ -5067,6 +5072,15 @@
 14+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
 15+ arg=
 16+@@ -2137,6 +2142,15 @@
1717 lib=
1818 found=no
1919 case $deplib in
Index: trunk/debs/librsvg2/debian/patches/no-external-files.patch
——@@ -0,0 +1,58 @@
 2+diff --git a/rsvg-base-file-util.c b/rsvg-base-file-util.c
 3+index 902c436..a3cc7c5 100644
 4+--- a/rsvg-base-file-util.c
 5+@@ -91,7 +91,7 @@ rsvg_handle_new_from_file (const gchar * file_name, GError ** error)
 6+ rsvg_return_val_if_fail (file_name != NULL, NULL, error);
 7+
 8+ base_uri = rsvg_get_base_uri_from_filename (file_name);
 9+- f = _rsvg_acquire_xlink_href_resource (file_name, base_uri, error);
 10++ f = _rsvg_acquire_file_resource (file_name, base_uri, error);
 11+
 12+ if (f) {
 13+ handle = rsvg_handle_new ();
 14+diff --git a/rsvg-image.c b/rsvg-image.c
 15+index 02882bd..5e74a1e 100644
 16+--- a/rsvg-image.c
 17+@@ -160,6 +160,26 @@ rsvg_acquire_vfs_resource (const char *filename, const char *base_uri, GError **
 18+ }
 19+
 20+ GByteArray *
 21++_rsvg_acquire_file_resource (const char *href, const char *base_uri, GError ** err)
 22++{
 23++ GByteArray *arr = NULL;
 24++
 25++ if (!(href && *href))
 26++ return NULL;
 27++
 28++ if (!strncmp (href, "data:", 5))
 29++ arr = rsvg_acquire_base64_resource (href, NULL);
 30++
 31++ if (!arr)
 32++ arr = rsvg_acquire_file_resource (href, base_uri, NULL);
 33++
 34++ if (!arr)
 35++ arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
 36++
 37++ return arr;
 38++}
 39++
 40++GByteArray *
 41+ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GError ** err)
 42+ {
 43+ GByteArray *arr = NULL;
 44+@@ -170,11 +190,13 @@ _rsvg_acquire_xlink_href_resource (const char *href, const char *base_uri, GErro
 45+ if (!strncmp (href, "data:", 5))
 46+ arr = rsvg_acquire_base64_resource (href, NULL);
 47+
 48++#ifdef ALLOW_EXTERNAL
 49+ if (!arr)
 50+ arr = rsvg_acquire_file_resource (href, base_uri, NULL);
 51+
 52+ if (!arr)
 53+ arr = rsvg_acquire_vfs_resource (href, base_uri, NULL);
 54++#endif
 55+
 56+ return arr;
 57+ }
Index: trunk/debs/librsvg2/debian/patches/10_rsvg-gz.patch
——@@ -10,13 +10,3 @@
1111 +{
1212 + return rsvg_handle_new ();
1313 +}
14 -+++ b/librsvg.def
15 -@@ -7,6 +7,7 @@
16 - rsvg_handle_set_dpi
17 - rsvg_handle_set_dpi_x_y
18 - rsvg_handle_new
19 -+rsvg_handle_new_gz
20 - rsvg_handle_write
21 - rsvg_handle_close
22 - rsvg_handle_get_pixbuf
Index: trunk/debs/librsvg2/debian/patches/rsvg-gz.patch
——@@ -0,0 +1,22 @@
 2+--- rsvg-gobject.c 2006-02-06 05:41:56.000000000 +0100
 3+@@ -317,3 +317,9 @@
 4+ {
 5+ return RSVG_HANDLE (g_object_new (RSVG_TYPE_HANDLE, NULL));
 6+ }
 7++
 8++RsvgHandle *
 9++rsvg_handle_new_gz (void)
 10++{
 11++ return rsvg_handle_new ();
 12++}
 13+--- librsvg.def.orig 2006-09-05 23:46:41.000000000 +0200
 14+@@ -7,6 +7,7 @@
 15+ rsvg_handle_set_dpi
 16+ rsvg_handle_set_dpi_x_y
 17+ rsvg_handle_new
 18++rsvg_handle_new_gz
 19+ rsvg_handle_write
 20+ rsvg_handle_close
 21+ rsvg_handle_get_pixbuf
Index: trunk/debs/librsvg2/debian/rules
——@@ -3,6 +3,7 @@
44 include /usr/share/cdbs/1/rules/debhelper.mk
55 include /usr/share/cdbs/1/rules/utils.mk
66 include /usr/share/cdbs/1/class/gnome.mk
 7+include /usr/share/cdbs/1/rules/simple-patchsys.mk
78 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
89 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
910
Index: trunk/debs/librsvg2/debian/librsvg2-2.install
——@@ -1 +1 @@
2 -usr/lib/*/lib*.so.*
 2+usr/lib/lib*.so.*
Index: trunk/debs/librsvg2/debian/librsvg2-common.postinst.in
——@@ -4,13 +4,12 @@
55 #DEBHELPER#
66
77 if [ "$1" = configure ]; then
8 - # run an update there because the trigger might not work; see
 8+ # gdk-pixbuf's triggers already trigger on "interest" which happens after
 9+ # unpack. At that time the SVG loader might not work yet due to
 10+ # unconfigured/missing dependencies, so we need to run the gdk pixbuf
 11+ # loader query again after we are configured, as that is the only time when
 12+ # our library is guaranteed to work. see #
913 # https://launchpad.net/bugs/719861 comment 9 for details
10 - GDKPIXDIR=/usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/
11 - if [ -d $GDKPIXDIR ]; then
12 - for VERSION in `ls $GDKPIXDIR`; do
13 - $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
14 - done
15 - fi
 14+ dpkg-trigger --no-await /usr/lib/#MULTIARCH#/gdk-pixbuf-2.0/*/loaders
1615 fi
1716
Index: trunk/debs/librsvg2/debian/librsvg2-dev.install
——@@ -1,5 +1,5 @@
22 usr/include
3 -usr/lib/*/lib*.a
4 -usr/lib/*/lib*.so
5 -usr/lib/*/pkgconfig
 3+usr/lib/lib*.a
 4+usr/lib/lib*.so
 5+usr/lib/pkgconfig
66 usr/share/gtk-doc/html/rsvg-2.0/* usr/share/doc/librsvg2-dev/html/
Index: trunk/debs/librsvg2/debian/shlibs.local
——@@ -0,0 +1 @@
 2+librsvg-2 2

Follow-up revisions

RevisionCommit summaryAuthorDate
r109605rollback r109160 and r109162 in preparation for moving to git and to make sur...mah03:06, 20 January 2012

Comments

#Comment by Tim Starling (talk | contribs)   00:41, 20 January 2012

The commit message does not match the diff. Why are you switching to a different upstream version? Where did this new upstream version even come from?

You didn't add the WMF patches to the series file, so presumably they won't be applied. It's a quilt format source package.

Why are you re-adding cmdline-bugfixes.patch? It's been accepted upstream, so it's not necessary and won't apply.

#Comment by MarkAHershberger (talk | contribs)   03:00, 20 January 2012

I should have used my lucid box to make the commit but I was lazy and just used the copy I had.

Mea culpa.

I'll revert this and switch this over to the git repo as suggested by MarkB.

Status & tagging log