Accepting request 35797 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/librsvg via accept of submit request 35797 revision 13. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/35797 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=18
This commit is contained in:
Vincent Untz
Git OBS Bridge
parent
c34351208c
commit
8b27d6ecb1
@ -1,45 +0,0 @@
|
||||
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;
|
||||
}
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 26 13:17:24 CET 2010 - vuntz@opensuse.org
|
||||
|
||||
- Stop building the mozilla plugin: browsers now do support svg, so
|
||||
it's useless.
|
||||
- Remove librsvg-plugin subpackage.
|
||||
- Drop librsvg-xulrunner191.patch and remove
|
||||
mozilla-xulrunner-devel BuildRequires.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 19 12:15:26 CET 2009 - jengelh@medozas.de
|
||||
|
||||
|
||||
49
librsvg.spec
49
librsvg.spec
@ -19,17 +19,19 @@
|
||||
|
||||
|
||||
Name: librsvg
|
||||
%if 0%{suse_version} > 1110
|
||||
%define xulrunner_version 191
|
||||
%else
|
||||
%define xulrunner_version 190
|
||||
%endif
|
||||
Version: 2.26.0
|
||||
Release: 3
|
||||
License: LGPLv2.1+
|
||||
Summary: A Library for Rendering SVG Data
|
||||
Url: http://librsvg.sourceforge.net/
|
||||
Group: System/Libraries
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2
|
||||
Source99: baselibs.conf
|
||||
Patch1: env-paths.diff
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: libcroco-devel
|
||||
BuildRequires: libgsf-devel
|
||||
License: LGPLv2.1+
|
||||
Group: System/Libraries
|
||||
AutoReqProv: on
|
||||
PreReq: coreutils
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: librsvg-64bit
|
||||
@ -37,17 +39,6 @@ Obsoletes: librsvg-64bit
|
||||
#
|
||||
Provides: librsvg2
|
||||
Obsoletes: librsvg2
|
||||
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
|
||||
PreReq: coreutils
|
||||
Version: 2.26.0
|
||||
Release: 3
|
||||
Summary: A Library for Rendering SVG Data
|
||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2
|
||||
Source99: baselibs.conf
|
||||
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/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -72,17 +63,6 @@ Obsoletes: librsvg-devel-64bit
|
||||
This package contains all necessary include files and libraries needed
|
||||
to develop applications that require these.
|
||||
|
||||
%package plugin
|
||||
License: GPLv2+
|
||||
Summary: A Library for Rendering SVG Data - SVG Browser Plugin
|
||||
Group: System/Libraries
|
||||
Requires: %{name} = %{version}
|
||||
|
||||
%description plugin
|
||||
This package contains a library to render SVG (scalable vector
|
||||
graphics) data. This format has been specified by the W3C (see
|
||||
http://www.w3c.org).
|
||||
|
||||
%package -n rsvg-view
|
||||
License: LGPLv2.1+
|
||||
Summary: SVG View using the GNOME Render SVG library
|
||||
@ -97,7 +77,6 @@ http://www.w3c.org).
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%configure\
|
||||
@ -107,9 +86,7 @@ make %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
%makeinstall
|
||||
mv $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins $RPM_BUILD_ROOT%{_libdir}/browser-plugins
|
||||
rmdir $RPM_BUILD_ROOT%{_libdir}/mozilla
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/*.*a $RPM_BUILD_ROOT/%{_libdir}/*/*.*a $RPM_BUILD_ROOT/%{_libdir}/*/*/*/*.*a
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -146,8 +123,4 @@ touch var/adm/SuSEconfig/run-gtk
|
||||
%dir %{_datadir}/gtk-doc
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
|
||||
%files plugin
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/browser-plugins/*.so
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user