diff --git a/yakuake-2.9.9.tar.xz b/yakuake-2.9.9.tar.xz deleted file mode 100644 index 25b0538..0000000 --- a/yakuake-2.9.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce -size 316716 diff --git a/yakuake-2.9.9_no-close.patch b/yakuake-2.9.9_no-close.patch deleted file mode 100644 index aaea28c..0000000 --- a/yakuake-2.9.9_no-close.patch +++ /dev/null @@ -1,213 +0,0 @@ -From 4655fb0affb4753eade7d6c92bb699e9d7dd3fb5 Mon Sep 17 00:00:00 2001 -From: Eike Hein -Date: Mon, 5 Nov 2012 23:06:26 +0100 -Subject: [PATCH] Add an option for keeping the window open after the last - session closes. - -BUG:308850 ---- - app/config/behaviorsettings.ui | 107 ++++++++++++++++++++++++----------------- - app/config/yakuake.kcfg | 5 ++ - app/mainwindow.cpp | 2 +- - 3 files changed, 68 insertions(+), 46 deletions(-) - -diff --git a/app/config/behaviorsettings.ui b/app/config/behaviorsettings.ui -index 2fce1c7..3759f7b 100644 ---- a/app/config/behaviorsettings.ui -+++ b/app/config/behaviorsettings.ui -@@ -6,8 +6,8 @@ - - 0 - 0 -- 364 -- 308 -+ 356 -+ 289 - - - -@@ -20,31 +20,49 @@ - General - - -- -- -+ -+ - -- Open window after program start -+ Focus terminals when the mouse pointer is moved over them - - - -- -- -+ -+ -+ -+ false -+ -+ -+ -+ 0 -+ 0 -+ -+ - -- If this option is enabled, the window will automatically open when the mouse pointer is moved to the same edge of the screen that it would open on when using the shortcut. -+ If this option is enabled, the shortcut normally used to open and retract the window will give it focus, rather than close it, if it has previously lost focus. Unless the window is set to show on all virtual desktops, this may cause the window manager to switch to the virtual desktop it currently resides on. - - -- Open window when the mouse pointer touches the screen edge -+ Use Open/Retract action to focus window - - - -- -- -+ -+ -+ -+ false -+ -+ -+ -+ 0 -+ 0 -+ -+ - -- Keep window open when it loses focus -+ Keep window above other windows - - - -- -+ - - - Qt::Horizontal -@@ -60,23 +78,31 @@ - - - -- -- -- -- false -+ -+ -+ -+ Open window after program start - -- -- -- 0 -- 0 -- -+ -+ -+ -+ -+ -+ If this option is enabled, the window will automatically open when the mouse pointer is moved to the same edge of the screen that it would open on when using the shortcut. - - -- Keep window above other windows -+ Open window when the mouse pointer touches the screen edge - - - -- -+ -+ -+ -+ Keep window open when it loses focus -+ -+ -+ -+ - - - Qt::Horizontal -@@ -92,29 +118,10 @@ - - - -- -- -- -- false -- -- -- -- 0 -- 0 -- -- -- -- If this option is enabled, the shortcut normally used to open and retract the window will give it focus, rather than close it, if it has previously lost focus. Unless the window is set to show on all virtual desktops, this may cause the window manager to switch to the virtual desktop it currently resides on. -- -- -- Use Open/Retract action to focus window -- -- -- - -- -+ - -- Focus terminals when the mouse pointer is moved over them -+ Keep window open after the last session is closed - - - -@@ -152,6 +159,16 @@ - - - -+ -+ kcfg_OpenAfterStart -+ kcfg_PollMouse -+ kcfg_KeepOpen -+ kcfg_KeepAbove -+ kcfg_ToggleToFocus -+ kcfg_KeepOpenAfterLastSessionCloses -+ kcfg_FocusFollowsMouse -+ kcfg_ConfirmQuit -+ - - - -diff --git a/app/config/yakuake.kcfg b/app/config/yakuake.kcfg -index e70418b..a71e9b3 100644 ---- a/app/config/yakuake.kcfg -+++ b/app/config/yakuake.kcfg -@@ -41,6 +41,11 @@ - Whether to keep the application window open when it loses focus. - true - -+ -+ -+ Whether to keep the application window open after the last session is closed. -+ false -+ - - - Whether the open/retract keyboard shortcut can be used to focus the application window when it is already open. -diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp -index 3f51911..22b374d 100644 ---- a/app/mainwindow.cpp -+++ b/app/mainwindow.cpp -@@ -538,7 +538,7 @@ void MainWindow::handleTerminalSilence(Terminal* terminal) - - void MainWindow::handleLastTabClosed() - { -- if (isVisible()) -+ if (isVisible() && !Settings::keepOpenAfterLastSessionCloses()) - toggleWindowState(); - } - --- -1.8.1.4 - diff --git a/yakuake-3.0.2.tar.xz b/yakuake-3.0.2.tar.xz new file mode 100644 index 0000000..3a148c3 --- /dev/null +++ b/yakuake-3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e541e725246e20b755d8c9314185739f2439e18b884f6ae6f977343443948d6d +size 443516 diff --git a/yakuake.changes b/yakuake.changes index 3d64d6c..6644dc3 100644 --- a/yakuake.changes +++ b/yakuake.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Mar 3 14:38:16 UTC 2016 - tittiatcoke@gmail.com + +- Update to 3.0.2 + * Also install the AppData file. + +------------------------------------------------------------------- +Thu Mar 3 14:01:41 UTC 2016 - tittiatcoke@gmail.com + +- Update to 3.0.1 + * Fixed installation and integratin of hicolor application icon + +------------------------------------------------------------------- +Thu Mar 3 13:51:33 UTC 2016 - tittiatcoke@gmail.com + +- Update to 3.0 + * Yakuake was ported to KDE Frameworks 5 and Qt 5 + * A new default skin follows the Plasma 5 Breeze design + +- Drop yakuake-2.9.9_no-close.patch + ------------------------------------------------------------------- Sun Oct 4 12:21:02 UTC 2015 - wbauer@tmo.at diff --git a/yakuake.spec b/yakuake.spec index 5f79a2a..5d3f7ef 100644 --- a/yakuake.spec +++ b/yakuake.spec @@ -1,7 +1,7 @@ # # spec file for package yakuake # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,30 +17,40 @@ Name: yakuake -Version: 2.9.9 +Version: 3.0.2 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-2.9.9_no-close.patch kde#308850 peter@rmk2.org -- patch comes from upstream -Patch0: yakuake-2.9.9_no-close.patch BuildRequires: fdupes -BuildRequires: libkde4-devel -BuildRequires: xz -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} -Requires: konsole4-part -%else -Requires: konsole -%endif +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdbusaddons-devel +BuildRequires: kf5-filesystem +BuildRequires: kglobalaccel-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifications-devel +BuildRequires: knotifyconfig-devel +BuildRequires: kparts-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kwindowsystem-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +Requires: konsole-part > 15.12 +Recommends: konsole > 15.12 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Recommends: %{name}-lang = %{version} -Provides: kde4-yakuake = %{version} -Obsoletes: kde4-yakuake < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{kde4_runtime_requires} %description Yakuake is a retractable KDE Terminal Emulator. @@ -49,17 +59,14 @@ Yakuake is a retractable KDE Terminal Emulator. %prep %setup -q -%patch0 -p1 %build - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - cd build - %make_install - %suse_update_desktop_file -G "Terminal Program" yakuake System TerminalEmulator - cd .. + %kf5_makeinstall -C build + %suse_update_desktop_file -G "Terminal Program" org.kde.yakuake System TerminalEmulator %find_lang %{name} %fdupes -s %{buildroot} @@ -74,12 +81,15 @@ Yakuake is a retractable KDE Terminal Emulator. %files %defattr(-,root,root) %doc README AUTHORS ChangeLog COPYING COPYING.DOC NEWS -%{_kde4_applicationsdir}/yakuake.desktop -%{_kde4_appsdir}/yakuake -%{_kde4_bindir}/yakuake -%{_kde4_iconsdir}/hicolor/ -%{_kde4_appsdir}/kconf_update/ -%{_kde4_configdir}/yakuake.knsrc +%{_kf5_bindir}/yakuake +%config %{_kf5_configdir}/yakuake.knsrc +%{_kf5_applicationsdir}/org.kde.yakuake.desktop +%{_kf5_notifydir}/ +%dir %{_kf5_sharedir}/icons/hicolor/256x256 +%dir %{_kf5_sharedir}/icons/hicolor/256x256/apps +%{_kf5_sharedir}/icons/hicolor/*/*/*.* +%{_kf5_sharedir}/yakuake/ +%{_datadir}/appdata/ %files lang -f %{name}.lang %defattr(-,root,root)