[csw-devel] SF.net SVN: gar:[14720] csw/mgar/pkg/librsvg/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jun 7 11:14:12 CEST 2011
Revision: 14720
http://gar.svn.sourceforge.net/gar/?rev=14720&view=rev
Author: dmichelsen
Date: 2011-06-07 09:14:12 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
librsvg: Update to 2.34.0 and latest standards
Modified Paths:
--------------
csw/mgar/pkg/librsvg/trunk/Makefile
csw/mgar/pkg/librsvg/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch
csw/mgar/pkg/librsvg/trunk/files/fixme.sh
csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.i
csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.s
csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch
Modified: csw/mgar/pkg/librsvg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:09:41 UTC (rev 14719)
+++ csw/mgar/pkg/librsvg/trunk/Makefile 2011-06-07 09:14:12 UTC (rev 14720)
@@ -1,149 +1,96 @@
NAME = librsvg
-VERSION = 2.26
-GARSUBREV = 0
+VERSION = 2.34.0
CATEGORIES = lib
DESCRIPTION = Scalable Vector Graphics library
define BLURB
- This is librsvg - A high performance SVG rendering library associated with the
- Gnome Project.
-
- If you have questions or comments about librsvg, please send email to
- librsvg-devel at lists.sourceforge.net. Any bugs should be reported to
- http://bugzilla.gnome.org/
-
- Also, more information on librsvg can be found at librsvg.sf.net
+ This is librsvg - A high performance SVG rendering library associated with the Gnome Project.
endef
-SPKG_VERSION= $(VERSION).$(GARSUBREV)
+MASTER_SITES = $(GNOME_MIRROR)
+DISTFILES = $(DISTNAME).tar.bz2
-MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(VERSION)/
-DISTFILES = $(NAME)-$(VERSION).$(GARSUBREV).tar.bz2
+# Upstream develops on gcc only
+PATCHFILES += pdiff.patch
+PATCHFILES += perceptualdiff.patch
-DISTNAME = $(NAME)-$(VERSION).$(GARSUBREV)
+VENDOR_URL = http://librsvg.sourceforge.net
-SPKG_SOURCEURL = http://librsvg.sourceforge.net
-
LICENSE = COPYING.LIB
-PACKAGES = CSWlibrsvg CSWlibrsvgdevel CSWlibrsvgdoc CSWlibrsvgmozilla CSWrsvg CSWlibrsvggnome
+PACKAGES += CSWlibrsvg2-2
+SPKG_DESC_CSWlibrsvg2-2 = Scalable Vector Graphics library, librsvg-2.so.2
+PKGFILES_CSWlibrsvg2-2 += $(call pkgfiles_lib,librsvg-2.so.2)
+OBSOLETED_BY_CSWlibrsvg2-2 = CSWlibrsvg
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpng
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWgtk2
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgsf
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWglib2
-CATALOGNAME_CSWrsvg = rsvg
-CATALOGNAME_CSWlibrsvg = librsvg
-CATALOGNAME_CSWlibrsvggnome = librsvg_gnome
-CATALOGNAME_CSWlibrsvgdevel = librsvg_devel
-CATALOGNAME_CSWlibrsvgdoc = librsvg_doc
-CATALOGNAME_CSWlibrsvgmozilla = librsvg_mozilla
+PACKAGES += CSWlibrsvg-dev
+SPKG_DESC_CSWlibrsvg-dev = Development files for librsvg-2.so.2
+PKGFILES_CSWlibrsvg-dev = $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibrsvg2-2
+OBSOLETED_BY_CSWlibrsvg-dev = CSWlibrsvgdevel
+CATALOGNAME_CSWlibrsvgdevel = librsvg_devel_stub
-SPKG_DESC_CSWrsvg += SVG to raster image conversion utility
-SPKG_DESC_CSWlibrsvg += Scalable Vector Graphics library
-SPKG_DESC_CSWlibrsvgdevel += Scalable Vector Graphics library - developer package
-SPKG_DESC_CSWlibrsvgdoc += Scalable Vector Graphics library - documentation
-SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module
-SPKG_DESC_CSWlibrsvgmozilla += Scalable Vector Graphics library - Mozilla plugin
+PACKAGES += CSWlibrsvg-doc
+SPKG_DESC_CSWlibrsvg-doc = Documentation for librsvg
+PKGFILES_CSWlibrsvg-doc = $(sharedstatedir)/gtk-doc/.*
+ARCHALL_CSWlibrsvg-doc = 1
+OBSOLETED_BY_CSWlibrsvg-doc = CSWlibrsvgdoc
+CATALOGNAME_CSWlibrsvgdoc = librsvg_doc_stub
-RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig
+PACKAGES += CSWrsvg
+SPKG_DESC_CSWrsvg += SVG to raster image conversion utility
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrsvg += CSWpng
RUNTIME_DEP_PKGS_CSWrsvg += CSWftype2
-RUNTIME_DEP_PKGS_CSWrsvg += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo
RUNTIME_DEP_PKGS_CSWrsvg += CSWgtk2
RUNTIME_DEP_PKGS_CSWrsvg += CSWlibatk
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrsvg += CSWpango
RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWrsvg += CSWfconfig
RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgsf
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibrsvg
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibx11
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWrsvg += CSWpango
-RUNTIME_DEP_PKGS_CSWrsvg += CSWpng
+RUNTIME_DEP_PKGS_CSWrsvg += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWbonobo2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgconf2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWgtk2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibcroco
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibgsf
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWorbit2
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWpng
-RUNTIME_DEP_PKGS_CSWlibrsvg += CSWzlib
-
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig
+PACKAGES += CSWlibrsvggnome
+CATALOGNAME_CSWlibrsvggnome = librsvg_gnome
+PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.*
+SPKG_DESC_CSWlibrsvggnome += Scalable Vector Graphics library - Gnome module
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng
RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo
RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWgtk2
RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibatk
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcairo
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2-2
RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWfconfig
RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibgsf
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibrsvg
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpango
-RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWpng
+RUNTIME_DEP_PKGS_CSWlibrsvggnome += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibrsvgdevel += CSWlibrsvg
-RUNTIME_DEP_PKGS_CSWlibrsvgdoc +=
-RUNTIME_DEP_PKGS_CSWlibrsvgmozilla += CSWggettextrt CSWglib2
+BUILD_DEP_PKGS += CSWlibxml2-dev
-PKGFILES_CSWlibrsvg= $(PKGFILES_RT)
-PKGFILES_CSWlibrsvgdevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibrsvggnome = $(libdir)/gtk-2.0/.*
-PKGFILES_CSWlibrsvgmozilla = $(libdir)/mozilla/.*
-PKGFILES_CSWlibrsvgdoc = $(sharedstatedir)/gtk-doc/.*
-
-ARCHALL_CSWlibrsvgdoc = 1
-
-# Only if building mozilla plugin
-BUILD_DEP_PKGS += CSWmozilla
-BUILD_DEP_PKGS += CSWlibxml2devel
-
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
-# Upstream develops on gcc only
-PATCHFILES = pdiff.patch
-PATCHFILES += perceptualdiff.patch
-# Upstream have missed adding some required libs
-PATCHFILES += test_makefiles.patch
-# gtkdoc-rebase doesn't exist (now it does)
-#PATCHFILES += doc_makefile.patch
-
-LIBS=-lm
-EXTRA_COMMON_EXPORTS = LIBS
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --enable-shared=yes --enable-static=no
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
-# We want to be linked with Xrender from $(prefix)/X11/lib not
-# $(prefix)/lib since the latter is linked to /usr/openwin/lib/libX11.so.4
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-#EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
# Won't work until libgsf-1 is 64bit
-#BUILD64 = 1
+# BUILD64 = 1
-STRIP_LIBTOOL=1
+STRIP_LIBTOOL = 1
-TEST_TARGET = check
-
include gar/category.mk
-
-post-install-isa-sparcv8:
- @cp $(FILEDIR)/librsvg-2.so.2.15.90.s $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90
-
-post-install-isa-i386:
- @cp $(FILEDIR)/librsvg-2.so.2.15.90.i $(INSTALLISADIR)/opt/csw/lib/librsvg-2.so.2.15.90
Modified: csw/mgar/pkg/librsvg/trunk/checksums
===================================================================
--- csw/mgar/pkg/librsvg/trunk/checksums 2011-06-07 09:09:41 UTC (rev 14719)
+++ csw/mgar/pkg/librsvg/trunk/checksums 2011-06-07 09:14:12 UTC (rev 14720)
@@ -1,5 +1 @@
-5eddcc7be3ee182c94ee21691720c6aa doc_makefile.patch
-65dbd726a514fe8b797d26254b8efc1e librsvg-2.26.0.tar.bz2
-5b0c0387946c3b7ca7feb913de436936 pdiff.patch
-8a26f6d0d0cf1cfce1a1e0365c6624ce perceptualdiff.patch
-803a5d10e3e9c9a561b397aade043024 test_makefiles.patch
+5eb2fcd0765aa5e47a4999985e3c27ab librsvg-2.34.0.tar.bz2
Deleted: csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch
===================================================================
--- csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch 2011-06-07 09:09:41 UTC (rev 14719)
+++ csw/mgar/pkg/librsvg/trunk/files/doc_makefile.patch 2011-06-07 09:14:12 UTC (rev 14720)
@@ -1,13 +0,0 @@
---- librsvg-2.22.3.orig/doc/Makefile.in 2008-09-23 02:54:51.000000000 +0200
-+++ librsvg-2.22.3/doc/Makefile.in 2009-02-16 14:43:59.506582432 +0100
-@@ -568,8 +568,8 @@
- @GTK_DOC_INSTALLED_TRUE@ done; \
- @GTK_DOC_INSTALLED_TRUE@ echo '-- Installing $(srcdir)/html/index.sgml' ; \
- @GTK_DOC_INSTALLED_TRUE@ $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-- at GTK_DOC_INSTALLED_TRUE@ which gtkdoc-rebase >/dev/null && \
-- at GTK_DOC_INSTALLED_TRUE@ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-+ at GTK_DOC_INSTALLED_TRUE@ #which gtkdoc-rebase >/dev/null && \
-+ at GTK_DOC_INSTALLED_TRUE@ #gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
- @GTK_DOC_INSTALLED_TRUE@ fi
-
- @GTK_DOC_INSTALLED_TRUE at uninstall-local:
Deleted: csw/mgar/pkg/librsvg/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/librsvg/trunk/files/fixme.sh 2011-06-07 09:09:41 UTC (rev 14719)
+++ csw/mgar/pkg/librsvg/trunk/files/fixme.sh 2011-06-07 09:14:12 UTC (rev 14720)
@@ -1,49 +0,0 @@
-#!/bin/bash
-####################################################
-#
-# fixme.sh
-# Intended to remove the use of libtool's
-# pseudo-libraries for opencsw builds.
-#
-# Author: Mike Watters mwatters_at_opencsw.org
-# Initial Version: 0.1
-#
-####################################################
-
-umask 0022
-PATH=/opt/csw/bin
-
-if [ $# -ne 1 ]; then
- gecho "USAGE: $(basename $0) WORKSRC"
- exit 1
-fi
-BASEPATH=$1
-
-## Fix Makefiles
-for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \
- gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
-
- for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep 'dlname=' ${file} | \
- gsed -e "s/.*'\(.*\)'/\1/" \
- -e "s/^lib//" \
- -e "s/\.so.*$//")
- fixpath=$(gecho $file |gsed 's/\//\\\//g')
- sed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
- gmv Makefile.new ${mk}
- done
-done
-
-## Fix libtool Script
-for lt in $(gfind ${BASEPATH} -name libtool -print); do
- gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- gmv ${lt}.new ${lt}
-done
-
-LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
-if [ -f ${LTMAIN} ]; then
- gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
- gmv ${LTMAIN}.new ${LTMAIN}
-fi
-
Deleted: csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.i
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/librsvg/trunk/files/librsvg-2.so.2.15.90.s
===================================================================
(Binary files differ)
Deleted: csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch
===================================================================
--- csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch 2011-06-07 09:09:41 UTC (rev 14719)
+++ csw/mgar/pkg/librsvg/trunk/files/test_makefiles.patch 2011-06-07 09:14:12 UTC (rev 14720)
@@ -1,24 +0,0 @@
-diff --speed-large-files --minimal -Nru librsvg-2.22.3.orig/tests/pdiff/Makefile.in librsvg-2.22.3/tests/pdiff/Makefile.in
---- librsvg-2.22.3.orig/tests/pdiff/Makefile.in 2008-09-23 02:54:52.000000000 +0200
-+++ librsvg-2.22.3/tests/pdiff/Makefile.in 2009-02-16 03:35:29.779065807 +0100
-@@ -134,7 +134,7 @@
- LIBRSVG_MAJOR_VERSION = @LIBRSVG_MAJOR_VERSION@
- LIBRSVG_MICRO_VERSION = @LIBRSVG_MICRO_VERSION@
- LIBRSVG_MINOR_VERSION = @LIBRSVG_MINOR_VERSION@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lm
- LIBTOOL = @LIBTOOL@
- LIBXML_REQUIRED = @LIBXML_REQUIRED@
- LN_S = @LN_S@
-diff --speed-large-files --minimal -Nru librsvg-2.22.3.orig/tests/Makefile.in librsvg-2.22.3/tests/Makefile.in
---- librsvg-2.22.3.orig/tests/Makefile.in 2008-09-23 02:54:52.000000000 +0200
-+++ librsvg-2.22.3/tests/Makefile.in 2009-02-16 03:35:18.338184863 +0100
-@@ -139,7 +139,7 @@
- LIBRSVG_MAJOR_VERSION = @LIBRSVG_MAJOR_VERSION@
- LIBRSVG_MICRO_VERSION = @LIBRSVG_MICRO_VERSION@
- LIBRSVG_MINOR_VERSION = @LIBRSVG_MINOR_VERSION@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lm
- LIBTOOL = @LIBTOOL@
- LIBXML_REQUIRED = @LIBXML_REQUIRED@
- LN_S = @LN_S@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list