OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2005 14:05:32
Branch: HEAD Handle: 2005102213053100
Modified files:
openpkg-src/librsvg librsvg.patch librsvg.spec
Log:
upgrading package: librsvg 2.12.7 -> 2.13.0
Summary:
Revision Changes Path
1.5 +15 -4 openpkg-src/librsvg/librsvg.patch
1.17 +14 -11 openpkg-src/librsvg/librsvg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/librsvg/librsvg.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 librsvg.patch
--- openpkg-src/librsvg/librsvg.patch 17 Sep 2005 18:46:32 -0000 1.4
+++ openpkg-src/librsvg/librsvg.patch 22 Oct 2005 12:05:31 -0000 1.5
@@ -1,12 +1,23 @@
Index: librsvg-2.0.pc.in
---- librsvg-2.0.pc.in.orig 2004-06-05 02:23:35 +0200
-+++ librsvg-2.0.pc.in 2005-08-13 11:10:12 +0200
+--- librsvg-2.0.pc.in.orig 2005-07-21 02:46:07 +0200
++++ librsvg-2.0.pc.in 2005-10-22 13:54:27 +0200
@@ -6,6 +6,6 @@
Name: librsvg
Description: library that renders svg files
Version: @VERSION@
-Requires: glib-2.0 gdk-pixbuf-2.0
--Libs: -L${libdir} -lrsvg-2
+Requires: glib-2.0 gdk-pixbuf-2.0 pangoft2 libxml-2.0 libart-2.0
-+Libs: -L${libdir} -lrsvg-2
+ Libs: -L${libdir} -lrsvg-2 -lrsvg-2-libart
Cflags: -I${includedir}/librsvg-2
+Index: rsvg-art-composite.c
+--- rsvg-art-composite.c.orig 2005-08-07 21:38:44 +0200
++++ rsvg-art-composite.c 2005-10-22 13:58:21 +0200
+@@ -293,7 +293,7 @@
+ GdkPixbuf * temp;
+ out = get_next_out(&operationsleft, in, tos, nos,
intermediate);
+ temp = rsvg_filter_render (filter, in, insidebg, ctx,
+-
(RsvgIRect *)&render->bbox);
++
&render->bbox, "2103");
+ if (render->clippath)
+ rsvg_art_clip_image(temp, render->clippath);
+ rsvg_alpha_blt (temp, render->bbox.x0, render->bbox.y0,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/librsvg/librsvg.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 librsvg.spec
--- openpkg-src/librsvg/librsvg.spec 14 Oct 2005 14:28:18 -0000 1.16
+++ openpkg-src/librsvg/librsvg.spec 22 Oct 2005 12:05:31 -0000 1.17
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 2.12
-%define V_minor 7
+%define V_major 2.13
+%define V_minor 0
# package information
Name: librsvg
@@ -37,7 +37,7 @@
Group: Graphics
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20051014
+Release: 20051022
# list of sources
Source0:
http://ftp.gnome.org/pub/GNOME/sources/librsvg/%{V_major}/librsvg-%{version}.tar.bz2
@@ -48,8 +48,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: libxml, libart, glib2, gtk2, pango, popt
-PreReq: libxml, libart, glib2, gtk2, pango, popt
+BuildPreReq: libxml, libart, cairo, libcroco, libgsf, glib2, gtk2, pango,
popt
+PreReq: libxml, libart, cairo, libcroco, libgsf, glib2, gtk2, pango,
popt
AutoReq: no
AutoReqProv: no
@@ -68,13 +68,8 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst \
- -e 's;^\(SUBDIRS =.*\) moz-plugin\(.*\)$;\1\2;' \
- Makefile.in
%build
- ( echo "ac_cv_path_MOZILLA_CONFIG=no"
- ) >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -82,8 +77,15 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --with-cairo \
+ --with-art \
+ --with-svgz \
+ --with-croco \
+ --disable-gtk-theme \
+ --disable-pixbuf-loader \
+ --disable-mozilla-plugin \
--disable-shared
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -91,6 +93,7 @@
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/mozilla
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/gtk-2.0
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/lib/pkgconfig'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
