| Index: trunk/debs/librsvg/debian/control |
| — | — | @@ -0,0 +1,104 @@ |
| | 2 | +# This file is autogenerated. DO NOT EDIT! |
| | 3 | +# |
| | 4 | +# Modifications should be made to debian/control.in instead. |
| | 5 | +# This file is regenerated automatically in the clean target. |
| | 6 | + |
| | 7 | +Source: librsvg |
| | 8 | +Section: libdevel |
| | 9 | +Priority: optional |
| | 10 | +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
| | 11 | +XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> |
| | 12 | +Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org> |
| | 13 | +Build-Depends: cdbs (>= 0.4.41), |
| | 14 | + debhelper (>= 5), |
| | 15 | + libfreetype6-dev, |
| | 16 | + libfontconfig1-dev (>= 1.0.1), |
| | 17 | + libxml2-dev (>= 2.6.22), |
| | 18 | + libglib2.0-dev (>= 2.16.0), |
| | 19 | + libcairo2-dev (>= 1.2.0), |
| | 20 | + libpango1.0-dev (>= 1.10.0), |
| | 21 | + libgtk2.0-dev (>= 2.16), |
| | 22 | + libgsf-1-dev (>= 1.13.2-2), |
| | 23 | + gnome-pkg-tools (>= 0.10), |
| | 24 | + libcroco3-dev (>= 0.6.1), |
| | 25 | + gtk-doc-tools (>= 1.0), |
| | 26 | + python, |
| | 27 | + python-support, |
| | 28 | + dpkg-dev (>= 1.13.19), |
| | 29 | + libglib2.0-doc, |
| | 30 | + libgtk2.0-doc, |
| | 31 | + libcairo2-doc |
| | 32 | +Standards-Version: 3.8.1 |
| | 33 | +Homepage: http://librsvg.sourceforge.net/ |
| | 34 | +XS-Python-Version: current |
| | 35 | + |
| | 36 | +Package: librsvg2-dev |
| | 37 | +Section: libdevel |
| | 38 | +Architecture: any |
| | 39 | +Depends: ${misc:Depends}, |
| | 40 | + librsvg2-2 (= ${binary:Version}), |
| | 41 | + libgtk2.0-dev (>= 2.10.1-1), |
| | 42 | + libglib2.0-dev (>= 2.12.0), |
| | 43 | + libcairo2-dev (>= 1.2.0) |
| | 44 | +Description: SAX-based renderer library for SVG files (development) |
| | 45 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 46 | + (SVG) pictures. |
| | 47 | + . |
| | 48 | + This package provides the necessary development libraries and include |
| | 49 | + files to allow you to develop with librsvg. |
| | 50 | + |
| | 51 | +Package: librsvg2-2 |
| | 52 | +Section: libs |
| | 53 | +Architecture: any |
| | 54 | +Depends: ${misc:Depends}, |
| | 55 | + ${shlibs:Depends} |
| | 56 | +Suggests: librsvg2-bin |
| | 57 | +Conflicts: librsvg2-common (<< 2.12) |
| | 58 | +Description: SAX-based renderer library for SVG files (runtime) |
| | 59 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 60 | + (SVG) pictures. |
| | 61 | + . |
| | 62 | + This package contains the runtime library, necessary to run |
| | 63 | + applications using librsvg. |
| | 64 | + |
| | 65 | +Package: librsvg2-common |
| | 66 | +Section: libs |
| | 67 | +Architecture: any |
| | 68 | +Depends: ${misc:Depends}, |
| | 69 | + ${shlibs:Depends}, |
| | 70 | + librsvg2-2 (= ${binary:Version}) |
| | 71 | +Conflicts: gnome-games (<< 1:2.12) |
| | 72 | +Description: SAX-based renderer library for SVG files (extra runtime) |
| | 73 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 74 | + (SVG) pictures. |
| | 75 | + . |
| | 76 | + This package includes the gdk-pixbuf loader and a GTK+ engine, allowing |
| | 77 | + to load SVG images transparently inside GTK+ applications. |
| | 78 | + |
| | 79 | +Package: librsvg2-dbg |
| | 80 | +Section: debug |
| | 81 | +Priority: extra |
| | 82 | +Architecture: any |
| | 83 | +Depends: ${misc:Depends}, |
| | 84 | + ${shlibs:Depends}, |
| | 85 | + librsvg2-2 (= ${binary:Version}) |
| | 86 | +Description: SAX-based renderer library for SVG files (debug) |
| | 87 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 88 | + (SVG) pictures. |
| | 89 | + . |
| | 90 | + This package contains the debugging symbols. |
| | 91 | + |
| | 92 | +Package: librsvg2-bin |
| | 93 | +Section: graphics |
| | 94 | +Architecture: any |
| | 95 | +Depends: ${misc:Depends}, |
| | 96 | + ${shlibs:Depends}, |
| | 97 | + ${python:Depends}, |
| | 98 | + librsvg2-2 (>= ${binary:Version}) |
| | 99 | +Conflicts: librsvg2-common (<< 2.7) |
| | 100 | +Description: command-line and graphical viewers for SVG files |
| | 101 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 102 | + (SVG) pictures. |
| | 103 | + . |
| | 104 | + This package includes a command-line utility to convert the SVG files |
| | 105 | + to the PNG format and a graphical SVG viewer. |
| Property changes on: trunk/debs/librsvg/debian/control |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 106 | + native |
| Index: trunk/debs/librsvg/debian/compat |
| — | — | @@ -0,0 +1 @@ |
| | 2 | +5 |
| Property changes on: trunk/debs/librsvg/debian/compat |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/debs/librsvg/debian/control.in |
| — | — | @@ -0,0 +1,99 @@ |
| | 2 | +Source: librsvg |
| | 3 | +Section: libdevel |
| | 4 | +Priority: optional |
| | 5 | +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
| | 6 | +XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> |
| | 7 | +Uploaders: @GNOME_TEAM@ |
| | 8 | +Build-Depends: cdbs (>= 0.4.41), |
| | 9 | + debhelper (>= 5), |
| | 10 | + libfreetype6-dev, |
| | 11 | + libfontconfig1-dev (>= 1.0.1), |
| | 12 | + libxml2-dev (>= 2.6.22), |
| | 13 | + libglib2.0-dev (>= 2.16.0), |
| | 14 | + libcairo2-dev (>= 1.2.0), |
| | 15 | + libpango1.0-dev (>= 1.10.0), |
| | 16 | + libgtk2.0-dev (>= 2.16), |
| | 17 | + libgsf-1-dev (>= 1.13.2-2), |
| | 18 | + gnome-pkg-tools (>= 0.10), |
| | 19 | + libcroco3-dev (>= 0.6.1), |
| | 20 | + gtk-doc-tools (>= 1.0), |
| | 21 | + python, |
| | 22 | + python-support, |
| | 23 | + dpkg-dev (>= 1.13.19), |
| | 24 | + libglib2.0-doc, |
| | 25 | + libgtk2.0-doc, |
| | 26 | + libcairo2-doc |
| | 27 | +Standards-Version: 3.8.1 |
| | 28 | +Homepage: http://librsvg.sourceforge.net/ |
| | 29 | +XS-Python-Version: current |
| | 30 | + |
| | 31 | +Package: librsvg2-dev |
| | 32 | +Section: libdevel |
| | 33 | +Architecture: any |
| | 34 | +Depends: ${misc:Depends}, |
| | 35 | + librsvg2-2 (= ${binary:Version}), |
| | 36 | + libgtk2.0-dev (>= 2.10.1-1), |
| | 37 | + libglib2.0-dev (>= 2.12.0), |
| | 38 | + libcairo2-dev (>= 1.2.0) |
| | 39 | +Description: SAX-based renderer library for SVG files (development) |
| | 40 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 41 | + (SVG) pictures. |
| | 42 | + . |
| | 43 | + This package provides the necessary development libraries and include |
| | 44 | + files to allow you to develop with librsvg. |
| | 45 | + |
| | 46 | +Package: librsvg2-2 |
| | 47 | +Section: libs |
| | 48 | +Architecture: any |
| | 49 | +Depends: ${misc:Depends}, |
| | 50 | + ${shlibs:Depends} |
| | 51 | +Suggests: librsvg2-bin |
| | 52 | +Conflicts: librsvg2-common (<< 2.12) |
| | 53 | +Description: SAX-based renderer library for SVG files (runtime) |
| | 54 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 55 | + (SVG) pictures. |
| | 56 | + . |
| | 57 | + This package contains the runtime library, necessary to run |
| | 58 | + applications using librsvg. |
| | 59 | + |
| | 60 | +Package: librsvg2-common |
| | 61 | +Section: libs |
| | 62 | +Architecture: any |
| | 63 | +Depends: ${misc:Depends}, |
| | 64 | + ${shlibs:Depends}, |
| | 65 | + librsvg2-2 (= ${binary:Version}) |
| | 66 | +Conflicts: gnome-games (<< 1:2.12) |
| | 67 | +Description: SAX-based renderer library for SVG files (extra runtime) |
| | 68 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 69 | + (SVG) pictures. |
| | 70 | + . |
| | 71 | + This package includes the gdk-pixbuf loader and a GTK+ engine, allowing |
| | 72 | + to load SVG images transparently inside GTK+ applications. |
| | 73 | + |
| | 74 | +Package: librsvg2-dbg |
| | 75 | +Section: debug |
| | 76 | +Priority: extra |
| | 77 | +Architecture: any |
| | 78 | +Depends: ${misc:Depends}, |
| | 79 | + ${shlibs:Depends}, |
| | 80 | + librsvg2-2 (= ${binary:Version}) |
| | 81 | +Description: SAX-based renderer library for SVG files (debug) |
| | 82 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 83 | + (SVG) pictures. |
| | 84 | + . |
| | 85 | + This package contains the debugging symbols. |
| | 86 | + |
| | 87 | +Package: librsvg2-bin |
| | 88 | +Section: graphics |
| | 89 | +Architecture: any |
| | 90 | +Depends: ${misc:Depends}, |
| | 91 | + ${shlibs:Depends}, |
| | 92 | + ${python:Depends}, |
| | 93 | + librsvg2-2 (>= ${binary:Version}) |
| | 94 | +Conflicts: librsvg2-common (<< 2.7) |
| | 95 | +Description: command-line and graphical viewers for SVG files |
| | 96 | + The rsvg library is an efficient renderer for Scalable Vector Graphics |
| | 97 | + (SVG) pictures. |
| | 98 | + . |
| | 99 | + This package includes a command-line utility to convert the SVG files |
| | 100 | + to the PNG format and a graphical SVG viewer. |
| Property changes on: trunk/debs/librsvg/debian/control.in |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 101 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-common.install |
| — | — | @@ -0,0 +1 @@ |
| | 2 | +debian/tmp/usr/lib/gtk-2.0/*/*/*.so |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-common.install |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-dev.links |
| — | — | @@ -0,0 +1 @@ |
| | 2 | +usr/share/doc/librsvg2-dev/html/ usr/share/gtk-doc/html/rsvg |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-dev.links |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/debs/librsvg/debian/changelog |
| — | — | @@ -0,0 +1,856 @@ |
| | 2 | +librsvg (2.26.3-0ubuntu1.1) lucid-security; urgency=low |
| | 3 | + |
| | 4 | + * SECURITY UPDATE: fix arbitrary execution of fake node types. |
| | 5 | + - debian/patches/store-node-type-separately.patch: add upstream fix, |
| | 6 | + thanks to Christian Persch. |
| | 7 | + - CVE-2011-3146 |
| | 8 | + |
| | 9 | + -- Kees Cook <kees@ubuntu.com> Thu, 01 Sep 2011 16:28:24 -0700 |
| | 10 | + |
| | 11 | +librsvg (2.26.3-0ubuntu1) lucid-proposed; urgency=low |
| | 12 | + |
| | 13 | + * New upstream version: |
| | 14 | + - Bug fixed: |
| | 15 | + 143300 wrong bounding box when importing SVG |
| | 16 | + 403274 text in thumbnail too large |
| | 17 | + 404976 Unicode decomposed chars are not rendered well |
| | 18 | + 524690 text alignment incorrect with text-anchor:end |
| | 19 | + 545158 Segfault or bad rendering when displaying a SVG file |
| | 20 | + 563933 corrupted rendering of a card in 'Paris' aisleriot card theme |
| | 21 | + 564527 rsvg_handle_get_dimensions_sub weird behaviour |
| | 22 | + 564544 shape-rendering crispEdges property is antialiasing line elements |
| | 23 | + 566433 Could not read a valid svg file |
| | 24 | + 579286 This SVG-File crashes nautilus/rsvg-view (lp: #438484) |
| | 25 | + 581491 rsvg rendering is broken when encounters a 0px styled <text> |
| | 26 | + 589612 EOG error when loading a large SVG |
| | 27 | + 592207 Object cannot be rendered with more than 1 CSS {} rule |
| | 28 | + 597873 glib-mkenums cannot be invoked when GLib is uninstalled. |
| | 29 | + 597988 incorrect pkgconfig file let's others fail to detect librsvg |
| | 30 | + 598151 Incorrect rendering of svg file |
| | 31 | + 608575 Hang on particular SVG input |
| | 32 | + 612951 SVG not rendered if header contains width or height in percentage |
| | 33 | + 614123 librsvg builds tests even if tests are not run |
| | 34 | + 614555 should remove unused rsvg_filter_adobe_blend function |
| | 35 | + 614566 Needless G_OBJECT macro should be removed. |
| | 36 | + 614606 !important is not respected |
| | 37 | + 614643 does not handle comma separated CSS selector without libcroco |
| | 38 | + 614703 Need tests for get_dimensions. |
| | 39 | + 614704 css style doesn't override presentation attributes |
| | 40 | + 614730 Rendering not disabled for 0 sized objects |
| | 41 | + 614866 tests for CSS handling |
| | 42 | + 615490 rsvg-view should scale image size by default if the image has huge canvas. |
| | 43 | + 615699 rsvg-view should show zoom ratio. |
| | 44 | + 615701 class directive in svg element is not used at all |
| | 45 | + 615715 .class#id type selector is not supported. |
| | 46 | + 616187 rsvg-view crashes when open a svg image |
| | 47 | + 616835 Fix linking with pedantic linkers |
| | 48 | + 617163 !important directive support without libcroco. |
| | 49 | + * debian/patches/90_bugzilla_svg_crash.patch: |
| | 50 | + - the change is in the new version |
| | 51 | + |
| | 52 | + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 18 May 2010 12:05:46 +0200 |
| | 53 | + |
| | 54 | +librsvg (2.26.2-0ubuntu2) lucid-proposed; urgency=low |
| | 55 | + |
| | 56 | + * debian/patches/90_bugzilla_svg_crash.patch: |
| | 57 | + - upstream bugzilla change to fix a crasher when view some svg images |
| | 58 | + (lp: #566474) |
| | 59 | + |
| | 60 | + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 19 Apr 2010 23:32:25 +0200 |
| | 61 | + |
| | 62 | +librsvg (2.26.2-0ubuntu1) lucid; urgency=low |
| | 63 | + |
| | 64 | + * New upstream version: |
| | 65 | + - Enable silent build by default |
| | 66 | + - Use GDK_DRAWABLE |
| | 67 | + - Fix compiler warnings |
| | 68 | + - Remove some deprecated gtk+/gdk functions and bump gtk+ requirement |
| | 69 | + - Fix linking with pedantic linkers |
| | 70 | + - Make librsvg compile with -DGSEAL_ENABLED |
| | 71 | + - Drop mozilla plugin |
| | 72 | + * debian/control.in: |
| | 73 | + - updated gtk requirement |
| | 74 | + * debian/rules: |
| | 75 | + - don't use --disable-mozilla-plugin since the new version has deprecated |
| | 76 | + the option now |
| | 77 | + |
| | 78 | + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 30 Mar 2010 13:32:26 +0200 |
| | 79 | + |
| | 80 | +librsvg (2.26.0-1build1) lucid; urgency=low |
| | 81 | + |
| | 82 | + * rebuild rest of main for armel armv7/thumb2 optimization; |
| | 83 | + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 |
| | 84 | + |
| | 85 | + -- Alexander Sack <asac@ubuntu.com> Sat, 06 Mar 2010 13:36:51 +0100 |
| | 86 | + |
| | 87 | +librsvg (2.26.0-1) unstable; urgency=low |
| | 88 | + |
| | 89 | + [ Luca Bruno ] |
| | 90 | + * New upstream release. |
| | 91 | + * Bump shlibs version to 2.26.0. |
| | 92 | + * debian/control.in: |
| | 93 | + - Update Standards-Version to 3.8.1, no changes needed. |
| | 94 | + - Fix debug package section. |
| | 95 | + * debian/patches/rsvg-radius.patch: |
| | 96 | + - Removed as applied upstream. |
| | 97 | + |
| | 98 | + [ Josselin Mouette ] |
| | 99 | + * Build-depend on libglib2.0-doc, libgtk2.0-doc and libcairo2-doc to |
| | 100 | + ensure proper xrefs. |
| | 101 | + |
| | 102 | + [ Sebastian Dröge ] |
| | 103 | + * Upload to unstable. |
| | 104 | + |
| | 105 | + -- Sebastian Dröge <slomo@debian.org> Sun, 07 Jun 2009 11:37:23 +0200 |
| | 106 | + |
| | 107 | +librsvg (2.22.3-2) unstable; urgency=low |
| | 108 | + |
| | 109 | + [ Josselin Mouette ] |
| | 110 | + * rsvg-radius.patch: new patch. Check radii against floating point |
| | 111 | + underflow instead of comparing them to 0.0. Thanks a lot to Thomas |
| | 112 | + Viehmann for all the testing and providing the original patch. |
| | 113 | + Closes: #508443. |
| | 114 | + |
| | 115 | + [ Emilio Pozuelo Monfort ] |
| | 116 | + * debian/control: |
| | 117 | + - Build-depend on libgtk2.0-dev 2.10.1-1~ instead of 2.10.1-1 to ease |
| | 118 | + backports. Spotted by lintian. |
| | 119 | + - librsvg-dev depends on ${misc:Depends}. Thanks lintian! |
| | 120 | + * debian/shlibs.local: Removed. It was added as a hack to workaround |
| | 121 | + a dependency issue, but it's not needed anymore. |
| | 122 | + * Use dh_pysupport instead of the deprecated dh_python. |
| | 123 | + |
| | 124 | + -- Josselin Mouette <joss@debian.org> Wed, 04 Mar 2009 14:48:38 +0100 |
| | 125 | + |
| | 126 | +librsvg (2.22.3-1) experimental; urgency=low |
| | 127 | + |
| | 128 | + * New upstream release. |
| | 129 | + * Bump shlibs version to 2.22.3. |
| | 130 | + |
| | 131 | + -- Josselin Mouette <joss@debian.org> Fri, 21 Nov 2008 22:35:18 +0100 |
| | 132 | + |
| | 133 | +librsvg (2.22.2-3) unstable; urgency=low |
| | 134 | + |
| | 135 | + * Build a dbg package. Closes: #496189. |
| | 136 | + * debian/control: |
| | 137 | + - Update Standards-Version to 3.8.0, no changes needed. |
| | 138 | + - Added Homepage field. |
| | 139 | + |
| | 140 | + -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Tue, 21 Oct 2008 11:52:06 +0200 |
| | 141 | + |
| | 142 | +librsvg (2.22.2-2) unstable; urgency=low |
| | 143 | + |
| | 144 | + * debian/control.in: |
| | 145 | + + Build depend on GLib >= 2.16.0 for GIO support. |
| | 146 | + |
| | 147 | + -- Sebastian Dröge <slomo@debian.org> Tue, 11 Mar 2008 05:56:01 +0100 |
| | 148 | + |
| | 149 | +librsvg (2.22.2-1) unstable; urgency=low |
| | 150 | + |
| | 151 | + * New upstream bugfix release. |
| | 152 | + |
| | 153 | + -- Sebastian Dröge <slomo@debian.org> Wed, 05 Mar 2008 05:41:23 +0100 |
| | 154 | + |
| | 155 | +librsvg (2.22.1-1) unstable; urgency=low |
| | 156 | + |
| | 157 | + * New upstream bugfix release. |
| | 158 | + |
| | 159 | + -- Sebastian Dröge <slomo@debian.org> Mon, 25 Feb 2008 06:45:05 +0100 |
| | 160 | + |
| | 161 | +librsvg (2.22.0-1) unstable; urgency=low |
| | 162 | + |
| | 163 | + * New upstream release, with no API changes. |
| | 164 | + This release adds support for GIO and we want to rebuild it once GLib 2.16 |
| | 165 | + is in unstable. |
| | 166 | + * debian/control.in: |
| | 167 | + + Update and cleanup build dependencies. |
| | 168 | + + Cleanup and correct dependencies of the -dev package. |
| | 169 | + * debian/patches/99_ltmain_as-needed.patch: |
| | 170 | + + Updated to apply cleanly again. |
| | 171 | + |
| | 172 | + -- Sebastian Dröge <slomo@debian.org> Thu, 21 Feb 2008 19:19:09 +0100 |
| | 173 | + |
| | 174 | +librsvg (2.20.0-1) unstable; urgency=low |
| | 175 | + |
| | 176 | + [ Kilian Krause ] |
| | 177 | + * Use binary:version and source:Version for binnNMU-safe uploads as |
| | 178 | + added in dpkg-dev 1.13.19. Add to Build-Depends accordingly. |
| | 179 | + |
| | 180 | + [ Sebastian Dröge ] |
| | 181 | + * New upstream bugfix release with no API changes. |
| | 182 | + * debian/control.in: |
| | 183 | + + Update Standards-Version to 3.7.3, no additional changes needed. |
| | 184 | + |
| | 185 | + -- Sebastian Dröge <slomo@debian.org> Sat, 19 Jan 2008 17:55:44 +0100 |
| | 186 | + |
| | 187 | +librsvg (2.18.2-1) unstable; urgency=low |
| | 188 | + |
| | 189 | + [ Alan Baghumian ] |
| | 190 | + * New upstream stable release. |
| | 191 | + - Basic support for SVG 1.1's text-rendering |
| | 192 | + and shape-rendering properties |
| | 193 | + - Bump shlibs to >= 2.18.1 |
| | 194 | + |
| | 195 | + [ Loic Minier ] |
| | 196 | + * New upstream stable release. |
| | 197 | + |
| | 198 | + -- Loic Minier <lool@dooz.org> Sun, 02 Sep 2007 19:31:12 +0200 |
| | 199 | + |
| | 200 | +librsvg (2.18.0-1) unstable; urgency=low |
| | 201 | + |
| | 202 | + [ Loic Minier ] |
| | 203 | + * Drop dependencies on libgtk2.0-common and libgtk2.0-bin; thanks "Jonny"; |
| | 204 | + closes: #419335. |
| | 205 | + * Pass -z defs in LDFLAGS for additional safety. |
| | 206 | + |
| | 207 | + [ Josselin Mouette ] |
| | 208 | + * 99_ltmain_as-needed.patch: get --as-needed back to work. |
| | 209 | + |
| | 210 | + [ Loic Minier ] |
| | 211 | + * New upstream stable release; no API change. |
| | 212 | + |
| | 213 | + -- Loic Minier <lool@dooz.org> Tue, 24 Jul 2007 18:30:31 +0200 |
| | 214 | + |
| | 215 | +librsvg (2.16.1-2) unstable; urgency=low |
| | 216 | + |
| | 217 | + * Add a get-orig-source target to retrieve the upstream tarball. |
| | 218 | + * Include the new check-dist Makefile to prevent accidental uploads to |
| | 219 | + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. |
| | 220 | + * Upload to unstable; drop check-dist include. |
| | 221 | + * Wrap build-deps and deps. |
| | 222 | + * Bump up Debhelper compatibility level to 5. |
| | 223 | + * Drop clean target which removed the upstream documentation. |
| | 224 | + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on |
| | 225 | + cdbs >= 0.4.41. |
| | 226 | + * Cleanups. |
| | 227 | + * Fix watch file to track all stable versions and use HTTP. |
| | 228 | + * Fix URL in copyright. |
| | 229 | + |
| | 230 | + -- Loic Minier <lool@dooz.org> Sat, 14 Apr 2007 09:10:08 +0200 |
| | 231 | + |
| | 232 | +librsvg (2.16.1-1) experimental; urgency=low |
| | 233 | + |
| | 234 | + * New upstream release. |
| | 235 | + * Bump shlibs requirement. |
| | 236 | + |
| | 237 | + -- Josselin Mouette <joss@debian.org> Fri, 8 Dec 2006 23:33:34 +0100 |
| | 238 | + |
| | 239 | +librsvg (2.16.0-3) experimental; urgency=low |
| | 240 | + |
| | 241 | + * Call dh_gtkmodules with an appropriate LD_LIBRARY_PATH. |
| | 242 | + * Don't hardcode the library package name. |
| | 243 | + |
| | 244 | + -- Loic Minier <lool@dooz.org> Wed, 27 Sep 2006 08:11:17 +0200 |
| | 245 | + |
| | 246 | +librsvg (2.16.0-2) experimental; urgency=low |
| | 247 | + |
| | 248 | + [ Josselin Mouette ] |
| | 249 | + * Build-depend on gtk+ 2.10. |
| | 250 | + |
| | 251 | + [ Loic Minier ] |
| | 252 | + * Convert the package to the new Gtk modules handling. |
| | 253 | + - Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1. |
| | 254 | + - Call dh_gtkmodules. |
| | 255 | + - Add ${misc:Depends}. |
| | 256 | + - Drop librsvg2-common.postinst and librsvg2-common.postrm. |
| | 257 | + |
| | 258 | + -- Loic Minier <lool@dooz.org> Tue, 19 Sep 2006 13:02:21 +0200 |
| | 259 | + |
| | 260 | +librsvg (2.16.0-1) experimental; urgency=low |
| | 261 | + |
| | 262 | + * New upstream release. |
| | 263 | + * Bump shlibs requirement. |
| | 264 | + * Remove libart build-dependency. |
| | 265 | + * rsvg-gz.patch: updated. |
| | 266 | + |
| | 267 | + -- Josselin Mouette <joss@debian.org> Tue, 5 Sep 2006 23:47:26 +0200 |
| | 268 | + |
| | 269 | +librsvg (2.15.90-1) experimental; urgency=low |
| | 270 | + |
| | 271 | + * New upstream development releases; no API changes. |
| | 272 | + - Target at experimental. |
| | 273 | + - Add missing build-deps on libglib2.0-dev (>= 2.11.0), libxml2-dev (>= |
| | 274 | + 2.4.7), libfreetype6-dev, libgnomeprint2.2-dev (>= 2.2.0). |
| | 275 | + - Bump up build-deps to libcairo2-dev >= 1.2.0, gtk-doc-tools (>= 1.0). |
| | 276 | + - Drop obsolete build-dep on libpopt-dev. |
| | 277 | + |
| | 278 | + -- Loic Minier <lool@dooz.org> Tue, 8 Aug 2006 17:38:07 +0200 |
| | 279 | + |
| | 280 | +librsvg (2.14.4-2) unstable; urgency=low |
| | 281 | + |
| | 282 | + Loic Minier <lool@dooz.org>: |
| | 283 | + * Stop shipping *.la files in librsvg2-dev now that |
| | 284 | + libnautilus-extension-dev doesn't ship these. |
| | 285 | + |
| | 286 | + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Thu, 22 Jun 2006 21:56:18 +0200 |
| | 287 | + |
| | 288 | +librsvg (2.14.4-1) unstable; urgency=low |
| | 289 | + |
| | 290 | + * New upstream release. |
| | 291 | + * rsvg-image_crasher.patch, export-get-type.patch: removed, integrated |
| | 292 | + upstream. |
| | 293 | + * Standards-version is 3.7.2. |
| | 294 | + |
| | 295 | + -- Josselin Mouette <joss@debian.org> Sun, 18 Jun 2006 05:07:20 +0200 |
| | 296 | + |
| | 297 | +librsvg (2.14.3-2) unstable; urgency=low |
| | 298 | + |
| | 299 | + * export-get-type.patch: Correctly export rsvg_error_get_type |
| | 300 | + (closes: #362646). |
| | 301 | + * rsvg-image_crasher.patch, stolen from CVS: fix crasher with some |
| | 302 | + images (closes: #361653). |
| | 303 | + * rsvg-gz.patch: updated so that the symbol still gets exported. |
| | 304 | + * rules, control.in: add missing python dependency. |
| | 305 | + + Also build-depend on python. |
| | 306 | + * librsvg2-dev.{install,links,postinst}: move documentation to a more |
| | 307 | + suitable place (closes: #363142). |
| | 308 | + |
| | 309 | + -- Josselin Mouette <joss@debian.org> Tue, 25 Apr 2006 21:49:48 +0200 |
| | 310 | + |
| | 311 | +librsvg (2.14.3-1) unstable; urgency=low |
| | 312 | + |
| | 313 | + * New upstream release. |
| | 314 | + * [debian/control.in] Bumped libgtk2.0-dev and libcairo2-dev dependencies |
| | 315 | + and versioned libgnomeprintui2.2-dev build dependency to rebuild without |
| | 316 | + the .la files for libXcursor and libXrender. |
| | 317 | + |
| | 318 | + Josselin Mouette <joss@debian.org>: |
| | 319 | + * Update watch file. |
| | 320 | + |
| | 321 | + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Fri, 21 Apr 2006 11:20:56 +0200 |
| | 322 | + |
| | 323 | +librsvg (2.14.2-1) unstable; urgency=low |
| | 324 | + |
| | 325 | + * New upstream release. |
| | 326 | + + paint-server.patch: removed, unneeded with the cairo backend. |
| | 327 | + + rsvg-gz.patch: updated. |
| | 328 | + * Build-depend on libcairo2-dev. |
| | 329 | + * Bump requirement for libcroco3-dev. |
| | 330 | + * Disable the mozilla plugin (incidentally closes: #327547, #349936). |
| | 331 | + |
| | 332 | + -- Josselin Mouette <joss@debian.org> Sat, 1 Apr 2006 17:44:25 +0200 |
| | 333 | + |
| | 334 | +librsvg (2.12.7-5) unstable; urgency=high |
| | 335 | + |
| | 336 | + * rsvg-gz.patch: provide the rsvg_handle_new_gz function |
| | 337 | + (closes: #348920). Do not provide the C prototype to force |
| | 338 | + applications using it to use rsvg_handle_new instead. |
| | 339 | + |
| | 340 | + -- Josselin Mouette <joss@debian.org> Thu, 9 Feb 2006 22:09:04 +0100 |
| | 341 | + |
| | 342 | +librsvg (2.12.7-4) unstable; urgency=high |
| | 343 | + |
| | 344 | + * Fix the conflict line to include the epoch (closes: #350229). |
| | 345 | + |
| | 346 | + -- Josselin Mouette <joss@debian.org> Wed, 1 Feb 2006 23:29:46 +0100 |
| | 347 | + |
| | 348 | +librsvg (2.12.7-3) unstable; urgency=low |
| | 349 | + |
| | 350 | + * Only suggest librsvg2-bin instead of recommending it |
| | 351 | + (closes: #269048). |
| | 352 | + * Upload to unstable. |
| | 353 | + |
| | 354 | + -- Josselin Mouette <joss@debian.org> Sat, 7 Jan 2006 18:32:09 +0100 |
| | 355 | + |
| | 356 | +librsvg (2.12.7-2) experimental; urgency=low |
| | 357 | + |
| | 358 | + * Make librsvg2-2 conflict with older librsvg2-common packages, |
| | 359 | + otherwise serious breakage can occur. |
| | 360 | + * Make librsvg2-common depend on the exact librsvg2-2 version to avoid |
| | 361 | + such breakage in the future. |
| | 362 | + * Bump libgsf-1-dev build-dep to >= 1.13.2-2. |
| | 363 | + |
| | 364 | + -- Josselin Mouette <joss@debian.org> Tue, 22 Nov 2005 19:41:19 +0100 |
| | 365 | + |
| | 366 | +librsvg (2.12.7-1) experimental; urgency=low |
| | 367 | + |
| | 368 | + * New upstream release (closes: #331279). |
| | 369 | + + -h 0 or -w 0 should now work (closes: #278750). |
| | 370 | + + rsvg-filter.c includes config.h (closes: #292286). |
| | 371 | + + files in different directories are handled (closes: #315822). |
| | 372 | + * Rename the source package to librsvg. |
| | 373 | + * librsvg2-bin.install: use a wildcard for the plugin |
| | 374 | + (closes: #312615). |
| | 375 | + * Update build-dependencies, especially libxml. |
| | 376 | + * open-relative-path.patch, keep-aspect-ratio.patch, |
| | 377 | + open-file-twice.patch: removed, included upstream. |
| | 378 | + * paint-server.patch: apply to rsvg-art-paint-server.c. |
| | 379 | + * watch: update for 2.12. |
| | 380 | + * Break the dependency cycle, by making librsvg2-2 stop depending |
| | 381 | + on librsvg2-common. Packages will now have to depend on |
| | 382 | + librsvg2-common if they include SVG graphics. |
| | 383 | + * Bump the shlibs version. |
| | 384 | + * Standards-version is 3.6.2. |
| | 385 | + * Make librsvg2-common with gnome-games 2.10, as a bug in |
| | 386 | + libgames-support makes this version fail to work with the new |
| | 387 | + librsvg. |
| | 388 | + |
| | 389 | + -- Josselin Mouette <joss@debian.org> Wed, 12 Oct 2005 19:55:03 +0200 |
| | 390 | + |
| | 391 | +librsvg2 (2.9.5-4) unstable; urgency=low |
| | 392 | + |
| | 393 | + * Set myself as maintainer. |
| | 394 | + * Don't require mozilla-dev on hurd-i386 (closes: #312615). |
| | 395 | + * keep-aspect-ratio.patch: assume you want to keep the aspect ratio when |
| | 396 | + only one of width and height are specified (closes: #316309). |
| | 397 | + * Pass --as-needed to ld. |
| | 398 | + * open-file-twice.patch: don't try to open the file twice. |
| | 399 | + * open-relative-path.patch: always build an absolute base_uri, so that we |
| | 400 | + can open a relative path (closes: #315822). |
| | 401 | + |
| | 402 | + -- Josselin Mouette <joss@debian.org> Thu, 30 Jun 2005 21:59:20 +0200 |
| | 403 | + |
| | 404 | +librsvg2 (2.9.5-3) unstable; urgency=low |
| | 405 | + |
| | 406 | + * Really upload to unstable. |
| | 407 | + |
| | 408 | + -- Josselin Mouette <joss@debian.org> Tue, 7 Jun 2005 23:42:58 +0200 |
| | 409 | + |
| | 410 | +librsvg2 (2.9.5-2) experimental; urgency=low |
| | 411 | + |
| | 412 | + * Upload to unstable. |
| | 413 | + |
| | 414 | + -- Josselin Mouette <joss@debian.org> Tue, 7 Jun 2005 22:35:24 +0200 |
| | 415 | + |
| | 416 | +librsvg2 (2.9.5-1) experimental; urgency=low |
| | 417 | + |
| | 418 | + * New upstream release. |
| | 419 | + + The pixbuf loader now supports .svgz (closes: #261885). |
| | 420 | + * Build using cdbs. |
| | 421 | + |
| | 422 | + -- Josselin Mouette <joss@debian.org> Tue, 3 May 2005 21:29:25 +0200 |
| | 423 | + |
| | 424 | +librsvg2 (2.8.1-3) unstable; urgency=low |
| | 425 | + |
| | 426 | + * enable again the mozilla plugin (closes: #286570): |
| | 427 | + + debian/control.in: build-depend on mozilla-dev and libxt-dev. |
| | 428 | + + librsvg2-bin suggests mozilla. |
| | 429 | + + librsvg2-bin.files: install it. |
| | 430 | + + librsvg2-bin.links: a plugin for mozilla-firefox. |
| | 431 | + * debian/rules: run dh_movefiles in the install target. |
| | 432 | + |
| | 433 | + -- Josselin Mouette <joss@debian.org> Tue, 5 Apr 2005 20:18:08 +0200 |
| | 434 | + |
| | 435 | +librsvg2 (2.8.1-2) unstable; urgency=low |
| | 436 | + |
| | 437 | + * debian/librsvg2-common.postrm: Only try to execute |
| | 438 | + /usr/sbin/update-gdkpixbuf-loaders if it's available. Thanks for |
| | 439 | + the report and patch to Andreas Barth. (Closes: #286689) |
| | 440 | + |
| | 441 | + -- Marc 'HE' Brockschmidt <he@debian.org> Tue, 21 Dec 2004 21:54:06 +0100 |
| | 442 | + |
| | 443 | +librsvg2 (2.8.1-1) unstable; urgency=low |
| | 444 | + |
| | 445 | + * New upstream release (closes: #275352). |
| | 446 | + * rsvg-paint-server.c: patch from Matijs van Zuijlen |
| | 447 | + <Matijs.van.Zuijlen@xs4all.nl> to avoid crash with some broken SVGs |
| | 448 | + (closes: #273729). |
| | 449 | + * rsvg.1: fix a typo. |
| | 450 | + * debian/rsvg-view.1: provide new manpage, written by Paul Brossier |
| | 451 | + <piem@altern.org> (closes: #265846). |
| | 452 | + * debian/{rules,control.in}: remove dependency on GnomeVFS, this is |
| | 453 | + completely useless and annoys some uses (closes: #257821). |
| | 454 | + |
| | 455 | + -- Josselin Mouette <joss@debian.org> Tue, 19 Oct 2004 15:18:16 +0200 |
| | 456 | + |
| | 457 | +librsvg2 (2.7.2-5) unstable; urgency=medium |
| | 458 | + |
| | 459 | + * Rebuild with libgnutls11 (closes: #263682). |
| | 460 | + * debian/control.in: build-depend on libgnomevfs2-dev 2.6.1.1-6 to force |
| | 461 | + use of libgnutls11. |
| | 462 | + |
| | 463 | + -- Josselin Mouette <joss@debian.org> Thu, 5 Aug 2004 14:13:23 +0200 |
| | 464 | + |
| | 465 | +librsvg2 (2.7.2-4) unstable; urgency=medium |
| | 466 | + |
| | 467 | + * Remove mozilla support, SVG is now supported by default in mozilla: |
| | 468 | + + debian/control.in: don't build-depend on mozilla-dev and libxt-dev, |
| | 469 | + build-conflict with mozilla-dev. |
| | 470 | + + debian/control.in: librsvg2-bin doesn't suggest mozilla anymore. |
| | 471 | + + debian/librsvg2-bin.files: don't install the plugin. |
| | 472 | + |
| | 473 | + -- Josselin Mouette <joss@debian.org> Wed, 28 Jul 2004 14:40:27 +0200 |
| | 474 | + |
| | 475 | +librsvg2 (2.7.2-3) unstable; urgency=medium |
| | 476 | + |
| | 477 | + * [debian/control.in] Add a build dependency on libxt-dev as moz-plugin.c |
| | 478 | + includes X11/Intrinsic.h. (Closes: #259159) |
| | 479 | + |
| | 480 | + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Tue, 13 Jul 2004 20:35:09 +0200 |
| | 481 | + |
| | 482 | +librsvg2 (2.7.2-2) unstable; urgency=low |
| | 483 | + |
| | 484 | + * rsvg-filter.c: apply patch from CVS to fix a crash with some |
| | 485 | + SphereCrystal icons. |
| | 486 | + |
| | 487 | + -- Josselin Mouette <joss@debian.org> Wed, 30 Jun 2004 00:42:02 +0200 |
| | 488 | + |
| | 489 | +librsvg2 (2.7.2-1) unstable; urgency=low |
| | 490 | + |
| | 491 | + * New upstream release. |
| | 492 | + * debian/rules: |
| | 493 | + + Always enable svgz and gnome-vfs support. |
| | 494 | + + Don't check the mozilla plugin for dependencies. |
| | 495 | + * debian/control.in: |
| | 496 | + + Build-depend on libcroco3-dev, libgnomevfs2-dev, |
| | 497 | + libgnomeprintui2.2-dev and mozilla-dev. |
| | 498 | + + New package: librsvg2-bin. |
| | 499 | + |
| | 500 | + -- Josselin Mouette <joss@debian.org> Fri, 18 Jun 2004 16:22:10 +0200 |
| | 501 | + |
| | 502 | +librsvg2 (2.6.4-7) unstable; urgency=high |
| | 503 | + |
| | 504 | + * debian/control.in: |
| | 505 | + + make librsvg2-2 depend on librsvg2-common (= source version) |
| | 506 | + (closes: #254284). |
| | 507 | + + make librsvg2-common depend on librsvg2-2 (>= source version) to avoid |
| | 508 | + circular dependencies. |
| | 509 | + * Use high urgency so that it enters testing before gnome-games 2.6. |
| | 510 | + |
| | 511 | + -- Josselin Mouette <joss@debian.org> Thu, 17 Jun 2004 13:54:54 +0200 |
| | 512 | + |
| | 513 | +librsvg2 (2.6.4-6) unstable; urgency=high |
| | 514 | + |
| | 515 | + * GNOME Team Upload. |
| | 516 | + * [debian/control.in] Versioned librsvg2-dev's dependency on libgsf-1-dev to |
| | 517 | + ensure libbz2-dev is getting installed; reworded the descriptions a bit. |
| | 518 | + |
| | 519 | + -- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 13 Jun 2004 14:15:55 +0200 |
| | 520 | + |
| | 521 | +librsvg2 (2.6.4-5) unstable; urgency=low |
| | 522 | + |
| | 523 | + * GNOME Team Upload. |
| | 524 | + * Upload in unstable. |
| | 525 | + * debian/control.in: |
| | 526 | + + removed workaround on openjade. |
| | 527 | + |
| | 528 | + -- Sebastien Bacher <seb128@debian.org> Mon, 24 May 2004 19:46:41 +0200 |
| | 529 | + |
| | 530 | +librsvg2 (2.6.4-4) experimental; urgency=low |
| | 531 | + |
| | 532 | + * GNOME Team Upload. |
| | 533 | + * debian/control.in: |
| | 534 | + + librsvg2-common really depends on libgtk2.0-bin |
| | 535 | + |
| | 536 | + -- Sebastien Bacher <seb128@debian.org> Fri, 7 May 2004 19:42:58 +0200 |
| | 537 | + |
| | 538 | +librsvg2 (2.6.4-3) experimental; urgency=low |
| | 539 | + |
| | 540 | + * debian/control.in: |
| | 541 | + + added a Build-Depends on gtk-doc-tools for the doc, and on openjade as |
| | 542 | + a workaround, the time to have gtk-doc-tools fixed. |
| | 543 | + + librsvg2-dev depends on libcroco2-dev (Closes: #247242). |
| | 544 | + + updated librsvg2-common depends on libgtk2.0-bin |
| | 545 | + (Closes: #246599, #246665). |
| | 546 | + * debian/librsvg2-dev.files: |
| | 547 | + + added documentation to librsvg2-dev package. |
| | 548 | + |
| | 549 | + -- Sebastien Bacher <seb128@debian.org> Wed, 5 May 2004 21:59:15 +0200 |
| | 550 | + |
| | 551 | +librsvg2 (2.6.4-2) experimental; urgency=low |
| | 552 | + |
| | 553 | + * Use compat=4 and dh_makeshlibs -V to generate the shlibs file, it's more |
| | 554 | + reliable. |
| | 555 | + * Really build with -mieee on alpha. |
| | 556 | + * Various cleanups in debian/rules. |
| | 557 | + * Re-run libtoolize --force --copy; aclocal; autoheader; automake -acf; |
| | 558 | + autoconf. |
| | 559 | + * rsvg-paint-server.c: revert changes from 2.6.3->2.6.4, as they break the |
| | 560 | + rendering of many Wasp icons. |
| | 561 | + |
| | 562 | + -- Josselin Mouette <joss@debian.org> Mon, 26 Apr 2004 18:43:39 +0200 |
| | 563 | + |
| | 564 | +librsvg2 (2.6.4-1) experimental; urgency=low |
| | 565 | + |
| | 566 | + * New upstream release. |
| | 567 | + * GNOME Team Upload. |
| | 568 | + |
| | 569 | + -- Sebastien Bacher <seb128@debian.org> Tue, 20 Apr 2004 21:25:19 +0200 |
| | 570 | + |
| | 571 | +librsvg2 (2.6.3-2) experimental; urgency=low |
| | 572 | + |
| | 573 | + * GNOME Team Upload |
| | 574 | + * Updated for the GNOME Team. |
| | 575 | + * debian/rules: |
| | 576 | + + added "--with-croco" flags since libcroco is in the archive now. |
| | 577 | + * debian/control.in: |
| | 578 | + + updated build-depends. |
| | 579 | + + librsvg2-common depends on "librsvg2-2 (= ${Source-version})" now |
| | 580 | + + librsvg2-2 conflicts on librsvg2-common (<< 2.6) (Closes: #240593). |
| | 581 | + * debian/shlibs.local: |
| | 582 | + + added to fix the double depends on librsvg2-2. |
| | 583 | + |
| | 584 | + -- Sebastien Bacher <seb128@debian.org> Mon, 19 Apr 2004 22:00:32 +0200 |
| | 585 | + |
| | 586 | +librsvg2 (2.6.3-1) experimental; urgency=low |
| | 587 | + |
| | 588 | + * New upstream release. |
| | 589 | + * Re-run libtoolize --force --copy; aclocal; autoheader; automake -acf; |
| | 590 | + autoconf. |
| | 591 | + * Build-depend on libgtk2.0-dev 2.4. |
| | 592 | + |
| | 593 | + -- Josselin Mouette <joss@debian.org> Thu, 25 Mar 2004 13:45:17 +0100 |
| | 594 | + |
| | 595 | +librsvg2 (2.5.0-2) unstable; urgency=low |
| | 596 | + |
| | 597 | + * Run libtoolize --force --copy; aclocal; autoheader; automake -acf; |
| | 598 | + autoconf on the source tree (closes: #234843). |
| | 599 | + |
| | 600 | + -- Josselin Mouette <joss@debian.org> Thu, 26 Feb 2004 11:20:13 +0100 |
| | 601 | + |
| | 602 | +librsvg2 (2.5.0-1) unstable; urgency=low |
| | 603 | + |
| | 604 | + * New upstream release (Closes: #234472). |
| | 605 | + * Gnome Team Upload. |
| | 606 | + |
| | 607 | + -- Sebastien Bacher <seb128@debian.org> Tue, 24 Feb 2004 21:07:00 +0100 |
| | 608 | + |
| | 609 | +librsvg2 (2.4.0-3) unstable; urgency=low |
| | 610 | + |
| | 611 | + * added $(LIBGSF_LIBS) into librsvg_2_la_LIBADD (closes: #220065) |
| | 612 | + |
| | 613 | + -- Takuo KITAME <kitame@debian.org> Tue, 11 Nov 2003 13:44:09 +0900 |
| | 614 | + |
| | 615 | +librsvg2 (2.4.0-2) unstable; urgency=low |
| | 616 | + |
| | 617 | + * Built with -mieee on alpha (Closes: #184897). |
| | 618 | + * Fixed override disparity. |
| | 619 | + |
| | 620 | + -- Sebastien Bacher <seb128@debian.org> Wed, 22 Oct 2003 01:45:05 +0200 |
| | 621 | + |
| | 622 | +librsvg2 (2.4.0-1) unstable; urgency=low |
| | 623 | + |
| | 624 | + * New upstream release |
| | 625 | + * Gnome Team upload |
| | 626 | + |
| | 627 | + -- Sebastien Bacher <seb128@debian.org> Sat, 18 Oct 2003 17:44:35 +0200 |
| | 628 | + |
| | 629 | +librsvg2 (2.2.5-2) unstable; urgency=low |
| | 630 | + |
| | 631 | + * Maintainer upload, merged NMU patches. (closes: #187367, #207785) |
| | 632 | + * -dev debepends on libgsf-1-dev (closes: #208028) |
| | 633 | + * fix debian/copyrigt (closes: #180958) |
| | 634 | + |
| | 635 | + -- Takuo KITAME <kitame@debian.org> Mon, 1 Sep 2003 13:48:46 +0900 |
| | 636 | + |
| | 637 | +librsvg2 (2.2.5-1.2) unstable; urgency=low |
| | 638 | + |
| | 639 | + * Changed section to libdevel to fix override disparity. |
| | 640 | + * Added libgsf-1-dev to Build-Depends (Closes: #207785). |
| | 641 | + |
| | 642 | + -- Sebastien Bacher <seb128@debian.org> Sat, 30 Aug 2003 02:25:24 +0200 |
| | 643 | + |
| | 644 | +librsvg2 (2.2.5-1.1) unstable; urgency=low |
| | 645 | + |
| | 646 | + * NMU to fix a RC bug. |
| | 647 | + * Explicitly link to missing libs (Closes: #187367). |
| | 648 | + |
| | 649 | + -- Sebastien Bacher <seb128@debian.org> Fri, 29 Aug 2003 18:30:42 +0200 |
| | 650 | + |
| | 651 | +librsvg2 (2.2.5-1) unstable; urgency=low |
| | 652 | + |
| | 653 | + * New upstream release |
| | 654 | + |
| | 655 | + -- Takuo KITAME <kitame@debian.org> Thu, 10 Apr 2003 11:21:37 +0900 |
| | 656 | + |
| | 657 | +librsvg2 (2.2.4-1) unstable; urgency=low |
| | 658 | + |
| | 659 | + * New upstream release |
| | 660 | + |
| | 661 | + -- Takuo KITAME <kitame@debian.org> Thu, 20 Mar 2003 16:30:23 +0900 |
| | 662 | + |
| | 663 | +librsvg2 (2.2.3-1) unstable; urgency=low |
| | 664 | + |
| | 665 | + * New upstream release |
| | 666 | + |
| | 667 | + -- Takuo KITAME <kitame@debian.org> Thu, 6 Feb 2003 14:03:44 +0900 |
| | 668 | + |
| | 669 | +librsvg2 (2.2.1-2) unstable; urgency=low |
| | 670 | + |
| | 671 | + * Don't include /etc/gtk-2.0/gdk-pixbuf.loaders (closes: #178848) |
| | 672 | + |
| | 673 | + -- Takuo KITAME <kitame@debian.org> Thu, 30 Jan 2003 16:54:37 +0900 |
| | 674 | + |
| | 675 | +librsvg2 (2.2.1-1) unstable; urgency=low |
| | 676 | + |
| | 677 | + * New upstream release |
| | 678 | + |
| | 679 | + -- Takuo KITAME <kitame@debian.org> Tue, 28 Jan 2003 13:22:08 +0900 |
| | 680 | + |
| | 681 | +librsvg2 (2.2.0-3) unstable; urgency=low |
| | 682 | + |
| | 683 | + * librsvg2-common: Depends on libgtk2.0-common (closes: #178006) |
| | 684 | + |
| | 685 | + -- Takuo KITAME <kitame@debian.org> Thu, 23 Jan 2003 19:53:38 +0900 |
| | 686 | + |
| | 687 | +librsvg2 (2.2.0-2) unstable; urgency=low |
| | 688 | + |
| | 689 | + * Added new package librsvg2-common includes rsvg command line program, manpage and gdk-pixbuf loader. (closes: #177251) |
| | 690 | + |
| | 691 | + -- Takuo KITAME <kitame@debian.org> Thu, 23 Jan 2003 10:52:04 +0900 |
| | 692 | + |
| | 693 | +librsvg2 (2.2.0-1) unstable; urgency=low |
| | 694 | + |
| | 695 | + * New upstream release |
| | 696 | + * distribute gdk-pixbuf-loader (closes: #177251) |
| | 697 | + |
| | 698 | + -- Takuo KITAME <kitame@debian.org> Wed, 22 Jan 2003 12:51:54 +0900 |
| | 699 | + |
| | 700 | +librsvg2 (2.1.5-2) unstable; urgency=low |
| | 701 | + |
| | 702 | + * Maintainer upload (closes: #177115) |
| | 703 | + * enable gdk-pixbuf loader (closes: #177251) |
| | 704 | + |
| | 705 | + -- Takuo KITAME <kitame@debian.org> Tue, 21 Jan 2003 10:01:42 +0900 |
| | 706 | + |
| | 707 | +librsvg2 (2.1.5-1.1) unstable; urgency=low |
| | 708 | + |
| | 709 | + * Non-Maintainer Upload |
| | 710 | + * relibtoolize (closes: #177115) |
| | 711 | + |
| | 712 | + -- Ryan Murray <rmurray@debian.org> Sun, 19 Jan 2003 16:02:24 -0800 |
| | 713 | + |
| | 714 | +librsvg2 (2.1.5-1) unstable; urgency=low |
| | 715 | + |
| | 716 | + * New upstream release |
| | 717 | + |
| | 718 | + -- Takuo KITAME <kitame@debian.org> Fri, 17 Jan 2003 13:36:22 +0900 |
| | 719 | + |
| | 720 | +librsvg2 (2.0.1-4) unstable; urgency=low |
| | 721 | + |
| | 722 | + * update config.{guess,sub} (closes: #166821) |
| | 723 | + |
| | 724 | + -- Takuo KITAME <kitame@debian.org> Thu, 5 Dec 2002 13:34:24 +0900 |
| | 725 | + |
| | 726 | +librsvg2 (2.0.1-3) unstable; urgency=low |
| | 727 | + |
| | 728 | + * fix build-depends (closes: #162645) |
| | 729 | + * Change Maintainer address to @debian.org |
| | 730 | + |
| | 731 | + -- Takuo KITAME <kitame@debian.org> Thu, 24 Oct 2002 14:23:02 +0900 |
| | 732 | + |
| | 733 | +librsvg2 (2.0.1-2) unstable; urgency=low |
| | 734 | + |
| | 735 | + * Build against libgtk2.0-0png3 |
| | 736 | + |
| | 737 | + -- Takuo KITAME <kitame@northeye.org> Sun, 11 Aug 2002 01:42:45 +0900 |
| | 738 | + |
| | 739 | +librsvg2 (2.0.1-1) unstable; urgency=low |
| | 740 | + |
| | 741 | + * New upstream release |
| | 742 | + |
| | 743 | + -- Takuo KITAME <kitame@northeye.org> Wed, 7 Aug 2002 04:17:49 +0900 |
| | 744 | + |
| | 745 | +librsvg2 (2.0.0-1) unstable; urgency=low |
| | 746 | + |
| | 747 | + * New upstream release |
| | 748 | + * bump soname to 2 |
| | 749 | + |
| | 750 | + -- Takuo KITAME <kitame@northeye.org> Fri, 28 Jun 2002 14:03:22 +0900 |
| | 751 | + |
| | 752 | +librsvg2 (1.1.6-4) unstable; urgency=low |
| | 753 | + |
| | 754 | + * Makefile.in: |
| | 755 | + - LINK link against $(LIBRSVG_LIBS) $(POPT_LIBS) (closes: #145426) |
| | 756 | + |
| | 757 | + -- Takuo KITAME <kitame@northeye.org> Fri, 3 May 2002 08:33:18 +0900 |
| | 758 | + |
| | 759 | +librsvg2 (1.1.6-3) unstable; urgency=low |
| | 760 | + |
| | 761 | + * fix again, Build-Depends on libgtk2.0-dev |
| | 762 | + |
| | 763 | + -- Takuo KITAME <kitame@northeye.org> Mon, 8 Apr 2002 08:44:51 +0900 |
| | 764 | + |
| | 765 | +librsvg2 (1.1.6-2) unstable; urgency=low |
| | 766 | + |
| | 767 | + * build against glib2.0/pango1.0 (closes: #141665) |
| | 768 | + |
| | 769 | + -- Takuo KITAME <kitame@northeye.org> Thu, 21 Mar 2002 01:23:21 +0900 |
| | 770 | + |
| | 771 | +librsvg2 (1.1.6-1) unstable; urgency=low |
| | 772 | + |
| | 773 | + * New upstream release |
| | 774 | + |
| | 775 | + -- Takuo KITAME <kitame@northeye.org> Sat, 9 Mar 2002 14:39:00 +0900 |
| | 776 | + |
| | 777 | +librsvg2 (1.1.5-1) unstable; urgency=low |
| | 778 | + |
| | 779 | + * New upstream release |
| | 780 | + |
| | 781 | + -- Takuo KITAME <kitame@northeye.org> Tue, 5 Mar 2002 13:33:41 +0900 |
| | 782 | + |
| | 783 | +librsvg2 (1.1.4-1) unstable; urgency=low |
| | 784 | + |
| | 785 | + * New upstream release |
| | 786 | + |
| | 787 | + -- Takuo KITAME <kitame@northeye.org> Tue, 26 Feb 2002 13:37:59 +0900 |
| | 788 | + |
| | 789 | +librsvg2 (1.1.3-2) unstable; urgency=low |
| | 790 | + |
| | 791 | + * Build-Depends pkg-config (>= 0.9) (closes: #133585) |
| | 792 | + |
| | 793 | + -- Takuo KITAME <kitame@northeye.org> Thu, 14 Feb 2002 12:07:10 +0900 |
| | 794 | + |
| | 795 | +librsvg2 (1.1.3-1) unstable; urgency=low |
| | 796 | + |
| | 797 | + * New upstream release |
| | 798 | + |
| | 799 | + -- Takuo KITAME <kitame@northeye.org> Mon, 11 Feb 2002 22:50:49 +0900 |
| | 800 | + |
| | 801 | +librsvg2 (1.1.2-1) unstable; urgency=low |
| | 802 | + |
| | 803 | + * New upstream release |
| | 804 | + |
| | 805 | + -- Takuo KITAME <kitame@northeye.org> Wed, 6 Feb 2002 01:24:00 +0900 |
| | 806 | + |
| | 807 | +librsvg2 (1.1.1-2) unstable; urgency=low |
| | 808 | + |
| | 809 | + * Fix build-depends (closes: #130159) |
| | 810 | + |
| | 811 | + -- Takuo KITAME <kitame@northeye.org> Sun, 20 Jan 2002 23:47:45 +0000 |
| | 812 | + |
| | 813 | +librsvg2 (1.1.1-1) unstable; urgency=low |
| | 814 | + |
| | 815 | + * New upstream release |
| | 816 | + * GNOME2 version |
| | 817 | + * package renamed to librsvg2 |
| | 818 | + |
| | 819 | + -- Takuo KITAME <kitame@northeye.org> Fri, 18 Jan 2002 21:08:43 +0000 |
| | 820 | + |
| | 821 | +librsvg (1.0.2-1) unstable; urgency=low |
| | 822 | + |
| | 823 | + * New upstream release |
| | 824 | + |
| | 825 | + -- Takuo KITAME <kitame@northeye.org> Sat, 6 Oct 2001 05:55:13 +0900 |
| | 826 | + |
| | 827 | +librsvg (1.0.1-3) unstable; urgency=low |
| | 828 | + |
| | 829 | + * Multibyte fix by Akira TAGOH (tagoh@redhad.com) |
| | 830 | + |
| | 831 | + -- Takuo KITAME <kitame@northeye.org> Sat, 28 Jul 2001 02:15:37 +0900 |
| | 832 | + |
| | 833 | +librsvg (1.0.1-2) unstable; urgency=low |
| | 834 | + |
| | 835 | + * update config.{guess.sub} (closes: Bug#103336) |
| | 836 | + |
| | 837 | + -- Takuo KITAME <kitame@northeye.org> Sun, 8 Jul 2001 19:02:36 +0900 |
| | 838 | + |
| | 839 | +librsvg (1.0.1-1) unstable; urgency=low |
| | 840 | + |
| | 841 | + * New upstream release |
| | 842 | + |
| | 843 | + -- Takuo KITAME <kitame@northeye.org> Sat, 7 Jul 2001 22:00:21 +0900 |
| | 844 | + |
| | 845 | +librsvg (1.0.0-2) unstable; urgency=low |
| | 846 | + |
| | 847 | + * build-depends: +libpng2-dev (closes: Bug#97344) |
| | 848 | + |
| | 849 | + -- Takuo KITAME <kitame@northeye.org> Wed, 16 May 2001 03:35:45 +0900 |
| | 850 | + |
| | 851 | +librsvg (1.0.0-1) unstable; urgency=low |
| | 852 | + |
| | 853 | + * Initial Release. (closes: Bug#93505) |
| | 854 | + |
| | 855 | + -- Takuo KITAME <kitame@northeye.org> Wed, 9 May 2001 06:37:25 +0900 |
| | 856 | + |
| | 857 | + |
| Property changes on: trunk/debs/librsvg/debian/changelog |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 858 | + native |
| Index: trunk/debs/librsvg/debian/patches/store-node-type-separately.patch |
| — | — | @@ -0,0 +1,1034 @@ |
| | 2 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-base.c librsvg-2.26.3.new//rsvg-base.c |
| | 3 | +--- librsvg-2.26.3//rsvg-base.c 2010-04-30 16:10:51.000000000 -0700 |
| | 4 | +@@ -144,7 +144,6 @@ |
| | 5 | + static void |
| | 6 | + rsvg_standard_element_start (RsvgHandle * ctx, const char *name, RsvgPropertyBag * atts) |
| | 7 | + { |
| | 8 | +- |
| | 9 | + /*replace this stuff with a hash for fast reading! */ |
| | 10 | + RsvgNode *newnode = NULL; |
| | 11 | + if (!strcmp (name, "g")) |
| | 12 | +@@ -238,11 +237,11 @@ |
| | 13 | + else if (!strcmp (name, "feFuncA")) |
| | 14 | + newnode = rsvg_new_node_component_transfer_function ('a'); |
| | 15 | + else if (!strcmp (name, "feDistantLight")) |
| | 16 | +- newnode = rsvg_new_filter_primitive_light_source ('d'); |
| | 17 | ++ newnode = rsvg_new_node_light_source ('d'); |
| | 18 | + else if (!strcmp (name, "feSpotLight")) |
| | 19 | +- newnode = rsvg_new_filter_primitive_light_source ('s'); |
| | 20 | ++ newnode = rsvg_new_node_light_source ('s'); |
| | 21 | + else if (!strcmp (name, "fePointLight")) |
| | 22 | +- newnode = rsvg_new_filter_primitive_light_source ('p'); |
| | 23 | ++ newnode = rsvg_new_node_light_source ('p'); |
| | 24 | + /* hack to make multiImage sort-of work */ |
| | 25 | + else if (!strcmp (name, "multiImage")) |
| | 26 | + newnode = rsvg_new_switch (); |
| | 27 | +@@ -256,21 +255,22 @@ |
| | 28 | + newnode = rsvg_new_tspan (); |
| | 29 | + else if (!strcmp (name, "tref")) |
| | 30 | + newnode = rsvg_new_tref (); |
| | 31 | +- else { |
| | 32 | ++ else { |
| | 33 | + /* hack for bug 401115. whenever we encounter a node we don't understand, push it into a group. |
| | 34 | + this will allow us to handle things like conditionals properly. */ |
| | 35 | + newnode = rsvg_new_group (); |
| | 36 | + } |
| | 37 | + |
| | 38 | + if (newnode) { |
| | 39 | +- newnode->type = g_string_new (name); |
| | 40 | ++ g_assert (RSVG_NODE_TYPE (newnode) != RSVG_NODE_TYPE_INVALID); |
| | 41 | ++ newnode->name = (char *) name; /* libxml will keep this while parsing */ |
| | 42 | + newnode->parent = ctx->priv->currentnode; |
| | 43 | + rsvg_node_set_atts (newnode, ctx, atts); |
| | 44 | + rsvg_defs_register_memory (ctx->priv->defs, newnode); |
| | 45 | + if (ctx->priv->currentnode) { |
| | 46 | + rsvg_node_group_pack (ctx->priv->currentnode, newnode); |
| | 47 | + ctx->priv->currentnode = newnode; |
| | 48 | +- } else if (!strcmp (name, "svg")) { |
| | 49 | ++ } else if (RSVG_NODE_TYPE (newnode) == RSVG_NODE_TYPE_SVG) { |
| | 50 | + ctx->priv->treebase = newnode; |
| | 51 | + ctx->priv->currentnode = newnode; |
| | 52 | + } |
| | 53 | +@@ -687,7 +687,7 @@ |
| | 54 | + } |
| | 55 | + |
| | 56 | + if (ctx->priv->currentnode |
| | 57 | +- && !strcmp ((const char *) name, ctx->priv->currentnode->type->str)) |
| | 58 | ++ && !strcmp ((const char *) name, ctx->priv->currentnode->name)) |
| | 59 | + rsvg_pop_def_group (ctx); |
| | 60 | + |
| | 61 | + if (!strcmp ((const char *)name, "style")) |
| | 62 | +@@ -703,6 +703,30 @@ |
| | 63 | + _rsvg_node_free (node); |
| | 64 | + } |
| | 65 | + |
| | 66 | ++static RsvgNodeChars * |
| | 67 | ++rsvg_new_chars (const char *text, |
| | 68 | ++ int len) |
| | 69 | ++{ |
| | 70 | ++ RsvgNodeChars *self; |
| | 71 | ++ |
| | 72 | ++ self = g_new (RsvgNodeChars, 1); |
| | 73 | ++ _rsvg_node_init (&self->super, RSVG_NODE_TYPE_CHARS); |
| | 74 | ++ |
| | 75 | ++ if (!g_utf8_validate (text, len, NULL)) { |
| | 76 | ++ char *utf8; |
| | 77 | ++ utf8 = rsvg_make_valid_utf8 (text, len); |
| | 78 | ++ self->contents = g_string_new (utf8); |
| | 79 | ++ g_free (utf8); |
| | 80 | ++ } else { |
| | 81 | ++ self->contents = g_string_new_len (text, len); |
| | 82 | ++ } |
| | 83 | ++ |
| | 84 | ++ self->super.free = _rsvg_node_chars_free; |
| | 85 | ++ self->super.state->cond_true = FALSE; |
| | 86 | ++ |
| | 87 | ++ return self; |
| | 88 | ++} |
| | 89 | ++ |
| | 90 | + static void |
| | 91 | + rsvg_characters_impl (RsvgHandle * ctx, const xmlChar * ch, int len) |
| | 92 | + { |
| | 93 | +@@ -712,8 +736,9 @@ |
| | 94 | + return; |
| | 95 | + |
| | 96 | + if (ctx->priv->currentnode) { |
| | 97 | +- if (!strcmp ("tspan", ctx->priv->currentnode->type->str) || |
| | 98 | +- !strcmp ("text", ctx->priv->currentnode->type->str)) { |
| | 99 | ++ RsvgNodeType type = RSVG_NODE_TYPE (ctx->priv->currentnode); |
| | 100 | ++ if (type == RSVG_NODE_TYPE_TSPAN || |
| | 101 | ++ type == RSVG_NODE_TYPE_TEXT) { |
| | 102 | + guint i; |
| | 103 | + |
| | 104 | + /* find the last CHARS node in the text or tspan node, so that we |
| | 105 | +@@ -721,7 +746,7 @@ |
| | 106 | + self = NULL; |
| | 107 | + for (i = 0; i < ctx->priv->currentnode->children->len; i++) { |
| | 108 | + RsvgNode *node = g_ptr_array_index (ctx->priv->currentnode->children, i); |
| | 109 | +- if (!strcmp (node->type->str, "RSVG_NODE_CHARS")) { |
| | 110 | ++ if (RSVG_NODE_TYPE (node) == RSVG_NODE_TYPE_CHARS) { |
| | 111 | + self = (RsvgNodeChars*)node; |
| | 112 | + } |
| | 113 | + } |
| | 114 | +@@ -741,21 +766,7 @@ |
| | 115 | + } |
| | 116 | + } |
| | 117 | + |
| | 118 | +- self = g_new (RsvgNodeChars, 1); |
| | 119 | +- _rsvg_node_init (&self->super); |
| | 120 | +- |
| | 121 | +- if (!g_utf8_validate ((char *) ch, len, NULL)) { |
| | 122 | +- char *utf8; |
| | 123 | +- utf8 = rsvg_make_valid_utf8 ((char *) ch, len); |
| | 124 | +- self->contents = g_string_new (utf8); |
| | 125 | +- g_free (utf8); |
| | 126 | +- } else { |
| | 127 | +- self->contents = g_string_new_len ((char *) ch, len); |
| | 128 | +- } |
| | 129 | +- |
| | 130 | +- self->super.type = g_string_new ("RSVG_NODE_CHARS"); |
| | 131 | +- self->super.free = _rsvg_node_chars_free; |
| | 132 | +- self->super.state->cond_true = FALSE; |
| | 133 | ++ self = rsvg_new_chars ((char *) ch, len); |
| | 134 | + |
| | 135 | + rsvg_defs_register_memory (ctx->priv->defs, (RsvgNode *) self); |
| | 136 | + if (ctx->priv->currentnode) |
| | 137 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-cairo-draw.c librsvg-2.26.3.new//rsvg-cairo-draw.c |
| | 138 | +--- librsvg-2.26.3//rsvg-cairo-draw.c 2010-04-30 04:52:03.000000000 -0700 |
| | 139 | +@@ -145,7 +145,7 @@ |
| | 140 | + |
| | 141 | + for (i = 0; i < stops->len; i++) { |
| | 142 | + node = (RsvgNode *) g_ptr_array_index (stops, i); |
| | 143 | +- if (strcmp (node->type->str, "stop")) |
| | 144 | ++ if (RSVG_NODE_TYPE (node) != RSVG_NODE_TYPE_STOP) |
| | 145 | + continue; |
| | 146 | + stop = (RsvgGradientStop *) node; |
| | 147 | + rgba = stop->rgba; |
| | 148 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-filter.c librsvg-2.26.3.new//rsvg-filter.c |
| | 149 | +--- librsvg-2.26.3//rsvg-filter.c 2010-04-30 17:02:56.000000000 -0700 |
| | 150 | +@@ -483,7 +483,7 @@ |
| | 151 | + |
| | 152 | + for (i = 0; i < self->super.children->len; i++) { |
| | 153 | + current = g_ptr_array_index (self->super.children, i); |
| | 154 | +- if (!strncmp (current->super.type->str, "fe", 2)) |
| | 155 | ++ if (RSVG_NODE_IS_FILTER_PRIMITIVE (¤t->super)) |
| | 156 | + rsvg_filter_primitive_render (current, ctx); |
| | 157 | + } |
| | 158 | + |
| | 159 | +@@ -646,7 +646,7 @@ |
| | 160 | + val = rsvg_defs_lookup (defs, name); |
| | 161 | + g_free (name); |
| | 162 | + |
| | 163 | +- if (val && (!strcmp (val->type->str, "filter"))) |
| | 164 | ++ if (val && RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_FILTER) |
| | 165 | + return (RsvgFilter *) val; |
| | 166 | + } |
| | 167 | + return NULL; |
| | 168 | +@@ -697,7 +697,7 @@ |
| | 169 | + RsvgFilter *filter; |
| | 170 | + |
| | 171 | + filter = g_new (RsvgFilter, 1); |
| | 172 | +- _rsvg_node_init (&filter->super); |
| | 173 | ++ _rsvg_node_init (&filter->super, RSVG_NODE_TYPE_FILTER); |
| | 174 | + filter->filterunits = objectBoundingBox; |
| | 175 | + filter->primitiveunits = userSpaceOnUse; |
| | 176 | + filter->x = _rsvg_css_parse_length ("-10%"); |
| | 177 | +@@ -921,7 +921,7 @@ |
| | 178 | + { |
| | 179 | + RsvgFilterPrimitiveBlend *filter; |
| | 180 | + filter = g_new (RsvgFilterPrimitiveBlend, 1); |
| | 181 | +- _rsvg_node_init (&filter->super.super); |
| | 182 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_BLEND); |
| | 183 | + filter->mode = normal; |
| | 184 | + filter->super.in = g_string_new ("none"); |
| | 185 | + filter->in2 = g_string_new ("none"); |
| | 186 | +@@ -1173,7 +1173,7 @@ |
| | 187 | + { |
| | 188 | + RsvgFilterPrimitiveConvolveMatrix *filter; |
| | 189 | + filter = g_new (RsvgFilterPrimitiveConvolveMatrix, 1); |
| | 190 | +- _rsvg_node_init (&filter->super.super); |
| | 191 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_CONVOLVE_MATRIX); |
| | 192 | + filter->super.in = g_string_new ("none"); |
| | 193 | + filter->super.result = g_string_new ("none"); |
| | 194 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 195 | +@@ -1414,7 +1414,7 @@ |
| | 196 | + { |
| | 197 | + RsvgFilterPrimitiveGaussianBlur *filter; |
| | 198 | + filter = g_new (RsvgFilterPrimitiveGaussianBlur, 1); |
| | 199 | +- _rsvg_node_init (&filter->super.super); |
| | 200 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_GAUSSIAN_BLUR); |
| | 201 | + filter->super.in = g_string_new ("none"); |
| | 202 | + filter->super.result = g_string_new ("none"); |
| | 203 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 204 | +@@ -1550,7 +1550,7 @@ |
| | 205 | + { |
| | 206 | + RsvgFilterPrimitiveOffset *filter; |
| | 207 | + filter = g_new (RsvgFilterPrimitiveOffset, 1); |
| | 208 | +- _rsvg_node_init (&filter->super.super); |
| | 209 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_OFFSET); |
| | 210 | + filter->super.in = g_string_new ("none"); |
| | 211 | + filter->super.result = g_string_new ("none"); |
| | 212 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 213 | +@@ -1591,7 +1591,7 @@ |
| | 214 | + for (i = 0; i < upself->super.super.children->len; i++) { |
| | 215 | + RsvgFilterPrimitive *mn; |
| | 216 | + mn = g_ptr_array_index (upself->super.super.children, i); |
| | 217 | +- if (strcmp (mn->super.type->str, "feMergeNode")) |
| | 218 | ++ if (RSVG_NODE_TYPE (&mn->super) != RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE_NODE) |
| | 219 | + continue; |
| | 220 | + in = rsvg_filter_get_in (mn->in, ctx); |
| | 221 | + rsvg_alpha_blt (in, boundarys.x0, boundarys.y0, boundarys.x1 - boundarys.x0, |
| | 222 | +@@ -1644,7 +1644,7 @@ |
| | 223 | + { |
| | 224 | + RsvgFilterPrimitiveMerge *filter; |
| | 225 | + filter = g_new (RsvgFilterPrimitiveMerge, 1); |
| | 226 | +- _rsvg_node_init (&filter->super.super); |
| | 227 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE); |
| | 228 | + filter->super.result = g_string_new ("none"); |
| | 229 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 230 | + filter->super.height.factor = 'n'; |
| | 231 | +@@ -1687,7 +1687,7 @@ |
| | 232 | + { |
| | 233 | + RsvgFilterPrimitive *filter; |
| | 234 | + filter = g_new (RsvgFilterPrimitive, 1); |
| | 235 | +- _rsvg_node_init (&filter->super); |
| | 236 | ++ _rsvg_node_init (&filter->super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE_NODE); |
| | 237 | + filter->in = g_string_new ("none"); |
| | 238 | + filter->super.free = rsvg_filter_primitive_merge_node_free; |
| | 239 | + filter->render = &rsvg_filter_primitive_merge_node_render; |
| | 240 | +@@ -1921,7 +1921,7 @@ |
| | 241 | + { |
| | 242 | + RsvgFilterPrimitiveColourMatrix *filter; |
| | 243 | + filter = g_new (RsvgFilterPrimitiveColourMatrix, 1); |
| | 244 | +- _rsvg_node_init (&filter->super.super); |
| | 245 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOUR_MATRIX); |
| | 246 | + filter->super.in = g_string_new ("none"); |
| | 247 | + filter->super.result = g_string_new ("none"); |
| | 248 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 249 | +@@ -1953,8 +1953,9 @@ |
| | 250 | + gint slope; |
| | 251 | + gint intercept; |
| | 252 | + gint amplitude; |
| | 253 | +- gdouble exponent; |
| | 254 | + gint offset; |
| | 255 | ++ gdouble exponent; |
| | 256 | ++ char channel; |
| | 257 | + }; |
| | 258 | + |
| | 259 | + struct _RsvgFilterPrimitiveComponentTransfer { |
| | 260 | +@@ -2050,15 +2051,18 @@ |
| | 261 | + for (c = 0; c < 4; c++) { |
| | 262 | + char channel = "RGBA"[c]; |
| | 263 | + for (i = 0; i < self->super.children->len; i++) { |
| | 264 | +- RsvgNodeComponentTransferFunc *temp; |
| | 265 | +- temp = (RsvgNodeComponentTransferFunc *) |
| | 266 | +- g_ptr_array_index (self->super.children, i); |
| | 267 | +- if (!strncmp (temp->super.type->str, "feFunc", 6)) |
| | 268 | +- if (temp->super.type->str[6] == channel) { |
| | 269 | ++ RsvgNode *child_node; |
| | 270 | ++ |
| | 271 | ++ child_node = (RsvgNode *) g_ptr_array_index (self->super.children, i); |
| | 272 | ++ if (RSVG_NODE_TYPE (child_node) == RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPONENT_TRANSFER) { |
| | 273 | ++ RsvgNodeComponentTransferFunc *temp = (RsvgNodeComponentTransferFunc *) child_node; |
| | 274 | ++ |
| | 275 | ++ if (temp->channel == channel) { |
| | 276 | + functions[ctx->channelmap[c]] = temp->function; |
| | 277 | + channels[ctx->channelmap[c]] = temp; |
| | 278 | + break; |
| | 279 | + } |
| | 280 | ++ } |
| | 281 | + } |
| | 282 | + if (i == self->super.children->len) |
| | 283 | + functions[ctx->channelmap[c]] = identity_component_transfer_func; |
| | 284 | +@@ -2141,7 +2145,7 @@ |
| | 285 | + RsvgFilterPrimitiveComponentTransfer *filter; |
| | 286 | + |
| | 287 | + filter = g_new (RsvgFilterPrimitiveComponentTransfer, 1); |
| | 288 | +- _rsvg_node_init (&filter->super.super); |
| | 289 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPONENT_TRANSFER); |
| | 290 | + filter->super.result = g_string_new ("none"); |
| | 291 | + filter->super.in = g_string_new ("none"); |
| | 292 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 293 | +@@ -2215,7 +2219,7 @@ |
| | 294 | + RsvgNodeComponentTransferFunc *filter; |
| | 295 | + |
| | 296 | + filter = g_new (RsvgNodeComponentTransferFunc, 1); |
| | 297 | +- _rsvg_node_init (&filter->super); |
| | 298 | ++ _rsvg_node_init (&filter->super, RSVG_NODE_TYPE_COMPONENT_TRANFER_FUNCTION); |
| | 299 | + filter->super.free = rsvg_component_transfer_function_free; |
| | 300 | + filter->super.set_atts = rsvg_node_component_transfer_function_set_atts; |
| | 301 | + filter->function = identity_component_transfer_func; |
| | 302 | +@@ -2357,7 +2361,7 @@ |
| | 303 | + { |
| | 304 | + RsvgFilterPrimitiveErode *filter; |
| | 305 | + filter = g_new (RsvgFilterPrimitiveErode, 1); |
| | 306 | +- _rsvg_node_init (&filter->super.super); |
| | 307 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_ERODE); |
| | 308 | + filter->super.in = g_string_new ("none"); |
| | 309 | + filter->super.result = g_string_new ("none"); |
| | 310 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 311 | +@@ -2582,7 +2586,7 @@ |
| | 312 | + { |
| | 313 | + RsvgFilterPrimitiveComposite *filter; |
| | 314 | + filter = g_new (RsvgFilterPrimitiveComposite, 1); |
| | 315 | +- _rsvg_node_init (&filter->super.super); |
| | 316 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPOSITE); |
| | 317 | + filter->mode = COMPOSITE_MODE_OVER; |
| | 318 | + filter->super.in = g_string_new ("none"); |
| | 319 | + filter->in2 = g_string_new ("none"); |
| | 320 | +@@ -2687,7 +2691,7 @@ |
| | 321 | + { |
| | 322 | + RsvgFilterPrimitive *filter; |
| | 323 | + filter = g_new (RsvgFilterPrimitive, 1); |
| | 324 | +- _rsvg_node_init (&filter->super); |
| | 325 | ++ _rsvg_node_init (&filter->super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_FLOOD); |
| | 326 | + filter->in = g_string_new ("none"); |
| | 327 | + filter->result = g_string_new ("none"); |
| | 328 | + filter->x.factor = filter->y.factor = filter->width.factor = filter->height.factor = 'n'; |
| | 329 | +@@ -2863,7 +2867,7 @@ |
| | 330 | + { |
| | 331 | + RsvgFilterPrimitiveDisplacementMap *filter; |
| | 332 | + filter = g_new (RsvgFilterPrimitiveDisplacementMap, 1); |
| | 333 | +- _rsvg_node_init (&filter->super.super); |
| | 334 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_DISPLACEMENT_MAP); |
| | 335 | + filter->super.in = g_string_new ("none"); |
| | 336 | + filter->in2 = g_string_new ("none"); |
| | 337 | + filter->super.result = g_string_new ("none"); |
| | 338 | +@@ -3234,7 +3238,7 @@ |
| | 339 | + { |
| | 340 | + RsvgFilterPrimitiveTurbulence *filter; |
| | 341 | + filter = g_new (RsvgFilterPrimitiveTurbulence, 1); |
| | 342 | +- _rsvg_node_init (&filter->super.super); |
| | 343 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_TURBULENCE); |
| | 344 | + filter->super.in = g_string_new ("none"); |
| | 345 | + filter->super.result = g_string_new ("none"); |
| | 346 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 347 | +@@ -3453,7 +3457,7 @@ |
| | 348 | + { |
| | 349 | + RsvgFilterPrimitiveImage *filter; |
| | 350 | + filter = g_new (RsvgFilterPrimitiveImage, 1); |
| | 351 | +- _rsvg_node_init (&filter->super.super); |
| | 352 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_IMAGE); |
| | 353 | + filter->super.in = g_string_new ("none"); |
| | 354 | + filter->super.result = g_string_new ("none"); |
| | 355 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 356 | +@@ -3814,8 +3818,8 @@ |
| | 357 | + |
| | 358 | + |
| | 359 | + static void |
| | 360 | +-rsvg_filter_primitive_light_source_set_atts (RsvgNode * self, |
| | 361 | +- RsvgHandle * ctx, RsvgPropertyBag * atts) |
| | 362 | ++rsvg_node_light_source_set_atts (RsvgNode * self, |
| | 363 | ++ RsvgHandle * ctx, RsvgPropertyBag * atts) |
| | 364 | + { |
| | 365 | + RsvgNodeLightSource *data; |
| | 366 | + const char *value; |
| | 367 | +@@ -3847,13 +3851,13 @@ |
| | 368 | + } |
| | 369 | + |
| | 370 | + RsvgNode * |
| | 371 | +-rsvg_new_filter_primitive_light_source (char type) |
| | 372 | ++rsvg_new_node_light_source (char type) |
| | 373 | + { |
| | 374 | + RsvgNodeLightSource *data; |
| | 375 | + data = g_new (RsvgNodeLightSource, 1); |
| | 376 | +- _rsvg_node_init (&data->super); |
| | 377 | ++ _rsvg_node_init (&data->super, RSVG_NODE_TYPE_LIGHT_SOURCE); |
| | 378 | + data->super.free = _rsvg_node_free; |
| | 379 | +- data->super.set_atts = rsvg_filter_primitive_light_source_set_atts; |
| | 380 | ++ data->super.set_atts = rsvg_node_light_source_set_atts; |
| | 381 | + data->specularExponent = 1; |
| | 382 | + if (type == 's') |
| | 383 | + data->type = SPOTLIGHT; |
| | 384 | +@@ -3903,10 +3907,11 @@ |
| | 385 | + |
| | 386 | + for (i = 0; i < self->super.children->len; i++) { |
| | 387 | + RsvgNode *temp; |
| | 388 | ++ |
| | 389 | + temp = g_ptr_array_index (self->super.children, i); |
| | 390 | +- if (!strcmp (temp->type->str, "feDistantLight") || |
| | 391 | +- !strcmp (temp->type->str, "fePointLight") || !strcmp (temp->type->str, "feSpotLight")) |
| | 392 | ++ if (RSVG_NODE_TYPE (temp) == RSVG_NODE_TYPE_LIGHT_SOURCE) { |
| | 393 | + source = (RsvgNodeLightSource *) temp; |
| | 394 | ++ } |
| | 395 | + } |
| | 396 | + if (source == NULL) |
| | 397 | + return; |
| | 398 | +@@ -4023,7 +4028,7 @@ |
| | 399 | + { |
| | 400 | + RsvgFilterPrimitiveDiffuseLighting *filter; |
| | 401 | + filter = g_new (RsvgFilterPrimitiveDiffuseLighting, 1); |
| | 402 | +- _rsvg_node_init (&filter->super.super); |
| | 403 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_DIFFUSE_LIGHTING); |
| | 404 | + filter->super.in = g_string_new ("none"); |
| | 405 | + filter->super.result = g_string_new ("none"); |
| | 406 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 407 | +@@ -4078,9 +4083,9 @@ |
| | 408 | + for (i = 0; i < self->super.children->len; i++) { |
| | 409 | + RsvgNode *temp; |
| | 410 | + temp = g_ptr_array_index (self->super.children, i); |
| | 411 | +- if (!strcmp (temp->type->str, "feDistantLight") || |
| | 412 | +- !strcmp (temp->type->str, "fePointLight") || !strcmp (temp->type->str, "feSpotLight")) |
| | 413 | ++ if (RSVG_NODE_TYPE (temp) == RSVG_NODE_TYPE_LIGHT_SOURCE) { |
| | 414 | + source = (RsvgNodeLightSource *) temp; |
| | 415 | ++ } |
| | 416 | + } |
| | 417 | + if (source == NULL) |
| | 418 | + return; |
| | 419 | +@@ -4202,7 +4207,7 @@ |
| | 420 | + { |
| | 421 | + RsvgFilterPrimitiveSpecularLighting *filter; |
| | 422 | + filter = g_new (RsvgFilterPrimitiveSpecularLighting, 1); |
| | 423 | +- _rsvg_node_init (&filter->super.super); |
| | 424 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_SPECULAR_LIGHTING); |
| | 425 | + filter->super.in = g_string_new ("none"); |
| | 426 | + filter->super.result = g_string_new ("none"); |
| | 427 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 428 | +@@ -4324,7 +4329,7 @@ |
| | 429 | + { |
| | 430 | + RsvgFilterPrimitiveTile *filter; |
| | 431 | + filter = g_new (RsvgFilterPrimitiveTile, 1); |
| | 432 | +- _rsvg_node_init (&filter->super.super); |
| | 433 | ++ _rsvg_node_init (&filter->super.super, RSVG_NODE_TYPE_FILTER_PRIMITIVE_TILE); |
| | 434 | + filter->super.in = g_string_new ("none"); |
| | 435 | + filter->super.result = g_string_new ("none"); |
| | 436 | + filter->super.x.factor = filter->super.y.factor = filter->super.width.factor = |
| | 437 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-filter.h librsvg-2.26.3.new//rsvg-filter.h |
| | 438 | +--- librsvg-2.26.3//rsvg-filter.h 2010-04-30 16:11:20.000000000 -0700 |
| | 439 | +@@ -64,7 +64,7 @@ |
| | 440 | + RsvgNode *rsvg_new_filter_primitive_turbulence (void); |
| | 441 | + RsvgNode *rsvg_new_filter_primitive_image (void); |
| | 442 | + RsvgNode *rsvg_new_filter_primitive_diffuse_lighting (void); |
| | 443 | +-RsvgNode *rsvg_new_filter_primitive_light_source (char type); |
| | 444 | ++RsvgNode *rsvg_new_node_light_source (char type); |
| | 445 | + RsvgNode *rsvg_new_filter_primitive_specular_lighting (void); |
| | 446 | + RsvgNode *rsvg_new_filter_primitive_tile (void); |
| | 447 | + |
| | 448 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-image.c librsvg-2.26.3.new//rsvg-image.c |
| | 449 | +--- librsvg-2.26.3//rsvg-image.c 2010-04-30 04:45:33.000000000 -0700 |
| | 450 | +@@ -555,7 +555,7 @@ |
| | 451 | + { |
| | 452 | + RsvgNodeImage *image; |
| | 453 | + image = g_new (RsvgNodeImage, 1); |
| | 454 | +- _rsvg_node_init (&image->super); |
| | 455 | ++ _rsvg_node_init (&image->super, RSVG_NODE_TYPE_IMAGE); |
| | 456 | + g_assert (image->super.state); |
| | 457 | + image->img = NULL; |
| | 458 | + image->preserve_aspect_ratio = RSVG_ASPECT_RATIO_XMID_YMID; |
| | 459 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-marker.c librsvg-2.26.3.new//rsvg-marker.c |
| | 460 | +--- librsvg-2.26.3//rsvg-marker.c 2010-04-30 16:58:28.000000000 -0700 |
| | 461 | +@@ -84,7 +84,7 @@ |
| | 462 | + { |
| | 463 | + RsvgMarker *marker; |
| | 464 | + marker = g_new (RsvgMarker, 1); |
| | 465 | +- _rsvg_node_init (&marker->super); |
| | 466 | ++ _rsvg_node_init (&marker->super, RSVG_NODE_TYPE_MARKER); |
| | 467 | + marker->orient = 0; |
| | 468 | + marker->orientAuto = FALSE; |
| | 469 | + marker->preserve_aspect_ratio = RSVG_ASPECT_RATIO_XMID_YMID; |
| | 470 | +@@ -199,7 +199,7 @@ |
| | 471 | + val = rsvg_defs_lookup (defs, name); |
| | 472 | + g_free (name); |
| | 473 | + |
| | 474 | +- if (val && (!strcmp (val->type->str, "marker"))) |
| | 475 | ++ if (val && RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_MARKER) |
| | 476 | + return val; |
| | 477 | + } |
| | 478 | + return NULL; |
| | 479 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-mask.c librsvg-2.26.3.new//rsvg-mask.c |
| | 480 | +--- librsvg-2.26.3//rsvg-mask.c 2010-04-30 04:45:33.000000000 -0700 |
| | 481 | +@@ -74,7 +74,7 @@ |
| | 482 | + RsvgMask *mask; |
| | 483 | + |
| | 484 | + mask = g_new (RsvgMask, 1); |
| | 485 | +- _rsvg_node_init (&mask->super); |
| | 486 | ++ _rsvg_node_init (&mask->super, RSVG_NODE_TYPE_MASK); |
| | 487 | + mask->maskunits = objectBoundingBox; |
| | 488 | + mask->contentunits = userSpaceOnUse; |
| | 489 | + mask->x = _rsvg_css_parse_length ("0"); |
| | 490 | +@@ -113,7 +113,7 @@ |
| | 491 | + val = rsvg_defs_lookup (defs, name); |
| | 492 | + g_free (name); |
| | 493 | + |
| | 494 | +- if (val && (!strcmp (val->type->str, "mask"))) |
| | 495 | ++ if (val && RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_MASK) |
| | 496 | + return val; |
| | 497 | + } |
| | 498 | + return NULL; |
| | 499 | +@@ -130,7 +130,7 @@ |
| | 500 | + val = rsvg_defs_lookup (defs, name); |
| | 501 | + g_free (name); |
| | 502 | + |
| | 503 | +- if (val && (!strcmp (val->type->str, "clipPath"))) |
| | 504 | ++ if (val && RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_CLIP_PATH) |
| | 505 | + return val; |
| | 506 | + } |
| | 507 | + return NULL; |
| | 508 | +@@ -168,7 +168,7 @@ |
| | 509 | + RsvgClipPath *clip_path; |
| | 510 | + |
| | 511 | + clip_path = g_new (RsvgClipPath, 1); |
| | 512 | +- _rsvg_node_init (&clip_path->super); |
| | 513 | ++ _rsvg_node_init (&clip_path->super, RSVG_NODE_TYPE_CLIP_PATH); |
| | 514 | + clip_path->units = userSpaceOnUse; |
| | 515 | + clip_path->super.set_atts = rsvg_clip_path_set_atts; |
| | 516 | + clip_path->super.free = _rsvg_node_free; |
| | 517 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-paint-server.c librsvg-2.26.3.new//rsvg-paint-server.c |
| | 518 | +--- librsvg-2.26.3//rsvg-paint-server.c 2010-04-30 15:41:13.000000000 -0700 |
| | 519 | +@@ -129,11 +129,11 @@ |
| | 520 | + |
| | 521 | + if (val == NULL) |
| | 522 | + return NULL; |
| | 523 | +- if (!strcmp (val->type->str, "linearGradient")) |
| | 524 | ++ if (RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_LINEAR_GRADIENT) |
| | 525 | + return rsvg_paint_server_lin_grad ((RsvgLinearGradient *) val); |
| | 526 | +- else if (!strcmp (val->type->str, "radialGradient")) |
| | 527 | ++ else if (RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_RADIAL_GRADIENT) |
| | 528 | + return rsvg_paint_server_rad_grad ((RsvgRadialGradient *) val); |
| | 529 | +- else if (!strcmp (val->type->str, "pattern")) |
| | 530 | ++ else if (RSVG_NODE_TYPE (val) == RSVG_NODE_TYPE_PATTERN) |
| | 531 | + return rsvg_paint_server_pattern ((RsvgPattern *) val); |
| | 532 | + else |
| | 533 | + return NULL; |
| | 534 | +@@ -224,7 +224,7 @@ |
| | 535 | + rsvg_new_stop (void) |
| | 536 | + { |
| | 537 | + RsvgGradientStop *stop = g_new (RsvgGradientStop, 1); |
| | 538 | +- _rsvg_node_init (&stop->super); |
| | 539 | ++ _rsvg_node_init (&stop->super, RSVG_NODE_TYPE_STOP); |
| | 540 | + stop->super.set_atts = rsvg_stop_set_atts; |
| | 541 | + stop->offset = 0; |
| | 542 | + stop->rgba = 0; |
| | 543 | +@@ -293,7 +293,7 @@ |
| | 544 | + { |
| | 545 | + RsvgLinearGradient *grad = NULL; |
| | 546 | + grad = g_new (RsvgLinearGradient, 1); |
| | 547 | +- _rsvg_node_init (&grad->super); |
| | 548 | ++ _rsvg_node_init (&grad->super, RSVG_NODE_TYPE_LINEAR_GRADIENT); |
| | 549 | + _rsvg_affine_identity (grad->affine); |
| | 550 | + grad->has_current_color = FALSE; |
| | 551 | + grad->x1 = grad->y1 = grad->y2 = _rsvg_css_parse_length ("0"); |
| | 552 | +@@ -376,7 +376,7 @@ |
| | 553 | + { |
| | 554 | + |
| | 555 | + RsvgRadialGradient *grad = g_new (RsvgRadialGradient, 1); |
| | 556 | +- _rsvg_node_init (&grad->super); |
| | 557 | ++ _rsvg_node_init (&grad->super, RSVG_NODE_TYPE_RADIAL_GRADIENT); |
| | 558 | + _rsvg_affine_identity (grad->affine); |
| | 559 | + grad->has_current_color = FALSE; |
| | 560 | + grad->obj_bbox = TRUE; |
| | 561 | +@@ -458,7 +458,7 @@ |
| | 562 | + rsvg_new_pattern (void) |
| | 563 | + { |
| | 564 | + RsvgPattern *pattern = g_new (RsvgPattern, 1); |
| | 565 | +- _rsvg_node_init (&pattern->super); |
| | 566 | ++ _rsvg_node_init (&pattern->super, RSVG_NODE_TYPE_PATTERN); |
| | 567 | + pattern->obj_bbox = TRUE; |
| | 568 | + pattern->obj_cbbox = FALSE; |
| | 569 | + pattern->x = pattern->y = pattern->width = pattern->height = _rsvg_css_parse_length ("0"); |
| | 570 | +@@ -477,7 +477,8 @@ |
| | 571 | + { |
| | 572 | + unsigned int i; |
| | 573 | + for (i = 0; i < lookin->len; i++) { |
| | 574 | +- if (!strcmp (((RsvgNode *) g_ptr_array_index (lookin, i))->type->str, "stop")) |
| | 575 | ++ RsvgNode *node = g_ptr_array_index (lookin, i); |
| | 576 | ++ if (RSVG_NODE_TYPE (node) == RSVG_NODE_TYPE_STOP) |
| | 577 | + return 1; |
| | 578 | + } |
| | 579 | + return 0; |
| | 580 | +@@ -490,7 +491,7 @@ |
| | 581 | + int i; |
| | 582 | + ufallback = grad->fallback; |
| | 583 | + while (ufallback != NULL) { |
| | 584 | +- if (!strcmp (ufallback->type->str, "linearGradient")) { |
| | 585 | ++ if (RSVG_NODE_TYPE (ufallback) == RSVG_NODE_TYPE_LINEAR_GRADIENT) { |
| | 586 | + RsvgLinearGradient *fallback = (RsvgLinearGradient *) ufallback; |
| | 587 | + if (!grad->hasx1 && fallback->hasx1) { |
| | 588 | + grad->hasx1 = TRUE; |
| | 589 | +@@ -525,7 +526,7 @@ |
| | 590 | + grad->super.children = fallback->super.children; |
| | 591 | + } |
| | 592 | + ufallback = fallback->fallback; |
| | 593 | +- } else if (!strcmp (ufallback->type->str, "radialGradient")) { |
| | 594 | ++ } else if (RSVG_NODE_TYPE (ufallback) == RSVG_NODE_TYPE_RADIAL_GRADIENT) { |
| | 595 | + RsvgRadialGradient *fallback = (RsvgRadialGradient *) ufallback; |
| | 596 | + if (!grad->hastransform && fallback->hastransform) { |
| | 597 | + grad->hastransform = TRUE; |
| | 598 | +@@ -555,7 +556,7 @@ |
| | 599 | + int i; |
| | 600 | + ufallback = grad->fallback; |
| | 601 | + while (ufallback != NULL) { |
| | 602 | +- if (!strcmp (ufallback->type->str, "radialGradient")) { |
| | 603 | ++ if (RSVG_NODE_TYPE (ufallback) == RSVG_NODE_TYPE_RADIAL_GRADIENT) { |
| | 604 | + RsvgRadialGradient *fallback = (RsvgRadialGradient *) ufallback; |
| | 605 | + if (!grad->hascx && fallback->hascx) { |
| | 606 | + grad->hascx = TRUE; |
| | 607 | +@@ -594,7 +595,7 @@ |
| | 608 | + grad->super.children = fallback->super.children; |
| | 609 | + } |
| | 610 | + ufallback = fallback->fallback; |
| | 611 | +- } else if (!strcmp (ufallback->type->str, "linearGradient")) { |
| | 612 | ++ } else if (RSVG_NODE_TYPE (ufallback) == RSVG_NODE_TYPE_LINEAR_GRADIENT) { |
| | 613 | + RsvgLinearGradient *fallback = (RsvgLinearGradient *) ufallback; |
| | 614 | + if (!grad->hastransform && fallback->hastransform) { |
| | 615 | + grad->hastransform = TRUE; |
| | 616 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-private.h librsvg-2.26.3.new//rsvg-private.h |
| | 617 | +--- librsvg-2.26.3//rsvg-private.h 2010-04-30 16:12:01.000000000 -0700 |
| | 618 | +@@ -250,16 +250,74 @@ |
| | 619 | + |
| | 620 | + void _rsvg_size_callback (int *width, int *height, gpointer data); |
| | 621 | + |
| | 622 | ++typedef enum { |
| | 623 | ++ RSVG_NODE_TYPE_INVALID = 0, |
| | 624 | ++ |
| | 625 | ++ RSVG_NODE_TYPE_CHARS, |
| | 626 | ++ RSVG_NODE_TYPE_CIRCLE, |
| | 627 | ++ RSVG_NODE_TYPE_CLIP_PATH, |
| | 628 | ++ RSVG_NODE_TYPE_COMPONENT_TRANFER_FUNCTION, |
| | 629 | ++ RSVG_NODE_TYPE_DEFS, |
| | 630 | ++ RSVG_NODE_TYPE_ELLIPSE, |
| | 631 | ++ RSVG_NODE_TYPE_FILTER, |
| | 632 | ++ RSVG_NODE_TYPE_GROUP, |
| | 633 | ++ RSVG_NODE_TYPE_IMAGE, |
| | 634 | ++ RSVG_NODE_TYPE_LIGHT_SOURCE, |
| | 635 | ++ RSVG_NODE_TYPE_LINE, |
| | 636 | ++ RSVG_NODE_TYPE_LINEAR_GRADIENT, |
| | 637 | ++ RSVG_NODE_TYPE_MARKER, |
| | 638 | ++ RSVG_NODE_TYPE_MASK, |
| | 639 | ++ RSVG_NODE_TYPE_PATH, |
| | 640 | ++ RSVG_NODE_TYPE_PATTERN, |
| | 641 | ++ RSVG_NODE_TYPE_POLYGON, |
| | 642 | ++ RSVG_NODE_TYPE_POLYLINE, |
| | 643 | ++ RSVG_NODE_TYPE_RADIAL_GRADIENT, |
| | 644 | ++ RSVG_NODE_TYPE_RECT, |
| | 645 | ++ RSVG_NODE_TYPE_STOP, |
| | 646 | ++ RSVG_NODE_TYPE_SVG, |
| | 647 | ++ RSVG_NODE_TYPE_SWITCH, |
| | 648 | ++ RSVG_NODE_TYPE_SYMBOL, |
| | 649 | ++ RSVG_NODE_TYPE_TEXT, |
| | 650 | ++ RSVG_NODE_TYPE_TREF, |
| | 651 | ++ RSVG_NODE_TYPE_TSPAN, |
| | 652 | ++ RSVG_NODE_TYPE_USE, |
| | 653 | ++ |
| | 654 | ++ /* Filter primitives */ |
| | 655 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE = 64, |
| | 656 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_BLEND, |
| | 657 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_COLOUR_MATRIX, |
| | 658 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPONENT_TRANSFER, |
| | 659 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_COMPOSITE, |
| | 660 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_CONVOLVE_MATRIX, |
| | 661 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_DIFFUSE_LIGHTING, |
| | 662 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_DISPLACEMENT_MAP, |
| | 663 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_ERODE, |
| | 664 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_FLOOD, |
| | 665 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_GAUSSIAN_BLUR, |
| | 666 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_IMAGE, |
| | 667 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE, |
| | 668 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_MERGE_NODE, |
| | 669 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_OFFSET, |
| | 670 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_SPECULAR_LIGHTING, |
| | 671 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_TILE, |
| | 672 | ++ RSVG_NODE_TYPE_FILTER_PRIMITIVE_TURBULENCE, |
| | 673 | ++ |
| | 674 | ++} RsvgNodeType; |
| | 675 | ++ |
| | 676 | + struct _RsvgNode { |
| | 677 | + RsvgState *state; |
| | 678 | + RsvgNode *parent; |
| | 679 | +- GString *type; |
| | 680 | + GPtrArray *children; |
| | 681 | ++ RsvgNodeType type; |
| | 682 | ++ const char *name; /* owned by the xmlContext, invalid after parsing! */ |
| | 683 | + void (*free) (RsvgNode * self); |
| | 684 | + void (*draw) (RsvgNode * self, RsvgDrawingCtx * ctx, int dominate); |
| | 685 | + void (*set_atts) (RsvgNode * self, RsvgHandle * ctx, RsvgPropertyBag *); |
| | 686 | + }; |
| | 687 | + |
| | 688 | ++#define RSVG_NODE_TYPE(node) ((node)->type) |
| | 689 | ++#define RSVG_NODE_IS_FILTER_PRIMITIVE(node) (RSVG_NODE_TYPE((node)) & RSVG_NODE_TYPE_FILTER_PRIMITIVE) |
| | 690 | ++ |
| | 691 | + struct _RsvgNodeChars { |
| | 692 | + RsvgNode super; |
| | 693 | + GString *contents; |
| | 694 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-shapes.c librsvg-2.26.3.new//rsvg-shapes.c |
| | 695 | +--- librsvg-2.26.3//rsvg-shapes.c 2010-04-30 15:41:27.000000000 -0700 |
| | 696 | +@@ -89,7 +89,7 @@ |
| | 697 | + { |
| | 698 | + RsvgNodePath *path; |
| | 699 | + path = g_new (RsvgNodePath, 1); |
| | 700 | +- _rsvg_node_init (&path->super); |
| | 701 | ++ _rsvg_node_init (&path->super, RSVG_NODE_TYPE_PATH); |
| | 702 | + path->d = NULL; |
| | 703 | + path->super.free = rsvg_node_path_free; |
| | 704 | + path->super.draw = rsvg_node_path_draw; |
| | 705 | +@@ -101,7 +101,6 @@ |
| | 706 | + struct _RsvgNodePoly { |
| | 707 | + RsvgNode super; |
| | 708 | + gdouble *pointlist; |
| | 709 | +- gboolean is_polyline; |
| | 710 | + guint pointlist_len; |
| | 711 | + }; |
| | 712 | + |
| | 713 | +@@ -126,7 +125,8 @@ |
| | 714 | + rsvg_defs_register_name (ctx->priv->defs, value, self); |
| | 715 | + } |
| | 716 | + |
| | 717 | +- rsvg_parse_style_attrs (ctx, self->state, (poly->is_polyline ? "polyline" : "polygon"), |
| | 718 | ++ rsvg_parse_style_attrs (ctx, self->state, |
| | 719 | ++ RSVG_NODE_TYPE (self) == RSVG_NODE_TYPE_POLYLINE ? "polyline" : "polygon", |
| | 720 | + klazz, id, atts); |
| | 721 | + } |
| | 722 | + |
| | 723 | +@@ -160,7 +160,7 @@ |
| | 724 | + g_string_append (d, g_ascii_dtostr (buf, sizeof (buf), poly->pointlist[i + 1])); |
| | 725 | + } |
| | 726 | + |
| | 727 | +- if (!poly->is_polyline) |
| | 728 | ++ if (RSVG_NODE_TYPE (self) == RSVG_NODE_TYPE_POLYGON) |
| | 729 | + g_string_append (d, " Z"); |
| | 730 | + |
| | 731 | + rsvg_state_reinherit_top (ctx, self->state, dominate); |
| | 732 | +@@ -181,16 +181,15 @@ |
| | 733 | + |
| | 734 | + |
| | 735 | + static RsvgNode * |
| | 736 | +-rsvg_new_any_poly (gboolean is_polyline) |
| | 737 | ++rsvg_new_any_poly (RsvgNodeType type) |
| | 738 | + { |
| | 739 | + RsvgNodePoly *poly; |
| | 740 | + poly = g_new (RsvgNodePoly, 1); |
| | 741 | +- _rsvg_node_init (&poly->super); |
| | 742 | ++ _rsvg_node_init (&poly->super, type); |
| | 743 | + poly->super.free = _rsvg_node_poly_free; |
| | 744 | + poly->super.draw = _rsvg_node_poly_draw; |
| | 745 | + poly->super.set_atts = _rsvg_node_poly_set_atts; |
| | 746 | + poly->pointlist = NULL; |
| | 747 | +- poly->is_polyline = is_polyline; |
| | 748 | + poly->pointlist_len = 0; |
| | 749 | + return &poly->super; |
| | 750 | + } |
| | 751 | +@@ -198,13 +197,13 @@ |
| | 752 | + RsvgNode * |
| | 753 | + rsvg_new_polygon (void) |
| | 754 | + { |
| | 755 | +- return rsvg_new_any_poly (FALSE); |
| | 756 | ++ return rsvg_new_any_poly (RSVG_NODE_TYPE_POLYGON); |
| | 757 | + } |
| | 758 | + |
| | 759 | + RsvgNode * |
| | 760 | + rsvg_new_polyline (void) |
| | 761 | + { |
| | 762 | +- return rsvg_new_any_poly (TRUE); |
| | 763 | ++ return rsvg_new_any_poly (RSVG_NODE_TYPE_POLYLINE); |
| | 764 | + } |
| | 765 | + |
| | 766 | + |
| | 767 | +@@ -275,7 +274,7 @@ |
| | 768 | + { |
| | 769 | + RsvgNodeLine *line; |
| | 770 | + line = g_new (RsvgNodeLine, 1); |
| | 771 | +- _rsvg_node_init (&line->super); |
| | 772 | ++ _rsvg_node_init (&line->super, RSVG_NODE_TYPE_LINE); |
| | 773 | + line->super.draw = _rsvg_node_line_draw; |
| | 774 | + line->super.set_atts = _rsvg_node_line_set_atts; |
| | 775 | + line->x1 = line->x2 = line->y1 = line->y2 = _rsvg_css_parse_length ("0"); |
| | 776 | +@@ -451,7 +450,7 @@ |
| | 777 | + { |
| | 778 | + RsvgNodeRect *rect; |
| | 779 | + rect = g_new (RsvgNodeRect, 1); |
| | 780 | +- _rsvg_node_init (&rect->super); |
| | 781 | ++ _rsvg_node_init (&rect->super, RSVG_NODE_TYPE_RECT); |
| | 782 | + rect->super.draw = _rsvg_node_rect_draw; |
| | 783 | + rect->super.set_atts = _rsvg_node_rect_set_atts; |
| | 784 | + rect->x = rect->y = rect->w = rect->h = rect->rx = rect->ry = _rsvg_css_parse_length ("0"); |
| | 785 | +@@ -577,7 +576,7 @@ |
| | 786 | + { |
| | 787 | + RsvgNodeCircle *circle; |
| | 788 | + circle = g_new (RsvgNodeCircle, 1); |
| | 789 | +- _rsvg_node_init (&circle->super); |
| | 790 | ++ _rsvg_node_init (&circle->super, RSVG_NODE_TYPE_CIRCLE); |
| | 791 | + circle->super.draw = _rsvg_node_circle_draw; |
| | 792 | + circle->super.set_atts = _rsvg_node_circle_set_atts; |
| | 793 | + circle->cx = circle->cy = circle->r = _rsvg_css_parse_length ("0"); |
| | 794 | +@@ -703,7 +702,7 @@ |
| | 795 | + { |
| | 796 | + RsvgNodeEllipse *ellipse; |
| | 797 | + ellipse = g_new (RsvgNodeEllipse, 1); |
| | 798 | +- _rsvg_node_init (&ellipse->super); |
| | 799 | ++ _rsvg_node_init (&ellipse->super, RSVG_NODE_TYPE_ELLIPSE); |
| | 800 | + ellipse->super.draw = _rsvg_node_ellipse_draw; |
| | 801 | + ellipse->super.set_atts = _rsvg_node_ellipse_set_atts; |
| | 802 | + ellipse->cx = ellipse->cy = ellipse->rx = ellipse->ry = _rsvg_css_parse_length ("0"); |
| | 803 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-shapes.h librsvg-2.26.3.new//rsvg-shapes.h |
| | 804 | +--- librsvg-2.26.3//rsvg-shapes.h 2010-04-30 16:06:54.000000000 -0700 |
| | 805 | +@@ -34,7 +34,7 @@ |
| | 806 | + |
| | 807 | + G_BEGIN_DECLS |
| | 808 | + |
| | 809 | +-RsvgNode * rsvg_new_path (void); |
| | 810 | ++RsvgNode *rsvg_new_path (void); |
| | 811 | + RsvgNode *rsvg_new_polygon (void); |
| | 812 | + RsvgNode *rsvg_new_polyline (void); |
| | 813 | + RsvgNode *rsvg_new_line (void); |
| | 814 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-structure.c librsvg-2.26.3.new//rsvg-structure.c |
| | 815 | +--- librsvg-2.26.3//rsvg-structure.c 2010-04-30 04:58:55.000000000 -0700 |
| | 816 | +@@ -103,8 +103,10 @@ |
| | 817 | + } |
| | 818 | + |
| | 819 | + void |
| | 820 | +-_rsvg_node_init (RsvgNode * self) |
| | 821 | ++_rsvg_node_init (RsvgNode * self, |
| | 822 | ++ RsvgNodeType type) |
| | 823 | + { |
| | 824 | ++ self->type = type; |
| | 825 | + self->parent = NULL; |
| | 826 | + self->children = g_ptr_array_new (); |
| | 827 | + self->state = g_new (RsvgState, 1); |
| | 828 | +@@ -112,7 +114,6 @@ |
| | 829 | + self->free = _rsvg_node_free; |
| | 830 | + self->draw = _rsvg_node_draw_nothing; |
| | 831 | + self->set_atts = _rsvg_node_dont_set_atts; |
| | 832 | +- self->type = NULL; |
| | 833 | + } |
| | 834 | + |
| | 835 | + void |
| | 836 | +@@ -124,8 +125,6 @@ |
| | 837 | + } |
| | 838 | + if (self->children != NULL) |
| | 839 | + g_ptr_array_free (self->children, TRUE); |
| | 840 | +- if (self->type != NULL) |
| | 841 | +- g_string_free (self->type, TRUE); |
| | 842 | + } |
| | 843 | + |
| | 844 | + void |
| | 845 | +@@ -157,7 +156,7 @@ |
| | 846 | + { |
| | 847 | + RsvgNodeGroup *group; |
| | 848 | + group = g_new (RsvgNodeGroup, 1); |
| | 849 | +- _rsvg_node_init (&group->super); |
| | 850 | ++ _rsvg_node_init (&group->super, RSVG_NODE_TYPE_GROUP); |
| | 851 | + group->super.draw = _rsvg_node_draw_children; |
| | 852 | + group->super.set_atts = rsvg_node_group_set_atts; |
| | 853 | + return &group->super; |
| | 854 | +@@ -166,8 +165,8 @@ |
| | 855 | + void |
| | 856 | + rsvg_pop_def_group (RsvgHandle * ctx) |
| | 857 | + { |
| | 858 | +- if (ctx->priv->currentnode != NULL) |
| | 859 | +- ctx->priv->currentnode = ctx->priv->currentnode->parent; |
| | 860 | ++ g_assert (ctx->priv->currentnode != NULL); |
| | 861 | ++ ctx->priv->currentnode = ctx->priv->currentnode->parent; |
| | 862 | + } |
| | 863 | + |
| | 864 | + void |
| | 865 | +@@ -218,7 +217,7 @@ |
| | 866 | + return; |
| | 867 | + |
| | 868 | + state = rsvg_state_current (ctx); |
| | 869 | +- if (strcmp (child->type->str, "symbol")) { |
| | 870 | ++ if (RSVG_NODE_TYPE (child) != RSVG_NODE_TYPE_SYMBOL) { |
| | 871 | + _rsvg_affine_translate (affine, x, y); |
| | 872 | + _rsvg_affine_multiply (state->affine, affine, state->affine); |
| | 873 | + |
| | 874 | +@@ -384,7 +383,7 @@ |
| | 875 | + { |
| | 876 | + RsvgNodeSvg *svg; |
| | 877 | + svg = g_new (RsvgNodeSvg, 1); |
| | 878 | +- _rsvg_node_init (&svg->super); |
| | 879 | ++ _rsvg_node_init (&svg->super, RSVG_NODE_TYPE_SVG); |
| | 880 | + svg->vbox.active = FALSE; |
| | 881 | + svg->preserve_aspect_ratio = RSVG_ASPECT_RATIO_XMID_YMID; |
| | 882 | + svg->x = _rsvg_css_parse_length ("0"); |
| | 883 | +@@ -430,7 +429,7 @@ |
| | 884 | + { |
| | 885 | + RsvgNodeUse *use; |
| | 886 | + use = g_new (RsvgNodeUse, 1); |
| | 887 | +- _rsvg_node_init (&use->super); |
| | 888 | ++ _rsvg_node_init (&use->super, RSVG_NODE_TYPE_USE); |
| | 889 | + use->super.draw = rsvg_node_use_draw; |
| | 890 | + use->super.set_atts = rsvg_node_use_set_atts; |
| | 891 | + use->x = _rsvg_css_parse_length ("0"); |
| | 892 | +@@ -471,7 +470,7 @@ |
| | 893 | + { |
| | 894 | + RsvgNodeSymbol *symbol; |
| | 895 | + symbol = g_new (RsvgNodeSymbol, 1); |
| | 896 | +- _rsvg_node_init (&symbol->super); |
| | 897 | ++ _rsvg_node_init (&symbol->super, RSVG_NODE_TYPE_SYMBOL); |
| | 898 | + symbol->vbox.active = FALSE; |
| | 899 | + symbol->preserve_aspect_ratio = RSVG_ASPECT_RATIO_XMID_YMID; |
| | 900 | + symbol->super.draw = _rsvg_node_draw_nothing; |
| | 901 | +@@ -484,7 +483,7 @@ |
| | 902 | + { |
| | 903 | + RsvgNodeGroup *group; |
| | 904 | + group = g_new (RsvgNodeGroup, 1); |
| | 905 | +- _rsvg_node_init (&group->super); |
| | 906 | ++ _rsvg_node_init (&group->super, RSVG_NODE_TYPE_DEFS); |
| | 907 | + group->super.draw = _rsvg_node_draw_nothing; |
| | 908 | + group->super.set_atts = rsvg_node_group_set_atts; |
| | 909 | + return &group->super; |
| | 910 | +@@ -519,7 +518,7 @@ |
| | 911 | + { |
| | 912 | + RsvgNodeGroup *group; |
| | 913 | + group = g_new (RsvgNodeGroup, 1); |
| | 914 | +- _rsvg_node_init (&group->super); |
| | 915 | ++ _rsvg_node_init (&group->super, RSVG_NODE_TYPE_SWITCH); |
| | 916 | + group->super.draw = _rsvg_node_switch_draw; |
| | 917 | + group->super.set_atts = rsvg_node_group_set_atts; |
| | 918 | + return &group->super; |
| | 919 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-structure.h librsvg-2.26.3.new//rsvg-structure.h |
| | 920 | +--- librsvg-2.26.3//rsvg-structure.h 2010-04-30 04:59:50.000000000 -0700 |
| | 921 | +@@ -36,7 +36,7 @@ |
| | 922 | + |
| | 923 | + G_BEGIN_DECLS |
| | 924 | + |
| | 925 | +-RsvgNode * rsvg_new_use (void); |
| | 926 | ++RsvgNode *rsvg_new_use (void); |
| | 927 | + RsvgNode *rsvg_new_symbol (void); |
| | 928 | + RsvgNode *rsvg_new_svg (void); |
| | 929 | + RsvgNode *rsvg_new_defs (void); |
| | 930 | +@@ -50,6 +50,7 @@ |
| | 931 | + |
| | 932 | + struct _RsvgNodeGroup { |
| | 933 | + RsvgNode super; |
| | 934 | ++ char *name; |
| | 935 | + }; |
| | 936 | + |
| | 937 | + struct _RsvgNodeSymbol { |
| | 938 | +@@ -80,7 +81,7 @@ |
| | 939 | + void _rsvg_node_draw_children (RsvgNode * self, RsvgDrawingCtx * ctx, int dominate); |
| | 940 | + void _rsvg_node_finalize (RsvgNode * self); |
| | 941 | + void _rsvg_node_free (RsvgNode * self); |
| | 942 | +-void _rsvg_node_init (RsvgNode * self); |
| | 943 | ++void _rsvg_node_init (RsvgNode * self, RsvgNodeType type); |
| | 944 | + void _rsvg_node_svg_apply_atts (RsvgNodeSvg * self, RsvgHandle * ctx); |
| | 945 | + |
| | 946 | + G_END_DECLS |
| | 947 | +diff -Nur -x '*.orig' -x '*~' librsvg-2.26.3//rsvg-text.c librsvg-2.26.3.new//rsvg-text.c |
| | 948 | +--- librsvg-2.26.3//rsvg-text.c 2010-04-30 05:02:19.000000000 -0700 |
| | 949 | +@@ -181,17 +181,19 @@ |
| | 950 | + rsvg_push_discrete_layer (ctx); |
| | 951 | + for (i = 0; i < self->children->len; i++) { |
| | 952 | + RsvgNode *node = g_ptr_array_index (self->children, i); |
| | 953 | +- if (!strcmp (node->type->str, "RSVG_NODE_CHARS")) { |
| | 954 | ++ RsvgNodeType type = RSVG_NODE_TYPE (node); |
| | 955 | ++ |
| | 956 | ++ if (type == RSVG_NODE_TYPE_CHARS) { |
| | 957 | + RsvgNodeChars *chars = (RsvgNodeChars *) node; |
| | 958 | + GString *str = _rsvg_text_chomp (rsvg_state_current (ctx), chars->contents, lastwasspace); |
| | 959 | + rsvg_text_render_text (ctx, str->str, x, y); |
| | 960 | + g_string_free (str, TRUE); |
| | 961 | +- } else if (!strcmp (node->type->str, "tspan")) { |
| | 962 | ++ } else if (type == RSVG_NODE_TYPE_TSPAN) { |
| | 963 | + RsvgNodeText *tspan = (RsvgNodeText *) node; |
| | 964 | + rsvg_state_push (ctx); |
| | 965 | + _rsvg_node_text_type_tspan (tspan, ctx, x, y, lastwasspace); |
| | 966 | + rsvg_state_pop (ctx); |
| | 967 | +- } else if (!strcmp (node->type->str, "tref")) { |
| | 968 | ++ } else if (type == RSVG_NODE_TYPE_TREF) { |
| | 969 | + RsvgNodeTref *tref = (RsvgNodeTref *) node; |
| | 970 | + _rsvg_node_text_type_tref (tref, ctx, x, y, lastwasspace); |
| | 971 | + } |
| | 972 | +@@ -217,17 +219,19 @@ |
| | 973 | + int out = FALSE; |
| | 974 | + for (i = 0; i < self->children->len; i++) { |
| | 975 | + RsvgNode *node = g_ptr_array_index (self->children, i); |
| | 976 | ++ RsvgNodeType type = RSVG_NODE_TYPE (node); |
| | 977 | ++ |
| | 978 | + rsvg_state_push (ctx); |
| | 979 | + rsvg_state_reinherit_top (ctx, node->state, 0); |
| | 980 | +- if (!strcmp (node->type->str, "RSVG_NODE_CHARS")) { |
| | 981 | ++ if (type == RSVG_NODE_TYPE_CHARS) { |
| | 982 | + RsvgNodeChars *chars = (RsvgNodeChars *) node; |
| | 983 | + GString *str = _rsvg_text_chomp (rsvg_state_current (ctx), chars->contents, lastwasspace); |
| | 984 | + *x += rsvg_text_length_text_as_string (ctx, str->str); |
| | 985 | + g_string_free (str, TRUE); |
| | 986 | +- } else if (!strcmp (node->type->str, "tspan")) { |
| | 987 | ++ } else if (type == RSVG_NODE_TYPE_TSPAN) { |
| | 988 | + RsvgNodeText *tspan = (RsvgNodeText *) node; |
| | 989 | + out = _rsvg_node_text_length_tspan (tspan, ctx, x, lastwasspace); |
| | 990 | +- } else if (!strcmp (node->type->str, "tref")) { |
| | 991 | ++ } else if (type == RSVG_NODE_TYPE_TREF) { |
| | 992 | + RsvgNodeTref *tref = (RsvgNodeTref *) node; |
| | 993 | + out = _rsvg_node_text_length_tref (tref, ctx, x, lastwasspace); |
| | 994 | + } |
| | 995 | +@@ -270,7 +274,7 @@ |
| | 996 | + { |
| | 997 | + RsvgNodeText *text; |
| | 998 | + text = g_new (RsvgNodeText, 1); |
| | 999 | +- _rsvg_node_init (&text->super); |
| | 1000 | ++ _rsvg_node_init (&text->super, RSVG_NODE_TYPE_TEXT); |
| | 1001 | + text->super.draw = _rsvg_node_text_draw; |
| | 1002 | + text->super.set_atts = _rsvg_node_text_set_atts; |
| | 1003 | + text->x = text->y = text->dx = text->dy = _rsvg_css_parse_length ("0"); |
| | 1004 | +@@ -342,7 +346,7 @@ |
| | 1005 | + { |
| | 1006 | + RsvgNodeText *text; |
| | 1007 | + text = g_new (RsvgNodeText, 1); |
| | 1008 | +- _rsvg_node_init (&text->super); |
| | 1009 | ++ _rsvg_node_init (&text->super, RSVG_NODE_TYPE_TSPAN); |
| | 1010 | + text->super.set_atts = _rsvg_node_tspan_set_atts; |
| | 1011 | + text->x.factor = text->y.factor = 'n'; |
| | 1012 | + text->dx = text->dy = _rsvg_css_parse_length ("0"); |
| | 1013 | +@@ -385,7 +389,7 @@ |
| | 1014 | + { |
| | 1015 | + RsvgNodeTref *text; |
| | 1016 | + text = g_new (RsvgNodeTref, 1); |
| | 1017 | +- _rsvg_node_init (&text->super); |
| | 1018 | ++ _rsvg_node_init (&text->super, RSVG_NODE_TYPE_TREF); |
| | 1019 | + text->super.set_atts = _rsvg_node_tref_set_atts; |
| | 1020 | + text->link = NULL; |
| | 1021 | + return &text->super; |
| Property changes on: trunk/debs/librsvg/debian/patches/store-node-type-separately.patch |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 1022 | + native |
| Index: trunk/debs/librsvg/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" |
| Property changes on: trunk/debs/librsvg/debian/patches/manpage.patch |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 12 | + native |
| Index: trunk/debs/librsvg/debian/patches/99_ltmain_as-needed.patch |
| — | — | @@ -0,0 +1,30 @@ |
| | 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/^ //"` |
| | 5 | + ;; |
| | 6 | + |
| | 7 | ++ -Wl,--as-needed) |
| | 8 | ++ deplibs="$deplibs $arg" |
| | 9 | ++ continue |
| | 10 | ++ ;; |
| | 11 | ++ |
| | 12 | + -Wl,*) |
| | 13 | + args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` |
| | 14 | + arg= |
| | 15 | +@@ -2137,6 +2142,15 @@ |
| | 16 | + lib= |
| | 17 | + found=no |
| | 18 | + case $deplib in |
| | 19 | ++ -Wl,--as-needed) |
| | 20 | ++ if test "$linkmode,$pass" = "prog,link"; then |
| | 21 | ++ compile_deplibs="$deplib $compile_deplibs" |
| | 22 | ++ finalize_deplibs="$deplib $finalize_deplibs" |
| | 23 | ++ else |
| | 24 | ++ deplibs="$deplib $deplibs" |
| | 25 | ++ fi |
| | 26 | ++ continue |
| | 27 | ++ ;; |
| | 28 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
| | 29 | + if test "$linkmode,$pass" = "prog,link"; then |
| | 30 | + compile_deplibs="$deplib $compile_deplibs" |
| Property changes on: trunk/debs/librsvg/debian/patches/99_ltmain_as-needed.patch |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 31 | + native |
| Index: trunk/debs/librsvg/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 |
| Property changes on: trunk/debs/librsvg/debian/patches/rsvg-gz.patch |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 22 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-dev.postinst |
| — | — | @@ -0,0 +1,10 @@ |
| | 2 | +#! /bin/sh |
| | 3 | +set -e |
| | 4 | + |
| | 5 | +DOCDIR=/usr/share/gtk-doc/html/rsvg |
| | 6 | + |
| | 7 | +if [ -d $DOCDIR -a ! -L $DOCDIR ]; then |
| | 8 | + rmdir $DOCDIR && ln -s ../../doc/librsvg2-dev/html $DOCDIR || true |
| | 9 | +fi |
| | 10 | + |
| | 11 | +#DEBHELPER# |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-dev.postinst |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 12 | + native |
| Index: trunk/debs/librsvg/debian/rsvg-view.1 |
| — | — | @@ -0,0 +1,58 @@ |
| | 2 | +.TH rsvg-view 1 |
| | 3 | +.SH NAME |
| | 4 | +rsvg-view \- Display SVG files |
| | 5 | +.SH SYNOPSIS |
| | 6 | +.B rsvg-view |
| | 7 | +.I [options] |
| | 8 | +file.svg |
| | 9 | +.I "" |
| | 10 | +.SH DESCRIPTION |
| | 11 | +RSVG displays SVG images on the screen. |
| | 12 | +.SS OPTIONS |
| | 13 | +.TP |
| | 14 | +.I "\-i \-\-xid int" |
| | 15 | +XWindow ID (for X11 embedding). |
| | 16 | +.TP |
| | 17 | +.I "\-s \-\-stdin |
| | 18 | +Read from stdin instead of a file. |
| | 19 | +.TP |
| | 20 | +.I "\-d \-\-dpi number" |
| | 21 | +Set the resolution of the image in pixels per inch. RSVG's current default is 90dpi. |
| | 22 | +.TP |
| | 23 | +.I "\-x \-\-x\-zoom number" |
| | 24 | +X Zoom factor, as a percentage. If unspecified, 1.0 is used as the default. |
| | 25 | +.TP |
| | 26 | +.I "\-y \-\-y\-zoom number" |
| | 27 | +Y Zoom factor, as a percentage. If unspecified, 1.0 is used as the default. |
| | 28 | +.TP |
| | 29 | +.I "\-w \-\-width integer" |
| | 30 | +Specify how wide you wish the image to be. If unspecified, the natural width of the image is used as the default. |
| | 31 | +.TP |
| | 32 | +.I "\-h \-\-height integer" |
| | 33 | +Specify how tall you wish the image to be. If unspecified, the natural height of the image is used as the default. |
| | 34 | +.TP |
| | 35 | +.I "\-b \-\-bgcolor string" |
| | 36 | +Set the image background color (default: transparent). |
| | 37 | +.TP |
| | 38 | +.I "\-k \-\-keep\-aspect" |
| | 39 | +Preserve the image's aspect ratio. |
| | 40 | +.TP |
| | 41 | +.I "\-? \-\-help" |
| | 42 | +Show a short help message. |
| | 43 | +.TP |
| | 44 | +.I "\-\-usage" |
| | 45 | +Display a brief usage message. |
| | 46 | +.TP |
| | 47 | +.I "\-v \-\-version" |
| | 48 | +Display what version of rsvg-view this is. |
| | 49 | +.SH MORE INFORMATION |
| | 50 | +.B http://www.gnome.org/ |
| | 51 | +.br |
| | 52 | +.B http://librsvg.sourceforge.net/ |
| | 53 | +.br |
| | 54 | +.B http://www.w3.org/TR/SVG11/ |
| | 55 | +.SH "AUTHORS" |
| | 56 | +This manpage was written for the Debian project by Paul Brossier |
| | 57 | +<piem@altern.org>, based on the similar rsvg upstream manpage, originally |
| | 58 | +written by Dom Lachowicz (cinamod@hotmail.com), Alex Larsson (alex@redhat.com), |
| | 59 | +and a host of others. |
| Property changes on: trunk/debs/librsvg/debian/rsvg-view.1 |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 60 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-bin.manpages |
| — | — | @@ -0,0 +1 @@ |
| | 2 | +debian/rsvg-view.1 |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-bin.manpages |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/debs/librsvg/debian/rules |
| — | — | @@ -0,0 +1,27 @@ |
| | 2 | +#!/usr/bin/make -f |
| | 3 | + |
| | 4 | +include /usr/share/cdbs/1/rules/debhelper.mk |
| | 5 | +include /usr/share/cdbs/1/class/gnome.mk |
| | 6 | +include /usr/share/cdbs/1/rules/simple-patchsys.mk |
| | 7 | +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk |
| | 8 | +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk |
| | 9 | + |
| | 10 | +ifeq ($(DEB_BUILD_ARCH),alpha) |
| | 11 | + CFLAGS += -mieee |
| | 12 | +endif |
| | 13 | + |
| | 14 | +LIBRSVG2_PKG := librsvg2-2 |
| | 15 | + |
| | 16 | +binary-install/librsvg2-common:: |
| | 17 | + LD_LIBRARY_PATH=debian/$(LIBRSVG2_PKG)/usr/lib:$(LD_LIBRARY_PATH) \ |
| | 18 | + dh_gtkmodules -plibrsvg2-common |
| | 19 | + |
| | 20 | +binary-install/librsvg2-bin:: |
| | 21 | + dh_pysupport -plibrsvg2-bin |
| | 22 | + |
| | 23 | +DEB_CONFIGURE_EXTRA_FLAGS += --enable-pixbuf-loader --with-croco \ |
| | 24 | + --with-svgz --disable-gnome-vfs |
| | 25 | + |
| | 26 | +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed |
| | 27 | + |
| | 28 | +DEB_DH_MAKESHLIBS_ARGS_$(LIBRSVG2_PKG) += -V '$(LIBRSVG2_PKG) (>= 2.26.0)' |
| Property changes on: trunk/debs/librsvg/debian/rules |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 29 | + native |
| Added: svn:executable |
| 2 | 30 | + * |
| Index: trunk/debs/librsvg/debian/librsvg2-2.install |
| — | — | @@ -0,0 +1 @@ |
| | 2 | +debian/tmp/usr/lib/lib*.so.* |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-2.install |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-bin.install |
| — | — | @@ -0,0 +1,3 @@ |
| | 2 | +debian/tmp/usr/share/man |
| | 3 | +debian/tmp/usr/bin |
| | 4 | +debian/tmp/usr/share/pixmaps |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-bin.install |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 5 | + native |
| Index: trunk/debs/librsvg/debian/watch |
| — | — | @@ -0,0 +1,2 @@ |
| | 2 | +version=2 |
| | 3 | +http://ftp.gnome.org/pub/gnome/sources/librsvg/([\d\.]+)[02468]/librsvg-([\d\.]+)\.tar\.gz |
| Property changes on: trunk/debs/librsvg/debian/watch |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 4 | + native |
| Index: trunk/debs/librsvg/debian/copyright |
| — | — | @@ -0,0 +1,30 @@ |
| | 2 | +This package was debianized by Takuo KITAME <kitame@northeye.org> on |
| | 3 | +Sat, 21 Apr 2001 05:12:02 +0900. |
| | 4 | + |
| | 5 | +It was downloaded from: |
| | 6 | + <http://ftp.gnome.org/pub/GNOME/sources/librsvg/> |
| | 7 | + |
| | 8 | + |
| | 9 | + Copyright (C) 2000 Eazel, Inc. |
| | 10 | + Copyright (C) 2002 Dom Lachowicz <cinamod@hotmail.com> |
| | 11 | + |
| | 12 | + This program is free software; you can redistribute it and/or |
| | 13 | + modify it under the terms of the GNU Library General Public License as |
| | 14 | + published by the Free Software Foundation; either version 2 of the |
| | 15 | + License, or (at your option) any later version. |
| | 16 | + |
| | 17 | + This program is distributed in the hope that it will be useful, |
| | 18 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 19 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| | 20 | + Library General Public License for more details. |
| | 21 | + |
| | 22 | + You should have received a copy of the GNU Library General Public |
| | 23 | + License along with this program; if not, write to the Free Software |
| | 24 | + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, |
| | 25 | + USA. |
| | 26 | + |
| | 27 | + Author: Raph Levien <raph@artofcode.com> |
| | 28 | + |
| | 29 | +see also |
| | 30 | + /usr/share/common-licenses/LGPL |
| | 31 | + |
| Property changes on: trunk/debs/librsvg/debian/copyright |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 32 | + native |
| Index: trunk/debs/librsvg/debian/librsvg2-dev.install |
| — | — | @@ -0,0 +1,5 @@ |
| | 2 | +debian/tmp/usr/include |
| | 3 | +debian/tmp/usr/lib/lib*.a |
| | 4 | +debian/tmp/usr/lib/lib*.so |
| | 5 | +debian/tmp/usr/lib/pkgconfig |
| | 6 | +debian/tmp/usr/share/gtk-doc/html/rsvg/* usr/share/doc/librsvg2-dev/html/ |
| Property changes on: trunk/debs/librsvg/debian/librsvg2-dev.install |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 7 | + native |