mkfontscale: always include non-native recipe and use xorg-app-common.inc

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/xorg-app/mkfontscale-native_1.0.3.bb b/recipes/xorg-app/mkfontscale-native_1.0.3.bb
index 7aad28c..bae3416 100644 (file)
--- a/recipes/xorg-app/mkfontscale-native_1.0.3.bb
+++ b/recipes/xorg-app/mkfontscale-native_1.0.3.bb
@@ -1,14 +1,7 @@
-DESCRIPTION = "X mkfontscale app"
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-S="${WORKDIR}/mkfontscale-${PV}"
+inherit native
+require mkfontscale_${PV}.bb
 
 DEPENDS = "libx11-native libfontenc-native freetype-native"
 
-SRC_URI = "${XORG_MIRROR}/individual/app/mkfontscale-${PV}.tar.bz2"
-
-inherit native autotools pkgconfig
-
-SRC_URI[md5sum] = "1d608771aca9695b828cec1e34178fd1"
-SRC_URI[sha256sum] = "0458a3a5525b4ab458a018648ef8575afc191f904364c00e27876a7bd53af020"
-PR = "${INC_PR}.0"
+S="${WORKDIR}/mkfontscale-${PV}"
+XORG_PN="mkfontscale"

diff --git a/recipes/xorg-app/mkfontscale-native_1.0.4.bb b/recipes/xorg-app/mkfontscale-native_1.0.4.bb
index a1ce7a7..bae3416 100644 (file)
--- a/recipes/xorg-app/mkfontscale-native_1.0.4.bb
+++ b/recipes/xorg-app/mkfontscale-native_1.0.4.bb
@@ -1,11 +1,7 @@
 inherit native
-require mkfontscale_1.0.4.bb
+require mkfontscale_${PV}.bb
 
 DEPENDS = "libx11-native libfontenc-native freetype-native"
 
 S="${WORKDIR}/mkfontscale-${PV}"
 XORG_PN="mkfontscale"
-
-SRC_URI[archive.md5sum] = "e5d7373c4266973b3b13aac5d1a4655b"
-SRC_URI[archive.sha256sum] = "dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227"
-PR = "${INC_PR}.0"

diff --git a/recipes/xorg-app/mkfontscale-native_1.0.5.bb b/recipes/xorg-app/mkfontscale-native_1.0.5.bb
index 7af2eac..bae3416 100644 (file)
--- a/recipes/xorg-app/mkfontscale-native_1.0.5.bb
+++ b/recipes/xorg-app/mkfontscale-native_1.0.5.bb
@@ -5,4 +5,3 @@ DEPENDS = "libx11-native libfontenc-native freetype-native"
 
 S="${WORKDIR}/mkfontscale-${PV}"
 XORG_PN="mkfontscale"
-PR = "${INC_PR}.0"

diff --git a/recipes/xorg-app/mkfontscale-native_1.0.7.bb b/recipes/xorg-app/mkfontscale-native_1.0.7.bb
index 23a8ab1..bae3416 100644 (file)
--- a/recipes/xorg-app/mkfontscale-native_1.0.7.bb
+++ b/recipes/xorg-app/mkfontscale-native_1.0.7.bb
@@ -5,7 +5,3 @@ DEPENDS = "libx11-native libfontenc-native freetype-native"
 
 S="${WORKDIR}/mkfontscale-${PV}"
 XORG_PN="mkfontscale"
-
-SRC_URI[archive.md5sum] = "96ca346f185c0ab48e42bf5bb0375da5"
-SRC_URI[archive.sha256sum] = "8306b229cca233216a6582cb1ff60af78e37c47d6412ac823d7d41c3d7de7127"
-PR = "${INC_PR}.0"