[packages/kp5-discover] - fix incorrect extern C linkage
baggins
baggins at pld-linux.org
Sat Apr 17 22:55:26 CEST 2021
commit b19536be92685ef6a054c2f04f0d67b60ec56d66
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 17 22:55:02 2021 +0200
- fix incorrect extern C linkage
cxx-linkage.patch | 12 ++++++++++++
kp5-discover.spec | 4 ++++
2 files changed, 16 insertions(+)
---
diff --git a/kp5-discover.spec b/kp5-discover.spec
index cb80992..2c65aa9 100644
--- a/kp5-discover.spec
+++ b/kp5-discover.spec
@@ -9,6 +9,7 @@ License: GPL v2+/LGPL v2.1+
Group: X11/Libraries
Source0: http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
# Source0-md5: 5e47b7079ddf8633c7fa3fe5dc1f5a79
+Patch0: cxx-linkage.patch
URL: http://www.kde.org/
BuildRequires: Qt5Concurrent-devel >= %{qtver}
BuildRequires: Qt5Core-devel >= %{qtver}
@@ -31,7 +32,9 @@ BuildRequires: kf5-kdbusaddons-devel
BuildRequires: kf5-kdeclarative-devel
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kidletime-devel
BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kitemmodels-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-knewstuff-devel
BuildRequires: kf5-knotifications-devel
@@ -51,6 +54,7 @@ discover
%prep
%setup -q -n %{kpname}-%{version}
+%patch0 -p1
%build
install -d build
diff --git a/cxx-linkage.patch b/cxx-linkage.patch
new file mode 100644
index 0000000..f355f9c
--- /dev/null
+++ b/cxx-linkage.patch
@@ -0,0 +1,12 @@
+--- discover-5.21.4/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h~ 2021-04-06 14:16:29.000000000 +0200
++++ discover-5.21.4/libdiscover/backends/FlatpakBackend/FlatpakTransactionThread.h 2021-04-17 22:29:21.010317076 +0200
+@@ -7,8 +7,8 @@
+ #ifndef FLATPAKTRANSACTIONTHREAD_H
+ #define FLATPAKTRANSACTIONTHREAD_H
+
+-extern "C" {
+ #include <flatpak.h>
++extern "C" {
+ #include <gio/gio.h>
+ #include <glib.h>
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kp5-discover.git/commitdiff/b19536be92685ef6a054c2f04f0d67b60ec56d66
More information about the pld-cvs-commit
mailing list