rpms/libhandy
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable glade catalog for F33+

Browse Source 
It doesn't build with glade 3.38.0.
This commit is contained in:
Kalev Lember 2020-09-13 17:11:46 +02:00
parent 4b9913e383
commit 9ff260024e
2 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-glade-Adapt-to-Glade-3.36-API-changes.patch
View File

@ -1,40 +0,0 @@
From f9d3de79161396efed15147188d175f5a5f7e60f Mon Sep 17 00:00:00 2001
From: Alberto Fanjul <albertofanjul@gmail.com>
Date: Thu, 7 May 2020 12:43:51 +0200
Subject: [PATCH] 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.26.2

13
libhandy.spec
View File

@ -1,20 +1,16 @@
Name: libhandy
Version: 0.0.13
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Library with GTK+ widgets for mobile phones
License: LGPLv2+
URL: https://source.puri.sm/Librem5/libhandy/
Source0: https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2
# Backported from upstream
Patch0: 0001-glade-Adapt-to-Glade-3.36-API-changes.patch
BuildRequires: gcc
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gladeui-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gmodule-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
@ -37,7 +33,7 @@ developing applications that use %{name}.
%autosetup -n libhandy-v%{version} -p1
%build
%meson -Dgtk_doc=true -Dexamples=false
%meson -Dgtk_doc=true -Dexamples=false -Dglade_catalog=disabled
%meson_build
%install
@ -51,15 +47,16 @@ developing applications that use %{name}.
%files devel
%{_includedir}/libhandy-0.0/
%{_libdir}/glade/
%{_libdir}/libhandy-0.0.so
%{_libdir}/pkgconfig/libhandy-0.0.pc
%{_datadir}/gir-1.0/
%{_datadir}/glade/
%{_datadir}/gtk-doc/
%{_datadir}/vala/
%changelog
* Sun Sep 13 2020 Kalev Lember <klember@redhat.com> - 0.0.13-6
- Disable glade catalog for F33+
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild