gentoo resync : 25.08.2020

4 files changed, 103 insertions, 1 deletions

diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 4bbf85fb44d1..b9019541fad5 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,5 @@
+AUX 0.0.13-glade3.36-compat1.patch 1655 BLAKE2B fcc6be57b5eea5554e5ba0149fdc6fe9067a436b333c299f2b6366c98798e821d6d1c861b0fc299c6de145e9f310ea5822505591e678c36f938802accecbe0e6 SHA512 beffe74c8f78767113930193870165c751443d0f9c3cf5c6df89f1f872c892a559c1d34c63f84090d6187afa4495bc2c6a557335db5a98afc3820fe688a48a6f
+AUX 0.0.13-glade3.36-compat2.patch 1879 BLAKE2B d21b874a52028e2b7e4c09da9fb1b97296872a2a7d1665124813a644c9524e56fdeba2afbca218519edf524e91efb76f6182009319e3b098e2464e478b4b5b2d SHA512 c154ee41052dadc97afe99350a08eb141c61dad7201fe2421ae0c27e9cbd5fad8af057e44ae277a2dac9b22d3e1bf945345791bc764783a8bd19448da63bde95
 DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
-EBUILD libhandy-0.0.13.ebuild 1529 BLAKE2B 19de19913c32cf576e8c50e2d97d21baf1de6f82287c6f423e70ec1b86928ad1b1f619535e59abba0c6202dd4a5062e3293dd983bef15b5cb1e5f70bb27d958a SHA512 233e6db2a84c03810aaa1eeeebdd7a890aba1993de78f732e5d25db64d8d07ad7a0fd56109f6473fcfcfbad9875de22f598c592cac0818246c89da0a94bd558e
+EBUILD libhandy-0.0.13.ebuild 1591 BLAKE2B d74668dab9d35dae1878479aca43a8c14369fb27beaa93aac0c7c9c9a65f267bdd46e0678e5e3dc29a8c8efe518db3d72043c66e31bd6663b02ccee96dda1869 SHA512 fe0692e70fd80f63fbb3a9ed21231901cf02a2e81760f0eae1dc1ef0689ded1706875a040c131be5254684bb139dde4296383e8fc39ebbea0a732bdb650b4957
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
new file mode 100644
index 000000000000..13321778ff2f
--- /dev/null
+++ b/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
@@ -0,0 +1,40 @@
+From c5ada7063a68cc05ed1b783a9769557b8e2a83ed Mon Sep 17 00:00:00 2001
+From: Alberto Fanjul <albertofanjul@gmail.com>
+Date: Thu, 7 May 2020 12:43:51 +0200
+Subject: [PATCH 1/2] glade: Adapt to Glade 3.36 API changes
+
+Fixes https://source.puri.sm/Librem5/libhandy/issues/267.
+---
+ glade/glade-hdy-header-group.c | 2 +-
+ glade/glade-hdy-swipe-group.c  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
+index be6a9de..aa83c6b 100644
+--- a/glade/glade-hdy-header-group.c
++++ b/glade/glade-hdy-header-group.c
+@@ -43,7 +43,7 @@ glade_hdy_header_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
+         string = widget_name;
+       } else if (widget_name != NULL) {
+         tmp =
+-          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
++          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
+                            widget_name);
+         string = (g_free (string), tmp);
+         g_free (widget_name);
+diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
+index 0b42798..ff909b0 100644
+--- a/glade/glade-hdy-swipe-group.c
++++ b/glade/glade-hdy-swipe-group.c
+@@ -45,7 +45,7 @@ glade_hdy_swipe_group_read_widgets (GladeWidget  *widget,
+         string = widget_name;
+       } else if (widget_name != NULL) {
+         tmp =
+-          g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
++          g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
+                            widget_name);
+         string = (g_free (string), tmp);
+         g_free (widget_name);
+-- 
+2.20.1
+
diff --git a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch b/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
new file mode 100644
index 000000000000..a3b2f891499a
--- /dev/null
+++ b/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
@@ -0,0 +1,56 @@
+From 2fb8c6a62b52aa85266f1cf0e8cf6dfa1a7f194f Mon Sep 17 00:00:00 2001
+From: Adrien Plazas <kekun.plazas@laposte.net>
+Date: Mon, 11 May 2020 13:38:36 +0200
+Subject: [PATCH 2/2] glade: Support both 3.24 and 3.36
+
+leio: Backported to 0.0.13
+---
+ glade/glade-hdy-header-group.c |  9 +++++++++
+ glade/glade-hdy-swipe-group.c  | 11 +++++++++++
+ 2 files changed, 20 insertions(+)
+
+diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
+index aa83c6b..bd620ad 100644
+--- a/glade/glade-hdy-header-group.c
++++ b/glade/glade-hdy-header-group.c
+@@ -14,6 +14,15 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/* Guess wether we are using a Glade version older than 3.36.
++ *
++ * If yes, redefine some symbols which got renamed.
++ */
++#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
++#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
++#define glade_widget_action_get_def glade_widget_action_get_class
++#endif
++
+ #define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
+ #define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
+ 
+diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
+index ff909b0..5b165a2 100644
+--- a/glade/glade-hdy-swipe-group.c
++++ b/glade/glade-hdy-swipe-group.c
+@@ -15,6 +15,17 @@
+ #include <glib/gi18n-lib.h>
+ #include <gladeui/glade.h>
+ 
++/* Guess wether we are using a Glade version older than 3.36.
++ *
++ * If yes, redefine some symbols which got renamed.
++ */
++#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
++#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
++#define glade_widget_action_get_def glade_widget_action_get_class
++#endif
++
++#define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
++#define GLADE_TAG_HEADERGROUP_WIDGET  "headerbar"
+ #define PROP_SWIPEABLES "swipeables"
+ #define GLADE_TAG_SWIPEGROUP_SWIPEABLES "swipeables"
+ #define GLADE_TAG_SWIPEGROUP_SWIPEABLE "swipeable"
+-- 
+2.20.1
+
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
index 4f69d327c067..07b2ca7fab24 100644
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.13.ebuild
@@ -37,6 +37,10 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.3 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
+)
+
 src_prepare() {
 	use vala && vala_src_prepare
 	xdg_src_prepare