[csw-devel] SF.net SVN: gar:[8106] csw/mgar/pkg/fontconfig/trunk
a_o_m at users.sourceforge.net
a_o_m at users.sourceforge.net
Thu Jan 21 14:01:18 CET 2010
Revision: 8106
http://gar.svn.sourceforge.net/gar/?rev=8106&view=rev
Author: a_o_m
Date: 2010-01-21 13:01:18 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
fontconfig: removed patches for older releases, removing cache-csw-2 files during postinstall now
Modified Paths:
--------------
csw/mgar/pkg/fontconfig/trunk/Makefile
csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
Removed Paths:
-------------
csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall
csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch
csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff
Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 11:18:18 UTC (rev 8105)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile 2010-01-21 13:01:18 UTC (rev 8106)
@@ -13,11 +13,7 @@
MASTER_SITES = http://www.fontconfig.org/release/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
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
@@ -35,6 +31,4 @@
CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig
CONFIGURE_ARGS += --with-confdir=/opt/csw/etc/fontconfig
-EXTRA_MERGE_EXCLUDE_FILES = .*/fonts.conf.bak
-
include gar/category.mk
Deleted: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 11:18:18 UTC (rev 8105)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.checkinstall 2010-01-21 13:01:18 UTC (rev 8106)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ ! -f ${BASEDIR}/opt/csw/lib/libexpat.so.1 ]; then
- echo Expat XML parser version 2.0 or higher required. Please upgrade CSWexpat first.
- exit 1
-fi
-
-exit 0
Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 11:18:18 UTC (rev 8105)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2010-01-21 13:01:18 UTC (rev 8106)
@@ -3,8 +3,8 @@
CHROOTDIR=${BASEDIR:-/}
echo
-echo fc-cache is running now to build font information caches
-echo this may take up to several minutes on slow workstations
+echo Fontconfig needs to update its font cache.
+echo This can take up to a couple of minutes.
echo
${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s
@@ -15,6 +15,8 @@
find ${BASEDIR}/usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \;
find ${BASEDIR}/usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \;
find ${BASEDIR}/opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+# removing ancient *.cache-csw-2 files
+rm "${BASEDIR}/opt/csw/var/cache/fontconfig/*.cache-csw-2" 2>/dev/null
# remove obsolete cache dir
[ -d "${BASEDIR}/opt/csw/var/cache-fontconfig" ] && rm -r "${BASEDIR}/opt/csw/var/cache-fontconfig" 2>/dev/null
Deleted: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 11:18:18 UTC (rev 8105)
+++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2010-01-21 13:01:18 UTC (rev 8106)
@@ -1,12 +0,0 @@
-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 {
Deleted: csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 11:18:18 UTC (rev 8105)
+++ csw/mgar/pkg/fontconfig/trunk/files/fontconfig.h.diff 2010-01-21 13:01:18 UTC (rev 8106)
@@ -1,15 +0,0 @@
---- 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.
More information about the devel
mailing list