xorg-font: Add INC_PR to all the Xorg fonts.

41 files changed, 57 insertions, 19 deletions

diff --git a/recipes/xorg-font/encodings_1.0.2.bb b/recipes/xorg-font/encodings_1.0.2.bb
index da67d037aa..68cc2b5293 100644
--- a/recipes/xorg-font/encodings_1.0.2.bb
+++ b/recipes/xorg-font/encodings_1.0.2.bb
@@ -1,8 +1,5 @@
 require xorg-font-common.inc
 PE = "1"
-
-#DESCRIPTION = ""
+PR = "${INC_PR}.0"
 
 DEPENDS = "mkfontscale-native"
-RDEPENDS = ""
-
diff --git a/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb b/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
index e1bdcb5e7a..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-adobe-100dpi_1.0.0.bb
@@ -1,3 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb b/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-adobe-75dpi_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
index 0799b8a97e..897fd018df 100644
--- a/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
+++ b/recipes/xorg-font/font-adobe-utopia-100dpi_1.0.1.bb
@@ -3,3 +3,4 @@ require xorg-font-common.inc
 DESCRIPTION = "Adobe typeface software"
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
index 6e20eb97d8..897fd018df 100644
--- a/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
+++ b/recipes/xorg-font/font-adobe-utopia-75dpi_1.0.1.bb
@@ -3,4 +3,4 @@ require xorg-font-common.inc
 DESCRIPTION = "Adobe typeface software"
 
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb b/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
index 6e20eb97d8..897fd018df 100644
--- a/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
+++ b/recipes/xorg-font/font-adobe-utopia-type1_1.0.1.bb
@@ -3,4 +3,4 @@ require xorg-font-common.inc
 DESCRIPTION = "Adobe typeface software"
 
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-alias_1.0.1.bb b/recipes/xorg-font/font-alias_1.0.1.bb
index 90eec26a57..5314cbc5db 100644
--- a/recipes/xorg-font/font-alias_1.0.1.bb
+++ b/recipes/xorg-font/font-alias_1.0.1.bb
@@ -5,4 +5,5 @@ DESCRIPTION = "X font aliases."
 DEPENDS = "virtual/xserver font-util"
 RDEPENDS = "encodings font-util"
 
-PE = "1"
\ No newline at end of file
+PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-arabic-misc_1.0.0.bb b/recipes/xorg-font/font-arabic-misc_1.0.0.bb
index 6171333d6a..501d4dd979 100644
--- a/recipes/xorg-font/font-arabic-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-arabic-misc_1.0.0.bb
@@ -4,4 +4,4 @@ DESCRIPTION = "100dpi, 24 point (approximately) font to minimally support (almos
 of the Arabic characters available in Unicode."
 
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-100dpi_1.0.0.bb b/recipes/xorg-font/font-bh-100dpi_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-100dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-100dpi_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-75dpi_1.0.0.bb b/recipes/xorg-font/font-bh-75dpi_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-75dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-75dpi_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb b/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb b/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-lucidatypewriter-75dpi_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-ttf_1.0.0.bb b/recipes/xorg-font/font-bh-ttf_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-ttf_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-ttf_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bh-type1_1.0.0.bb b/recipes/xorg-font/font-bh-type1_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bh-type1_1.0.0.bb
+++ b/recipes/xorg-font/font-bh-type1_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb b/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bitstream-100dpi_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb b/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
+++ b/recipes/xorg-font/font-bitstream-75dpi_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb b/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
+++ b/recipes/xorg-font/font-bitstream-speedo_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-bitstream-type1_1.0.0.bb b/recipes/xorg-font/font-bitstream-type1_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-bitstream-type1_1.0.0.bb
+++ b/recipes/xorg-font/font-bitstream-type1_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb b/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
+++ b/recipes/xorg-font/font-cronyx-cyrillic_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-cursor-misc_1.0.0.bb b/recipes/xorg-font/font-cursor-misc_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-cursor-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-cursor-misc_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-daewoo-misc_1.0.0.bb b/recipes/xorg-font/font-daewoo-misc_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-daewoo-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-daewoo-misc_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-dec-misc_1.0.0.bb b/recipes/xorg-font/font-dec-misc_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-dec-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-dec-misc_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-ibm-type1_1.0.0.bb b/recipes/xorg-font/font-ibm-type1_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-ibm-type1_1.0.0.bb
+++ b/recipes/xorg-font/font-ibm-type1_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-isas-misc_1.0.0.bb b/recipes/xorg-font/font-isas-misc_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-isas-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-isas-misc_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-jis-misc_1.0.0.bb b/recipes/xorg-font/font-jis-misc_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-jis-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-jis-misc_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-micro-misc_1.0.0.bb b/recipes/xorg-font/font-micro-misc_1.0.0.bb
index 383d16c799..9eec596969 100644
--- a/recipes/xorg-font/font-micro-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-micro-misc_1.0.0.bb
@@ -1,4 +1,6 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
 
 EXTRA_OECONF = "--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-6 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-12 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-15 --disable-iso8859-16 --disable-jisx0201 --disable-koi8-r"
diff --git a/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb b/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
index 60ef06fba0..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
+++ b/recipes/xorg-font/font-misc-cyrillic_1.0.0.bb
@@ -1,2 +1,4 @@
 require xorg-font-common.inc
+
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb b/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
+++ b/recipes/xorg-font/font-misc-ethiopic_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-misc-meltho_1.0.0.bb b/recipes/xorg-font/font-misc-meltho_1.0.0.bb
index 719a443b51..d2d6883aea 100644
--- a/recipes/xorg-font/font-misc-meltho_1.0.0.bb
+++ b/recipes/xorg-font/font-misc-meltho_1.0.0.bb
@@ -2,4 +2,4 @@ require xorg-font-common.inc
 
 DESCRIPTION = "These fonts are designed for the display of Syriac text."
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-misc-misc_1.0.0.bb b/recipes/xorg-font/font-misc-misc_1.0.0.bb
index ad42a16ae2..729a90aa48 100644
--- a/recipes/xorg-font/font-misc-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-misc-misc_1.0.0.bb
@@ -2,8 +2,6 @@ EXTRA_OECONF = "STAGING_LIBDIR_NATIVE=\"${STAGING_LIBDIR_NATIVE}\""
 
 require xorg-font-common.inc
 
-SRC_URI += " file://configure-mapdir.patch;patch=1"
-
-#DESCRIPTION = ""
+PR = "${INC_PR}.0"
 
-#DEPENDS += " "
+SRC_URI += " file://configure-mapdir.patch;patch=1"
diff --git a/recipes/xorg-font/font-mutt-misc_1.0.0.bb b/recipes/xorg-font/font-mutt-misc_1.0.0.bb
index a5ded3d3cc..6862d026b6 100644
--- a/recipes/xorg-font/font-mutt-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-mutt-misc_1.0.0.bb
@@ -4,4 +4,4 @@ DESCRIPTION = "Provides a 12pt, 100dpi proportional font with many of \
 the glyphs needed for Unicode text."
 
 PE = "1"
-
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-schumacher-misc_1.0.0.bb b/recipes/xorg-font/font-schumacher-misc_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-schumacher-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-schumacher-misc_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb b/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
+++ b/recipes/xorg-font/font-screen-cyrillic_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-sony-misc_1.0.0.bb b/recipes/xorg-font/font-sony-misc_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-sony-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-sony-misc_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-sun-misc_1.0.0.bb b/recipes/xorg-font/font-sun-misc_1.0.0.bb
index 60ef06fba0..ae0b32e8fd 100644
--- a/recipes/xorg-font/font-sun-misc_1.0.0.bb
+++ b/recipes/xorg-font/font-sun-misc_1.0.0.bb
@@ -1,2 +1,3 @@
 require xorg-font-common.inc
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-util-native_1.0.1.bb b/recipes/xorg-font/font-util-native_1.0.1.bb
index 32ea62c3d5..cb117bf957 100644
--- a/recipes/xorg-font/font-util-native_1.0.1.bb
+++ b/recipes/xorg-font/font-util-native_1.0.1.bb
@@ -1,4 +1,4 @@
-inherit native
+be inherit native
 require xorg-font-common.inc
 
 XORG_PN = "font-util"
@@ -6,3 +6,4 @@ XORG_PN = "font-util"
 DEPENDS = "bdftopcf-native"
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-util_1.0.1.bb b/recipes/xorg-font/font-util_1.0.1.bb
index 3ba1c05a29..5a1761bf6a 100644
--- a/recipes/xorg-font/font-util_1.0.1.bb
+++ b/recipes/xorg-font/font-util_1.0.1.bb
@@ -1,4 +1,4 @@
-require xorg-font-common.inc
+Qurequire xorg-font-common.inc
 
 PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
 
@@ -7,5 +7,5 @@ DESCRIPTION = "X font utils."
 DEPENDS = "encodings"
 RDEPENDS = "mkfontdir mkfontscale encodings"
 
-PR = "r1"
 PE = "1"
+PR = "${INC_PR}.1"
diff --git a/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb b/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
+++ b/recipes/xorg-font/font-winitzki-cyrillic_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-xfree86-type1_1.0.0.bb b/recipes/xorg-font/font-xfree86-type1_1.0.0.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-xfree86-type1_1.0.0.bb
+++ b/recipes/xorg-font/font-xfree86-type1_1.0.0.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/font-xfree86-type1_1.0.1.bb b/recipes/xorg-font/font-xfree86-type1_1.0.1.bb
index f8fe553c62..4aa3ec58a0 100644
--- a/recipes/xorg-font/font-xfree86-type1_1.0.1.bb
+++ b/recipes/xorg-font/font-xfree86-type1_1.0.1.bb
@@ -1,3 +1,4 @@
 require xorg-font-common.inc
 
 PE = "1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-font/xorg-minimal-fonts.bb b/recipes/xorg-font/xorg-minimal-fonts.bb
index d91c6d772d..92b29e61e6 100644
--- a/recipes/xorg-font/xorg-minimal-fonts.bb
+++ b/recipes/xorg-font/xorg-minimal-fonts.bb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/fonts"
 LICENSE = "MIT-X"
 
-PR = "r1"
+PR = "1"
 
 SRC_URI = "file://misc"