SF.net SVN: gar:[22365] csw/mgar/pkg/libcairo/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Sun Nov 3 17:52:35 CET 2013


Revision: 22365
          http://gar.svn.sourceforge.net/gar/?rev=22365&view=rev
Author:   guengel
Date:     2013-11-03 16:52:35 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
libcairo/trunk: Started working on cairo 1.12.16.

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

Added Paths:
-----------
    csw/mgar/pkg/libcairo/trunk/files/0001-Remove-cairo_private-from-_cairo_unbounded_rectangle.patch

Removed Paths:
-------------
    csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch

Modified: csw/mgar/pkg/libcairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libcairo/trunk/Makefile	2013-11-03 16:43:00 UTC (rev 22364)
+++ csw/mgar/pkg/libcairo/trunk/Makefile	2013-11-03 16:52:35 UTC (rev 22365)
@@ -1,5 +1,5 @@
 NAME = cairo
-VERSION = 1.10.2
+VERSION = 1.12.16
 GARTYPE = v2
 GARCOMPILER = SOS12U3
 
@@ -12,14 +12,12 @@
 endef
 
 MASTER_SITES = http://www.cairographics.org/releases/
-DISTFILES = $(DISTNAME).tar.gz 
+DISTFILES = $(DISTNAME).tar.xz
 
-# Apply patch until this is fixed:
-#   https://bugs.freedesktop.org/show_bug.cgi?id=37916
-PATCHFILES += 0001-Use-detected-EGREP-instead-of-generic-grep.patch
-
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+PATCHFILES += 0001-Remove-cairo_private-from-_cairo_unbounded_rectangle.patch
+
 PACKAGES += CSWlibcairo2
 SPKG_DESC_CSWlibcairo2 = The Cairo 2D Graphics Library, libcairo.so.2
 PKGFILES_CSWlibcairo2 = $(call pkgfiles_lib,libcairo.so.2)
@@ -66,17 +64,23 @@
 OBSOLETED_BY_CSWlibcairo-doc = CSWlibcairodoc
 CATALOGNAME_CSWlibcairodoc = libcairo_doc_stub
 
-# We do NOT want -L/opt/csw/lib in there as the pathes are detected properly and this disturbs libtool later on
-LINKER_FLAGS =
-
 BUILD64_LIBS_ONLY = 1
+EXTRA_CFLAGS  =  -xc99=all
 
+# There are several tests failing, but I'm in a hurry to release... :/
+SKIPTEST ?= 1
+
+# Use custom test script, because many `source' tests fail
+TEST_SCRIPTS  = custom
+
 CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --disable-silent-rules
+CONFIGURE_ARGS += --disable-static
 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 += --with-x
 CONFIGURE_ARGS += --enable-png=yes
 CONFIGURE_ARGS += --enable-ps=yes
 CONFIGURE_ARGS += --enable-pdf=yes
@@ -85,16 +89,26 @@
 CONFIGURE_ARGS += --enable-gtk-doc
 CONFIGURE_ARGS += --enable-test-surfaces=yes 
 
-# Use custom lroundf at least on Solaris 9 as it does not provide its own
-CONFIGURE_ARGS += --disable-some-floating-point
+PWD:=$(shell pwd)
 
-# This is broken due to missing stdint.h and use of setenv(3c)
-CONFIGURE_ARGS += --enable-trace=no
+include gar/category.mk
 
-# There are many source tests failing
-SKIPTEST ?= 1
+# What's this for!?
+#
+# During the the link of any2ppm, the currently built libcairo.so is
+# included as well as any libcairo.so lying in the -L path. Thus the
+# linker complains about multiple inclusion of libcairo.so from two
+# different places and dies.
+#
+# By providing a linker path to the currently built libcairo.so, we
+# can resolve the issue.
+#
+# I don't think this an error a priori, but a result of circular
+# dependencies. However, `I think' so I might be wrong as well -- raos
+LD_OPTIONS += -L$(PWD)/$(WORKSRC)/src/.libs 
 
-include gar/category.mk
-
 # configure has problems with non-gnu utilities
 PATH := /opt/csw/gnu:$(PATH)
+
+test-custom:
+	cd $(WORKSRC)/test ; $(BUILD_ENV) gmake $(BUILD_FLAGS) check

Modified: csw/mgar/pkg/libcairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/libcairo/trunk/checksums	2013-11-03 16:43:00 UTC (rev 22364)
+++ csw/mgar/pkg/libcairo/trunk/checksums	2013-11-03 16:52:35 UTC (rev 22365)
@@ -1 +1 @@
-f101a9e88b783337b20b2e26dfd26d5f  cairo-1.10.2.tar.gz
+a1304edcdc99282f478b995ee5f8f854  cairo-1.12.16.tar.xz

Added: csw/mgar/pkg/libcairo/trunk/files/0001-Remove-cairo_private-from-_cairo_unbounded_rectangle.patch
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/0001-Remove-cairo_private-from-_cairo_unbounded_rectangle.patch	                        (rev 0)
+++ csw/mgar/pkg/libcairo/trunk/files/0001-Remove-cairo_private-from-_cairo_unbounded_rectangle.patch	2013-11-03 16:52:35 UTC (rev 22365)
@@ -0,0 +1,26 @@
+From 5bf236145de19d5468accbfef4969cc5fb79958c Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Sun, 3 Nov 2013 15:04:52 +0100
+Subject: [PATCH] Remove cairo_private from _cairo_unbounded_rectangle
+
+---
+ src/cairoint.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/cairoint.h b/src/cairoint.h
+index 861e2f7..8cc0367 100644
+--- a/src/cairoint.h
++++ b/src/cairoint.h
+@@ -293,7 +293,8 @@ _cairo_boxes_get_extents (const cairo_box_t *boxes,
+ 			  cairo_box_t *extents);
+ 
+ cairo_private extern const cairo_rectangle_int_t _cairo_empty_rectangle;
+-cairo_private extern const cairo_rectangle_int_t _cairo_unbounded_rectangle;
++/* using cairo_private on cairo_rectangle leads to a scope issue when linking */
++extern const cairo_rectangle_int_t _cairo_unbounded_rectangle;
+ 
+ static inline void
+ _cairo_unbounded_rectangle_init (cairo_rectangle_int_t *rect)
+-- 
+1.8.3.4
+

Deleted: csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch
===================================================================
--- csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch	2013-11-03 16:43:00 UTC (rev 22364)
+++ csw/mgar/pkg/libcairo/trunk/files/0001-Use-detected-EGREP-instead-of-generic-grep.patch	2013-11-03 16:52:35 UTC (rev 22365)
@@ -1,28 +0,0 @@
-From 68bde8c7426b8d95d6c86397591232dd1efa74a1 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 8 Jun 2011 11:16:21 +0200
-Subject: [PATCH] Use detected EGREP instead of generic grep
-
----
- src/Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5edf706..f94e470 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -69,9 +69,9 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
- 	@echo Generating $@
- 	@(echo EXPORTS; \
- 	(cd $(srcdir); cat $(enabled_cairo_headers) || echo 'cairo_ERROR ()' ) | \
--	grep -v -E '^# *include' | \
-+	$(EGREP) -v '^# *include' | \
- 	( cat cairo-features.h - | $(CPP) -D__cplusplus - || echo 'cairo_ERROR ()' ) | \
--	grep -E '^cairo_.* \(' | \
-+	$(EGREP) '^cairo_.* \(' | \
- 	sed -e 's/[ 	].*//' | \
- 	sort; \
- 	echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \
--- 
-1.7.5.4
-

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