summaryrefslogtreecommitdiff
path: root/extra/fontconfig
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-10 11:32:41 +0100
commitbdf817c3549ba377334deb1161de703579670d62 (patch)
treec1b80c05c917cda2619e267049978f971bdad169 /extra/fontconfig
parentdf609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff)
parent1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/cdemu-client/PKGBUILD community/dcron/PKGBUILD community/freevo/PKGBUILD community/gmerlin-avdecoder/PKGBUILD community/hacburn/PKGBUILD community/htmldoc/PKGBUILD community/ibus-table/PKGBUILD community/iksemel/PKGBUILD community/isomaster/PKGBUILD community/libmatio/PKGBUILD community/libtlen/PKGBUILD community/luarocks/PKGBUILD community/lxde-common/PKGBUILD community/multipath-tools/PKGBUILD community/nvclock/PKGBUILD community/pam-krb5/PKGBUILD community/pidgin-musictracker/PKGBUILD community/pkgfile/PKGBUILD community/pkgtools/PKGBUILD community/print-manager/PKGBUILD community/python-pyro/PKGBUILD community/python-pyxmpp/PKGBUILD community/python2-simplejson/PKGBUILD community/rsnapshot/PKGBUILD community/setconf/PKGBUILD community/tagpy/PKGBUILD community/terminator/PKGBUILD community/udunits/PKGBUILD community/vlock/PKGBUILD community/winefish/PKGBUILD core/nss-myhostname/PKGBUILD extra/avfs/PKGBUILD extra/bmp-musepack/PKGBUILD extra/bmp-wma/PKGBUILD extra/bochs/PKGBUILD extra/botan/PKGBUILD extra/cdargs/PKGBUILD extra/cx_freeze/PKGBUILD extra/dcfldd/PKGBUILD extra/devilspie/PKGBUILD extra/emelfm2/PKGBUILD extra/evilwm/PKGBUILD extra/fssos-nsvs/PKGBUILD extra/gimp-dbp/PKGBUILD extra/gimp-gap/PKGBUILD extra/gimp-ufraw/PKGBUILD extra/gmpc/PKGBUILD extra/gtkpod/PKGBUILD extra/hercules/PKGBUILD extra/herqq/PKGBUILD extra/hydrogen/PKGBUILD extra/kdegames/PKGBUILD extra/kradio/PKGBUILD extra/kshutdown/PKGBUILD extra/libmusicbrainz4/PKGBUILD extra/mahjong/PKGBUILD extra/mcrypt/PKGBUILD extra/monica/PKGBUILD extra/mpck/PKGBUILD extra/mrtg/PKGBUILD extra/nicotine/PKGBUILD extra/normalize/PKGBUILD extra/oprofile/PKGBUILD extra/perl-event/PKGBUILD extra/perl-unicode-string/PKGBUILD extra/pidgin-encryption/PKGBUILD extra/proftpd/PKGBUILD extra/pymad/PKGBUILD extra/qiv/PKGBUILD extra/quodlibet/PKGBUILD extra/ratpoison/PKGBUILD extra/rox/PKGBUILD extra/scrot/PKGBUILD extra/stardict/PKGBUILD extra/terminal/PKGBUILD extra/usbview/PKGBUILD extra/xdelta/PKGBUILD extra/xdelta3/PKGBUILD extra/xorg-xlsfonts/PKGBUILD extra/zile/PKGBUILD mozilla-testing/iceweasel-libre/mozconfig mozilla-testing/iceweasel-libre/vendor.js social/tokyocabinet/PKGBUILD ~fauno/notmuch/PKGBUILD ~mtjm/thinkfan/PKGBUILD ~mtjm/zbar/PKGBUILD
Diffstat (limited to 'extra/fontconfig')
-rw-r--r--extra/fontconfig/30-urw-aliases.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/extra/fontconfig/30-urw-aliases.patch b/extra/fontconfig/30-urw-aliases.patch
deleted file mode 100644
index 8077b869e..000000000
--- a/extra/fontconfig/30-urw-aliases.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/conf.d/30-urw-aliases.conf 2009-08-06 16:23:57.000000000 +0100
-+++ b/conf.d/30-urw-aliases.conf 2009-08-06 16:25:07.000000000 +0100
-@@ -29,6 +29,10 @@
- <family>Zapf Dingbats</family>
- <accept><family>Dingbats</family></accept>
- </alias>
-+ <alias binding="same">
-+ <family>ZapfDingbats</family>
-+ <accept><family>Dingbats</family></accept>
-+ </alias>
- <match target="pattern">
- <test name="family">
- <string>Symbol</string>