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

diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 52902f9..9c31e13 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb
index 54ca0b2..6989b7a 100644 (file)
--- 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
+}
+