SF.net SVN: gar:[23657] csw/mgar/pkg/librsvg/trunk

[lblume at users.sourceforge.net]

Revision: 23657
          http://sourceforge.net/p/gar/code/23657
Author:   lblume
Date:     2014-05-19 11:27:14 +0000 (Mon, 19 May 2014)
Log Message:
-----------
librsvg/trunk: Switch to 2.6.34; switch to GCC4; update dependencies; add workarund for ld bug; disable introspection

Modified Paths:
--------------
    csw/mgar/pkg/librsvg/trunk/Makefile
    csw/mgar/pkg/librsvg/trunk/checksums

Modified: csw/mgar/pkg/librsvg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/librsvg/trunk/Makefile	2014-05-19 07:59:39 UTC (rev 23656)
+++ csw/mgar/pkg/librsvg/trunk/Makefile	2014-05-19 11:27:14 UTC (rev 23657)
@@ -1,5 +1,5 @@
 NAME = librsvg
-VERSION = 2.35.0
+VERSION = 2.36.4
 GARTYPE = v2
 
 DESCRIPTION = Scalable Vector Graphics library
@@ -18,7 +18,7 @@
 
 LICENSE = COPYING.LIB
 
-GARCOMPILER = SOS12U3
+GARCOMPILER = GCC4
 
 # We need the new glib only available on Solaris 10
 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
@@ -29,7 +29,6 @@
 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)
-RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWpango
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcroco
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibcairo2
@@ -37,6 +36,10 @@
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpangocairo1-0-0
+
 OBSOLETED_BY_CSWlibrsvg2-2  = CSWlibrsvg
 
 PACKAGES += CSWlibrsvg-dev
@@ -45,7 +48,7 @@
 PKGFILES_CSWlibrsvg-dev += $(sharedstatedir)/gtk-doc/.*
 RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibrsvg2-2
 RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibglib2-dev
-RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWgtk2devel
+RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibgtk2-dev
 RUNTIME_DEP_PKGS_CSWlibrsvg-dev += CSWlibcairo-dev
 
 PACKAGES += CSWrsvg
@@ -56,8 +59,7 @@
 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgobject2-0-0
 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-pixbuf2-0-0
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgdk-x11-2-0-0
-RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgcc-s1
 
 PACKAGES += CSWlibrsvg-gnome
 SPKG_DESC_CSWlibrsvg-gnome += Scalable Vector Graphics library - Gnome module
@@ -68,9 +70,40 @@
 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgdk-x11-2-0-0
 RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgmodule2-0-0
 
+###
+# Needed for the Solaris ld bug
+ifeq ($(shell /usr/bin/uname -p),sparc)
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpangoft2-1-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg-gnome += CSWlibatk1-0-0
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpng15-15
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibcroco
+RUNTIME_DEP_PKGS_CSWrsvg += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibrsvg2-2 += CSWlibpng15-15
+endif
+###
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared=yes --enable-static=no
+# That fails on sparc
+CONFIGURE_ARGS += --enable-introspection=no
 # This causes an configure abort
 CONFIGURE_ARGS += --disable-Bsymbolic
 
@@ -79,6 +112,9 @@
 
 STRIP_LIBTOOL = 1
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=694649
+SKIPTEST = 1
+
 EXTRA_MERGE_DIRS_isa-extra = $(bindir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/librsvg/trunk/checksums
===================================================================
--- csw/mgar/pkg/librsvg/trunk/checksums	2014-05-19 07:59:39 UTC (rev 23656)
+++ csw/mgar/pkg/librsvg/trunk/checksums	2014-05-19 11:27:14 UTC (rev 23657)
@@ -1 +1 @@
-190e81d8d4ed34583c71a5842e51f405  librsvg-2.35.0.tar.xz
+3c94524c8ccf668e30b236f409239f54  librsvg-2.36.4.tar.xz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.