diff --git a/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch b/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch new file mode 100644 index 0000000..079b77c --- /dev/null +++ b/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch @@ -0,0 +1,31 @@ +From 6e9c03a79e4702e57cb3164233ac2b71f18626a9 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Thu, 12 Nov 2015 19:22:40 +0000 +Subject: [PATCH 1/1] Don't add extra KDE SNI actions in our systemtray qpt + plugin + +If any app is written using QSystemTrayIcon they'll have to provide +their own quit action in order to work on other platforms. If we add +our own entry apps end up with two quit entries. + +BUG: 354991 +REVIEW: 126047 +--- + src/platformtheme/kdeplatformsystemtrayicon.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/platformtheme/kdeplatformsystemtrayicon.cpp b/src/platformtheme/kdeplatformsystemtrayicon.cpp +index 7536697d59ed2b2f11aa10180e87d003b5579a16..8f0ce7b9a95ae4b8c2fba302966166adfc5f59f8 100644 +--- a/src/platformtheme/kdeplatformsystemtrayicon.cpp ++++ b/src/platformtheme/kdeplatformsystemtrayicon.cpp +@@ -268,6 +268,7 @@ void KDEPlatformSystemTrayIcon::init() + { + if (!m_sni) { + m_sni = new KStatusNotifierItem(); ++ m_sni->setStandardActionsEnabled(false); + m_sni->setTitle(QApplication::applicationDisplayName()); + connect(m_sni, &KStatusNotifierItem::activateRequested, [this](bool active, const QPoint &pos) { + Q_UNUSED(active) +-- +2.6.2 + diff --git a/frameworkintegration-5.15.0.tar.xz b/frameworkintegration-5.15.0.tar.xz deleted file mode 100644 index a69fa3e..0000000 --- a/frameworkintegration-5.15.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a7a3d450c28d7f1ac19ddf02cb5e2badcd6903cf3981d82ce70bcd16d644a1b -size 1781464 diff --git a/frameworkintegration-5.16.0.tar.xz b/frameworkintegration-5.16.0.tar.xz new file mode 100644 index 0000000..b6a6855 --- /dev/null +++ b/frameworkintegration-5.16.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceb0f3e79497a99a88aea3154c0c50c376ce4e8efea18a9ff4e6de4a061bdb6f +size 1782444 diff --git a/frameworkintegration.changes b/frameworkintegration.changes index a607435..8d1171a 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Nov 8 16:57:02 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.16.0 (boo#955067) + * Set default value for WheelScrollLines + * Fix WheelScrollLines settings with Qt >= 5.5 (kde#291144) + * Switch to Noto font for Plasma 5.5 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.16.0.php +- Added 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch + (kde#354991) + ------------------------------------------------------------------- Mon Oct 5 17:36:58 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/frameworkintegration.spec b/frameworkintegration.spec index ba5dff9..9654f3e 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Style5 -%define _tar_path 5.15 +%define _tar_path 5.16 Name: frameworkintegration -Version: 5.15.0 +Version: 5.16.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -47,6 +47,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch +Patch0: 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -75,6 +77,7 @@ Applications do not need to link to this directly. Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Group: System/GUI/KDE Requires: kde-oxygen-fonts +Requires: noto-sans Conflicts: %lname < 5.6.0 %requires_eq libQt5Gui5 @@ -103,6 +106,7 @@ Applications do not need to link to this directly. Development files %lang_package -n %lname %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build @@ -135,6 +139,7 @@ Applications do not need to link to this directly. Development files %{_kf5_datadir}/infopage/ %{_kf5_plugindir}/ %{_kf5_notifydir}/ +%{_kf5_sharedir}/kconf_update/ %files devel %defattr(-,root,root)