From b5ca766da98e524f107153634096f290b514ac20 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 May 2015 08:34:42 -0500 Subject: [PATCH] followup fix to sm patch --- 0003-fix-missing-export.patch | 25 +++++++++++++++++++++++++ kf5-kconfig.spec | 6 +++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0003-fix-missing-export.patch diff --git a/0003-fix-missing-export.patch b/0003-fix-missing-export.patch new file mode 100644 index 0000000..71d09b1 --- /dev/null +++ b/0003-fix-missing-export.patch @@ -0,0 +1,25 @@ +From 661d03d14aa2342e0542b49da4b440954c9654eb Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 12 May 2015 12:48:55 +0200 +Subject: [PATCH 3/3] fix missing export + +--- + src/gui/kconfiggui.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h +index fe1f820..813ab64 100644 +--- a/src/gui/kconfiggui.h ++++ b/src/gui/kconfiggui.h +@@ -64,7 +64,7 @@ KCONFIGGUI_EXPORT bool hasSessionConfig(); + * @deprecated since 5.11, use sessionConfig()->name() + */ + #ifndef KDE_NO_DEPRECATED +-KCONFIGGUI_DEPRECATED QString sessionConfigName(); ++KCONFIGGUI_DEPRECATED_EXPORT QString sessionConfigName(); + #endif + } + +-- +2.4.0 + diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index c8dbe75..71ab577 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -19,6 +19,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra ## upstream patches Patch1: 0001-Add-KConfigGui-setSessionConfig.patch +Patch3: 0003-fix-missing-export.patch BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -112,6 +113,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue May 12 2015 Rex Dieter 5.10.0-3 +- followup fix to sm patch + * Mon May 11 2015 Rex Dieter 5.10.0-2 - pull in reviewed/upstreamed session management fixes (kde#346768)