[csw-devel] SF.net SVN: gar:[13324] csw/mgar/pkg/libcairo/trunk

[dmichelsen at users.sourceforge.net]

Revision: 13324
          http://gar.svn.sourceforge.net/gar/?rev=13324&view=rev
Author:   dmichelsen
Date:     2011-02-15 12:41:50 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------
libcairo: Update to 1.10.2, still does not compile

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

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2011-02-15 12:14:22 UTC (rev 13323)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2011-02-15 12:41:50 UTC (rev 13324)
@@ -1,5 +1,5 @@
 NAME      = libcairo
-VERSION   = 1.8.8
+VERSION   = 1.10.2
 CATEGORIES   = lib
 
 DESCRIPTION  = The Cairo 2D Graphics Library
@@ -14,60 +14,63 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWlibcairo CSWlibcairodevel CSWlibcairodoc
-CATALOGNAME_CSWlibcairo      = libcairo
+PACKAGES += CSWlibcairo
+CATALOGNAME_CSWlibcairo = libcairo
+SPKG_DESC_CSWlibcairo = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWftype2
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWpixman
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWpng
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWexpat
+RUNTIME_DEP_PKGS_CSWlibcairo += CSWiconv
+
+PACKAGES += CSWlibcairodevel
 CATALOGNAME_CSWlibcairodevel = libcairo_devel
-CATALOGNAME_CSWlibcairodoc   = libcairo_doc
-
-SPKG_DESC_CSWlibcairo 		= $(DESCRIPTION)
-SPKG_DESC_CSWlibcairodevel 	= $(DESCRIPTION) development package
-SPKG_DESC_CSWlibcairodoc 	= $(DESCRIPTION) documentation
-
+SPKG_DESC_CSWlibcairodevel = $(DESCRIPTION) development package
 PKGFILES_CSWlibcairodevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibcairodevel += $(docdir)/libcairo_devel/.*
+RUNTIME_DEP_PKGS_CSWlibcairodevel = CSWlibcairo
+
+PACKAGES += CSWlibcairodoc
+CATALOGNAME_CSWlibcairodoc = libcairo_doc
+SPKG_DESC_CSWlibcairodoc = $(DESCRIPTION) documentation
 PKGFILES_CSWlibcairodoc    = $(sharedstatedir)/gtk-doc.*
 PKGFILES_CSWlibcairodoc   += $(docdir)/libcairo_doc/.*
+ARCHALL_CSWlibcairodoc = 1
 
-BUILD_DEP_PKGS += CSWlibxrenderdevel CSWkbproto CSWrenderproto
-BUILD_DEP_PKGS += CSWlibspectre 
+BUILD_DEP_PKGS = CSWlibspectre 
 
-RUNTIME_DEP_PKGS_CSWlibcairo      = CSWfconfig
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWftype2
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWpixman
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWpng
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWexpat
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWiconv
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWlibx11
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWlibxcb
-RUNTIME_DEP_PKGS_CSWlibcairo     += CSWxcbutil
+# imagediff in testsuite needs -lsocket
+# EXTRA_LDFLAGS = -lsocket -lnsl
 
-RUNTIME_DEP_PKGS_CSWlibcairodevel = CSWlibcairo
-RUNTIME_DEP_PKGS_CSWlibcairodoc   = 
+# We don't need it and if defined linking breaks if an old Cairo is installed
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
-ARCHALL_CSWlibcairodoc = 1
-
 BUILD64 = 1
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-# We want libcairo 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))
-# imagediff in testsuite needs -lsocket
-EXTRA_LDFLAGS = -lsocket -lnsl
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --disable-full-testing
+CONFIGURE_ARGS += --enable-xlib=yes
+CONFIGURE_ARGS += --enable-xlib-xrender=yes
+CONFIGURE_ARGS += --enable-ft=yes
+CONFIGURE_ARGS += --with-x 
+CONFIGURE_ARGS += --enable-png=yes
+CONFIGURE_ARGS += --enable-ps=yes
+CONFIGURE_ARGS += --enable-pdf=yes
+CONFIGURE_ARGS += --enable-svg=yes
+CONFIGURE_ARGS += --enable-xcb=no
+CONFIGURE_ARGS += --enable-gtk-doc
+CONFIGURE_ARGS += --enable-test-surfaces=yes 
 
-CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --disable-full-testing --enable-xlib=yes --enable-xlib-xrender=yes --enable-ft=yes --with-x 
-CONFIGURE_ARGS += --enable-png=yes --enable-ps=yes --enable-pdf=yes --enable-svg=yes --enable-xcb=yes
-CONFIGURE_ARGS += --enable-gtk-doc --enable-test-surfaces=yes 
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+# Use custom lroundf at least on Solaris 9 as it does not provide its own
+CONFIGURE_ARGS += --disable-some-floating-point
 
+# This is broken due to missing stdint.h and use of setenv(3c)
+CONFIGURE_ARGS += --enable-trace=no
+
 include gar/category.mk
 
-# configure have problems with non-gnu utilities
+# configure has problems with non-gnu utilities
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/libcairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcairo/trunk/checksums	2011-02-15 12:14:22 UTC (rev 13323)
+++ csw/mgar/pkg/libcairo/trunk/checksums	2011-02-15 12:41:50 UTC (rev 13324)
@@ -1 +1 @@
-d3e1a1035ae563812d4dd44a74fb0dd0  download/cairo-1.8.8.tar.gz
+f101a9e88b783337b20b2e26dfd26d5f  cairo-1.10.2.tar.gz


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