[csw-devel] SF.net SVN: gar:[6596] csw/mgar/pkg/fontconfig/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6596
          http://gar.svn.sourceforge.net/gar/?rev=6596&view=rev
Author:   dmichelsen
Date:     2009-09-28 13:58:17 +0000 (Mon, 28 Sep 2009)

Log Message:
-----------
fontconfig: Update to 2.7.3

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

Added Paths:
-----------
    csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2009-09-28 13:11:25 UTC (rev 6595)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2009-09-28 13:58:17 UTC (rev 6596)
@@ -1,5 +1,5 @@
 GARNAME = fontconfig
-GARVERSION = 2.6.0
+GARVERSION = 2.7.3
 CATEGORIES = lib
 
 DESCRIPTION = A library for configuring and customizing font access.
@@ -15,6 +15,9 @@
 DISTFILES += CSWfconfig.postinstall
 DISTFILES += CSWfconfig.checkinstall
 
+PATCHFILES = fontconfig.h.diff
+PATCHFILES += fix-zerowidth-struct.patch
+
 REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv
 
 # We define upstream file regex so we can be notifed of new upstream software release
@@ -22,18 +25,16 @@
 
 BUILD64 = 1
 PACKAGES = CSWfconfig
-CATALOGNAME_CSWfconfig = fontconfig
+CATALOGNAME = fontconfig
 
+SPKG_SOURCEURL = http://www.fontconfig.org/
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts
 CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts
 CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig
 CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig
 
-PATCHFILES = fontconfig.h.diff
-pre-package:
-	@rm -f $(DESTDIR)$(libdir)/libfontconfig.la*
-	@rm -f $(DESTDIR)/opt/csw/etc/fonts/fonts.conf.bak
-	@$(MAKECOOKIE)
+EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak
 
 include gar/category.mk

Modified: csw/mgar/pkg/fontconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/checksums	2009-09-28 13:11:25 UTC (rev 6595)
+++ csw/mgar/pkg/fontconfig/trunk/checksums	2009-09-28 13:58:17 UTC (rev 6596)
@@ -1,4 +1,5 @@
+747d2c691c66b563c8e8c1784ce8d014  download/fontconfig-2.7.3.tar.gz
+5a5b382b4a5e579cfc869bcffd7c034e  download/CSWfconfig.postinstall
 21481d18c2100203177ccab5b51e50d7  download/CSWfconfig.checkinstall
-5a5b382b4a5e579cfc869bcffd7c034e  download/CSWfconfig.postinstall
-ab54ec1d4ddd836313fdbc0cd5299d6d  download/fontconfig-2.6.0.tar.gz
 0fb83ca9bf9a7b99ab7601347e8c855d  download/fontconfig.h.diff
+bbdb45396408c48d50c7db5747dfae4e  download/fix-zerowidth-struct.patch

Added: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch	                        (rev 0)
+++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch	2009-09-28 13:58:17 UTC (rev 6596)
@@ -0,0 +1,12 @@
+diff -Naur fontconfig-2.7.3.orig/src/fcint.h fontconfig-2.7.3.patched/src/fcint.h
+--- fontconfig-2.7.3.orig/src/fcint.h	2009-06-28 19:46:36.000000000 +0200
++++ fontconfig-2.7.3.patched/src/fcint.h	2009-09-28 15:47:07.195049714 +0200
+@@ -253,7 +253,7 @@
+   FcExprPage *next_page;
+   FcExpr *next;
+   FcExpr exprs[(1024 - 2/* two pointers */ - 2/* malloc overhead */) * sizeof (void *) / sizeof (FcExpr)];
+-  FcExpr end[0];
++  FcExpr end[];
+ };
+ 
+ typedef enum _FcQual {


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