summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2021-07-11 15:31:22 +0300
committerMart Raudsepp <leio@gentoo.org>2021-07-11 15:31:22 +0300
commit3decf504fa80db3fa594dfb0fc3ac6bfddeac35b (patch)
tree8f5d1c9bb118414a9623e6781c8827a416d0b253 /gui-libs
parentmail-client/geary: fix libhandy vala dep (diff)
downloadgentoo-3decf504fa80db3fa594dfb0fc3ac6bfddeac35b.tar.gz
gentoo-3decf504fa80db3fa594dfb0fc3ac6bfddeac35b.tar.bz2
gentoo-3decf504fa80db3fa594dfb0fc3ac6bfddeac35b.zip
gui-libs/libhandy: remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gui-libs')
-rw-r--r--gui-libs/libhandy/Manifest1
-rw-r--r--gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch40
-rw-r--r--gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch56
-rw-r--r--gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch173
-rw-r--r--gui-libs/libhandy/libhandy-0.0.13.ebuild66
5 files changed, 0 insertions, 336 deletions
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index 39cc287d6007..6b95f7bc528d 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,2 @@
DIST libhandy-1.2.2.tar.xz 488508 BLAKE2B 1b764c90710de8a7960308b6441657799e6c3a12de9688f720748ca57653f6592fb4ba9f75841d76ae477af7c1709dc4f303658cc543c8de3f6f64d1de7d03cf SHA512 2135d3e15931fa143698de9200803c90e93c87b82c96b4fff90b75075c218a8ef2f69a26210bda8c10fb7195f115b11b804bb6de0b2f65cd464a7cefe35d0af4
DIST libhandy-1.2.3.tar.xz 491024 BLAKE2B b15e4b12135230ce6e588e005f55edada001abaa3fbdcf2f05b5e05f364beaa8983239f3a562b8600fc07edd6b6b7e834d42a06ec1ec626d7a43d6634ba93d0e SHA512 20ed6708bb517c81d9b8520c522555d7cdaf36f19dd29603a4f86d6d47ec2552af8874605b1866eb634d25afd0a2c18690cb1be6eafce81cac7857890388799e
-DIST libhandy-v0.0.13.tar.bz2 394811 BLAKE2B 318c226f20b4d8032e984dbd47b4634e828b922dcbc244e4f3f35b94c38f27ed38427196d553809bb1d6bfa7c4830db5d27701e3595cac8a05b58a27ba4a2472 SHA512 a0918c55c9ac14af223a83db542e7dc815d97c844d1f0830a1bee4bdcdf248d00d049fa90fd2be96265535a68d56de5143ddd9264b5e997a902ac9558d5096f3
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
deleted file mode 100644
index 13321778ff2f..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
deleted file mode 100644
index a3b2f891499a..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.36-compat2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/files/0.0.13-glade3.37-compat.patch b/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
deleted file mode 100644
index 63568496d637..000000000000
--- a/gui-libs/libhandy/files/0.0.13-glade3.37-compat.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From dfb9322ae70236edd45fad695dd6c24517f2ceaf Mon Sep 17 00:00:00 2001
-From: James Westman <james@flyingpimonster.net>
-Date: Wed, 23 Sep 2020 13:14:07 -0500
-Subject: [PATCH] glade: Fix macro renamed in GladeUI 3.37
-
-Glade 3.37 renamed the macro GWA_GET_CLASS to
-GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS [1]. This commit switches to use the new
-macro name, and for older versions of Glade, defines the new name as the old
-one for compatibility.
-
-Fixes #335 and obsoletes !607.
-
-[1]: https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd41d93c92b587b37f03d295356e39a7d04
-
-mattst88: Backported to 0.0.13
----
- glade/glade-hdy-header-group.c | 14 +++++++++++---
- glade/glade-hdy-paginator.c | 18 +++++++++++++-----
- glade/glade-hdy-swipe-group.c | 14 +++++++++++---
- 3 files changed, 35 insertions(+), 11 deletions(-)
-
-diff --git a/glade/glade-hdy-header-group.c b/glade/glade-hdy-header-group.c
-index bd620ad..11c3aad 100644
---- a/glade/glade-hdy-header-group.c
-+++ b/glade/glade-hdy-header-group.c
-@@ -14,6 +14,14 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
-
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- /* Guess wether we are using a Glade version older than 3.36.
- *
- * If yes, redefine some symbols which got renamed.
-@@ -83,7 +91,7 @@ glade_hdy_header_group_read_widget (GladeWidgetAdaptor *adaptor,
- return;
-
- /* First chain up and read in all the normal properties.. */
-- GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-
- glade_hdy_header_group_read_widgets (widget, node);
- }
-@@ -129,7 +137,7 @@ glade_hdy_header_group_write_widget (GladeWidgetAdaptor *adaptor,
- return;
-
- /* First chain up and read in all the normal properties.. */
-- GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-
- glade_hdy_header_group_write_widgets (widget, context, node);
- }
-@@ -163,7 +171,7 @@ glade_hdy_header_group_set_property (GladeWidgetAdaptor *adaptor,
- GTK_HEADER_BAR (list->data));
- }
- } else {
-- GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
- property_name, value);
- }
- }
-diff --git a/glade/glade-hdy-paginator.c b/glade/glade-hdy-paginator.c
-index cce9abf..f34acc8 100644
---- a/glade/glade-hdy-paginator.c
-+++ b/glade/glade-hdy-paginator.c
-@@ -16,6 +16,14 @@
-
- #include <math.h>
-
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- #define CENTER_CONTENT_INSENSITIVE_MSG _("This property does not apply unless Show Indicators is set.")
-
- static gint
-@@ -231,7 +239,7 @@ glade_hdy_paginator_child_action_activate (GladeWidgetAdaptor *adaptor,
-
- glade_command_pop_group ();
- } else
-- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_action_activate (adaptor,
- container,
- object,
- action_path);
-@@ -315,7 +323,7 @@ glade_hdy_paginator_set_property (GladeWidgetAdaptor *adaptor,
- if (!strcmp (id, "indicator-style"))
- set_indicator_style (object, value);
-
-- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->set_property (adaptor, object, id, value);
- }
- }
-
-@@ -332,7 +340,7 @@ glade_hdy_paginator_get_property (GladeWidgetAdaptor *adaptor,
- g_value_reset (value);
- g_value_set_int (value, hdy_paginator_get_page (HDY_PAGINATOR (object)));
- } else {
-- GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_property (adaptor, object, id, value);
- }
- }
-
-@@ -370,8 +378,8 @@ glade_hdy_paginator_verify_property (GladeWidgetAdaptor *adaptor,
- return glade_hdy_paginator_verify_n_pages (object, value);
- else if (!strcmp (id, "page"))
- return glade_hdy_paginator_verify_page (object, value);
-- else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-- return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
-+ else if (GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property)
-+ return GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor, object,
- id, value);
-
- return TRUE;
-diff --git a/glade/glade-hdy-swipe-group.c b/glade/glade-hdy-swipe-group.c
-index 5b165a2..927dea0 100644
---- a/glade/glade-hdy-swipe-group.c
-+++ b/glade/glade-hdy-swipe-group.c
-@@ -15,6 +15,14 @@
- #include <glib/gi18n-lib.h>
- #include <gladeui/glade.h>
-
-+/*
-+ * Another macro got renamed in GladeUI 3.38. For older versions of GladeUI,
-+ * define the new macro as the old one.
-+ */
-+#ifndef GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS
-+#define GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS GWA_GET_CLASS
-+#endif
-+
- /* Guess wether we are using a Glade version older than 3.36.
- *
- * If yes, redefine some symbols which got renamed.
-@@ -87,7 +95,7 @@ glade_hdy_swipe_group_read_widget (GladeWidgetAdaptor *adaptor,
- return;
-
- /* First chain up and read in all the normal properties.. */
-- GWA_GET_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->read_widget (adaptor, widget, node);
-
- glade_hdy_swipe_group_read_widgets (widget, node);
- }
-@@ -131,7 +139,7 @@ glade_hdy_swipe_group_write_widget (GladeWidgetAdaptor *adaptor,
- return;
-
- /* First chain up and read in all the normal properties.. */
-- GWA_GET_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->write_widget (adaptor, widget, context, node);
-
- glade_hdy_swipe_group_write_widgets (widget, context, node);
- }
-@@ -164,7 +172,7 @@ glade_hdy_swipe_group_set_property (GladeWidgetAdaptor *adaptor,
- HDY_SWIPEABLE (list->data));
- }
- } else {
-- GWA_GET_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
-+ GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (G_TYPE_OBJECT)->set_property (adaptor, object,
- property_name, value);
- }
- }
---
-2.26.3
-
diff --git a/gui-libs/libhandy/libhandy-0.0.13.ebuild b/gui-libs/libhandy/libhandy-0.0.13.ebuild
deleted file mode 100644
index 751616d2f13b..000000000000
--- a/gui-libs/libhandy/libhandy-0.0.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg vala virtualx
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="Library with GTK widgets for mobile phones"
-HOMEPAGE="https://source.puri.sm/Librem5/libhandy/"
-SRC_URI="https://source.puri.sm/Librem5/libhandy/-/archive/v${PV}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+"
-SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
-# SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="examples glade gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=x11-libs/gtk+-3.24.1:3[introspection?]
- glade? ( dev-util/glade:3.10= )
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- vala? ( $(vala_depend) )
- dev-libs/libxml2:2
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc
- app-text/docbook-xml-dtd:4.3 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-glade3.36-compat{1,2}.patch
- "${FILESDIR}"/${PV}-glade3.37-compat.patch
-)
-
-src_prepare() {
- use vala && vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dprofiling=false # -pg passing
- -Dstatic=false
- $(meson_feature introspection)
- $(meson_use vala vapi)
- $(meson_use gtk-doc gtk_doc)
- $(meson_use test tests)
- $(meson_use examples)
- $(meson_feature glade glade_catalog)
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}