Accepting request 19760 from GNOME:Factory

Copy from GNOME:Factory/librsvg based on submit request 19760 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/19760
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librsvg?expand=0&rev=23
This commit is contained in:
OBS User autobuild 2009-09-04 23:32:15 +00:00 committed by Git OBS Bridge
parent 452ea7752d
commit dc7ea657e4
3 changed files with 59 additions and 249 deletions

View File

@ -0,0 +1,45 @@
diff -aurpN librsvg-2.26.0/moz-plugin/moz-plugin.c librsvg-2.26.0.patched/moz-plugin/moz-plugin.c
--- librsvg-2.26.0/moz-plugin/moz-plugin.c 2008-08-20 14:41:00.000000000 +0200
+++ librsvg-2.26.0.patched/moz-plugin/moz-plugin.c 2009-09-02 22:00:21.000000000 +0200
@@ -39,7 +39,11 @@
#define XP_UNIX 1
#define MOZ_X11 1
#include "npapi.h"
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
#include "npupp.h"
+#else
+#include "npfunctions.h"
+#endif
#define DEBUG(x) _svg_plugin_debug x
@@ -561,9 +565,10 @@ NP_Initialize (NPNetscapeFuncs * moz_fun
return NPERR_INVALID_FUNCTABLE_ERROR;
memcpy (&mozilla_funcs, moz_funcs, sizeof (NPNetscapeFuncs));
-
+
plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
plugin_funcs->size = sizeof (NPPluginFuncs);
+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
plugin_funcs->newp = NewNPP_NewProc (svg_plugin_newp);
plugin_funcs->destroy = NewNPP_DestroyProc (svg_plugin_destroy);
plugin_funcs->setwindow = NewNPP_SetWindowProc (svg_plugin_set_window);
@@ -574,6 +579,17 @@ NP_Initialize (NPNetscapeFuncs * moz_fun
plugin_funcs->asfile = NewNPP_StreamAsFileProc (svg_plugin_stream_as_file);
plugin_funcs->write = NewNPP_WriteProc (svg_plugin_write);
plugin_funcs->print = NewNPP_PrintProc (svg_plugin_print);
+#else
+ plugin_funcs->newp = (NPP_NewProcPtr)(svg_plugin_newp);
+ plugin_funcs->destroy = (NPP_DestroyProcPtr)(svg_plugin_destroy);
+ plugin_funcs->setwindow = (NPP_SetWindowProcPtr)(svg_plugin_set_window);
+ plugin_funcs->newstream = (NPP_NewStreamProcPtr)(svg_plugin_new_stream);
+ plugin_funcs->destroystream = (NPP_DestroyStreamProcPtr)(svg_plugin_destroy_stream);
+ plugin_funcs->asfile = (NPP_StreamAsFileProcPtr)(svg_plugin_stream_as_file);
+ plugin_funcs->writeready = (NPP_WriteReadyProcPtr)(svg_plugin_write_ready);
+ plugin_funcs->write = (NPP_WriteProcPtr)(svg_plugin_write);
+ plugin_funcs->print = (NPP_PrintProcPtr)(svg_plugin_print);
+#endif
return NPERR_NO_ERROR;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 2 22:10:26 CEST 2009 - dimstar@opensuse.org
- Add librsvg-xulrunner191.patch to enable building against
xulrunner 1.9.1.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 16 18:35:09 CET 2009 - vuntz@novell.com Mon Mar 16 18:35:09 CET 2009 - vuntz@novell.com

View File

@ -19,7 +19,11 @@
Name: librsvg Name: librsvg
%if 0%{suse_version} > 1110
%define xulrunner_version 191
%else
%define xulrunner_version 190 %define xulrunner_version 190
%endif
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: libcroco-devel BuildRequires: libcroco-devel
BuildRequires: libgsf-devel BuildRequires: libgsf-devel
@ -36,10 +40,12 @@ Obsoletes: librsvg2
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
PreReq: coreutils PreReq: coreutils
Version: 2.26.0 Version: 2.26.0
Release: 1 Release: 2
Summary: A Library for Rendering SVG Data Summary: A Library for Rendering SVG Data
Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2
Patch1: env-paths.diff Patch1: env-paths.diff
# PATCH-FIX-UPSTREAM librsvg-xulrunner191.patch bnc#501397 bgo#593961 dimstar@opensuse.org -- Support building with xulrunner 1.9.1
Patch2: librsvg-xulrunner191.patch
Url: http://librsvg.sourceforge.net/ Url: http://librsvg.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -48,12 +54,6 @@ This package contains a library to render SVG (scalable vector
graphics) data. This format has been specified by the W3C (see graphics) data. This format has been specified by the W3C (see
http://www.w3c.org). http://www.w3c.org).
Authors:
--------
Raph Levien <raph@acm.org>
%package devel %package devel
License: GPL v2 or later License: GPL v2 or later
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
@ -71,12 +71,6 @@ Obsoletes: librsvg-devel-64bit
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
to develop applications that require these. to develop applications that require these.
Authors:
--------
Raph Levien <raph@acm.org>
%package plugin %package plugin
License: GPL v2 or later License: GPL v2 or later
Summary: A Library for Rendering SVG Data - SVG Browser Plugin Summary: A Library for Rendering SVG Data - SVG Browser Plugin
@ -88,12 +82,6 @@ This package contains a library to render SVG (scalable vector
graphics) data. This format has been specified by the W3C (see graphics) data. This format has been specified by the W3C (see
http://www.w3c.org). http://www.w3c.org).
Authors:
--------
Raph Levien <raph@acm.org>
%package -n rsvg-view %package -n rsvg-view
License: LGPL v2.1 or later License: LGPL v2.1 or later
Summary: SVG View using the GNOME Render SVG library Summary: SVG View using the GNOME Render SVG library
@ -105,15 +93,10 @@ This package contains a library to render SVG (scalable vector
graphics) data. This format has been specified by the W3C (see graphics) data. This format has been specified by the W3C (see
http://www.w3c.org). http://www.w3c.org).
Authors:
--------
Raph Levien <raph@acm.org>
%prep %prep
%setup -q %setup -q
%patch1 %patch1
%patch2 -p1
%build %build
%configure\ %configure\
@ -167,227 +150,3 @@ touch var/adm/SuSEconfig/run-gtk
%{_libdir}/browser-plugins/*.so %{_libdir}/browser-plugins/*.so
%changelog %changelog
* Mon Mar 16 2009 vuntz@novell.com
- Update to version 2.26.0:
+ Command-line tools can't handle UTF-8 encoded filenames
(bgo#557036)
+ Background color setting feature in rsvg_convert program
(bgo#556969)
+ Gdmgreeter segfault due to libxml2 API/ABI change (bgo#549087)
+ Plug mem leak (bgo#552919)
+ Stop crash due to recursive references (bgo#518640)
+ Don't use deprecated glib symbols
+ Stray Makefile variables (bgo#558039)
+ -I flag-ordering problem breaks build if system already has lib
installed (bgo#558040)
+ Add rsvg_handle_get_dimensions_sub() (bgo#555682)
+ Add version check macro (bgo#564226)
+ Indicate in the .pc file whether svgz and css support is
available (bgo#564616)
+ Add function to check whether the SVG document contains an
element by ID (bgo#567070)
+ Do not allocate RsvgState in rsvg_new_image() (bgo#557082)
+ Plug mem leak (bgo#562546)
+ Clean up GLib and GTK+ includes (bgo#563789)
+ librsvg can not render text-decoration=underline text
(bgo#566365)
+ Don't use deprecated gdk_pixbuf_unref (bgo#570938)
+ "const static" should be "static const" (bgo#570656)
+ Better error messages (bgo#567307)
+ Crashes on some architectures because of wrong zero check on
doubles (bgo#565371)
+ Filter nodes are leaked (bgo#475851)
+ Plug mem leaks (bgo#444444)
+ Fails to parse SVG with parameter entities (bgo#567311)
* Sat Feb 28 2009 vuntz@novell.com
- Remove BuildRequires: docbook-toys, gtk-doc
- Remove Requires of devel package: libbz2-devel, libart_lgpl-devel
- Remove --with-html-dir configure flag that breaks the doc
install, and non-existing --without-gimp flag.
- Move rsvg binary to librsvg package.
- Remove autoreconf call.
- Use makeinstall.
* Sat Jan 31 2009 vuntz@novell.com
- Remove unneeded BuildRequires: docbook-toys,
libgnomeprintui-devel, update-desktop-files, xmlcharent
- Remove Requires for the devel package: popt-devel, rsvg-view
- Do not have rsvg-view supplement gnome-session: we don't need it
by default on GNOME
- Remove checks for old versions of openSUSE
* Wed Jan 07 2009 olh@suse.de
- obsolete old -XXbit packages (bnc#437293)
* Tue Nov 25 2008 sbrabec@suse.cz
- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164).
* Fri Oct 03 2008 mboman@suse.de
- Update to version 2.22.3:
+ Make librsvg buildable on windows without freetype dependency
+ Fix build and tests
+ Fix the handling of the stroke-dashoffset property
+ Bad rendering for some wacko SVG path data
+ Fix some arcs not being well drawn in SVG path
+ Fix various crashes
+ Set license field of GdkPixBufFormat in the SVG loader
+ Migrate use of GMemChunk to GSlice
+ If an ID is not found, return an error and/or do not render whole SVG
* Tue Jul 22 2008 coolo@suse.de
- switch to xulrunner190 to avoid java dependency for gnome
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support
* Fri Mar 14 2008 maw@suse.de
- Update to version 2.22.2:
+ Bug fixed: bgo#520261.
* Tue Mar 04 2008 maw@suse.de
- Update to version 2.22.1:
+ Text rendering fixes, especially for non-ASCII text
+ Better cairo integratino
+ Use GIO
+ Use GtkPrint.
* Fri Feb 15 2008 dmueller@suse.de
- split off rsvg-view (20kb), removes 6.2MB from the KDE CD
* Tue Jan 29 2008 maw@suse.de
- Remove libtool archives.
* Tue Jan 29 2008 rodrigo@suse.de
- Update to version 2.20.0:
* Fixed memory leaks and segfaults
* Mon Sep 10 2007 maw@suse.de
- Update to version 2.18.2
- librsvg-64bit-warning.patch was necessary due to a typo in
2.18.1; that typo was removed in 2.18.2, and therefore the patch
has been too.
* Thu Aug 30 2007 maw@suse.de
- Update to version 2.18.1:
+ Basic support for SVG 1.1's text-rendering and shape-rendering
properties (bugzilla.gnome.org #464599)
- M-x replace-string RET %%run_ldconfig RET /sbin/ldconfig RET
- Add librsvg-64bit-warning.patch.
* Thu Aug 02 2007 mauro@suse.de
- Updated to 2.18.0
- Bugfixes for #412682, #418823, #401115, #444462, #452823, #448327,
[#444462], #444443, #435129, #409030, #375649, #421697, #421710,
[#427031], #407230, #402246, #402107, #393297, #388545.
* Mon Jul 16 2007 dmueller@suse.de
- move deprecated rsvg command into -devel subpackage.
scripts that break should use rsvg-convert instead
* Sat Mar 17 2007 aj@suse.de
- Require python for rsvg command (#242072).
* Mon Feb 19 2007 maw@suse.de
- Update to version 2.16.1
- Remove librsvg-xulrunner.patch which is now upstream.
* Sun Feb 18 2007 aj@suse.de
- Cleanup BuildRequires.
* Tue Feb 13 2007 sbrabec@suse.cz
- Do not build unusable static libraries (#238552#c17).
* Tue Jan 09 2007 sbrabec@suse.cz
- Patched to build plugin with xulrunner.
* Tue Jan 09 2007 maw@suse.de
- Fix a typo
- (Temporarily) remove the plugin subpackage.
* Tue Jan 09 2007 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Thu Dec 28 2006 jhargadon@suse.de
- removed unused libtool archives (#223654)
* Fri Oct 13 2006 danw@suse.de
- Remove dead patch
* Fri Sep 15 2006 sbrabec@suse.cz
- Removed mDNSResponder-lib from Requires - should be implicit.
* Thu Sep 14 2006 jhargadon@suse.de
- update to version 2.16.0
- librsvg.def: Make export symbols work on OSX
- rsvg-private.h: Some preparation work for color normalization
- Bug 344116: Committed patch from Kouhei Sutou that makes librsvg
use Pango-Cairo instead of PangoFT2+rendering text as a path.
- rsvg-base.c (rsvg_handle_write_impl): Have libxml2 replace entities
for us. This fixes a bug where style definitions don't get properly
expanded, but causes a (2.15.x-only feature) regression when importing
external ENTITIES.
* Wed Aug 23 2006 jhargadon@suse.de
- update to version 2.15.90
- Bug 348329 make gnome-print dependency optional
- Don't leak PangoFt2 fonts (bug 344235)
- Document _render_sub better (bug 346964)
* Mon Aug 14 2006 ro@suse.de
- use wildcard in filelist for gtk2 version
* Fri Jul 28 2006 ro@suse.de
- include rsvg.devhelp2 in filelist
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Oct 13 2005 gekker@suse.de
- Update to version 2.12.7
- Fix use of uninitialized variables
* Fri Sep 16 2005 rodrigo@suse.de
- Update to version 2.12.0
* Mon Sep 05 2005 gekker@suse.de
- Update to version 2.11.1 (GNOME 2.12)
* Fri Aug 12 2005 sbrabec@suse.cz
- Fixed devel requirements (#104295).
* Wed Jun 01 2005 sbrabec@suse.cz
- Fixed devel requirements.
* Sun Feb 06 2005 gekker@suse.de
- Update to version 2.9.5
* Wed Jan 19 2005 ro@suse.de
- fixed filelist
* Wed Dec 22 2004 gekker@suse.de
- Update to version 2.8.1
- Make *.svg and *.devhelp install
* Tue May 04 2004 sbrabec@suse.cz
- Updated to version 2.6.5 (GNOME 2.6).
* Mon Mar 15 2004 sbrabec@suse.cz
- FHS 2.3 fix (mandir, infodir, #35821).
* Wed Mar 10 2004 sbrabec@suse.cz
- Fixed %%postun.
- Fixed doc build.
* Sat Jan 10 2004 adrian@suse.de
- add %%defattr and %%run_ldconfig
* Mon Oct 20 2003 sbrabec@suse.cz
- Do not build SVG plug-in (moved to gimp2 package).
* Wed Oct 08 2003 sbrabec@suse.cz
- Updated to version 2.4.0 (GNOME 2.4).
* Tue Aug 26 2003 sbrabec@suse.cz
- Added Provides/Obsoletes for old name.
* Tue Aug 19 2003 sbrabec@suse.cz
- Package renamed (librsvg2 -> librsvg).
* Sun Jul 27 2003 hhetter@suse.de
- fix build
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Wed Jul 09 2003 sbrabec@suse.cz
- Branched gimp2-svg (to simplify dependences).
* Wed Jun 25 2003 sbrabec@suse.cz
- Updated to version 2.2.5.
- Updated neededforbuild.
- Turned on GIMP plugin, libgsf and SVGZ support.
* Wed Feb 12 2003 hhetter@suse.de
- install the rsvg loader at the default gdk-pixbuf-loader
module location
- updated to version 2.2.3 to critical bugs with SVG themes
* Thu Jan 30 2003 hhetter@suse.de
- force running of SuSEconfig.gtk to register the
librsvg gdk-pixbuf loader
* Tue Jan 28 2003 hhetter@suse.de
- updated to version 2.2.1
- update filelist
- include gdk-pixbuf loaders
* Mon Nov 11 2002 ro@suse.de
- changed neededforbuild <xf86 xdevel> to <x-devel-packages>
* Tue Oct 22 2002 hhetter@suse.de
- remove wrong docdir
- use correct kde datadir
* Fri Sep 27 2002 ro@suse.de
- Added alsa alsa-devel to neededforbuild (esound)
* Tue Aug 13 2002 ro@suse.de
- removed control-center from neededforbuild
* Tue Jul 23 2002 hhetter@suse.de
- updated to version 2.0.1
* trashcan rendering problems fixed
* Tue Jul 23 2002 hhetter@suse.de
- updated to version 2.0.0
* Wed May 15 2002 ro@suse.de
- use libdir
* Mon Apr 15 2002 hhetter@suse.de
- update to version 1.1.6 [gnome desktop beta3]
* Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Thu Jan 24 2002 hhetter@suse.de
- initial SuSE package for GNOME 2.0 platform