libhandy: Fix reproducibility issue

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 03a29241c7d0fe8434e43d23eb6e78e2246fd473..ce4e8ebe06be6b3150dc63b83ecc9d337065a4aa 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -39,7 +39,6 @@ exclude_packages = [
        'gstreamer1.0-python',
        'igt-gpu-tools',
        'libaprutil',
-       'libhandy-1-src',
        'libid3tag',
        'lttng-tools-dbg',
        'lttng-tools-ptest',

diff --git a/meta/recipes-gnome/libhandy/libhandy/determinism.patch b/meta/recipes-gnome/libhandy/libhandy/determinism.patch
new file mode 100644 (file)
index 0000000..7c4177f
--- /dev/null
+++ b/meta/recipes-gnome/libhandy/libhandy/determinism.patch
@@ -0,0 +1,35 @@
+hdy-enums*.c.in: Fix reproducibility issue
+
+When full filenames are used in generated sources it makes the resulting
+debug packages non-reproducible. Best practise is to use basename in
+comments instead.
+
+Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/734]
+
+Index: a/src/hdy-enums-private.c.in
+===================================================================
+--- a/src/hdy-enums-private.c.in
++++ b/src/hdy-enums-private.c.in
+@@ -7,7 +7,7 @@
+ /*** END file-header ***/
+ 
+ /*** BEGIN file-production ***/
+-/* enumerations from "@filename@" */
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+ 
+ /*** BEGIN value-header ***/
+Index: a/src/hdy-enums.c.in
+===================================================================
+--- a/src/hdy-enums.c.in
++++ b/src/hdy-enums.c.in
+@@ -13,7 +13,7 @@
+ /*** END file-header ***/
+ 
+ /*** BEGIN file-production ***/
+-/* enumerations from "@filename@" */
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+ 
+ /*** BEGIN value-header ***/

diff --git a/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb b/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
index 4d2037411d6314ac793f6ab38d3ce3760ac58106..f2b9ebf140b559044aea1d79fdb7c01f30b7dd3a 100644 (file)
--- a/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
+++ b/meta/recipes-gnome/libhandy/libhandy_1.0.3.bb
@@ -2,7 +2,8 @@ SUMMARY = "A library full of GTK+ widgets for mobile phones"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-0"
+SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-0 \
+           file://determinism.patch"
 SRCREV = "7126d2e8da9dcdeb5751e60ff6a74930804f9637"
 S = "${WORKDIR}/git"