xserver-kdrive: move enable-builtin-fonts.patch out of -common.inc

* I hope 1.4 will do without this hack

diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc
index a3e38b1..cc2c5c6 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -93,7 +93,6 @@ KDRIVE_COMMON_PATCHES = " \
        file://disable-apm.patch;patch=1 \
        file://no-serial-probing.patch;patch=1 \
        file://fbdev-not-fix.patch;patch=1  \
-       file://enable-builtin-fonts.patch;patch=1 \
        file://optional-xkb.patch;patch=1 \
        file://enable-epson.patch;patch=1 \
        file://enable-tslib.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
index 52fbf86..b7ab230 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb
@@ -7,6 +7,7 @@ PR = "r9"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
+       file://enable-builtin-fonts.patch;patch=1 \
        file://kdrive-evdev.patch;patch=1  \
        file://kdrive-use-evdev.patch;patch=1  \
        file://disable-xf86-dga-xorgcfg.patch;patch=1 \

diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 7fe176a..5dffead 100644 (file)
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -7,6 +7,7 @@ PR = "r17"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
+       file://enable-builtin-fonts.patch;patch=1 \
        file://kdrive-evdev.patch;patch=1  \
        file://kdrive-use-evdev.patch;patch=1  \
        file://disable-xf86-dga-xorgcfg.patch;patch=1 \