diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2012-04-23 21:05:05 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2012-04-23 21:05:05 +0000 |
| commit | 9a1f9836281ee23a4bc7800f3218cb4854f5a9a1 (patch) | |
| tree | 9b95ee495b8c02da0bf03e0edce3f07ec18bc391 /x11-fonts | |
| parent | Fix build (boinc-client 7.0.25_2 or higher required). (diff) | |
Add patch from upstream to fix a C++11 issue in fontconfig. This fixes the
build of libreoffice with Clang on current. And possible other C++ users of
fontconfig.
Submitted by: Buganini (via bapt@) on #freebsd-office
Obtained by: fontconfig git
Notes
Notes:
svn path=/head/; revision=295344
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/fontconfig/Makefile | 2 | ||||
| -rw-r--r-- | x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 41aad3726b29..74b90fa51b33 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -8,7 +8,7 @@ PORTNAME= fontconfig PORTVERSION= 2.8.0 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ diff --git a/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h b/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h new file mode 100644 index 000000000000..3434d003b24f --- /dev/null +++ b/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h @@ -0,0 +1,26 @@ +From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH <akira@tagoh.org> +Date: Sun, 22 Apr 2012 12:40:44 +0000 +Subject: C++11 requires a space between literal and identifier + +Reported by Buganini +--- +diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h +index 0e2ca50..b27ccb5 100644 +--- fontconfig/fontconfig.h ++++ fontconfig/fontconfig.h +@@ -112,9 +112,9 @@ typedef int FcBool; + #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-" FC_CACHE_VERSION ++#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION ++#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION + + /* Adjust outline rasterizer */ + #define FC_CHAR_WIDTH "charwidth" /* Int */ +-- +cgit v0.9.0.2-2-gbebe |