- updated to 1.0.1

- removed obsolete glade patch

diff --git a/libhandy-glade.patch b/libhandy-glade.patch
deleted file mode 100644 (file)
index 4c89179..0000000
--- a/libhandy-glade.patch
+++ /dev/null
@@ -1,337 +0,0 @@
---- libhandy-1.0.0/glade.orig/glade-hdy-carousel.c     2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-carousel.c  2020-09-22 06:39:15.622908776 +0200
-@@ -203,7 +203,7 @@ glade_hdy_carousel_child_action_activate
- 
-     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);
-@@ -266,7 +266,7 @@ glade_hdy_carousel_set_property (GladeWi
-   else if (!strcmp (id, "page"))
-     set_page (object, value);
-   else {
--    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);
-   }
- }
- 
-@@ -283,7 +283,7 @@ glade_hdy_carousel_get_property (GladeWi
-     g_value_reset (value);
-     g_value_set_int (value, hdy_carousel_get_page (HDY_CAROUSEL (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);
-   }
- }
- 
-@@ -321,8 +321,8 @@ glade_hdy_carousel_verify_property (Glad
-     return glade_hdy_carousel_verify_n_pages (object, value);
-   else if (!strcmp (id, "page"))
-     return glade_hdy_carousel_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;
-@@ -430,7 +430,7 @@ glade_hdy_carousel_get_child_property (G
-     g_value_set_int (value, glade_hdy_get_child_index (GTK_CONTAINER (container),
-                                                        GTK_WIDGET (child)));
-   else
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
-@@ -451,7 +451,7 @@ glade_hdy_carousel_set_child_property (G
- 
-     glade_hdy_sync_child_positions (GTK_CONTAINER (container));
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-expander-row.c 2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-expander-row.c      2020-09-22 06:39:15.622908776 +0200
-@@ -35,7 +35,7 @@ glade_hdy_expander_row_get_child_propert
-     g_value_set_int (value, glade_hdy_get_child_index (GTK_CONTAINER (container),
-                                                        GTK_WIDGET (child)));
-   else
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
-@@ -54,7 +54,7 @@ glade_hdy_expander_row_set_child_propert
-                              GTK_WIDGET (child),
-                              g_value_get_int (value));
-   else
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-header-bar.c   2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-header-bar.c        2020-09-22 06:39:15.622908776 +0200
-@@ -124,7 +124,7 @@ glade_hdy_header_bar_action_activate (Gl
- 
-     glade_command_pop_group ();
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-                                                          object,
-                                                          action_path);
-   }
-@@ -159,7 +159,7 @@ glade_hdy_header_bar_child_action_activa
- 
-     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);
-@@ -179,7 +179,7 @@ glade_hdy_header_bar_get_property (Glade
-     g_value_reset (value);
-     g_value_set_int (value, get_n_children (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);
-   }
- }
- 
-@@ -291,7 +291,7 @@ glade_hdy_header_bar_set_property (Glade
-   } else if (!strcmp (id, "size")) {
-     set_size (object, value);
-   } else {
--    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);
-   }
- }
- 
-@@ -316,7 +316,7 @@ glade_hdy_header_bar_add_child (GladeWid
-     return;
-   }
- 
--  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, parent, child);
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->add (adaptor, parent, child);
- 
-   gbox = glade_widget_get_from_gobject (parent);
-   if (!glade_widget_superuser ()) {
-@@ -380,7 +380,7 @@ glade_hdy_header_bar_replace_child (Glad
- 
-   g_object_set_data (G_OBJECT (new_widget), "special-child-type", NULL);
- 
--  GWA_GET_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
-+  GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->replace_child (adaptor,
-                                                      container,
-                                                      current,
-                                                      new_widget);
-@@ -400,8 +400,8 @@ glade_hdy_header_bar_verify_property (Gl
- {
-   if (!strcmp (id, "size"))
-     return verify_size (object, value);
--  else if (GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property)
--    return GWA_GET_CLASS (GTK_TYPE_CONTAINER)->verify_property (adaptor,
-+  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);
-@@ -446,7 +446,7 @@ GList *
- glade_hdy_header_bar_get_children (GladeWidgetAdaptor *adaptor,
-                                    GObject            *container)
- {
--  GList *children = GWA_GET_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
-+  GList *children = GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->get_children (adaptor, container);
- 
-   return g_list_sort_with_data (children, (GCompareDataFunc) sort_children, container);
- }
-@@ -539,7 +539,7 @@ glade_hdy_header_bar_child_set_property
- 
-   /* Chain Up */
-   if (!is_position)
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-header-group.c 2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-header-group.c      2020-09-22 06:39:15.626242091 +0200
-@@ -76,7 +76,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);
- }
-@@ -122,7 +122,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);
- }
-@@ -156,7 +156,7 @@ glade_hdy_header_group_set_property (Gla
-                                          HDY_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-1.0.0/glade.orig/glade-hdy-leaflet.c      2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-leaflet.c   2020-09-22 06:39:15.626242091 +0200
-@@ -227,7 +227,7 @@ glade_hdy_leaflet_child_action_activate
- 
-     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);
-@@ -332,7 +332,7 @@ glade_hdy_leaflet_set_property (GladeWid
-   else if (!strcmp (id, "page"))
-     set_page (object, value);
-   else
--    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);
- }
- 
- void
-@@ -348,7 +348,7 @@ glade_hdy_leaflet_get_property (GladeWid
-     g_value_reset (value);
-     g_value_set_int (value, get_page (GTK_CONTAINER (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);
-   }
- }
- 
-@@ -397,8 +397,8 @@ glade_hdy_leaflet_verify_property (Glade
-     return verify_n_pages (object, value);
-   else if (!strcmp (id, "page"))
-     return 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, id, value);
-+  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;
- }
-@@ -415,7 +415,7 @@ glade_hdy_leaflet_get_child_property (Gl
-     g_value_set_int (value, glade_hdy_get_child_index (GTK_CONTAINER (container),
-                                                        GTK_WIDGET (child)));
-   else
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
-@@ -436,7 +436,7 @@ glade_hdy_leaflet_set_child_property (Gl
- 
-     glade_hdy_sync_child_positions (GTK_CONTAINER (container));
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-preferences-page.c     2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-preferences-page.c  2020-09-22 06:39:15.626242091 +0200
-@@ -169,7 +169,7 @@ glade_hdy_preferences_page_action_activa
- 
-     glade_command_pop_group ();
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-                                                          object,
-                                                          action_path);
-   }
-@@ -188,7 +188,7 @@ glade_hdy_preferences_page_child_set_pro
-     gtk_container_child_set_property (GTK_CONTAINER (parent),
-                                       GTK_WIDGET (child), property_name, value);
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
-@@ -209,7 +209,7 @@ glade_hdy_preferences_page_child_get_pro
-     gtk_container_child_get_property (GTK_CONTAINER (parent),
-                                       GTK_WIDGET (child), property_name, value);
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-preferences-window.c   2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-preferences-window.c        2020-09-22 06:39:15.626242091 +0200
-@@ -237,7 +237,7 @@ glade_hdy_preferences_window_action_acti
- 
-     glade_command_pop_group ();
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->action_activate (adaptor,
-                                                          object,
-                                                          action_path);
-   }
-@@ -256,7 +256,7 @@ glade_hdy_preferences_window_child_set_p
-     gtk_container_child_set_property (GTK_CONTAINER (parent),
-                                       GTK_WIDGET (child), property_name, value);
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_set_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
-@@ -277,7 +277,7 @@ glade_hdy_preferences_window_child_get_p
-     gtk_container_child_get_property (GTK_CONTAINER (parent),
-                                       GTK_WIDGET (child), property_name, value);
-   } else {
--    GWA_GET_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-+    GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS (GTK_TYPE_CONTAINER)->child_get_property (adaptor,
-                                                             container,
-                                                             child,
-                                                             property_name,
---- libhandy-1.0.0/glade.orig/glade-hdy-swipe-group.c  2020-09-08 14:26:03.000000000 +0200
-+++ libhandy-1.0.0/glade/glade-hdy-swipe-group.c       2020-09-22 06:39:15.626242091 +0200
-@@ -78,7 +78,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);
- }
-@@ -122,7 +122,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);
- }
-@@ -155,7 +155,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/libhandy1.spec b/libhandy1.spec
index c1ada79997c5a586e640e3822c953a08c75b79c5..7a58cdf5b50e48a349d9d89ca00024470b0f1584 100644 (file)
--- a/libhandy1.spec
+++ b/libhandy1.spec
@@ -7,13 +7,12 @@
 Summary:       Library with GTK+ widgets for mobile phones
 Summary(pl.UTF-8):     Biblioteka z kontrolkami GTK+ dla telefonów komórkowych
 Name:          libhandy1
-Version:       1.0.0
-Release:       3
+Version:       1.0.1
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libhandy/1.0/libhandy-%{version}.tar.xz
-# Source0-md5: 3cdc0b2274b41770ad4758e612f4c16d
-Patch0:                libhandy-glade.patch
+# Source0-md5: 651afd7928c2f09949a07e271cea5be4
 URL:           https://gitlab.gnome.org/GNOME/libhandy/
 # -std=gnu11
 BuildRequires: gcc >= 6:4.7
@@ -25,7 +24,7 @@ BuildRequires:        gtk-doc
 BuildRequires: meson >= 0.49.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.27.0}
 BuildRequires: xz
@@ -72,9 +71,7 @@ Moduł libhandy dla Glade.
 Summary:       API documentation for libhandy library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libhandy
 Group:         Documentation
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{?noarchpackage}
 
 %description apidocs
 API documentation for libhandy library.
@@ -88,9 +85,7 @@ Summary(pl.UTF-8):    API języka Vala do bibliotek libhandy
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      vala >= 2:0.16.0
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:     noarch
-%endif
+%{noarchpackage}
 
 %description -n vala-libhandy1
 Vala API for libhandy library.
@@ -100,7 +95,6 @@ API języka VALA do biblioteki libhandy.
 
 %prep
 %setup -q -n libhandy-%{version}
-%patch0 -p1
 
 %build
 %meson build \