[PATCH 1/4] libevdev: upgrade to version 1.5.8

[PATCH 1/4] libevdev: upgrade to version 1.5.8

[Maxin B. John]

Bug fix release. Supports new keycodes in linux 4.15 headers

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 .../recipes-support/libevdev/{libevdev_1.5.7.bb => libevdev_1.5.8.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libevdev/{libevdev_1.5.7.bb => libevdev_1.5.8.bb} (74%)

diff --git a/meta/recipes-support/libevdev/libevdev_1.5.7.bb b/meta/recipes-support/libevdev/libevdev_1.5.8.bb
similarity index 74%
rename from meta/recipes-support/libevdev/libevdev_1.5.7.bb
rename to meta/recipes-support/libevdev/libevdev_1.5.8.bb
index f740da2..c138014 100644
--- a/meta/recipes-support/libevdev/libevdev_1.5.7.bb
+++ b/meta/recipes-support/libevdev/libevdev_1.5.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
 
 SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz"
 
-SRC_URI[md5sum] = "4f1cfaee8d75ea3fbbfeb99a98730952"
-SRC_URI[sha256sum] = "a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422"
+SRC_URI[md5sum] = "c25a8c3939e4ad59a5e9e5e1e354832d"
+SRC_URI[sha256sum] = "6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d"
 
 inherit autotools pkgconfig
-- 
2.4.0

[PATCH 2/4] harfbuzz: upgrade to version 1.7.5

[Maxin B. John]

1.7.4 -> 1.7.5

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 .../harfbuzz/{harfbuzz_1.7.4.bb => harfbuzz_1.7.5.bb}                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.4.bb => harfbuzz_1.7.5.bb} (88%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
index ce1ead4..0a9b029 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2"
 
-SRC_URI[md5sum] = "c7476d8b989869d8b95b37fa53add6bf"
-SRC_URI[sha256sum] = "b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b"
+SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
+SRC_URI[sha256sum] = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
-- 
2.4.0

[PATCH 3/4] fontconfig: fix upstream version check

[Maxin B. John]

In the case of fontconfig, version x.x.9x are release candidates
for next version.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index fa5f0ee..756e324 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -28,6 +28,7 @@ SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
 SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
 SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
 
+UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.[^9]\d*).tar.gz"
 
 do_configure_prepend() {
     # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
-- 
2.4.0

[PATCH 4/4] libinput: fix upstream version check

[Maxin B. John]

Skip RC releases for libinput which follow the pattern: x.x.9xx

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 meta/recipes-graphics/wayland/libinput_1.9.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/wayland/libinput_1.9.4.bb b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
index 2843314..c250383 100644
--- a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
@@ -12,6 +12,7 @@ SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
 SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f"
 SRC_URI[sha256sum] = "0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190"
 
+UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.[^9]\d*).tar.xz"
 inherit meson pkgconfig lib_package
 
 PACKAGECONFIG ??= ""
-- 
2.4.0

Re: [PATCH 3/4] fontconfig: fix upstream version check

[Alexander Kanavin]

On 02/12/2018 04:16 PM, Maxin B. John wrote:
> In the case of fontconfig, version x.x.9x are release candidates
> for next version.
> +UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.[^9]\d*).tar.gz"

This will incorrectly exclude x.x.9 which is not a release candidate. 
You need to exclude "9 followed by one or more digits", not just 9 alone.

Also, "." in .tar.gz means "any character", if you want to match literal 
"." it should be "\."

This is a good place to practice:
http://regex101.com


Alex

Re: [PATCH 4/4] libinput: fix upstream version check

[Alexander Kanavin]

On 02/12/2018 04:16 PM, Maxin B. John wrote:
> Skip RC releases for libinput which follow the pattern: x.x.9xx
> +UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.[^9]\d*).tar.xz"

Same issue as previous patch.

Alex

Re: [PATCH 3/4] fontconfig: fix upstream version check

[Maxin B. John]

Hi Alex,

On Mon, Feb 12, 2018 at 04:19:53PM +0200, Alexander Kanavin wrote:
> On 02/12/2018 04:16 PM, Maxin B. John wrote:
> >In the case of fontconfig, version x.x.9x are release candidates
> >for next version.
> >+UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.[^9]\d*).tar.gz"
> 
> This will incorrectly exclude x.x.9 which is not a release candidate. You
> need to exclude "9 followed by one or more digits", not just 9 alone.

You are right. Thanks for looking into this. However, in practice, I haven't found
a single non-RC release which follow the pattern x.x.9 for these 
packages (fontconfig, libinput). That doesn't mean, it is improbable.

> Also, "." in .tar.gz means "any character", if you want to match literal "."
> it should be "\."

Ok.

> This is a good place to practice:
> http://regex101.com

Thanks. I will update and send a v2.

> Alex

Best Regards,
Maxin

Re: [PATCH 3/4] fontconfig: fix upstream version check

[Alexander Kanavin]

On 02/12/2018 04:35 PM, Maxin B. John wrote:
>> This is a good place to practice:
>> http://regex101.com
> 
> Thanks. I will update and send a v2.

To save you a bit of time, I think the right construct should be either

(9|[0-8]\d+)

or

(?!9\d+)\d+


Alex

Re: [PATCH 3/4] fontconfig: fix upstream version check

[Maxin B. John]

Hi Alex,

On Mon, Feb 12, 2018 at 04:43:54PM +0200, Alexander Kanavin wrote:
> On 02/12/2018 04:35 PM, Maxin B. John wrote:
> >>This is a good place to practice:
> >>http://regex101.com
> >
> >Thanks. I will update and send a v2.
> 
> To save you a bit of time, I think the right construct should be either
> 
> (9|[0-8]\d+)
> 
> or
> 
> (?!9\d+)\d+
 
This looks much better. Thanks!

> 
> Alex

Thanks and Regards,
Maxin