[csw-devel] SF.net SVN: gar:[7958] csw/mgar/pkg/librsvg/trunk

[hson at users.sourceforge.net]

Revision: 7958
          http://gar.svn.sourceforge.net/gar/?rev=7958&view=rev
Author:   hson
Date:     2010-01-10 23:26:05 +0000 (Sun, 10 Jan 2010)

Log Message:
-----------
librsvg: Fix LD_FLAGS for libcairo problem, disable 64-bit until libgsf-1 has 64-bit support

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	2010-01-10 19:21:12 UTC (rev 7957)
+++ csw/mgar/pkg/librsvg/trunk/Makefile	2010-01-10 23:26:05 UTC (rev 7958)
@@ -54,10 +54,15 @@
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-EXTRA_LD_OPTIONS = -R/opt/csw/X11/lib
 
-BUILD64 = 1
+# 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
+
 STRIP_LIBTOOL=1
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/librsvg/trunk/checksums
===================================================================
--- csw/mgar/pkg/librsvg/trunk/checksums	2010-01-10 19:21:12 UTC (rev 7957)
+++ csw/mgar/pkg/librsvg/trunk/checksums	2010-01-10 23:26:05 UTC (rev 7958)
@@ -1,5 +1,5 @@
-5eddcc7be3ee182c94ee21691720c6aa  download/doc_makefile.patch
-65dbd726a514fe8b797d26254b8efc1e  download/librsvg-2.26.0.tar.bz2
-5b0c0387946c3b7ca7feb913de436936  download/pdiff.patch
-8a26f6d0d0cf1cfce1a1e0365c6624ce  download/perceptualdiff.patch
-803a5d10e3e9c9a561b397aade043024  download/test_makefiles.patch
+5eddcc7be3ee182c94ee21691720c6aa  doc_makefile.patch
+65dbd726a514fe8b797d26254b8efc1e  librsvg-2.26.0.tar.bz2
+5b0c0387946c3b7ca7feb913de436936  pdiff.patch
+8a26f6d0d0cf1cfce1a1e0365c6624ce  perceptualdiff.patch
+803a5d10e3e9c9a561b397aade043024  test_makefiles.patch


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