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

[a_o_m at users.sourceforge.net]

Revision: 4467
          http://gar.svn.sourceforge.net/gar/?rev=4467&view=rev
Author:   a_o_m
Date:     2009-04-24 11:59:04 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
fontconfig: added csw prefix to fonts.cache files again

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

Added Paths:
-----------
    csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff

Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2009-04-24 04:11:04 UTC (rev 4466)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2009-04-24 11:59:04 UTC (rev 4467)
@@ -12,7 +12,6 @@
 
 MASTER_SITES = http://www.fontconfig.org/release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz 
-#DISTFILES += $(call admfiles,postinstall)
 DISTFILES += CSWfconfig.postinstall
 DISTFILES += CSWfconfig.checkinstall
 
@@ -27,10 +26,11 @@
 
 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
+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

Modified: csw/mgar/pkg/fontconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/checksums	2009-04-24 04:11:04 UTC (rev 4466)
+++ csw/mgar/pkg/fontconfig/trunk/checksums	2009-04-24 11:59:04 UTC (rev 4467)
@@ -1,3 +1,4 @@
+21481d18c2100203177ccab5b51e50d7  download/CSWfconfig.checkinstall
+5a5b382b4a5e579cfc869bcffd7c034e  download/CSWfconfig.postinstall
 ab54ec1d4ddd836313fdbc0cd5299d6d  download/fontconfig-2.6.0.tar.gz
-5a5b382b4a5e579cfc869bcffd7c034e  download/CSWfconfig.postinstall
-21481d18c2100203177ccab5b51e50d7  download/CSWfconfig.checkinstall
+0fb83ca9bf9a7b99ab7601347e8c855d  download/fontconfig.h.diff

Added: csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff	                        (rev 0)
+++ csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff	2009-04-24 11:59:04 UTC (rev 4467)
@@ -0,0 +1,15 @@
+--- fontconfig-2.6.0/fontconfig/fontconfig.h_orig	2008-06-01 04:24:34.000000000 +0200
++++ fontconfig-2.6.0/fontconfig/fontconfig.h	2009-04-24 12:14:14.404366000 +0200
+@@ -113,9 +113,9 @@
+ #define FC_DECORATIVE	    "decorative"	/* Bool - true if style is a decorative variant */
+ #define FC_LCD_FILTER	    "lcdfilter"		/* Int */
+ 
+-#define FC_CACHE_SUFFIX		    ".cache-"FC_CACHE_VERSION
+-#define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
+-#define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
++#define FC_CACHE_SUFFIX		    ".cache-csw-"FC_CACHE_VERSION
++#define FC_DIR_CACHE_FILE	    "fonts.cache-csw-"FC_CACHE_VERSION
++#define FC_USER_CACHE_FILE	    ".fonts.cache-csw-"FC_CACHE_VERSION
+ 
+ /* Adjust outline rasterizer */
+ #define FC_CHAR_WIDTH	    "charwidth"	/* Int */


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