rdieter pushed to yakuake (f22). "2.9.9-9 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 16:29:09 UTC 2015
>From caa6791df9d65b4906414bd1afa9814a9df519e7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 22 Apr 2015 10:05:31 -0500
Subject: 2.9.9-9
- pull in upstream fixes (including appdata)
- trim changelog
diff --git a/0001-Adjust-for-next-dev-cycle.patch b/0001-Adjust-for-next-dev-cycle.patch
new file mode 100644
index 0000000..0d55b45
--- /dev/null
+++ b/0001-Adjust-for-next-dev-cycle.patch
@@ -0,0 +1,25 @@
+From 15017b22ac829fb179e6bbb1a11ffa2a055c4ba5 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein at kde.org>
+Date: Fri, 19 Oct 2012 00:52:46 +0200
+Subject: [PATCH 01/56] Adjust for next dev cycle.
+
+---
+ app/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/main.cpp b/app/main.cpp
+index e384682..ecfe94d 100644
+--- a/app/main.cpp
++++ b/app/main.cpp
+@@ -34,7 +34,7 @@ int main (int argc, char *argv[])
+ KAboutData aboutData("yakuake",
+ 0,
+ ki18nc("@title", "<application>Yakuake</application>"),
+- "2.9.9",
++ "2.9.9+",
+ ki18nc("@title", "A drop-down terminal emulator based on KDE Konsole technology."),
+ KAboutData::License_GPL,
+ ki18nc("@info:credit", "(c) 2008-2012 The Yakuake Team"),
+--
+1.9.3
+
diff --git a/0004-Add-an-option-for-keeping-the-window-open-after-the-.patch b/0004-Add-an-option-for-keeping-the-window-open-after-the-.patch
new file mode 100644
index 0000000..39d4e88
--- /dev/null
+++ b/0004-Add-an-option-for-keeping-the-window-open-after-the-.patch
@@ -0,0 +1,213 @@
+From 4655fb0affb4753eade7d6c92bb699e9d7dd3fb5 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein at kde.org>
+Date: Mon, 5 Nov 2012 23:06:26 +0100
+Subject: [PATCH 04/56] 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 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>364</width>
+- <height>308</height>
++ <width>356</width>
++ <height>289</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+@@ -20,31 +20,49 @@
+ <string comment="@title:group Group box label">General</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+- <item row="0" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_OpenAfterStart">
++ <item row="6" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_FocusFollowsMouse">
+ <property name="text">
+- <string comment="@option:check">Open window after program start</string>
++ <string comment="@option:check">Focus terminals when the mouse pointer is moved over them</string>
+ </property>
+ </widget>
+ </item>
+- <item row="1" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_PollMouse">
++ <item row="4" column="1">
++ <widget class="QCheckBox" name="kcfg_ToggleToFocus">
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="sizePolicy">
++ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
+ <property name="whatsThis">
+- <string comment="@info:whatsthis">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.</string>
++ <string comment="@info:whatsthis">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.</string>
+ </property>
+ <property name="text">
+- <string comment="@option:check">Open window when the mouse pointer touches the screen edge</string>
++ <string comment="@option:check">Use Open/Retract action to focus window</string>
+ </property>
+ </widget>
+ </item>
+- <item row="2" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_KeepOpen">
++ <item row="3" column="1">
++ <widget class="QCheckBox" name="kcfg_KeepAbove">
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="sizePolicy">
++ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ </property>
+ <property name="text">
+- <string comment="@option:check">Keep window open when it loses focus</string>
++ <string comment="@option:check">Keep window above other windows</string>
+ </property>
+ </widget>
+ </item>
+- <item row="3" column="0">
++ <item row="4" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+@@ -60,23 +78,31 @@
+ </property>
+ </spacer>
+ </item>
+- <item row="3" column="1">
+- <widget class="QCheckBox" name="kcfg_KeepAbove">
+- <property name="enabled">
+- <bool>false</bool>
++ <item row="0" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_OpenAfterStart">
++ <property name="text">
++ <string comment="@option:check">Open window after program start</string>
+ </property>
+- <property name="sizePolicy">
+- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+- <horstretch>0</horstretch>
+- <verstretch>0</verstretch>
+- </sizepolicy>
++ </widget>
++ </item>
++ <item row="1" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_PollMouse">
++ <property name="whatsThis">
++ <string comment="@info:whatsthis">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.</string>
+ </property>
+ <property name="text">
+- <string comment="@option:check">Keep window above other windows</string>
++ <string comment="@option:check">Open window when the mouse pointer touches the screen edge</string>
+ </property>
+ </widget>
+ </item>
+- <item row="4" column="0">
++ <item row="2" column="0" colspan="2">
++ <widget class="QCheckBox" name="kcfg_KeepOpen">
++ <property name="text">
++ <string comment="@option:check">Keep window open when it loses focus</string>
++ </property>
++ </widget>
++ </item>
++ <item row="3" column="0">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+@@ -92,29 +118,10 @@
+ </property>
+ </spacer>
+ </item>
+- <item row="4" column="1">
+- <widget class="QCheckBox" name="kcfg_ToggleToFocus">
+- <property name="enabled">
+- <bool>false</bool>
+- </property>
+- <property name="sizePolicy">
+- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+- <horstretch>0</horstretch>
+- <verstretch>0</verstretch>
+- </sizepolicy>
+- </property>
+- <property name="whatsThis">
+- <string comment="@info:whatsthis">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.</string>
+- </property>
+- <property name="text">
+- <string comment="@option:check">Use Open/Retract action to focus window</string>
+- </property>
+- </widget>
+- </item>
+ <item row="5" column="0" colspan="2">
+- <widget class="QCheckBox" name="kcfg_FocusFollowsMouse">
++ <widget class="QCheckBox" name="kcfg_KeepOpenAfterLastSessionCloses">
+ <property name="text">
+- <string comment="@option:check">Focus terminals when the mouse pointer is moved over them</string>
++ <string extracomment="@option:check">Keep window open after the last session is closed</string>
+ </property>
+ </widget>
+ </item>
+@@ -152,6 +159,16 @@
+ </item>
+ </layout>
+ </widget>
++ <tabstops>
++ <tabstop>kcfg_OpenAfterStart</tabstop>
++ <tabstop>kcfg_PollMouse</tabstop>
++ <tabstop>kcfg_KeepOpen</tabstop>
++ <tabstop>kcfg_KeepAbove</tabstop>
++ <tabstop>kcfg_ToggleToFocus</tabstop>
++ <tabstop>kcg_KeepOpenAfterLastSessionCloses</tabstop>
++ <tabstop>kcfg_FocusFollowsMouse</tabstop>
++ <tabstop>kcfg_ConfirmQuit</tabstop>
++ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+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 @@
+ <whatsthis context="@info:whatsthis">Whether to keep the application window open when it loses focus.</whatsthis>
+ <default>true</default>
+ </entry>
++ <entry name="KeepOpenAfterLastSessionCloses" type="Bool">
++ <label context="@label">Keep window open after last session closes</label>
++ <whatsthis context="@info:whatsthis">Whether to keep the application window open after the last session is closed.</whatsthis>
++ <default>false</default>
++ </entry>
+ <entry name="ToggleToFocus" type="Bool">
+ <label context="@label">Use open/retract shortcut to focus window</label>
+ <whatsthis context="@info:whatsthis">Whether the open/retract keyboard shortcut can be used to focus the application window when it is already open.</whatsthis>
+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.9.3
+
diff --git a/0005-Fix-the-small-typo-and-thus-the-warning.patch b/0005-Fix-the-small-typo-and-thus-the-warning.patch
new file mode 100644
index 0000000..32bf997
--- /dev/null
+++ b/0005-Fix-the-small-typo-and-thus-the-warning.patch
@@ -0,0 +1,25 @@
+From 5a0e8f8bcf549459d431ab36244eb2223a7cc732 Mon Sep 17 00:00:00 2001
+From: Jekyll Wu <adaptee at gmail.com>
+Date: Tue, 6 Nov 2012 20:46:08 +0800
+Subject: [PATCH 05/56] Fix the small typo and thus the warning
+
+---
+ app/config/behaviorsettings.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/config/behaviorsettings.ui b/app/config/behaviorsettings.ui
+index 3759f7b..ca7176a 100644
+--- a/app/config/behaviorsettings.ui
++++ b/app/config/behaviorsettings.ui
+@@ -165,7 +165,7 @@
+ <tabstop>kcfg_KeepOpen</tabstop>
+ <tabstop>kcfg_KeepAbove</tabstop>
+ <tabstop>kcfg_ToggleToFocus</tabstop>
+- <tabstop>kcg_KeepOpenAfterLastSessionCloses</tabstop>
++ <tabstop>kcfg_KeepOpenAfterLastSessionCloses</tabstop>
+ <tabstop>kcfg_FocusFollowsMouse</tabstop>
+ <tabstop>kcfg_ConfirmQuit</tabstop>
+ </tabstops>
+--
+1.9.3
+
diff --git a/0021-Change-default-to-appear-on-the-screen-the-pointer-i.patch b/0021-Change-default-to-appear-on-the-screen-the-pointer-i.patch
new file mode 100644
index 0000000..35d0ef6
--- /dev/null
+++ b/0021-Change-default-to-appear-on-the-screen-the-pointer-i.patch
@@ -0,0 +1,26 @@
+From 9a3cc71209191aba129b15c19d8b617c6af028f7 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein at kde.org>
+Date: Wed, 21 Aug 2013 19:37:17 +0200
+Subject: [PATCH 21/56] Change default to appear on the screen the pointer is
+ on.
+
+---
+ app/config/yakuake.kcfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/config/yakuake.kcfg b/app/config/yakuake.kcfg
+index a71e9b3..a6d34c0 100644
+--- a/app/config/yakuake.kcfg
++++ b/app/config/yakuake.kcfg
+@@ -8,7 +8,7 @@
+ <entry name="Screen" type="Int">
+ <label context="@label">Screen to use</label>
+ <whatsthis context="@info:whatsthis">The screen on which the application window will appear. 0 is understood to be the screen the mouse pointer is on.</whatsthis>
+- <default>1</default>
++ <default>0</default>
+ </entry>
+ <entry name="Width" type="Int">
+ <label context="@label">Window width</label>
+--
+1.9.3
+
diff --git a/0022-Correctly-catch-offscreen-panels-when-building-the-e.patch b/0022-Correctly-catch-offscreen-panels-when-building-the-e.patch
new file mode 100644
index 0000000..77d15ac
--- /dev/null
+++ b/0022-Correctly-catch-offscreen-panels-when-building-the-e.patch
@@ -0,0 +1,27 @@
+From 785bac2127a46fae1ebf75b6f5ff2fb70015c796 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein at kde.org>
+Date: Tue, 26 Nov 2013 18:12:08 +0100
+Subject: [PATCH 22/56] Correctly catch offscreen panels when building the
+ exclude list for workArea().
+
+BUG:328035
+---
+ app/mainwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 22b374d..9b0a987 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -1282,7 +1282,7 @@ QRect MainWindow::getDesktopGeometry()
+ {
+ KWindowInfo windowInfo = KWindowSystem::windowInfo(windowId, NET::WMDesktop, NET::WM2ExtendedStrut);
+
+- if (windowInfo.valid() && windowInfo.desktop() == currentDesktop)
++ if (windowInfo.valid() && (windowInfo.desktop() == currentDesktop || windowInfo.desktop() == -1))
+ {
+ NETExtendedStrut strut = windowInfo.extendedStrut();
+
+--
+1.9.3
+
diff --git a/0023-The-F12-shortcut-is-reserved-on-Windows.patch b/0023-The-F12-shortcut-is-reserved-on-Windows.patch
new file mode 100644
index 0000000..a2b0c8d
--- /dev/null
+++ b/0023-The-F12-shortcut-is-reserved-on-Windows.patch
@@ -0,0 +1,29 @@
+From 00900688f3e1ad670c53eaf69c1c8b5e3a4ec08e Mon Sep 17 00:00:00 2001
+From: Patrick Spendrin <ps_ml at gmx.de>
+Date: Mon, 2 Dec 2013 00:37:46 +0100
+Subject: [PATCH 23/56] The F12 shortcut is reserved on Windows
+
+Since we do not want to hack windows, we simply change the default to F11.
+---
+ app/mainwindow.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index 9b0a987..ca5df80 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -192,7 +192,11 @@ void MainWindow::setupActions()
+ action = actionCollection()->addAction("toggle-window-state");
+ action->setText(i18nc("@action", "Open/Retract Yakuake"));
+ action->setIcon(KIcon("yakuake"));
++#ifndef Q_OS_WIN
+ action->setGlobalShortcut(KShortcut(Qt::Key_F12));
++#else
++ action->setGlobalShortcut(KShortcut(Qt::Key_F11));
++#endif
+ connect(action, SIGNAL(triggered()), this, SLOT(toggleWindowState()));
+
+ action = actionCollection()->addAction("keep-open");
+--
+1.9.3
+
diff --git a/0033-Add-AppStream-metadata.patch b/0033-Add-AppStream-metadata.patch
new file mode 100644
index 0000000..5f1d6eb
--- /dev/null
+++ b/0033-Add-AppStream-metadata.patch
@@ -0,0 +1,64 @@
+From 5a780cdcf1b05d4207e9afcb7a3d8ff74d2083a6 Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Sat, 8 Nov 2014 19:04:11 +0100
+Subject: [PATCH 33/56] Add AppStream metadata
+
+---
+ data/CMakeLists.txt | 1 +
+ data/yakuake.appdata.xml | 32 ++++++++++++++++++++++++++++++++
+ 2 files changed, 33 insertions(+)
+ create mode 100644 data/yakuake.appdata.xml
+
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index c70f83b..65efcd0 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -3,6 +3,7 @@ add_subdirectory( skins )
+ add_subdirectory( updaters )
+
+ install(PROGRAMS yakuake.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
++install(FILES yakuake.appdata.xml DESTINATION share/appdata)
+
+ macro_ensure_version("4.7.1" ${KDE_VERSION} HAVEKDE4_7_1)
+
+diff --git a/data/yakuake.appdata.xml b/data/yakuake.appdata.xml
+new file mode 100644
+index 0000000..cfca4b6
+--- /dev/null
++++ b/data/yakuake.appdata.xml
+@@ -0,0 +1,32 @@
++<?xml version="1.0" ?>
++<component type="desktop">
++ <id>yakuake.desktop</id>
++ <metadata_license>CC0-1.0</metadata_license>
++ <project_license>GPL-2.0+</project_license>
++ <name>Yakuake</name>
++ <summary>Drop-down Terminal</summary>
++ <description>
++ <p>
++ Yakuake is a drop-down terminal emulator based on KDE Konsole technology.
++ </p>
++ <p>Features:</p>
++ <ul>
++ <li>Smoothly rolls down from the top of your screen</li>
++ <li>Tabbed interface</li>
++ <li>Configurable dimensions and animation speed</li>
++ <li>Skinnable</li>
++ <li>Sophisticated D-Bus interface</li>
++ </ul>
++ </description>
++ <url type="homepage">http://yakuake.kde.org/</url>
++ <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&product=yakuake</url>
++ <screenshots>
++ <screenshot type="default">
++ <image>http://kde.org/images/screenshots/yakuake.png</image>
++ </screenshot>
++ </screenshots>
++ <project_group>KDE</project_group>
++ <provides>
++ <binary>yakuake</binary>
++ </provides>
++</component>
+--
+1.9.3
+
diff --git a/0041-Fixes-incorrect-Yakuake-height-handling-on-dualhead-.patch b/0041-Fixes-incorrect-Yakuake-height-handling-on-dualhead-.patch
new file mode 100644
index 0000000..5710c19
--- /dev/null
+++ b/0041-Fixes-incorrect-Yakuake-height-handling-on-dualhead-.patch
@@ -0,0 +1,51 @@
+From 5e31ccfdbc3a46e6bffd79fc6bcafc3a2bde0ed3 Mon Sep 17 00:00:00 2001
+From: Vangelis Tasoulas <vangelis at tasoulas.net>
+Date: Sun, 23 Nov 2014 00:16:11 +0100
+Subject: [PATCH 41/56] Fixes incorrect Yakuake height handling on dualhead
+ setups.
+
+BUG:310155
+---
+ app/mainwindow.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
+index ca5df80..c11de41 100644
+--- a/app/mainwindow.cpp
++++ b/app/mainwindow.cpp
+@@ -1269,8 +1269,6 @@ QRect MainWindow::getDesktopGeometry()
+ if (action->isChecked())
+ return screenGeometry;
+
+- int currentDesktop = KWindowSystem::windowInfo(winId(), NET::WMDesktop).desktop();
+-
+ if (KApplication::desktop()->numScreens() > 1)
+ {
+ const QList<WId> allWindows = KWindowSystem::windows();
+@@ -1286,7 +1284,9 @@ QRect MainWindow::getDesktopGeometry()
+ {
+ KWindowInfo windowInfo = KWindowSystem::windowInfo(windowId, NET::WMDesktop, NET::WM2ExtendedStrut);
+
+- if (windowInfo.valid() && (windowInfo.desktop() == currentDesktop || windowInfo.desktop() == -1))
++ // If windowInfo is valid and the window is located at the same (current)
++ // desktop with the yakuake window...
++ if (windowInfo.valid() && windowInfo.isOnCurrentDesktop())
+ {
+ NETExtendedStrut strut = windowInfo.extendedStrut();
+
+@@ -1316,10 +1316,10 @@ QRect MainWindow::getDesktopGeometry()
+ }
+ }
+
+- return KWindowSystem::workArea(offScreenWindows, currentDesktop).intersect(screenGeometry);
++ return KWindowSystem::workArea(offScreenWindows).intersect(screenGeometry);
+ }
+
+- return KWindowSystem::workArea(currentDesktop);
++ return KWindowSystem::workArea();
+ }
+
+ void MainWindow::whatsThis()
+--
+1.9.3
+
diff --git a/yakuake-height.patch b/yakuake-height.patch
deleted file mode 100644
index 13ea1ed..0000000
--- a/yakuake-height.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 5e31ccfdbc3a46e6bffd79fc6bcafc3a2bde0ed3
-Author: Vangelis Tasoulas <vangelis at tasoulas.net>
-Date: Sun Nov 23 00:16:11 2014 +0100
-
- Fixes incorrect Yakuake height handling on dualhead setups.
-
- BUG:310155
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index ca5df80..c11de41 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -1269,8 +1269,6 @@ QRect MainWindow::getDesktopGeometry()
- if (action->isChecked())
- return screenGeometry;
-
-- int currentDesktop = KWindowSystem::windowInfo(winId(), NET::WMDesktop).desktop();
--
- if (KApplication::desktop()->numScreens() > 1)
- {
- const QList<WId> allWindows = KWindowSystem::windows();
-@@ -1286,7 +1284,9 @@ QRect MainWindow::getDesktopGeometry()
- {
- KWindowInfo windowInfo = KWindowSystem::windowInfo(windowId, NET::WMDesktop, NET::WM2ExtendedStrut);
-
-- if (windowInfo.valid() && windowInfo.desktop() == currentDesktop)
-+ // If windowInfo is valid and the window is located at the same (current)
-+ // desktop with the yakuake window...
-+ if (windowInfo.valid() && windowInfo.isOnCurrentDesktop())
- {
- NETExtendedStrut strut = windowInfo.extendedStrut();
-
-@@ -1316,10 +1316,10 @@ QRect MainWindow::getDesktopGeometry()
- }
- }
-
-- return KWindowSystem::workArea(offScreenWindows, currentDesktop).intersect(screenGeometry);
-+ return KWindowSystem::workArea(offScreenWindows).intersect(screenGeometry);
- }
-
-- return KWindowSystem::workArea(currentDesktop);
-+ return KWindowSystem::workArea();
- }
-
- void MainWindow::whatsThis()
diff --git a/yakuake.spec b/yakuake.spec
index 9748775..efb1cb4 100644
--- a/yakuake.spec
+++ b/yakuake.spec
@@ -1,7 +1,10 @@
+# trim changelog included in binary rpms
+%global _changelog_trimtime %(date +%s -d "1 year ago")
+
Name: yakuake
Version: 2.9.9
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A drop-down terminal emulator
# KDE e.V. may determine that future GPL versions are accepted
@@ -9,7 +12,18 @@ License: GPLv2 or GPLv3
#URL: https://projects.kde.org/projects/extragear/utils/yakuake
URL: http://yakuake.kde.org/
Source0: http://download.kde.org/stable/yakuake/%{version}/src/yakuake-%{version}.tar.xz
-Patch1: yakuake-height.patch
+
+## upstream patches
+## git clone kde:yakuake; cd yakuake; git format-patch v2.9.9
+## (minus translation updates)
+Patch1: 0001-Adjust-for-next-dev-cycle.patch
+Patch4: 0004-Add-an-option-for-keeping-the-window-open-after-the-.patch
+Patch5: 0005-Fix-the-small-typo-and-thus-the-warning.patch
+Patch21: 0021-Change-default-to-appear-on-the-screen-the-pointer-i.patch
+Patch22: 0022-Correctly-catch-offscreen-panels-when-building-the-e.patch
+Patch23: 0023-The-F12-shortcut-is-reserved-on-Windows.patch
+Patch33: 0033-Add-AppStream-metadata.patch
+Patch41: 0041-Fixes-incorrect-Yakuake-height-handling-on-dualhead-.patch
# konsolepart
Requires: konsole4-part
@@ -17,14 +31,17 @@ Requires: konsole4-part
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
+%if 0%{?fedora} > 20
+BuildRequires: libappstream-glib
+%endif
%description
Yakuake is a drop-down terminal emulator.
%prep
-%setup -q
-%patch1 -p 1
+%autosetup -p1
+
%build
mkdir %{_target_platform}
@@ -42,6 +59,7 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%check
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/yakuake.appdata.xml ||:
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/yakuake.desktop
@@ -61,13 +79,18 @@ fi
%doc AUTHORS COPYING ChangeLog TODO
%{_kde4_bindir}/yakuake
%{_kde4_configdir}/yakuake.knsrc
+%{_kde4_datadir}/appdata/yakuake.appdata.xml
%{_kde4_datadir}/applications/kde4/yakuake.desktop
%{_kde4_appsdir}/kconf_update/yakuake*
%{_kde4_appsdir}/yakuake/
-%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/hicolor/*/apps/yakuake.*
%changelog
+* Wed Apr 22 2015 Rex Dieter <rdieter at fedoraproject.org> - 2.9.9-9
+- pull in upstream fixes (including appdata)
+- trim changelog
+
* Sat Apr 18 2015 Jochen Schmitt <Jochen herr-schmitt de> - 2.9.9-8
- Fix height-handling issue (#810312)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/yakuake.git/commit/?h=f22&id=caa6791df9d65b4906414bd1afa9814a9df519e7
More information about the scm-commits
mailing list