Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=1cf0f5e133eb33a52406568e080b306c73dbd870
commit 1cf0f5e133eb33a52406568e080b306c73dbd870
Author: crazy <[EMAIL PROTECTED]>
Date: Fri Jan 18 02:03:16 2008 +0100
fontconfig-2.5.91-1-i686
* Version bump
* removed merged patch
* reworked fw patch
* fixed install scriptlet
diff --git a/source/lib/fontconfig/01-frugalware-confs.patch
b/source/lib/fontconfig/01-frugalware-confs.patch
index fc8c3b7..5e08d74 100644
--- a/source/lib/fontconfig/01-frugalware-confs.patch
+++ b/source/lib/fontconfig/01-frugalware-confs.patch
@@ -1,6 +1,6 @@
-diff -Naurp fontconfig-2.4.0/conf.d/00-frugalware.conf
fontconfig-2.4.0-p/conf.d/00-frugalware.conf
---- fontconfig-2.4.0/conf.d/00-frugalware.conf 1970-01-01 01:00:00.000000000
+0100
-+++ fontconfig-2.4.0-p/conf.d/00-frugalware.conf 2007-02-09
00:57:26.000000000 +0100
+diff -Naur fontconfig-2.5.91/conf.d/00-frugalware.conf
fontconfig-2.5.91-p/conf.d/00-frugalware.conf
+--- fontconfig-2.5.91/conf.d/00-frugalware.conf 1970-01-01
01:00:00.000000000 +0100
++++ fontconfig-2.5.91-p/conf.d/00-frugalware.conf 2008-01-18
01:18:59.000000000 +0100
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@@ -15,9 +15,9 @@ diff -Naurp fontconfig-2.4.0/conf.d/00-frugalware.conf
fontconfig-2.4.0-p/conf.d
+ <dir>/usr/share/imlib2/data/fonts</dir>
+
+</fontconfig>
-diff -Naurp fontconfig-2.4.0/conf.d/10-fw-autohinting.conf
fontconfig-2.4.0-p/conf.d/10-fw-autohinting.conf
---- fontconfig-2.4.0/conf.d/10-fw-autohinting.conf 1970-01-01
01:00:00.000000000 +0100
-+++ fontconfig-2.4.0-p/conf.d/10-fw-autohinting.conf 2007-02-09
01:01:13.000000000 +0100
+diff -Naur fontconfig-2.5.91/conf.d/10-fw-autohinting.conf
fontconfig-2.5.91-p/conf.d/10-fw-autohinting.conf
+--- fontconfig-2.5.91/conf.d/10-fw-autohinting.conf 1970-01-01
01:00:00.000000000 +0100
++++ fontconfig-2.5.91-p/conf.d/10-fw-autohinting.conf 2008-01-18
01:18:59.000000000 +0100
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@@ -34,9 +34,9 @@ diff -Naurp fontconfig-2.4.0/conf.d/10-fw-autohinting.conf
fontconfig-2.4.0-p/co
+ <edit name="autohint" mode="assign"><bool>false</bool></edit>
+</match>
+</fontconfig>
-diff -Naurp fontconfig-2.4.0/conf.d/30-fw-urw.conf
fontconfig-2.4.0-p/conf.d/30-fw-urw.conf
---- fontconfig-2.4.0/conf.d/30-fw-urw.conf 1970-01-01 01:00:00.000000000
+0100
-+++ fontconfig-2.4.0-p/conf.d/30-fw-urw.conf 2007-02-09 00:57:26.000000000
+0100
+diff -Naur fontconfig-2.5.91/conf.d/30-fw-urw.conf
fontconfig-2.5.91-p/conf.d/30-fw-urw.conf
+--- fontconfig-2.5.91/conf.d/30-fw-urw.conf 1970-01-01 01:00:00.000000000
+0100
++++ fontconfig-2.5.91-p/conf.d/30-fw-urw.conf 2008-01-18 01:18:59.000000000
+0100
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@@ -183,9 +183,9 @@ diff -Naurp fontconfig-2.4.0/conf.d/30-fw-urw.conf
fontconfig-2.4.0-p/conf.d/30-
+ </match>
+
+</fontconfig>
-diff -Naurp fontconfig-2.4.0/conf.d/70-fw-no-bitmap.conf
fontconfig-2.4.0-p/conf.d/70-fw-no-bitmap.conf
---- fontconfig-2.4.0/conf.d/70-fw-no-bitmap.conf 1970-01-01
01:00:00.000000000 +0100
-+++ fontconfig-2.4.0-p/conf.d/70-fw-no-bitmap.conf 2007-02-09
00:57:26.000000000 +0100
+diff -Naur fontconfig-2.5.91/conf.d/70-fw-no-bitmap.conf
fontconfig-2.5.91-p/conf.d/70-fw-no-bitmap.conf
+--- fontconfig-2.5.91/conf.d/70-fw-no-bitmap.conf 1970-01-01
01:00:00.000000000 +0100
++++ fontconfig-2.5.91-p/conf.d/70-fw-no-bitmap.conf 2008-01-18
01:18:59.000000000 +0100
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
@@ -329,36 +329,36 @@ diff -Naurp fontconfig-2.4.0/conf.d/70-fw-no-bitmap.conf
fontconfig-2.4.0-p/conf
+ </edit>
+ </match>
+</fontconfig>
-diff -Naurp fontconfig-2.4.0/conf.d/Makefile.am
fontconfig-2.4.0-p/conf.d/Makefile.am
---- fontconfig-2.4.0/conf.d/Makefile.am 2006-09-10 06:07:07.000000000
+0200
-+++ fontconfig-2.4.0-p/conf.d/Makefile.am 2007-02-09 01:02:17.000000000
+0100
-@@ -23,6 +23,7 @@
+diff -Naur fontconfig-2.5.91/conf.d/Makefile.am
fontconfig-2.5.91-p/conf.d/Makefile.am
+--- fontconfig-2.5.91/conf.d/Makefile.am 2008-01-10 19:43:05.000000000
+0100
++++ fontconfig-2.5.91-p/conf.d/Makefile.am 2008-01-18 01:29:24.000000000
+0100
+@@ -25,6 +25,7 @@
+ README
CONF_FILES = \
- README \
+ 00-frugalware.conf \
10-autohint.conf \
10-no-sub-pixel.conf \
10-sub-pixel-bgr.conf \
-@@ -30,11 +31,13 @@ CONF_FILES = \
+@@ -32,10 +33,12 @@
10-sub-pixel-vbgr.conf \
10-sub-pixel-vrgb.conf \
10-unhinted.conf \
+ 10-fw-autohinting.conf \
20-fix-globaladvance.conf \
- 20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
- 30-amt-aliases.conf \
+ 25-unhint-nonlatin.conf \
30-urw-aliases.conf \
+ 30-fw-urw.conf \
- 40-generic.conf \
- 49-sansserif.conf \
- 50-user.conf \
-@@ -45,15 +48,19 @@ CONF_FILES = \
+ 30-metric-aliases.conf \
+ 40-nonlatin.conf \
+ 45-latin.conf \
+@@ -48,14 +51,18 @@
+ 65-nonlatin.conf \
69-unifont.conf \
70-no-bitmaps.conf \
- 70-yes-bitmaps.conf \
+ 70-fw-no-bitmap.conf \
+ 70-yes-bitmaps.conf \
80-delicious.conf \
90-synthetic.conf
@@ -367,15 +367,13 @@ diff -Naurp fontconfig-2.4.0/conf.d/Makefile.am
fontconfig-2.4.0-p/conf.d/Makefi
+ 10-fw-autohinting.conf \
+ 10-sub-pixel-rgb.conf \
20-fix-globaladvance.conf \
- 20-lohit-gujarati.conf \
20-unhint-small-vera.conf \
- 30-amt-aliases.conf \
- 30-urw-aliases.conf \
+ 30-fw-urw.conf \
- 40-generic.conf \
- 49-sansserif.conf \
- 50-user.conf \
-@@ -62,6 +69,7 @@ CONF_LINKS = \
+ 30-metric-aliases.conf \
+ 40-nonlatin.conf \
+ 45-latin.conf \
+@@ -66,6 +73,7 @@
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
@@ -383,17 +381,18 @@ diff -Naurp fontconfig-2.4.0/conf.d/Makefile.am
fontconfig-2.4.0-p/conf.d/Makefi
80-delicious.conf \
90-synthetic.conf
-@@ -70,11 +78,16 @@ EXTRA_DIST = $(CONF_FILES)
+@@ -74,12 +82,17 @@
configdir=$(CONFDIR)
confavaildir=$(configdir)/conf.avail
confddir=$(configdir)/conf.d
+conffdir=$(configdir)/frugalware.d
confavail_DATA=$(CONF_FILES)
+ confd_DATA=$(DOC_FILES)
install-data-local:
mkdir -p ${DESTDIR}${confddir}
-+ @(echo cd ${DESTDIR}${configdir}; \
++ @(echo cd ${DESTDIR}${confiddir}; \
+ cd ${DESTDIR}${configdir}; \
+ ln -sf conf.d frugalware.d; \
+ )
diff --git
a/source/lib/fontconfig/02-generic.conf-move-dejavu-and-luxi-before-vera.patch
b/source/lib/fontconfig/02-generic.conf-move-dejavu-and-luxi-before-vera.patch
deleted file mode 100644
index c87a158..0000000
---
a/source/lib/fontconfig/02-generic.conf-move-dejavu-and-luxi-before-vera.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur fontconfig-2.4.0/conf.d/40-generic.conf
fontconfig-2.4.0-p/conf.d/40-generic.conf
---- fontconfig-2.4.0/conf.d/40-generic.conf 2006-09-10 05:33:43.000000000
+0200
-+++ fontconfig-2.4.0-p/conf.d/40-generic.conf 2006-09-17 13:27:24.000000000
+0200
-@@ -10,8 +10,9 @@
- Serif faces
- -->
- <alias>
-- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
-+ <family>Luxi Serif</family>
-+ <family>Bitstream Vera Serif</family>
- <family>Times New Roman</family>
- <family>Times</family>
- <family>Nimbus Roman No9 L</family>
-@@ -29,8 +30,9 @@
- Sans-serif faces
- -->
- <alias>
-- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
-+ <family>Luxi Sans</family>
-+ <family>Bitstream Vera Sans</family>
- <family>Helvetica</family>
- <family>Arial</family>
- <family>Verdana</family>
-@@ -51,12 +53,12 @@
- Monospace faces
- -->
- <alias>
-- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
-+ <family>Luxi Mono</family>
-+ <family>Bitstream Vera Sans Mono</family>
- <family>Courier</family>
- <family>Courier New</family>
- <family>Andale Mono</family>
-- <family>Luxi Mono</family>
- <family>Cumberland AMT</family>
- <family>Nimbus Mono L</family>
- <family>NSimSun</family>
diff --git a/source/lib/fontconfig/FrugalBuild
b/source/lib/fontconfig/FrugalBuild
index 0f6d4dd..311311e 100644
--- a/source/lib/fontconfig/FrugalBuild
+++ b/source/lib/fontconfig/FrugalBuild
@@ -3,21 +3,17 @@
# Contributor: VMiklos <[EMAIL PROTECTED]>
pkgname=fontconfig
-pkgver=2.4.0
-pkgrel=3
+pkgver=2.5.91
+pkgrel=1
pkgdesc="A library for configuring and customizing font access"
url="http://fontconfig.org/";
depends=('libxml2' 'freetype2>=2.3.1' 'frugalware')
groups=('lib' 'misc-fonts')
archs=('i686' 'x86_64')
-## stable
-up2date="lynx -dump -source $url|grep -m1 'The latest version'|sed
's/.*latest.*is \(.*\).*which.*/\1/'|tr -d [:blank:]"
-## devel
-#up2date="lynx -dump http://fontconfig.org/release|Flasttar"
+up2date="lynx -dump http://fontconfig.org/release|Flasttar"
options=('force')
source=($url/release/$pkgname-$pkgver.tar.gz \
01-frugalware-confs.patch \
- 02-generic.conf-move-dejavu-and-luxi-before-vera.patch \
03-latin.conf-move-dejavu-and-luxi-before-vera.patch)
@@ -37,8 +33,7 @@ build()
}
-sha1sums=('132b0567740a04d89cd1eef0dd66b43ca32538c0'\
- '6bb074fe6abe3ba7a53eb46941af78db40a0738b'\
- 'd6e4c542d747b422b0c5221abe21476ac05697b2'\
+sha1sums=('bfd635761d24ed6fc1347aed61c0cf7b5fa7be5d' \
+ '9dd37943df4199edf0d8adca65a075286e84ed04' \
'e1c3d5c855149692d9fc7278fa57ad3c6a43e919')
# optimization OK
diff --git a/source/lib/fontconfig/fontconfig.install
b/source/lib/fontconfig/fontconfig.install
index a021405..ff01ba6 100644
--- a/source/lib/fontconfig/fontconfig.install
+++ b/source/lib/fontconfig/fontconfig.install
@@ -10,20 +10,18 @@ post_install() {
}
-pre_upgrade()
-{
- ## not valid with 2.3.96 anymore now its has such a
- ## xxxx-$ARCH.cache-2. Remove for 0.6 final
- /usr/bin/rm -f /var/cache/fontconfig/*.cache-2 2>/dev/null >/dev/null
-
-}
post_upgrade() {
post_install $1
}
+post_remove()
+{
+ post_install $1
+}
+
op=$1
shift
$op $*
-# vim: ft=sh
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
