- added glade3.36 patch (adapt for glade 3.36+ headers); release 2

diff --git a/libhandy-glade3.36.patch b/libhandy-glade3.36.patch
new file mode 100644 (file)
index 0000000..31f8025
--- /dev/null
+++ b/libhandy-glade3.36.patch
@@ -0,0 +1,22 @@
+--- libhandy-v0.0.13/glade/glade-hdy-header-group.c.orig       2019-12-27 12:23:11.000000000 +0100
++++ libhandy-v0.0.13/glade/glade-hdy-header-group.c    2020-05-10 14:05:16.741962051 +0200
+@@ -43,7 +43,7 @@
+         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);
+--- libhandy-v0.0.13/glade/glade-hdy-swipe-group.c.orig        2019-12-27 12:23:11.000000000 +0100
++++ libhandy-v0.0.13/glade/glade-hdy-swipe-group.c     2020-05-10 14:05:33.968535394 +0200
+@@ -45,7 +45,7 @@
+         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/libhandy.spec b/libhandy.spec
index a89bc6f23c63b164961198dbd09a6af5a3b4e0c7..a6fc0926181750cfad758a6adb719af64015350d 100644 (file)
--- a/libhandy.spec
+++ b/libhandy.spec
@@ -8,16 +8,17 @@ 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:       1
+Release:       2
 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
 URL:           https://source.puri.sm/Librem5/libhandy/
 # -std=gnu11
 BuildRequires: gcc >= 6:4.7
-%{?with_glade:BuildRequires:   glade-devel >= 2.0}
+%{?with_glade:BuildRequires:   glade-devel >= 3.36}
 BuildRequires: glib2-devel >= 1:2.44
 BuildRequires: gobject-introspection-devel
 BuildRequires: gtk+3-devel >= 3.24.1
@@ -58,7 +59,7 @@ Summary:      libhandy module for Glade
 Summary(pl.UTF-8):     Moduł libhandy dla Glade
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-Requires:      glade >= 2.0
+Requires:      glade >= 3.36
 
 %description glade
 libhandy module for Glade.
@@ -70,7 +71,7 @@ Moduł libhandy dla Glade.
 Summary:       API documentation for libhandy library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libhandy
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -86,7 +87,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}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -98,6 +99,7 @@ API języka VALA do biblioteki libhandy.
 
 %prep
 %setup -q -n %{name}-v%{version}
+%patch0 -p1
 
 %build
 %meson build \