aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <donnie@supernova.(none)>2006-09-16 12:59:51 -0700
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-16 12:59:51 -0700
commitef68c47b10191c7c16730144b3f2f9336f354633 (patch)
tree5dea3313c56b4ff1d1f36bff6b70d1748444aeee /media-libs
parentmesa: drop r300Fallback-always-return-false.patch. (diff)
downloaddberkholz-ef68c47b10191c7c16730144b3f2f9336f354633.tar.gz
dberkholz-ef68c47b10191c7c16730144b3f2f9336f354633.tar.bz2
dberkholz-ef68c47b10191c7c16730144b3f2f9336f354633.zip
fontconfig: update symbol_alias patch, split into its own conf.d file.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/fontconfig/Manifest16
-rw-r--r--media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch22
-rw-r--r--media-libs/fontconfig/files/fontconfig-9999-symbol_alias.patch25
-rw-r--r--media-libs/fontconfig/fontconfig-9999.ebuild2
4 files changed, 34 insertions, 31 deletions
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 7ec6ffe..591ddfe 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,14 +6,14 @@ AUX fontconfig-2.3.2-pkg_config.patch 421 RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da
MD5 89e73e244d58f9a2f27bca903ed69000 files/fontconfig-2.3.2-pkg_config.patch 421
RMD160 502c0bf09bf8ffe4fe0f64c8e7c42da7bbd8042e files/fontconfig-2.3.2-pkg_config.patch 421
SHA256 3b536251b30a12d200e40676ae6b040e08394fc19c163b201a1d8d8795d1ea88 files/fontconfig-2.3.2-pkg_config.patch 421
-AUX fontconfig-2.3.2-symbol_alias.patch 532 RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 SHA1 8108108700b3e4f3d8b13161d8e8c88611387256 SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58
-MD5 a64531ab26e1d4d97f4d6dbd1f7c245c files/fontconfig-2.3.2-symbol_alias.patch 532
-RMD160 a3dbe468e362da99d4c639115f12437d1593dee0 files/fontconfig-2.3.2-symbol_alias.patch 532
-SHA256 c5f30c8a1b8fad5bf3abc15569f74d9a6600af05522f49f32305951e5c595a58 files/fontconfig-2.3.2-symbol_alias.patch 532
-EBUILD fontconfig-9999.ebuild 2551 RMD160 4bfdc2d552bdf3a64091f93c19e829346cc2e336 SHA1 9da9dc225b7fb10bbc698c766c60f59a59942e29 SHA256 d6c525f8070f6382e053ff38638964424e26ea2304a00b395eb820bbea302484
-MD5 29be98084e960e1e57782edfda099fa1 fontconfig-9999.ebuild 2551
-RMD160 4bfdc2d552bdf3a64091f93c19e829346cc2e336 fontconfig-9999.ebuild 2551
-SHA256 d6c525f8070f6382e053ff38638964424e26ea2304a00b395eb820bbea302484 fontconfig-9999.ebuild 2551
+AUX fontconfig-9999-symbol_alias.patch 748 RMD160 e8b6d59db4a81faf100dcaf303e6ab036f09ffae SHA1 bcc9325779bdf58ee19cbee65f84863210485ddf SHA256 c7932dbbf0d89b60a98118871ecbcea142ccd27fa01238530ac2821821e5ec2b
+MD5 c148da1f26173b98d867c7cb7d70cd2f files/fontconfig-9999-symbol_alias.patch 748
+RMD160 e8b6d59db4a81faf100dcaf303e6ab036f09ffae files/fontconfig-9999-symbol_alias.patch 748
+SHA256 c7932dbbf0d89b60a98118871ecbcea142ccd27fa01238530ac2821821e5ec2b files/fontconfig-9999-symbol_alias.patch 748
+EBUILD fontconfig-9999.ebuild 2544 RMD160 eeac2be20eddbdc6d0ce6dff96921d5aaa8ab08d SHA1 a0e3b52af49aeaa6cbc6a203e316fb1242791ed4 SHA256 096c8650036a0b19cc492f4b6964f80d6ae250d7ac6cbc9d3d1ab34699b59d0a
+MD5 572ff16541f164053f77823f0dbfc6ac fontconfig-9999.ebuild 2544
+RMD160 eeac2be20eddbdc6d0ce6dff96921d5aaa8ab08d fontconfig-9999.ebuild 2544
+SHA256 096c8650036a0b19cc492f4b6964f80d6ae250d7ac6cbc9d3d1ab34699b59d0a fontconfig-9999.ebuild 2544
MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-fontconfig-9999 1
RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-fontconfig-9999 1
SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-fontconfig-9999 1
diff --git a/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch b/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch
deleted file mode 100644
index 2d35ff1..0000000
--- a/media-libs/fontconfig/files/fontconfig-2.3.2-symbol_alias.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- fontconfig-2.3.2/fonts.conf.in 2005-04-03 23:07:50.000000000 +0200
-+++ fontconfig-2.3.2/fonts.conf.in.new 2006-04-07 13:10:55.000000000 +0200
-@@ -311,6 +311,19 @@
- </prefer>
- </alias>
-
-+<!--
-+ Suitable free alias for Symbol font
-+ -->
-+
-+ <alias>
-+ <family>Symbol</family>
-+ <accept><family>Standard Symbols L</family></accept>
-+ </alias>
-+ <alias>
-+ <family>ZapfDingbats</family>
-+ <accept><family>Dingbats</family></accept>
-+ </alias>
-+
- <!--
- Artificial oblique for fonts without an italic or oblique version
- -->
diff --git a/media-libs/fontconfig/files/fontconfig-9999-symbol_alias.patch b/media-libs/fontconfig/files/fontconfig-9999-symbol_alias.patch
new file mode 100644
index 0000000..94ea332
--- /dev/null
+++ b/media-libs/fontconfig/files/fontconfig-9999-symbol_alias.patch
@@ -0,0 +1,25 @@
+--- fontconfig-9999.orig/conf.d/49-symbols.conf 2005-04-03 23:07:50.000000000 +0200
++++ fontconfig-9999/conf.d/49-symbols.conf 2006-04-07 13:10:55.000000000 +0200
+@@ -0,0 +1,12 @@
++<!--
++ Suitable free alias for Symbol font
++ -->
++
++ <alias>
++ <family>Symbol</family>
++ <accept><family>Standard Symbols L</family></accept>
++ </alias>
++ <alias>
++ <family>ZapfDingbats</family>
++ <accept><family>Dingbats</family></accept>
++ </alias>
+--- fontconfig-9999.orig/conf.d/Makefile.am 2006-09-16 12:56:38.000000000 -0700
++++ fontconfig-9999/conf.d/Makefile.am 2006-09-16 12:56:57.000000000 -0700
+@@ -37,6 +37,7 @@
+ 30-urw-aliases.conf \
+ 40-generic.conf \
+ 49-sansserif.conf \
++ 49-symbols.conf \
+ 50-user.conf \
+ 51-local.conf \
+ 60-latin.conf \
diff --git a/media-libs/fontconfig/fontconfig-9999.ebuild b/media-libs/fontconfig/fontconfig-9999.ebuild
index 47641c3..72de9b5 100644
--- a/media-libs/fontconfig/fontconfig-9999.ebuild
+++ b/media-libs/fontconfig/fontconfig-9999.ebuild
@@ -23,7 +23,7 @@ src_unpack() {
cd "${S}"
# alias for Symbol and dingbats font (#124238)
- epatch "${FILESDIR}"/${PN}-2.3.2-symbol_alias.patch
+ epatch "${FILESDIR}"/${P}-symbol_alias.patch
# add docbook switch so we can disable it
epatch "${FILESDIR}"/${PN}-2.3.2-docbook.patch