[csw-devel] SF.net SVN: gar:[21234] csw/mgar/pkg/fontconfig/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri May 31 15:43:02 CEST 2013
Revision: 21234
http://gar.svn.sourceforge.net/gar/?rev=21234&view=rev
Author: dmichelsen
Date: 2013-05-31 13:43:02 +0000 (Fri, 31 May 2013)
Log Message:
-----------
fontconfig/trunk: Update to 2.10.2, rework package names, drop unused patch
Modified Paths:
--------------
csw/mgar/pkg/fontconfig/trunk/Makefile
csw/mgar/pkg/fontconfig/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall
Removed Paths:
-------------
csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch
Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile 2013-05-31 13:14:22 UTC (rev 21233)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile 2013-05-31 13:43:02 UTC (rev 21234)
@@ -1,10 +1,10 @@
# $Id$
NAME = fontconfig
-VERSION = 2.8.0
+VERSION = 2.10.2
GARTYPE = v2
-DESCRIPTION = A library for configuring and customizing font access.
+DESCRIPTION = A library for configuring and customizing font access
define BLURB
Fontconfig is a library for configuring and customizing font access. It
contains two essential modules, the configuration module which builds an
@@ -13,49 +13,41 @@
endef
MASTER_SITES = http://www.fontconfig.org/release/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWfconfig.postinstall
+DISTFILES += $(DISTNAME).tar.gz
+DISTFILES += CSWfontconfig.postinstall
-PATCHFILES = fix-zerowidth-struct.patch
+VENDOR_URL = http://www.fontconfig.org
-BUILD64_LIBS_ONLY = 1
+PACKAGES += CSWlibfontconfig1
+PKGFILES_CSWlibfontconfig1 += $(call pkgfiles_lib,libfontconfig.so.1)
+SPKG_DESC_CSWlibfontconfig1 += A library for configuring and customizing font access, libfontconfig.so.1
+RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibexpat1
-SPKG_SOURCEURL = http://www.fontconfig.org/
+PACKAGES += CSWfontconfig-dev
+SPKG_DESC_CSWfontconfig-dev += Development files for libfontconfig.so.1
+PKGFILES_CSWfontconfig-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWfontconfig-dev += CSWlibfontconfig1
+OBSOLETED_BY_CSWfontconfig-dev += CSWfconfig-dev
-MIGRATE_FILES = fontconfig
+PACKAGES += CSWfontconfig
+SPKG_DESC_CSWfontconfig = A library for configuring and customizing font access
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWfontconfig += CSWlibfontconfig1
+# This is for /usr/share/fonts which is ok
+CHECKPKG_OVERRIDES_CSWfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf
+OBSOLETED_BY_CSWfontconfig += CSWfconfig
+CATALOGNAME_CSWfconfig = fontconfig_stub
+
+BUILD64_LIBS_ONLY = 1
+
+MIGRATE_FILES_CSWfontconfig = fontconfig
+
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=/etc/opt/csw/fontconfig
+CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/fontconfig
-PACKAGES += CSWlibfontconfig1
-PKGFILES_CSWlibfontconfig1 += $(call baseisadirs,$(libdir),libfontconfig\.so\.1(\.\d+)*)
-SPKG_DESC_CSWlibfontconfig1 += $(DESCRIPTION), libfontconfig.so.1
-RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibfontconfig1 += CSWlibz1
-
-PACKAGES += CSWfconfig-dev
-SPKG_DESC_CSWfconfig-dev += $(DESCRIPTION), development files
-PKGFILES_CSWfconfig-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWfconfig-dev += CSWlibfontconfig1
-
-PACKAGES += CSWfconfig
-CATALOGNAME_CSWfconfig = fontconfig
-SPKG_DESC_CSWfconfig = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWfconfig += CSWlibz1
-# It's the documentation.
-CHECKPKG_OVERRIDES_CSWfconfig += file-with-bad-content
-# One of the classic: "historical reasons"
-CHECKPKG_OVERRIDES_CSWfconfig += catalogname-does-not-match-pkgname|pkgname=CSWfconfig|catalogname=fontconfig|expected-catalogname=fconfig
-
include gar/category.mk
Modified: csw/mgar/pkg/fontconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/checksums 2013-05-31 13:14:22 UTC (rev 21233)
+++ csw/mgar/pkg/fontconfig/trunk/checksums 2013-05-31 13:43:02 UTC (rev 21234)
@@ -1 +1 @@
-77e15a92006ddc2adbb06f840d591c0e fontconfig-2.8.0.tar.gz
+025e08b3d7fe45c433de5718e441ed15 fontconfig-2.10.2.tar.gz
Deleted: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2013-05-31 13:14:22 UTC (rev 21233)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall 2013-05-31 13:43:02 UTC (rev 21234)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-CHROOTDIR=${BASEDIR:-/}
-
-echo
-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
-touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null
-
-${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null &
-
-# removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2
-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}/var/opt/csw/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
-
-exit 0
Copied: csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall (from rev 20894, csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall)
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall (rev 0)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfontconfig.postinstall 2013-05-31 13:43:02 UTC (rev 21234)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+CHROOTDIR=${BASEDIR:-/}
+
+echo
+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
+touch ${BASEDIR}/var/opt/csw/cache/fontconfig/.fc-cache_done 2>/dev/null
+
+${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-list 2>&1 >/dev/null &
+
+# removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2
+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}/var/opt/csw/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
+
+exit 0
Deleted: csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2013-05-31 13:14:22 UTC (rev 21233)
+++ csw/mgar/pkg/fontconfig/trunk/files/fix-zerowidth-struct.patch 2013-05-31 13:43:02 UTC (rev 21234)
@@ -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 {
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