Compare commits
No commits in common. "95de5c5502d6826d7e7344724f16b3cb067d6683" and "bc28fbe768941bfd653514495daa9cbe1c614b76" have entirely different histories.
95de5c5502
...
bc28fbe768
40
0001-glade-Adapt-to-Glade-3.36-API-changes.patch
Normal file
40
0001-glade-Adapt-to-Glade-3.36-API-changes.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
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
|
||||||
|
|
||||||
Binary file not shown.
BIN
libhandy-v0.0.13.tar.bz2
Normal file
BIN
libhandy-v0.0.13.tar.bz2
Normal file
Binary file not shown.
@ -1,23 +1,14 @@
|
|||||||
%global majmin %(echo %{version} | cut -d . -f -2)
|
|
||||||
|
|
||||||
Name: libhandy
|
Name: libhandy
|
||||||
Version: 1.8.2
|
Version: 0.0.13
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Library with GTK+ widgets for mobile phones
|
Summary: Library with GTK+ widgets for mobile phones
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://gitlab.gnome.org/GNOME/libhandy
|
URL: https://source.puri.sm/Librem5/libhandy/
|
||||||
Source0: https://download.gnome.org/sources/libhandy/%{majmin}/libhandy-%{version}.tar.xz
|
Source0: https://source.puri.sm/Librem5/libhandy/-/archive/v%{version}/libhandy-v%{version}.tar.bz2
|
||||||
|
Patch0: 0001-glade-Adapt-to-Glade-3.36-API-changes.patch
|
||||||
BuildRequires: gcc meson vala gi-docgen
|
BuildRequires: gcc gtk-doc meson pkgconfig(gio-2.0) pkgconfig(gladeui-2.0) pkgconfig(glib-2.0)
|
||||||
BuildRequires: pkgconfig(gio-2.0) pkgconfig(gladeui-2.0) pkgconfig(glib-2.0) >= 2.44
|
BuildRequires: pkgconfig(gmodule-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0)
|
||||||
BuildRequires: pkgconfig(gmodule-2.0) pkgconfig(gobject-introspection-1.0) pkgconfig(gtk+-3.0) >= 3.24.1
|
BuildRequires: vala
|
||||||
BuildRequires: xorg-x11-server-Xvfb
|
|
||||||
|
|
||||||
Obsoletes: libhandy1 < 1.1.90-2
|
|
||||||
Conflicts: libhandy1 < 1.1.90-2
|
|
||||||
Provides: libhandy1 = %{version}-%{release}
|
|
||||||
Provides: libhandy1%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
libhandy provides GTK+ widgets and GObjects to ease developing
|
libhandy provides GTK+ widgets and GObjects to ease developing
|
||||||
applications for mobile phones.
|
applications for mobile phones.
|
||||||
@ -25,67 +16,36 @@ applications for mobile phones.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for %{name}
|
Summary: Development files for %{name}
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
Obsoletes: libhandy1-devel < 1.1.90-2
|
|
||||||
Conflicts: libhandy1-devel < 1.1.90-2
|
|
||||||
Provides: libhandy1-devel = %{version}-%{release}
|
|
||||||
Provides: libhandy1-devel%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The %{name}-devel package contains libraries and header files for
|
The %{name}-devel package contains libraries and header files for
|
||||||
developing applications that use %{name}.
|
developing applications that use %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n libhandy-%{version}
|
%autosetup -n libhandy-v%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -Dgtk_doc=true -Dexamples=false \
|
%meson -Dgtk_doc=true -Dexamples=false
|
||||||
-Dtests=true
|
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
%find_lang libhandy
|
%files
|
||||||
|
|
||||||
%check
|
|
||||||
# No parallel test runs to try to avoid overwhellming Xvfb on some platforms
|
|
||||||
%define _smp_build_ncpus 1
|
|
||||||
%{shrink:xvfb-run -w 10 -d %meson_test}
|
|
||||||
|
|
||||||
%files -f libhandy.lang
|
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc AUTHORS HACKING.md NEWS README.md
|
%doc README.md
|
||||||
%{_libdir}/girepository-1.0/
|
%{_libdir}/girepository-1.0/
|
||||||
%{_libdir}/libhandy-1.so.0
|
%{_libdir}/libhandy-0.0.so.0*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_includedir}/libhandy-1/
|
%{_includedir}/libhandy-0.0/
|
||||||
%{_libdir}/glade/
|
%{_libdir}/glade/
|
||||||
%{_libdir}/libhandy-1.so
|
%{_libdir}/libhandy-0.0.so
|
||||||
%{_libdir}/pkgconfig/libhandy-1.pc
|
%{_libdir}/pkgconfig/libhandy-0.0.pc
|
||||||
%{_datadir}/gir-1.0/
|
%{_datadir}/gir-1.0/
|
||||||
%{_datadir}/glade/
|
%{_datadir}/glade/
|
||||||
%doc %{_datadir}/doc/libhandy-1/
|
%{_datadir}/gtk-doc/
|
||||||
%{_datadir}/vala/
|
%{_datadir}/vala/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Sep 14 2023 chenchen <chen_aka_jan@163.com> - 1.8.2-1
|
|
||||||
- Upgrade to version 1.8.2
|
|
||||||
|
|
||||||
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.0-1
|
|
||||||
- Update to 1.8.0
|
|
||||||
|
|
||||||
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.6.2-1
|
|
||||||
- Update to 1.6.2
|
|
||||||
|
|
||||||
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.6.1-1
|
|
||||||
- Update to 1.6.1
|
|
||||||
|
|
||||||
* Fri May 28 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.2.0-1
|
|
||||||
- Upgrade to 1.2.0
|
|
||||||
- Update Version, URL, Source0. delete Patch0. update stage 'prep'
|
|
||||||
- Add 'find_lang', update stage 'files'
|
|
||||||
|
|
||||||
* Thu Nov 5 2020 Liu wei bo <liuweibo10@huawei.com> - 0.0.13-1
|
* Thu Nov 5 2020 Liu wei bo <liuweibo10@huawei.com> - 0.0.13-1
|
||||||
- package init
|
- package init
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
version_control: gitlab.gnome
|
version_control: gitlab.gnome
|
||||||
src_repo: libhandy
|
src_repo: libhandy
|
||||||
tag_prefix: ""
|
tag_prefix: ""
|
||||||
separator: "."
|
seperator: "."
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user