rpm/yakuake
SHA256
1
0
Fork 0
forked from pool/yakuake
Code Pull Requests Activity

Accepting request 592104 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/592104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yakuake?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2018-03-29 09:57:42 +00:00 committed by Git OBS Bridge
parent 8041369c0a
commit 6174d43298
5 changed files with 48 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
0001-Revert-Removed-usage-to-deprecated-interface.patch
View File

@ -1,86 +0,0 @@
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

3
yakuake-3.0.4.tar.xz
View File

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

3
yakuake-3.0.5.tar.xz Normal file
View File

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

21
yakuake.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Mar 28 11:41:47 UTC 2018 - wbauer@tmo.at
- Update to 3.0.5
* Improved Wayland support.
* Yakuake's window title now always matches what's shown in its
title bar.
* Fixed button icons in the 'Appearance' settings page.
* Yakuake now installs a D-Bus service file. This allows calling
its D-Bus methods even when Yakuake is not running yet- it will
then be started implicitly.
* Fixed a crash due to a missing bounds check in the
'sessionAtTab' D-Bus method.
* Fixed a type marshalling issue with the 'addSession' D-Bus
method that caused a noisy warning when using it via qdbus.
* Yakuake now depends on KDE Frameworks 5.29 or higher.
- Drop 0001-Revert-Removed-usage-to-deprecated-interface.patch,
Leap 42.2 is no longer supported
- Use cmake() syntax for BuildRequires
- Mark license files as %license
-------------------------------------------------------------------
Wed Apr 5 18:40:06 UTC 2017 - wbauer@tmo.at

51
yakuake.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package yakuake
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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,37 +17,35 @@
Name: yakuake
Version: 3.0.4
Version: 3.0.5
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-OPENSUSE 0001-Revert-Removed-usage-to-deprecated-interface.patch
Patch: 0001-Revert-Removed-usage-to-deprecated-interface.patch
BuildRequires: fdupes
BuildRequires: karchive-devel >= 5.15.0
BuildRequires: kconfig-devel >= 5.15.0
BuildRequires: kcoreaddons-devel >= 5.15.0
BuildRequires: kcrash-devel >= 5.15.0
BuildRequires: kdbusaddons-devel >= 5.15.0
BuildRequires: kf5-filesystem
BuildRequires: kglobalaccel-devel >= 5.15.0
BuildRequires: ki18n-devel >= 5.15.0
BuildRequires: kiconthemes-devel >= 5.15.0
BuildRequires: kio-devel >= 5.15.0
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
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0
BuildRequires: cmake(KF5Archive)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5GlobalAccel)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5NotifyConfig)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5X11Extras)
Requires: konsole-part > 15.12
Recommends: konsole > 15.12
Requires(post): desktop-file-utils
@ -62,9 +60,6 @@ Yakuake is a retractable KDE Terminal Emulator.
%prep
%setup -q
%if 0%{?suse_version} == 1315 && 0%{?sle_version} <= 120200
%patch -p1
%endif
%build
%cmake_kf5 -d build
@ -86,7 +81,8 @@ Yakuake is a retractable KDE Terminal Emulator.
%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog COPYING COPYING.DOC NEWS
%license COPYING COPYING.DOC
%doc README AUTHORS ChangeLog NEWS
%{_kf5_bindir}/yakuake
%config %{_kf5_configdir}/yakuake.knsrc
%{_kf5_applicationsdir}/org.kde.yakuake.desktop
@ -96,6 +92,7 @@ Yakuake is a retractable KDE Terminal Emulator.
%{_kf5_sharedir}/icons/hicolor/*/*/*.*
%{_kf5_sharedir}/yakuake/
%{_kf5_appstreamdir}/
%{_kf5_sharedir}/dbus-1/services/org.kde.yakuake.service
%files lang -f %{name}.lang
%defattr(-,root,root)