libx11,diet-x11: use INC_PR

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

18 files changed, 19 insertions, 12 deletions

diff --git a/recipes/xorg-lib/diet-x11_1.1.1.bb b/recipes/xorg-lib/diet-x11_1.1.1.bb
index 89e472d5e1..3d8fe05b1b 100644
--- a/recipes/xorg-lib/diet-x11_1.1.1.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.1.bb
@@ -8,3 +8,4 @@ SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-utf8-wrong-define.patch \
 	    file://xim.patch \
 	    file://xchar2b.patch"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/diet-x11_1.1.2.bb b/recipes/xorg-lib/diet-x11_1.1.2.bb
index 5773dde1f2..8aefbc7da7 100644
--- a/recipes/xorg-lib/diet-x11_1.1.2.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.2.bb
@@ -6,3 +6,5 @@ CFLAGS += "-D_GNU_SOURCE"
 SRC_URI += "file://X18NCMSstubs.diff \
 	    file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
+PR = "${INC_PR}.0"
+
diff --git a/recipes/xorg-lib/diet-x11_1.1.3.bb b/recipes/xorg-lib/diet-x11_1.1.3.bb
index 5773dde1f2..853d794ce4 100644
--- a/recipes/xorg-lib/diet-x11_1.1.3.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.3.bb
@@ -6,3 +6,4 @@ CFLAGS += "-D_GNU_SOURCE"
 SRC_URI += "file://X18NCMSstubs.diff \
 	    file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/diet-x11_1.1.4.bb b/recipes/xorg-lib/diet-x11_1.1.4.bb
index c6f080c13c..d0f0608e66 100644
--- a/recipes/xorg-lib/diet-x11_1.1.4.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.4.bb
@@ -6,3 +6,4 @@ CFLAGS += "-D_GNU_SOURCE"
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/diet-x11_1.1.5.bb b/recipes/xorg-lib/diet-x11_1.1.5.bb
index c6f080c13c..d0f0608e66 100644
--- a/recipes/xorg-lib/diet-x11_1.1.5.bb
+++ b/recipes/xorg-lib/diet-x11_1.1.5.bb
@@ -6,3 +6,4 @@ CFLAGS += "-D_GNU_SOURCE"
 SRC_URI += "file://X18NCMSstubs.diff \
             file://fix-disable-xlocale.diff \
             file://fix-utf8-wrong-define.patch"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11-trim_1.1.5.bb b/recipes/xorg-lib/libx11-trim_1.1.5.bb
index ed227493c8..fec34d351f 100644
--- a/recipes/xorg-lib/libx11-trim_1.1.5.bb
+++ b/recipes/xorg-lib/libx11-trim_1.1.5.bb
@@ -4,4 +4,4 @@ EXTRA_OECONF += "--disable-xcms"
 
 SRC_URI += " file://makekeys-update.patch"
 
-PR = "r1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.0.1.bb b/recipes/xorg-lib/libx11_1.0.1.bb
index 90bbfa8b2b..2238a8c436 100644
--- a/recipes/xorg-lib/libx11_1.0.1.bb
+++ b/recipes/xorg-lib/libx11_1.0.1.bb
@@ -1,6 +1,6 @@
 require libx11.inc
 LICENSE = "XFree86"
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.0.3.bb b/recipes/xorg-lib/libx11_1.0.3.bb
index f06da8189e..73c7f7f61f 100644
--- a/recipes/xorg-lib/libx11_1.0.3.bb
+++ b/recipes/xorg-lib/libx11_1.0.3.bb
@@ -1,6 +1,6 @@
 require libx11.inc
 LICENSE = "XFree86"
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.1.bb b/recipes/xorg-lib/libx11_1.1.1.bb
index 37c819f5a7..1292f6c4e1 100644
--- a/recipes/xorg-lib/libx11_1.1.1.bb
+++ b/recipes/xorg-lib/libx11_1.1.1.bb
@@ -1,5 +1,5 @@
 require libx11.inc
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.2.bb b/recipes/xorg-lib/libx11_1.1.2.bb
index b51673695e..39dc20c83c 100644
--- a/recipes/xorg-lib/libx11_1.1.2.bb
+++ b/recipes/xorg-lib/libx11_1.1.2.bb
@@ -1,5 +1,5 @@
 require libx11.inc
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb
index 659fa89e24..b052c77dd6 100644
--- a/recipes/xorg-lib/libx11_1.1.3.bb
+++ b/recipes/xorg-lib/libx11_1.1.3.bb
@@ -1,5 +1,5 @@
 require libx11.inc
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb
index fb45668d59..eb3283ec37 100644
--- a/recipes/xorg-lib/libx11_1.1.4.bb
+++ b/recipes/xorg-lib/libx11_1.1.4.bb
@@ -1,5 +1,5 @@
 require libx11.inc
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.1.5.bb b/recipes/xorg-lib/libx11_1.1.5.bb
index c9b047ef65..e3b46cf678 100644
--- a/recipes/xorg-lib/libx11_1.1.5.bb
+++ b/recipes/xorg-lib/libx11_1.1.5.bb
@@ -1,5 +1,5 @@
 require libx11.inc
-PR = "r7"
+PR = "${INC_PR}.0"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
diff --git a/recipes/xorg-lib/libx11_1.2.bb b/recipes/xorg-lib/libx11_1.2.bb
index 0328bc8b12..042a135e96 100644
--- a/recipes/xorg-lib/libx11_1.2.bb
+++ b/recipes/xorg-lib/libx11_1.2.bb
@@ -1,5 +1,4 @@
 require libx11.inc
-PR = "r7"
 
 DEPENDS = "${COMMON_DEPENDS}"
 EXTRA_OECONF += " --without-xcb"
@@ -8,3 +7,4 @@ SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "c6265b59ea2b594fd68e33f9125b4d20"
 SRC_URI[archive.sha256sum] = "e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.3.2.bb b/recipes/xorg-lib/libx11_1.3.2.bb
index 438bba671c..9f35866f8e 100644
--- a/recipes/xorg-lib/libx11_1.3.2.bb
+++ b/recipes/xorg-lib/libx11_1.3.2.bb
@@ -1,7 +1,7 @@
 require libx11.inc
-PR = "r7"
 
 SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "001d780829f936e34851ef7cd37b4dfd"
 SRC_URI[archive.sha256sum] = "4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
index 89c57235fa..be9e749210 100644
--- a/recipes/xorg-lib/libx11_1.3.3.bb
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -1,7 +1,7 @@
 require libx11.inc
-PR = "r7"
 
 SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c"
 SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_1.3.4.bb b/recipes/xorg-lib/libx11_1.3.4.bb
index e3c444db37..c20a9af4e6 100644
--- a/recipes/xorg-lib/libx11_1.3.4.bb
+++ b/recipes/xorg-lib/libx11_1.3.4.bb
@@ -1,7 +1,7 @@
 require libx11.inc
-PR = "r7"
 
 SRC_URI += " file://dolt-fix.patch"
 
 SRC_URI[archive.md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
 SRC_URI[archive.sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb
index 947316de9c..4ae066f1c8 100644
--- a/recipes/xorg-lib/libx11_git.bb
+++ b/recipes/xorg-lib/libx11_git.bb
@@ -10,3 +10,4 @@ SRC_URI += " file://keysymdef_include.patch \
 "
 
 S = "${WORKDIR}/git"
+PR = "${INC_PR}.0"