Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/libhandy/, gui-libs/libhandy/files/
Date: Sun, 11 Jul 2021 12:31:43
Message-Id: 1626006682.3decf504fa80db3fa594dfb0fc3ac6bfddeac35b.leio@gentoo
1 commit: 3decf504fa80db3fa594dfb0fc3ac6bfddeac35b
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 11 12:31:22 2021 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 11 12:31:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3decf504
7
8 gui-libs/libhandy: remove old
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gui-libs/libhandy/Manifest | 1 -
14 .../libhandy/files/0.0.13-glade3.36-compat1.patch | 40 -----
15 .../libhandy/files/0.0.13-glade3.36-compat2.patch | 56 -------
16 .../libhandy/files/0.0.13-glade3.37-compat.patch | 173 ---------------------
17 gui-libs/libhandy/libhandy-0.0.13.ebuild | 66 --------
18 5 files changed, 336 deletions(-)
19
20 diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
21 index 39cc287d600..6b95f7bc528 100644
22 --- a/gui-libs/libhandy/Manifest
23 +++ b/gui-libs/libhandy/Manifest
24 @@ -1,3 +1,2 @@
25 DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
26 DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
27 -DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
28
29 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
30 deleted file mode 100644
31 index 13321778ff2..00000000000
32 --- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
33 +++ /dev/null
34 @@ -1,40 +0,0 @@
35 -From c5ada7063a68cc05ed1b783a9769557b8e2a83ed Mon Sep 17 00:00:00 2001
36 -From: Alberto Fanjul <albertofanjul@×××××.com>
37 -Date: Thu, 7 May 2020 12:43:51 +0200
38 -Subject: [PATCH 1/2] glade: Adapt to Glade 3.36 API changes
39 -
40 -Fixes https://source.puri.sm/Librem5/libhandy/issues/267.
41 ----
42 - glade/glade-hdy-header-group.c | 2 +-
43 - glade/glade-hdy-swipe-group.c | 2 +-
44 - 2 files changed, 2 insertions(+), 2 deletions(-)
45 -
46 -diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
47 -index be6a9de..aa83c6b 100644
48 ---- a/glade/glade-hdy-header-group.c
49 -+++ b/glade/glade-hdy-header-group.c
50 -@@ -43,7 +43,7 @@ glade_hdy_header_group_read_widgets (GladeWidget *widget, GladeXmlNode *node)
51 - string = widget_name;
52 - } else if (widget_name != NULL) {
53 - tmp =
54 -- g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
55 -+ g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
56 - widget_name);
57 - string = (g_free (string), tmp);
58 - g_free (widget_name);
59 -diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
60 -index 0b42798..ff909b0 100644
61 ---- a/glade/glade-hdy-swipe-group.c
62 -+++ b/glade/glade-hdy-swipe-group.c
63 -@@ -45,7 +45,7 @@ glade_hdy_swipe_group_read_widgets (GladeWidget *widget,
64 - string = widget_name;
65 - } else if (widget_name != NULL) {
66 - tmp =
67 -- g_strdup_printf ("%s%s%s", string, GPC_OBJECT_DELIMITER,
68 -+ g_strdup_printf ("%s%s%s", string, GLADE_PROPERTY_DEF_OBJECT_DELIMITER,
69 - widget_name);
70 - string = (g_free (string), tmp);
71 - g_free (widget_name);
72 ---
73 -2.20.1
74 -
75
76 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
77 deleted file mode 100644
78 index a3b2f891499..00000000000
79 --- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
80 +++ /dev/null
81 @@ -1,56 +0,0 @@
82 -From 2fb8c6a62b52aa85266f1cf0e8cf6dfa1a7f194f Mon Sep 17 00:00:00 2001
83 -From: Adrien Plazas <kekun.plazas@×××××××.net>
84 -Date: Mon, 11 May 2020 13:38:36 +0200
85 -Subject: [PATCH 2/2] glade: Support both 3.24 and 3.36
86 -
87 -leio: Backported to 0.0.13
88 ----
89 - glade/glade-hdy-header-group.c | 9 +++++++++
90 - glade/glade-hdy-swipe-group.c | 11 +++++++++++
91 - 2 files changed, 20 insertions(+)
92 -
93 -diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
94 -index aa83c6b..bd620ad 100644
95 ---- a/glade/glade-hdy-header-group.c
96 -+++ b/glade/glade-hdy-header-group.c
97 -@@ -14,6 +14,15 @@
98 - #include <glib/gi18n-lib.h>
99 - #include <gladeui/glade.h>
100 -
101 -+/* Guess wether we are using a Glade version older than 3.36.
102 -+ *
103 -+ * If yes, redefine some symbols which got renamed.
104 -+ */
105 -+#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
106 -+#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
107 -+#define glade_widget_action_get_def glade_widget_action_get_class
108 -+#endif
109 -+
110 - #define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
111 - #define GLADE_TAG_HEADERGROUP_WIDGET "headerbar"
112 -
113 -diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
114 -index ff909b0..5b165a2 100644
115 ---- a/glade/glade-hdy-swipe-group.c
116 -+++ b/glade/glade-hdy-swipe-group.c
117 -@@ -15,6 +15,17 @@
118 - #include <glib/gi18n-lib.h>
119 - #include <gladeui/glade.h>
120 -
121 -+/* Guess wether we are using a Glade version older than 3.36.
122 -+ *
123 -+ * If yes, redefine some symbols which got renamed.
124 -+ */
125 -+#ifndef GLADE_PROPERTY_DEF_OBJECT_DELIMITER
126 -+#define GLADE_PROPERTY_DEF_OBJECT_DELIMITER GPC_OBJECT_DELIMITER
127 -+#define glade_widget_action_get_def glade_widget_action_get_class
128 -+#endif
129 -+
130 -+#define GLADE_TAG_HEADERGROUP_WIDGETS "headerbars"
131 -+#define GLADE_TAG_HEADERGROUP_WIDGET "headerbar"
132 - #define PROP_SWIPEABLES "swipeables"
133 - #define GLADE_TAG_SWIPEGROUP_SWIPEABLES "swipeables"
134 - #define GLADE_TAG_SWIPEGROUP_SWIPEABLE "swipeable"
135 ---
136 -2.20.1
137 -
138
139 diff --git a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch b/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
140 deleted file mode 100644
141 index 63568496d63..00000000000
142 --- a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
143 +++ /dev/null
144 @@ -1,173 +0,0 @@
145 -From dfb9322ae70236edd45fad695dd6c24517f2ceaf Mon Sep 17 00:00:00 2001
146 -From: James Westman <james@×××××××××××××××.net>
147 -Date: Wed, 23 Sep 2020 13:14:07 -0500
148 -Subject: [PATCH] glade: Fix macro renamed in GladeUI 3.37
149 -
150 -Glade 3.37 renamed the macro GWA_GET_CLASS to
151 -GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS [1]. This commit switches to use the new
152 -macro name, and for older versions of Glade, defines the new name as the old
153 -one for compatibility.
154 -
155 -Fixes #335 and obsoletes !607.
156 -
157 -[1]: https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd41d93c92b587b37f03d295356e39a7d04
158 -
159 -mattst88: Backported to 0.0.13
160 ----
161 - glade/glade-hdy-header-group.c | 14 +++++++++++---
162 - glade/glade-hdy-paginator.c | 18 +++++++++++++-----
163 - glade/glade-hdy-swipe-group.c | 14 +++++++++++---
164 - 3 files changed, 35 insertions(+), 11 deletions(-)
165 -
166 -diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
167 -index bd620ad..11c3aad 100644
168 ---- a/glade/glade-hdy-header-group.c
169 -+++ b/glade/glade-hdy-header-group.c
170 -@@ -14,6 +14,14 @@
171 - #include <glib/gi18n-lib.h>
172 - #include <gladeui/glade.h>
173 -
174 -+/*
175 -+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
176 -+ * define the new macro as the old one.
177 -+ */
178 -+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
179 -+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
180 -+#endif
181 -+
182 - /* Guess wether we are using a Glade version older than 3.36.
183 - *
184 - * If yes, redefine some symbols which got renamed.
185 -@@ -83,7 +91,7 @@ glade_hdy_header_group_read_widget (GladeWidgetAdaptor *adaptor,
186 - return;
187 -
188 - /* First chain up and read in all the normal properties.. */
189 -- GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
190 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
191 -
192 - glade_hdy_header_group_read_widgets (widget, node);
193 - }
194 -@@ -129,7 +137,7 @@ glade_hdy_header_group_write_widget (GladeWidgetAdaptor *adaptor,
195 - return;
196 -
197 - /* First chain up and read in all the normal properties.. */
198 -- GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
199 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
200 -
201 - glade_hdy_header_group_write_widgets (widget, context, node);
202 - }
203 -@@ -163,7 +171,7 @@ glade_hdy_header_group_set_property (GladeWidgetAdaptor *adaptor,
204 - GTK_HEADER_BAR (list->data));
205 - }
206 - } else {
207 -- GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
208 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
209 - property_name, value);
210 - }
211 - }
212 -diff --git a/glade/glade-hdy-paginator.c b/glade/glade-hdy-paginator.c
213 -index cce9abf..f34acc8 100644
214 ---- a/glade/glade-hdy-paginator.c
215 -+++ b/glade/glade-hdy-paginator.c
216 -@@ -16,6 +16,14 @@
217 -
218 - #include <math.h>
219 -
220 -+/*
221 -+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
222 -+ * define the new macro as the old one.
223 -+ */
224 -+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
225 -+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
226 -+#endif
227 -+
228 - #define CENTER_CONTENT_INSENSITIVE_MSG _("This property does not apply unless Show Indicators is set.")
229 -
230 - static gint
231 -@@ -231,7 +239,7 @@ glade_hdy_paginator_child_action_activate (GladeWidgetAdaptor *adaptor,
232 -
233 - glade_command_pop_group ();
234 - } else
235 -- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
236 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
237 - container,
238 - object,
239 - action_path);
240 -@@ -315,7 +323,7 @@ glade_hdy_paginator_set_property (GladeWidgetAdaptor *adaptor,
241 - if (!strcmp (id, "indicator-style"))
242 - set_indicator_style (object, value);
243 -
244 -- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
245 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
246 - }
247 - }
248 -
249 -@@ -332,7 +340,7 @@ glade_hdy_paginator_get_property (GladeWidgetAdaptor *adaptor,
250 - g_value_reset (value);
251 - g_value_set_int (value, hdy_paginator_get_page (HDY_PAGINATOR (object)));
252 - } else {
253 -- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
254 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
255 - }
256 - }
257 -
258 -@@ -370,8 +378,8 @@ glade_hdy_paginator_verify_property (GladeWidgetAdaptor *adaptor,
259 - return glade_hdy_paginator_verify_n_pages (object, value);
260 - else if (!strcmp (id, "page"))
261 - return glade_hdy_paginator_verify_page (object, value);
262 -- else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
263 -- return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
264 -+ else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
265 -+ return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
266 - id, value);
267 -
268 - return TRUE;
269 -diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
270 -index 5b165a2..927dea0 100644
271 ---- a/glade/glade-hdy-swipe-group.c
272 -+++ b/glade/glade-hdy-swipe-group.c
273 -@@ -15,6 +15,14 @@
274 - #include <glib/gi18n-lib.h>
275 - #include <gladeui/glade.h>
276 -
277 -+/*
278 -+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
279 -+ * define the new macro as the old one.
280 -+ */
281 -+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
282 -+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
283 -+#endif
284 -+
285 - /* Guess wether we are using a Glade version older than 3.36.
286 - *
287 - * If yes, redefine some symbols which got renamed.
288 -@@ -87,7 +95,7 @@ glade_hdy_swipe_group_read_widget (GladeWidgetAdaptor *adaptor,
289 - return;
290 -
291 - /* First chain up and read in all the normal properties.. */
292 -- GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
293 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
294 -
295 - glade_hdy_swipe_group_read_widgets (widget, node);
296 - }
297 -@@ -131,7 +139,7 @@ glade_hdy_swipe_group_write_widget (GladeWidgetAdaptor *adaptor,
298 - return;
299 -
300 - /* First chain up and read in all the normal properties.. */
301 -- GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
302 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
303 -
304 - glade_hdy_swipe_group_write_widgets (widget, context, node);
305 - }
306 -@@ -164,7 +172,7 @@ glade_hdy_swipe_group_set_property (GladeWidgetAdaptor *adaptor,
307 - HDY_SWIPEABLE (list->data));
308 - }
309 - } else {
310 -- GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
311 -+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
312 - property_name, value);
313 - }
314 - }
315 ---
316 -2.26.3
317 -
318
319 diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
320 deleted file mode 100644
321 index 751616d2f13..00000000000
322 --- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
323 +++ /dev/null
324 @@ -1,66 +0,0 @@
325 -# Copyright 1999-2021 Gentoo Authors
326 -# Distributed under the terms of the GNU General Public License v2
327 -
328 -EAPI=7
329 -
330 -inherit meson xdg vala virtualx
331 -
332 -MY_P="${PN}-v${PV}"
333 -DESCRIPTION="Library with GTK widgets for mobile phones"
334 -HOMEPAGE="https://source.puri.sm/Librem5/libhandy/"
335 -SRC_URI="https://source.puri.sm/Librem5/libhandy/-/archive/v${PV}/${MY_P}.tar.bz2"
336 -S="${WORKDIR}/${MY_P}"
337 -
338 -LICENSE="LGPL-2.1+"
339 -SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
340 -# SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
341 -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
342 -
343 -IUSE="examples glade gtk-doc +introspection test +vala"
344 -REQUIRED_USE="vala? ( introspection )"
345 -RESTRICT="!test? ( test )"
346 -
347 -RDEPEND="
348 - >=dev-libs/glib-2.44:2
349 - >=x11-libs/gtk+-3.24.1:3[introspection?]
350 - glade? ( dev-util/glade:3.10= )
351 - introspection? ( >=dev-libs/gobject-introspection-1.54:= )
352 -"
353 -DEPEND="${RDEPEND}"
354 -BDEPEND="
355 - vala? ( $(vala_depend) )
356 - dev-libs/libxml2:2
357 - dev-util/glib-utils
358 - >=sys-devel/gettext-0.19.8
359 - virtual/pkgconfig
360 - gtk-doc? ( dev-util/gtk-doc
361 - app-text/docbook-xml-dtd:4.3 )
362 -"
363 -
364 -PATCHES=(
365 - "${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
366 - "${FILESDIR}"/${PV}-glade3.37-compat.patch
367 -)
368 -
369 -src_prepare() {
370 - use vala && vala_src_prepare
371 - xdg_src_prepare
372 -}
373 -
374 -src_configure() {
375 - local emesonargs=(
376 - -Dprofiling=false # -pg passing
377 - -Dstatic=false
378 - $(meson_feature introspection)
379 - $(meson_use vala vapi)
380 - $(meson_use gtk-doc gtk_doc)
381 - $(meson_use test tests)
382 - $(meson_use examples)
383 - $(meson_feature glade glade_catalog)
384 - )
385 - meson_src_configure
386 -}
387 -
388 -src_test() {
389 - virtx meson_src_test
390 -}