summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-20 19:40:10 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-20 19:40:10 +0000
commit0152cef47e4e9e888a3e25604b43a38a5351c14e (patch)
tree8ee9964d8e0028440cd6966c85469a57ffc07b58
parent0f4e2eb0c6e73e4fa6201da07da32f3146789633 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/20 19:38:57+00:00 (none)!pb preferred-gpe-versions.inc: set libgpevtype to version 0.11 2005/02/20 19:12:56+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/02/20 19:12:39+00:00 nexus.co.uk!pb install modified /etc/fonts/local.conf to enable subpixel rendering BKrev: 4218e79atfOW07Bt0AQOSmqbv5jA0Q
-rw-r--r--conf/distro/preferred-gpe-versions.inc2
-rw-r--r--packages/fontconfig/files/local.conf0
-rw-r--r--packages/fontconfig/fontconfig_2.2.95.bb10
3 files changed, 10 insertions, 2 deletions
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 52902f9c56..9c31e13994 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -17,7 +17,7 @@ PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
PREFERRED_VERSION_gtk+ = "2.6.2"
#PREFERRED_VERSION_libgpewidget = "0.97"
PREFERRED_VERSION_libgpepimc = "0.4"
-PREFERRED_VERSION_libgpevtype = "0.9"
+PREFERRED_VERSION_libgpevtype = "0.11"
PREFERRED_VERSION_libschedule = "0.14"
PREFERRED_VERSION_gpe-icons = "0.24"
PREFERRED_VERSION_libgsm = "1.0.10"
diff --git a/packages/fontconfig/files/local.conf b/packages/fontconfig/files/local.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fontconfig/files/local.conf
diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb
index 54ca0b2f6f..6989b7a053 100644
--- a/packages/fontconfig/fontconfig_2.2.95.bb
+++ b/packages/fontconfig/fontconfig_2.2.95.bb
@@ -5,7 +5,9 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native"
SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \
file://fc-glyphname.patch;patch=1 \
- file://fc-lang.patch;patch=1"
+ file://fc-lang.patch;patch=1 \
+ file://local.conf"
+PR = "r1"
PACKAGES =+ "fontconfig-utils "
FILES_fontconfig-utils = "${bindir}/*"
@@ -24,3 +26,9 @@ do_stage () {
install -d ${STAGING_INCDIR}/fontconfig
for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done
}
+
+do_install () {
+ autotools_do_install
+ install -m 0644 ${WORKDIR}/local.conf ${D}${sysconfdir}/fonts/local.conf
+}
+