From: Jakub Bogusz Date: Tue, 22 Sep 2020 14:12:24 +0000 (+0200) Subject: - added glade3.38 patch (adapt to glade 3.38 API changes); release 4 X-Git-Tag: auto/th/libhandy-0.0.13-4 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=af284f26fae20615a404db80e08135d5d33e74db;p=packages%2Flibhandy.git - added glade3.38 patch (adapt to glade 3.38 API changes); release 4 --- diff --git a/libhandy-glade3.38.patch b/libhandy-glade3.38.patch new file mode 100644 index 0000000..10e0e7b --- /dev/null +++ b/libhandy-glade3.38.patch @@ -0,0 +1,98 @@ +--- libhandy-v0.0.13/glade.orig/glade-hdy-header-group.c 2020-09-22 16:05:42.735451458 +0200 ++++ libhandy-v0.0.13/glade/glade-hdy-header-group.c 2020-09-22 16:06:36.041829339 +0200 +@@ -74,7 +74,7 @@ glade_hdy_header_group_read_widget (Glad + 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); + } +@@ -120,7 +120,7 @@ glade_hdy_header_group_write_widget (Gla + 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); + } +@@ -154,7 +154,7 @@ glade_hdy_header_group_set_property (Gla + 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); + } + } +--- libhandy-v0.0.13/glade.orig/glade-hdy-paginator.c 2019-12-27 12:23:11.000000000 +0100 ++++ libhandy-v0.0.13/glade/glade-hdy-paginator.c 2020-09-22 16:06:36.041829339 +0200 +@@ -231,7 +231,7 @@ glade_hdy_paginator_child_action_activat + + 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 +315,7 @@ glade_hdy_paginator_set_property (GladeW + 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 +332,7 @@ glade_hdy_paginator_get_property (GladeW + 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 +370,8 @@ glade_hdy_paginator_verify_property (Gla + 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; +--- libhandy-v0.0.13/glade.orig/glade-hdy-swipe-group.c 2020-09-22 16:05:42.735451458 +0200 ++++ libhandy-v0.0.13/glade/glade-hdy-swipe-group.c 2020-09-22 16:06:36.041829339 +0200 +@@ -76,7 +76,7 @@ glade_hdy_swipe_group_read_widget (Glade + 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); + } +@@ -120,7 +120,7 @@ glade_hdy_swipe_group_write_widget (Glad + 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); + } +@@ -153,7 +153,7 @@ glade_hdy_swipe_group_set_property (Glad + 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); + } + } diff --git a/libhandy.spec b/libhandy.spec index 2758a24..870d536 100644 --- a/libhandy.spec +++ b/libhandy.spec @@ -8,13 +8,14 @@ Summary: Library with GTK+ widgets for mobile phones Summary(pl.UTF-8): Biblioteka z kontrolkami GTK+ dla telefonów komórkowych Name: libhandy Version: 0.0.13 -Release: 3 +Release: 4 License: LGPL v2.1+ Group: Libraries #Source0Download: https://source.puri.sm/Librem5/libhandy/-/tags Source0: https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/%{name}-v%{version}.tar.bz2 # Source0-md5: 932ba6e80908c7579fa0392d6e0d0ceb Patch0: %{name}-glade3.36.patch +Patch1: %{name}-glade3.38.patch URL: https://source.puri.sm/Librem5/libhandy/ # -std=gnu11 BuildRequires: gcc >= 6:4.7 @@ -100,6 +101,7 @@ API języka VALA do biblioteki libhandy. %prep %setup -q -n %{name}-v%{version} %patch0 -p1 +%patch1 -p1 %build %meson build \