forked from pool/frameworkintegration
Accepting request 348535 from KDE:Frameworks5
Update to 5.17.0 OBS-URL: https://build.opensuse.org/request/show/348535 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/frameworkintegration?expand=0&rev=27
This commit is contained in:
commit
63379805d2
@ -1,31 +0,0 @@
|
|||||||
From 6e9c03a79e4702e57cb3164233ac2b71f18626a9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Edmundson <kde@davidedmundson.co.uk>
|
|
||||||
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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ceb0f3e79497a99a88aea3154c0c50c376ce4e8efea18a9ff4e6de4a061bdb6f
|
|
||||||
size 1782444
|
|
3
frameworkintegration-5.17.0.tar.xz
Normal file
3
frameworkintegration-5.17.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:743f94f359984b85f608b2f4f059b2daaa1f8dc90210431526677dcd0da60cb9
|
||||||
|
size 1782980
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 10 23:02:17 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Update to 5.17.0
|
||||||
|
* Add plasmoid installation failed to plasma_workspace.notifyrc
|
||||||
|
* For more details please see:
|
||||||
|
https://www.kde.org/announcements/kde-frameworks-5.17.0.php
|
||||||
|
- Drop upstreamed 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Nov 8 16:57:02 UTC 2015 - hrvoje.senjan@gmail.com
|
Sun Nov 8 16:57:02 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@
|
|||||||
|
|
||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
%define lname libKF5Style5
|
%define lname libKF5Style5
|
||||||
%define _tar_path 5.16
|
%define _tar_path 5.17
|
||||||
Name: frameworkintegration
|
Name: frameworkintegration
|
||||||
Version: 5.16.0
|
Version: 5.17.0
|
||||||
Release: 0
|
Release: 0
|
||||||
%define kf5_version %{version}
|
%define kf5_version %{version}
|
||||||
BuildRequires: cmake >= 2.8.12
|
BuildRequires: cmake >= 2.8.12
|
||||||
@ -47,8 +47,6 @@ Group: System/GUI/KDE
|
|||||||
Url: http://www.kde.org
|
Url: http://www.kde.org
|
||||||
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
|
||||||
Source1: baselibs.conf
|
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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -106,7 +104,6 @@ Applications do not need to link to this directly. Development files
|
|||||||
%lang_package -n %lname
|
%lang_package -n %lname
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake_kf5 -d build
|
%cmake_kf5 -d build
|
||||||
|
Loading…
x
Reference in New Issue
Block a user