From 5e2dc85b5db1147c77468d19b45cd8d1849054ae Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 23 Jun 2024 13:55:09 +0200 Subject: [PATCH] added upstream patch to install missing Notice header required to build discover [release 1.65-2mamba;Sat Jun 22 2024] --- ...missing-Notice-header-discover-6.1.0.patch | 30 +++++++++++++++++++ snapd-glib.spec | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 snapd-glib-1.65-upstream-install-missing-Notice-header-discover-6.1.0.patch diff --git a/snapd-glib-1.65-upstream-install-missing-Notice-header-discover-6.1.0.patch b/snapd-glib-1.65-upstream-install-missing-Notice-header-discover-6.1.0.patch new file mode 100644 index 0000000..282eab8 --- /dev/null +++ b/snapd-glib-1.65-upstream-install-missing-Notice-header-discover-6.1.0.patch @@ -0,0 +1,30 @@ +From 3b46e014bd513346836458a3a4e9d388f311463d Mon Sep 17 00:00:00 2001 +From: Andrew Ammerlaan +Date: Fri, 26 Apr 2024 21:41:26 +0200 +Subject: [PATCH] snapd-qt/meson.build: Install Notice header + +Otherwise compilation of Discover with snap back-end fails with: + +In file included from /usr/include/snapd-qt-2/Snapd/Client:1, +from /tmp/portage/kde-plasma/discover-6.0.4-r1/work/discover-6.0.4/libdiscover/backends/SnapBackend/libsnapclient/SnapAuthHelper.cpp:14: +/usr/include/snapd-qt-2/Snapd/client.h:24:10: fatal error: Snapd/Notice: No such file or directory +24 | #include +| ^~~~~~~~~~~~~~ + +Signed-off-by: Andrew Ammerlaan +--- + snapd-qt/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/snapd-qt/meson.build b/snapd-qt/meson.build +index a767c6d1..db2f5bf2 100644 +--- a/snapd-qt/meson.build ++++ b/snapd-qt/meson.build +@@ -131,6 +131,7 @@ source_alias_h = [ + 'Snapd/MarkdownNode', + 'Snapd/MarkdownParser', + 'Snapd/Media', ++ 'Snapd/Notice', + 'Snapd/Plug', + 'Snapd/PlugRef', + 'Snapd/Price', diff --git a/snapd-glib.spec b/snapd-glib.spec index 6a7213c..6c3859f 100644 --- a/snapd-glib.spec +++ b/snapd-glib.spec @@ -1,6 +1,6 @@ Name: snapd-glib Version: 1.65 -Release: 1mamba +Release: 2mamba Summary: A library to allow GLib and Qt based applications access to snapd Group: System/Libraries Vendor: openmamba @@ -8,6 +8,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://snapcraft.io/ Source: https://github.com/snapcore/snapd-glib.git/%{version}/snapd-glib-%{version}.tar.bz2 +Patch0: snapd-glib-1.65-upstream-install-missing-Notice-header-discover-6.1.0.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -60,6 +61,7 @@ This package contains libraries and header files for developing applications tha %prep %setup -q +%patch 0 -p1 -b .upstream-install-missing-Notice-header-discover-6.1.0 %build %meson @@ -121,6 +123,9 @@ This package contains libraries and header files for developing applications tha %{_libdir}/pkgconfig/snapd-qt-2.pc %changelog +* Sat Jun 22 2024 Silvan Calarco 1.65-2mamba +- added upstream patch to install missing Notice header required to build discover + * Sun Jun 16 2024 Automatic Build System 1.65-1mamba - automatic version update by autodist