summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2017-09-24 00:50:59 +0200
committerLars Wendler <polynomial-c@gentoo.org>2017-09-24 00:51:15 +0200
commit80ccaad7222c654940b7d8777cc9f78ea1aaac50 (patch)
tree403b2b510ce935082aaea0b20be07005003c9bcd /media-libs/fontconfig/files
parentmedia-libs/fontconfig: Bump to version 2.12.6 (diff)
downloadgentoo-80ccaad7222c654940b7d8777cc9f78ea1aaac50.tar.gz
gentoo-80ccaad7222c654940b7d8777cc9f78ea1aaac50.tar.bz2
gentoo-80ccaad7222c654940b7d8777cc9f78ea1aaac50.zip
media-libs/fontconfig: Removed old.
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'media-libs/fontconfig/files')
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch67
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.12.1-fix-ts18661-1-namespace-conflicts-w-glibc.patch59
2 files changed, 0 insertions, 126 deletions
diff --git a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch
deleted file mode 100644
index 033fe895bc10..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.11.93-latin-update.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- fontconfig-2.11.93.orig/conf.d/60-latin.conf 2015-04-18 20:06:06.070687989 +0800
-+++ fontconfig-2.11.93/conf.d/60-latin.conf 2015-04-18 20:14:15.245732796 +0800
-@@ -4,46 +4,49 @@
- <alias>
- <family>serif</family>
- <prefer>
-- <family>Bitstream Vera Serif</family>
-+ <family>Liberation Serif</family>
- <family>DejaVu Serif</family>
- <family>Times New Roman</family>
-- <family>Thorndale AMT</family>
- <family>Luxi Serif</family>
- <family>Nimbus Roman No9 L</family>
- <family>Nimbus Roman</family>
- <family>Times</family>
-+ <family>Thorndale AMT</family>
-+ <family>Bitstream Vera Serif</family>
- </prefer>
- </alias>
- <alias>
- <family>sans-serif</family>
- <prefer>
-- <family>Bitstream Vera Sans</family>
-+ <family>Liberation Sans</family>
- <family>DejaVu Sans</family>
-- <family>Verdana</family>
- <family>Arial</family>
-- <family>Albany AMT</family>
- <family>Luxi Sans</family>
- <family>Nimbus Sans L</family>
- <family>Nimbus Sans</family>
- <family>Helvetica</family>
- <family>Lucida Sans Unicode</family>
- <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
-+ <family>Verdana</family>
- <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-+ <family>Albany AMT</family>
-+ <family>Bitstream Vera Sans</family>
- </prefer>
- </alias>
- <alias>
- <family>monospace</family>
- <prefer>
-- <family>Bitstream Vera Sans Mono</family>
-+ <family>Liberation Mono</family>
- <family>DejaVu Sans Mono</family>
- <family>Inconsolata</family>
- <family>Andale Mono</family>
- <family>Courier New</family>
-- <family>Cumberland AMT</family>
- <family>Luxi Mono</family>
- <family>Nimbus Mono L</family>
- <family>Nimbus Mono</family>
- <family>Courier</family>
-+ <family>Cumberland AMT</family>
-+ <family>Bitstream Vera Sans Mono</family>
- </prefer>
- </alias>
- <!--
-@@ -64,6 +67,7 @@
- <alias>
- <family>cursive</family>
- <prefer>
-+ <family>Comic Neue</family>
- <family>ITC Zapf Chancery Std</family>
- <family>Zapfino</family>
- <family>Comic Sans MS</family>
diff --git a/media-libs/fontconfig/files/fontconfig-2.12.1-fix-ts18661-1-namespace-conflicts-w-glibc.patch b/media-libs/fontconfig/files/fontconfig-2.12.1-fix-ts18661-1-namespace-conflicts-w-glibc.patch
deleted file mode 100644
index c0306280ef84..000000000000
--- a/media-libs/fontconfig/files/fontconfig-2.12.1-fix-ts18661-1-namespace-conflicts-w-glibc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130213.html
-
-Gentoo-Bug: https://bugs.gentoo.org/608924
-
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index 5c72b22..070a557 100644
---- a/fontconfig/fontconfig.h
-+++ b/fontconfig/fontconfig.h
-@@ -128,7 +128,8 @@ typedef int FcBool;
- #define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
-
- /* Adjust outline rasterizer */
--#define FC_CHAR_WIDTH "charwidth" /* Int */
-+#define FC_CHARWIDTH "charwidth" /* Int */
-+#define FC_CHAR_WIDTH FC_CHARWIDTH
- #define FC_CHAR_HEIGHT "charheight"/* Int */
- #define FC_MATRIX "matrix" /* FcMatrix */
-
-diff --git a/src/fcobjs.h b/src/fcobjs.h
-index 1fc4f65..d27864b 100644
---- a/src/fcobjs.h
-+++ b/src/fcobjs.h
-@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
- FC_OBJECT (RGBA, FcTypeInteger, NULL)
- FC_OBJECT (SCALE, FcTypeDouble, NULL)
- FC_OBJECT (MINSPACE, FcTypeBool, NULL)
--FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
-+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
- FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
- FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
- FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
-
-diff --git a/src/fcobjshash.gperf b/src/fcobjshash.gperf
-index 80a0237..eb4ad84 100644
---- a/src/fcobjshash.gperf
-+++ b/src/fcobjshash.gperf
-@@ -44,7 +44,7 @@ int id;
- "rgba",FC_RGBA_OBJECT
- "scale",FC_SCALE_OBJECT
- "minspace",FC_MINSPACE_OBJECT
--"charwidth",FC_CHAR_WIDTH_OBJECT
-+"charwidth",FC_CHARWIDTH_OBJECT
- "charheight",FC_CHAR_HEIGHT_OBJECT
- "matrix",FC_MATRIX_OBJECT
- "charset",FC_CHARSET_OBJECT
-
-diff --git a/src/fcobjshash.h b/src/fcobjshash.h
-index 5a4d1ea..4e66bb0 100644
---- a/src/fcobjshash.h
-+++ b/src/fcobjshash.h
-@@ -284,7 +284,7 @@ FcObjectTypeLookup (register const char *str, register unsigned int len)
- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT},
- {-1},
- #line 47 "fcobjshash.gperf"
-- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT},
-+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT},
- #line 48 "fcobjshash.gperf"
- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT},
- #line 55 "fcobjshash.gperf"