Revision: 22398
http://gar.svn.sourceforge.net/gar/?rev=22398&view=rev
Author: guengel
Date: 2013-11-05 10:59:44 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
fontconfig/trunk: Using SOS12U3 to build. Added patches previously not required
for 2.10.x. Documentation files (NOT man pages) go into separate package.
Modified Paths:
--------------
csw/mgar/pkg/fontconfig/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/fontconfig/trunk/files/0001-Use-errwarn-instead-of-Werror.patch
csw/mgar/pkg/fontconfig/trunk/files/0002-Patch-for-test-migration.patch
Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile 2013-11-05 10:10:24 UTC (rev
22397)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile 2013-11-05 10:59:44 UTC (rev
22398)
@@ -3,6 +3,7 @@
NAME = fontconfig
VERSION = 2.11.0
GARTYPE = v2
+GARCOMPILER = SOS12U3
DESCRIPTION = A library for configuring and customizing font access
define BLURB
@@ -18,6 +19,11 @@
VENDOR_URL = http://www.fontconfig.org
+PATCHFILES_SOS12U3 += 0001-Use-errwarn-instead-of-Werror.patch
+
+PATCHFILES += 0002-Patch-for-test-migration.patch
+PATCHFILES += $(PATCHFILES_$(GARCOMPILER))
+
PACKAGES += CSWlibfontconfig1
PKGFILES_CSWlibfontconfig1 += $(call pkgfiles_lib,libfontconfig.so.1)
SPKG_DESC_CSWlibfontconfig1 += A library for configuring and customizing font
access, libfontconfig.so.1
@@ -30,13 +36,18 @@
RUNTIME_DEP_PKGS_CSWfontconfig-dev += CSWlibfontconfig1
OBSOLETED_BY_CSWfontconfig-dev += CSWfconfig-dev
+PACKAGES += CSWfontconfig-doc
+SPKG_DESC_CSWfontconfig-doc += Development documentation for fontconfig
+PKGFILES_CSWfontconfig-doc = .*/fontconfig/fontconfig-devel.*
+
PACKAGES += CSWfontconfig
SPKG_DESC_CSWfontconfig = A library for configuring and customizing font access
# PKGFILES is catchall
RUNTIME_DEP_PKGS_CSWfontconfig += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWfontconfig += CSWlibfreetype6
# 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
-
+CHECKPKG_OVERRIDES_CSWfontconfig +=
file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/conf.d/README
OBSOLETED_BY_CSWfontconfig += CSWfconfig
CATALOGNAME_CSWfconfig = fontconfig_stub
Added:
csw/mgar/pkg/fontconfig/trunk/files/0001-Use-errwarn-instead-of-Werror.patch
===================================================================
---
csw/mgar/pkg/fontconfig/trunk/files/0001-Use-errwarn-instead-of-Werror.patch
(rev 0)
+++
csw/mgar/pkg/fontconfig/trunk/files/0001-Use-errwarn-instead-of-Werror.patch
2013-11-05 10:59:44 UTC (rev 22398)
@@ -0,0 +1,25 @@
+From 5cf3803e8ab16132869e0ad12213df6d056b61d6 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <r...@opencsw.org>
+Date: Tue, 5 Nov 2013 08:39:09 +0100
+Subject: [PATCH] Use -errwarn instead of -Werror
+
+---
+ configure | 2 +-
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5866ce0..dae17dd 100755
+--- a/configure
++++ b/configure
+@@ -13922,7 +13922,7 @@ done
+
+
+ fc_saved_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $WARN_CFLAGS -Werror"
++CFLAGS="$CFLAGS $WARN_CFLAGS -errwarn"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix_fadvise" >&5
+ $as_echo_n "checking for posix_fadvise... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+--
+1.8.4.1
+
Added: csw/mgar/pkg/fontconfig/trunk/files/0002-Patch-for-test-migration.patch
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/0002-Patch-for-test-migration.patch
(rev 0)
+++ csw/mgar/pkg/fontconfig/trunk/files/0002-Patch-for-test-migration.patch
2013-11-05 10:59:44 UTC (rev 22398)
@@ -0,0 +1,62 @@
+From 8f7dd119814c55039b117a35ed50008bb6798f9f Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <r...@opencsw.org>
+Date: Tue, 5 Nov 2013 11:08:01 +0100
+Subject: [PATCH] Patch for test-migration
+
+---
+ test/test-migration.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-migration.c b/test/test-migration.c
+index a0ab839..9511b3c 100644
+--- a/test/test-migration.c
++++ b/test/test-migration.c
+@@ -6,6 +6,13 @@
+ #include <dirent.h>
+ #include <fontconfig/fontconfig.h>
+
++/* Quick and dirty mkdtemp */
++char* mkdtemp_qnd(char * wdc) {
++ char *name = tmpnam(NULL);
++ if (mkdir(name, S_IRWXU)) abort();
++ return name;
++}
++
+ FcBool
+ mkdir_p(const char *dir)
+ {
+@@ -36,6 +43,7 @@ unlink_dirs(const char *dir)
+ size_t len = strlen (dir);
+ char *n = NULL;
+ FcBool ret = FcTrue;
++ struct stat statbuf;
+
+ if (!d)
+ return FcFalse;
+@@ -53,7 +61,13 @@ unlink_dirs(const char *dir)
+ strcpy (n, dir);
+ n[len] = '/';
+ strcpy (&n[len + 1], e->d_name);
+- if (e->d_type == DT_DIR)
++
++ /* Welcome to the wonderful world of LinuxSoft: Using stuff like
dirent.d_type really makes my day */
++ if (stat(n, &statbuf)) {
++ fprintf(stderr, "E: %s\n", dir);
++ return FcFalse;
++ }
++ if (S_ISDIR(statbuf.st_mode))
+ {
+ if (!unlink_dirs (n))
+ {
+@@ -89,7 +103,7 @@ int
+ main(void)
+ {
+ char template[32] = "fontconfig-XXXXXXXX";
+- char *tmp = mkdtemp (template);
++ char *tmp = mkdtemp_qnd (template);
+ size_t len = strlen (tmp), xlen, dlen;
+ char xdg[256], confd[256], fn[256], nfn[256], ud[256], nud[256];
+ int ret = -1;
+--
+1.8.4.1
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
