Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29468
Modified Files:
librsvg2.info librsvg2.patch
Added Files:
librsvg2-mozilla.info librsvg2-mozilla.patch
Log Message:
new librsvg2
--- NEW FILE: librsvg2-mozilla.patch ---
diff -Naur rsvg-old/Makefile.in rsvg-moz/Makefile.in
--- rsvg-old/Makefile.in 2004-09-12 15:16:35.000000000 -0400
+++ rsvg-moz/Makefile.in 2005-06-20 22:52:32.000000000 -0400
@@ -307,7 +307,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
+SUBDIRS = moz-plugin
@[EMAIL PROTECTED] =
@[EMAIL PROTECTED] = rsvg-view
man_MANS = rsvg.1
@@ -707,7 +707,7 @@
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
+ dot_seen=yes; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
diff -Naur rsvg-old/configure rsvg-moz/configure
--- rsvg-old/configure 2004-09-12 15:16:43.000000000 -0400
+++ rsvg-moz/configure 2005-06-20 21:25:29.000000000 -0400
@@ -1715,7 +1715,7 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+if true; then
# Keeping the `.' argument allows $(mkdir_p) to be used without
# argument. Indeed, we sometimes output rules like
# $(mkdir_p) $(somedir)
diff -Naur rsvg-old/moz-plugin/Makefile.in rsvg-moz/moz-plugin/Makefile.in
--- rsvg-old/moz-plugin/Makefile.in 2004-09-12 15:16:40.000000000 -0400
+++ rsvg-moz/moz-plugin/Makefile.in 2005-06-20 22:52:08.000000000 -0400
@@ -52,7 +52,7 @@
am__DEPENDENCIES_1 =
libmozsvgdec_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(top_builddir)/librsvg-2.la
+ $(am__DEPENDENCIES_1)
am_libmozsvgdec_la_OBJECTS = moz-plugin.lo
libmozsvgdec_la_OBJECTS = $(am_libmozsvgdec_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -245,7 +245,7 @@
libmozsvgdec_la_LIBADD = $(LIBRSVG_LIBS) \
$(LIBGNOME_VFS_LIBS) \
$(LIBGSF_LIBS) $(LIBCROCO_LIBS) \
- $(top_builddir)/librsvg-2.la
+ -lrsvg-2
EXTRA_DIST = moz-plugin.c
all: all-am
Index: librsvg2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/librsvg2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- librsvg2.info 1 May 2005 07:16:47 -0000 1.2
+++ librsvg2.info 21 Jun 2005 04:14:05 -0000 1.3
@@ -1,42 +1,145 @@
Package: librsvg2
-Version: 2.6.5
-Revision: 9
-BuildDependsOnly: true
-Depends: %N-shlibs (= %v-%r), libcroco1-shlibs (>= 0.5.0-1), atk1-shlibs (>=
1.6.0-1), gettext, glib2-shlibs (>= 2.4.0-1), gtk+2-shlibs (>= 2.4.0-1),
libart2-shlibs (>= 2.3.16-1), libiconv, libxml2-shlibs (>= 2.6.7-1),
pango1-xft2-shlibs, popt-shlibs, pkgconfig
-BuildDepends: libcroco1 (>= 0.5.0-1), gconf2-dev (>= 2.6.0-1), gettext-bin,
gettext-tools, gettext-dev, glib2-dev (>= 2.4.0-1), gnome-vfs2-dev (>= 2.6.0-1)
| gnome-vfs2-ssl-dev (>= 2.6.0-1), gtk+2-dev (>= 2.4.0-1), libart2 (>=
2.3.16-1), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev (>= 2.6.0-1),
libgnome2-dev (>= 2.6.0-1), libgnomecanvas2-dev (>= 2.6.0-1), libgnomeui2-dev
(>= 2.6.0-1), libgsf-dev, libjpeg, libiconv-dev, libxml2 (>= 2.6.7-1),
orbit2-dev (>= 2.10.0-1), pango1-xft2-dev (>= 1.4.0-1), popt (>= 1.5),
pkgconfig, gtk-doc (>= 1.2-1), audiofile, esound
-Source: mirror:gnome:sources/librsvg/2.6/librsvg-%v.tar.bz2
-Source-MD5: 2d1d16f9493c80ce8214e585727334ae
+Version: 2.8.1
+Revision: 11
+
+License: GPL/LGPL
+Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
+Description: SAX-based render library for SVG files
+Homepage: http://www.gnome.org/
+
+Source: mirror:gnome:sources/librsvg/2.8/librsvg-%v.tar.bz2
+Source-MD5: 01c14f6adcf3a71be2b808879e1223a0
+
+
Patch: %n.patch
-PatchScript: perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g'
configure
-ConfigureParams: --mandir=%p/share/man --without-gimp
-NoSetLDFLAGS: true
-SetCPPFLAGS: -no-cpp-precomp
-SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
-SetLIBS: -L%p/lib
-InstallScript: make install DESTDIR=%d
-PostInstScript: <<
- if [ configure = "$1" ]; then
- update-gdk-pixbuf-loaders
- fi
+PatchScript: <<
+ perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
+ perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
<<
-PostRmScript: <<
- if [ upgrade != "$1" ]; then
- update-gdk-pixbuf-loaders
- fi
+
+SetLDFLAGS: -L/usr/X11R6/lib
+
+ConfigureParams: --with-svgz --enable-gnome-vfs --with-croco
--enable-gtk-theme --enable-pixbuf-loader --enable-gtk-doc
--mandir=%p/share/man --with-html-dir=%p/share/doc/%n/html
+
+
+CompileScript: <<
+ ac_cv_path_MOZILLA_CONFIG=no ./configure %c
+ make
<<
+
+InstallScript: <<
+ make install DESTDIR=%d
+ rm -r %i/lib/mozilla
+<<
+
+
+DocFiles: AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO
+
+BuildDependsOnly: true
+BuildDepends: <<
+ pkgconfig,
+
+ gtk+2-dev (>= 2.6.7-2),
+ atk1 (>= 1.6.0-1),
+
+ glib2-dev (>= 2.6.4-102),
+
+ libart2 (>= 2.3.17-1),
+
+ pango1-xft2-dev (>= 1.8.1-2),
+
+ popt (>= 1.7-5),
+
+ libgsf-dev (>= 1.9.1-1),
+ libxml2 (>= 2.6.1-1),
+
+ gnome-vfs2-ssl-dev (>= 2.6.1.1-17) | gnome-vfs2-dev (>= 2.6.1.1-17),
+ libbonobo2-dev (>= 2.6.0-1),
+ orbit2-dev (>= 2.10.0-1),
+ gconf2-dev (>= 2.6.0-1),
+
+ libcroco3 (>= 0.6.0-11),
+
+ libgnomeprint2.2-dev (>= 2.6.2-9),
+
+ libgnomeprintui2.2-dev (>= 2.6.2-8),
+ libgnomecanvas2-dev (>= 2.6.0-1),
+
+ x11-dev,
+
+ gtk+2 (>= 2.6.7-2),
+
+ gtk-doc,
+
+ libgettext3-dev,
+ libiconv-dev,
+<<
+Depends: %N-shlibs (= %v-%r)
+
+
SplitOff: <<
- Package: %N-shlibs
- Depends: gettext, glib2-shlibs (>= 2.4.0-1), gtk+2-shlibs (>= 2.4.0-1),
libart2-shlibs (>= 2.3.16-1), libcroco1-shlibs, libgsf-shlibs, libiconv,
libxml2-shlibs (>= 2.6.7-1), pango1-xft2-shlibs (>= 1.4.0-1)
- Files: lib/librsvg-2.*.dylib
- Shlibs: %p/lib/librsvg-2.2.dylib 7.0.0 %n (>= 2.6.0-1)
- DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
+ Package: %N-shlibs
+
+ Depends: <<
+ gconf2-shlibs (>= 2.6.0-1),
+ glib2-shlibs (>= 2.6.4-102),
+ gnome-vfs2-ssl-shlibs (>= 2.6.1.1-17) | gnome-vfs2-shlibs (>=
2.6.1.1-17),
+ gtk+2-shlibs (>= 2.6.7-2),
+ libart2-shlibs (>= 2.3.17-1),
+ libbonobo2-shlibs (>= 2.6.0-1),
+ libgettext3-shlibs,
+ libgsf-shlibs (>= 1.9.1-1),
+ libiconv,
+ libxml2-shlibs (>= 2.6.1-1),
+ orbit2-shlibs (>= 2.10.0-1),
+ pango1-xft2-shlibs (>= 1.8.1-2),
+ popt-shlibs (>= 1.7-5),
+ x11
+ <<
+
+ Files: lib/librsvg-2.*.dylib
+ Shlibs: %p/lib/librsvg-2.2.dylib 11.0.0 %n (>= 2.8.1-11)
+ DocFiles: COPYING*
<<
-DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO
-Description: SAX-based render library for SVG files
+
+SplitOff2: <<
+ Package: %N-gtk
+ Description: Enable GTK to use SVG data
+
+ Depends: %N-shlibs (= %v-%r)
+ Replaces: %N (<< 2.6.5-10)
+
+ Files: <<
+ lib/gtk-2.0/2.4.0/engines/libsvg.so
+ lib/gtk-2.0/2.4.0/loaders/svg_loader.so
+ <<
+ DocFiles: COPYING*
+
+ PostInstScript: <<
+ if [ configure = "$1" ]; then
+ update-gdk-pixbuf-loaders
+ fi
+ <<
+ PostRmScript: <<
+ if [ upgrade != "$1" ]; then
+ update-gdk-pixbuf-loaders
+ fi
+ <<
+<<
+
+SplitOff3: <<
+ Package: %N-bin
+
+ Depends: %N-shlibs (= %v-%r)
+ Replaces: %N (<< 2.6.5-10)
+
+ Files: bin share/man share/pixmaps
+ DocFiles: COPYING*
+<<
+
DescPort: <<
-Patches pkg-config arguments in configure to find freetype2 headers before
-freetype headers.
+ - Use X11 freetype 2.
+ - Put GTK stuff in splitoff.
+ - Disable Mozilla plugin, use librsvg2-mozilla to build that.
+ - Force configure to use mkdir instead of install-sh
<<
-License: GPL/LGPL
-Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
-Homepage: http://www.gnome.org/
--- NEW FILE: librsvg2-mozilla.info ---
Package: librsvg2-mozilla
Version: 2.8.1
Revision: 11
License: GPL/LGPL
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
Description: Mozilla plugin for SVG files
Homepage: http://www.gnome.org/
Source: mirror:gnome:sources/librsvg/2.8/librsvg-%v.tar.bz2
Source-MD5: 01c14f6adcf3a71be2b808879e1223a0
Patch: %n.patch
PatchScript: <<
perl -pi.bak -e 's,need_relink=yes,need_relink=no,g' ltmain.sh
perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
<<
SetLDFLAGS: -L/usr/X11R6/lib
ConfigureParams: --with-svgz --enable-gnome-vfs --with-croco --enable-gtk-theme
--enable-pixbuf-loader --enable-gtk-doc --mandir=%p/share/man
--with-html-dir=%p/share/doc/%n/html
InstallScript: make install DESTDIR=%d
DocFiles: COPYING*
BuildDependsOnly: true
BuildDepends: <<
pkgconfig,
gtk+2-dev (>= 2.6.7-2),
atk1 (>= 1.6.0-1),
glib2-dev (>= 2.6.4-102),
libart2 (>= 2.3.17-1),
pango1-xft2-dev (>= 1.8.1-2),
popt (>= 1.7-5),
libgsf-dev (>= 1.9.1-1),
libxml2 (>= 2.6.1-1),
gnome-vfs2-ssl-dev (>= 2.6.1.1-17) | gnome-vfs2-dev (>= 2.6.1.1-17),
libbonobo2-dev (>= 2.6.0-1),
orbit2-dev (>= 2.10.0-1),
gconf2-dev (>= 2.6.0-1),
libcroco3 (>= 0.6.0-11),
libgnomeprint2.2-dev (>= 2.6.2-9),
libgnomeprintui2.2-dev (>= 2.6.2-8),
libgnomecanvas2-dev (>= 2.6.0-1),
x11-dev,
gtk+2 (>= 2.6.7-2),
libgettext3-dev,
libiconv-dev,
mozilla-dev,
librsvg2 (= %v-%r),
<<
Depends: <<
librsvg2-bin (= %v-%r)
<<
SplitOff: <<
Package: %N-dev
Depends: %N (= %v-%r)
Files: lib/mozilla/plugins/libmozsvgdec.*a
DocFiles: COPYING*
<<
DescPort: <<
- Build this plugin separately so users don't have to have mozilla to
build the rest of rsvg. Disable everything else in this build, since
it's
already in librsvg2.
<<
Index: librsvg2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/gnome/librsvg2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- librsvg2.patch 27 Apr 2005 03:25:41 -0000 1.1
+++ librsvg2.patch 21 Jun 2005 04:14:06 -0000 1.2
@@ -1,46 +1,41 @@
-diff -Naur librsvg-2.6.5-old/Makefile.in librsvg-2.6.5/Makefile.in
---- librsvg-2.6.5-old/Makefile.in 2004-05-01 01:00:01.000000000 -0400
-+++ librsvg-2.6.5/Makefile.in 2004-06-22 11:16:40.000000000 -0400
-@@ -175,6 +175,7 @@
+diff -Naur rsvg-old/Makefile.in rsvg-new/Makefile.in
+--- rsvg-old/Makefile.in 2004-09-12 15:16:35.000000000 -0400
++++ rsvg-new/Makefile.in 2005-06-20 20:30:55.000000000 -0400
+@@ -342,7 +342,7 @@
+ rsvg-cond.c
+ librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-export-dynamic
+-librsvg_2_la_LIBADD = $(LIBRSVG_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS)
$(LIBGNOME_VFS_LIBS)
++librsvg_2_la_LIBADD = $(LIBRSVG_LIBS) $(LIBGSF_LIBS) $(LIBCROCO_LIBS)
$(LIBGNOME_VFS_LIBS) -lfreetype -lfontconfig
+ librsvgincdir = $(includedir)/librsvg-2/librsvg
+ librsvginc_HEADERS = \
+ rsvg-gz.h \
+@@ -350,6 +350,7 @@
+ librsvg-features.h
INCLUDES = \
-+ -I/usr/X11R6/include/freetype2 \
++ -I/usr/X11R6/include \
+ $(LIBGNOME_VFS_CFLAGS) \
$(LIBGSF_CFLAGS) \
$(LIBCROCO_CFLAGS) \
- -I$(top_srcdir) \
-diff -Naur librsvg-2.6.5-old/configure librsvg-2.6.5/configure
---- librsvg-2.6.5-old/configure 2004-05-01 00:59:38.000000000 -0400
-+++ librsvg-2.6.5/configure 2004-06-22 11:14:33.000000000 -0400
-@@ -19201,11 +19201,11 @@
- echo "$as_me:$LINENO: checking LIBRSVG_CFLAGS" >&5
- echo $ECHO_N "checking LIBRSVG_CFLAGS... $ECHO_C" >&6
- LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "\
-+ pangoft2 >= $PANGOFT2_REQUIRED \
- gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
- glib-2.0 >= $GLIB_REQUIRED \
- libart-2.0 >= $LIBART_REQUIRED \
-- libxml-2.0 >= $LIBXML_REQUIRED \
-- pangoft2 >= $PANGOFT2_REQUIRED"`
-+ libxml-2.0 >= $LIBXML_REQUIRED"`
- echo "$as_me:$LINENO: result: $LIBRSVG_CFLAGS" >&5
- echo "${ECHO_T}$LIBRSVG_CFLAGS" >&6
-
-diff -Naur librsvg-2.6.5-old/ltmain.sh librsvg-2.6.5/ltmain.sh
---- librsvg-2.6.5-old/ltmain.sh 2004-04-02 22:18:18.000000000 -0500
-+++ librsvg-2.6.5/ltmain.sh 2004-06-22 11:14:34.000000000 -0400
-@@ -5244,10 +5244,10 @@
+diff -Naur rsvg-old/configure rsvg-new/configure
+--- rsvg-old/configure 2004-09-12 15:16:43.000000000 -0400
++++ rsvg-new/configure 2005-06-20 20:42:43.000000000 -0400
+@@ -1715,7 +1715,7 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
-- if test "$installed" = no && test "$need_relink" = yes; then
-- $echo >> $output "\
--relink_command=\"$relink_command\""
-- fi
-+# if test "$installed" = no && test "$need_relink" = yes; then
-+# $echo >> $output "\
-+#relink_command=\"$relink_command\""
-+# fi
- done
- fi
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++if true; then
+ # Keeping the `.' argument allows $(mkdir_p) to be used without
+ # argument. Indeed, we sometimes output rules like
+ # $(mkdir_p) $(somedir)
+@@ -23549,7 +23549,7 @@
+ echo "$as_me:$LINENO: checking for mozilla-plugin" >&5
+ echo $ECHO_N "checking for mozilla-plugin... $ECHO_C" >&6
+- if $PKG_CONFIG --exists "mozilla-plugin" ; then
++ if false ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
