Accepting request 486743 from KDE:Extra

1

OBS-URL: https://build.opensuse.org/request/show/486743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yakuake?expand=0&rev=44

0001-Revert-Removed-usage-to-deprecated-interface.patch

@@ -0,0 +1,86 @@
+From b2f1ecc408cf862d28c890770705f729256aed8e Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Wed, 5 Apr 2017 20:42:53 +0200
+Subject: [PATCH] Revert "Removed usage to deprecated interface"
+
+This reverts commit 15886b6a9c634ae3bde77af36a4090db472c97da to fix the
+build with KDE Frameworks < 5.29.0.
+---
+ app/config/appearancesettings.cpp | 9 ++++-----
+ app/config/appearancesettings.h   | 4 ++--
+ app/config/skinlistdelegate.cpp   | 2 +-
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/app/config/appearancesettings.cpp b/app/config/appearancesettings.cpp
+index c21ac33..730bfeb 100644
+--- a/app/config/appearancesettings.cpp
++++ b/app/config/appearancesettings.cpp
+@@ -30,8 +30,8 @@
+ #include <KMessageBox>
+ #include <KTar>
+ 
+-#include <downloaddialog.h>
+-#include <downloadmanager.h>
++#include <KNS3/DownloadDialog>
++#include <KNS3/DownloadManager>
+ 
+ #include <QDir>
+ #include <QDirIterator>
+@@ -68,7 +68,7 @@ AppearanceSettings::AppearanceSettings(QWidget* parent) : QWidget(parent)
+     ghnsButton->setIcon(QIcon(QStringLiteral("get-hot-new-stuff")));
+ 
+     m_knsConfigFileName = QLatin1String("yakuake.knsrc");
+-    m_knsDownloadManager = new KNSCore::DownloadManager(m_knsConfigFileName);
++    m_knsDownloadManager = new KNS3::DownloadManager(m_knsConfigFileName);
+ 
+     connect(ghnsButton, &QPushButton::clicked, this, &AppearanceSettings::getNewSkins);
+ 
+@@ -509,9 +509,8 @@ void AppearanceSettings::getNewSkins()
+         quint32 invalidEntryCount = 0;
+         QString invalidSkinText;
+ 
+-        foreach (const KNS3::Entry &entry3, dialog->installedEntries())
++        foreach (const KNS3::Entry &entry, dialog->installedEntries())
+         {
+-            KNSCore::EntryInternal entry = KNSCore::EntryInternal::fromEntry(entry3);
+             bool isValid = true;
+             const QSet<QString>& skinIdList = extractKnsSkinIds(entry.installedFiles());
+ 
+diff --git a/app/config/appearancesettings.h b/app/config/appearancesettings.h
+index 5303f74..c226daf 100644
+--- a/app/config/appearancesettings.h
++++ b/app/config/appearancesettings.h
+@@ -35,7 +35,7 @@ class SkinListDelegate;
+ class QStandardItem;
+ class QStandardItemModel;
+ 
+-namespace KNSCore
++namespace KNS3
+ {
+     class DownloadManager;
+ }
+@@ -134,7 +134,7 @@ class AppearanceSettings : public QWidget, private Ui::AppearanceSettings
+         QStringList m_installSkinFileList;
+ 
+         QString m_knsConfigFileName;
+-        KNSCore::DownloadManager* m_knsDownloadManager;
++        KNS3::DownloadManager* m_knsDownloadManager;
+ };
+ 
+ #endif
+diff --git a/app/config/skinlistdelegate.cpp b/app/config/skinlistdelegate.cpp
+index d511c10..96876a4 100644
+--- a/app/config/skinlistdelegate.cpp
++++ b/app/config/skinlistdelegate.cpp
+@@ -57,7 +57,7 @@ void SkinListDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
+ 
+ void SkinListDelegate::paintBackground(QPainter* painter, const QStyleOptionViewItem& option) const
+ {
+-    QStyleOptionViewItem opt = option;
++    QStyleOptionViewItemV4 opt = option;
+     QStyle* style = opt.widget ? opt.widget->style() : QApplication::style();
+     style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget);
+ }
+-- 
+2.12.0
+

yakuake-3.0.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e541e725246e20b755d8c9314185739f2439e18b884f6ae6f977343443948d6d
-size 443516

yakuake-3.0.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10e2b57c508e2ec5bfd09eac38c4c16a1ac4b93b394b3ce3120b7d8859b861e0
+size 367788

yakuake-appdata-xml-desktop-ref.patch

@@ -1,12 +0,0 @@
-Index: yakuake-3.0.2/data/org.kde.yakuake.appdata.xml
-===================================================================
---- yakuake-3.0.2.orig/data/org.kde.yakuake.appdata.xml
-+++ yakuake-3.0.2/data/org.kde.yakuake.appdata.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <component type="desktop">
--  <id>yakuake.desktop</id>
-+  <id>org.kde.yakuake.desktop</id>
-   <metadata_license>CC0-1.0</metadata_license>
-   <project_license>GPL-2.0+</project_license>
-   <name>Yakuake</name>

yakuake.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Apr  5 18:40:06 UTC 2017 - wbauer@tmo.at
+
+- Update to 3.0.4
+  * Fixed build on Qt 5.7.
+- Add 0001-Revert-Removed-usage-to-deprecated-interface.patch to
+  fix build on Leap 42.2 and lower
+
+-------------------------------------------------------------------
+Fri Mar 31 14:12:28 UTC 2017 - wbauer@tmo.at
+
+- Update to 3.0.3
+  * Fixed Yakuake sometimes showing up in the Task Manager.
+  * Much improved Wayland support on Plasma 5.
+  * Added a security warning when using the runCommand DBus API (as
+    recently added to KDE Konsole as well).
+  * Switched to a different API for getting the user home path to
+    avoid blocking on network logins.
+  * The bell notification event now uses the correct Plasma 5 sound
+    file name instead of an old KDE 4 one that may not be present.
+  * Fixed standard CLI arguments like --help and --version.
+  * Code cleanups, e.g. porting away from deprecated API.
+  * Updated AppStream metadata.
+- Drop yakuake-appdata-xml-desktop-ref.patch, fixed upstream
+
 -------------------------------------------------------------------
 Sat Nov  5 16:46:26 UTC 2016 - hrvoje.senjan@gmail.com
 

yakuake.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package yakuake
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,15 @@
 
 
 Name:           yakuake
-Version:        3.0.2
+Version:        3.0.4
 Release:        0
 Summary:        Terminal for KDE
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Url:            https://yakuake.kde.org
 Source:         http://download.kde.org/stable/yakuake/%{version}/src/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM yakuake-appdata-xml-desktop-ref.patch badshah400@gmail.com -- Fix the .desktop file referenced in the appdata.xml: yakuake.desktop -> org.kde.yakuake.desktop
+# PATCH-FIX-OPENSUSE 0001-Revert-Removed-usage-to-deprecated-interface.patch
-Patch0:         yakuake-appdata-xml-desktop-ref.patch
+Patch:          0001-Revert-Removed-usage-to-deprecated-interface.patch
 BuildRequires:  fdupes
 BuildRequires:  karchive-devel >= 5.15.0
 BuildRequires:  kconfig-devel >= 5.15.0
@@ -41,6 +41,7 @@ BuildRequires:  knewstuff-devel >= 5.15.0
 BuildRequires:  knotifications-devel >= 5.15.0
 BuildRequires:  knotifyconfig-devel >= 5.15.0
 BuildRequires:  kparts-devel >= 5.15.0
+BuildRequires:  kwayland-devel
 BuildRequires:  kwidgetsaddons-devel >= 5.15.0
 BuildRequires:  kwindowsystem-devel >= 5.15.0
 BuildRequires:  update-desktop-files
@@ -61,7 +62,9 @@ Yakuake is a retractable KDE Terminal Emulator.
 
 %prep
 %setup -q
-%patch0 -p1
+%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200
+%patch -p1
+%endif
 
 %build
   %cmake_kf5 -d build