From d473a706836012853193afc7000922601e4ada61 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 19 Oct 2017 17:57:29 +0100 Subject: gentoo resync : 19.10.2017 --- kde-misc/yakuake/Manifest | 3 +- kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch | 28 ----------- kde-misc/yakuake/yakuake-3.0.4-r1.ebuild | 54 ---------------------- kde-misc/yakuake/yakuake-3.0.4-r2.ebuild | 53 +++++++++++++++++++++ 4 files changed, 54 insertions(+), 84 deletions(-) delete mode 100644 kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch delete mode 100644 kde-misc/yakuake/yakuake-3.0.4-r1.ebuild create mode 100644 kde-misc/yakuake/yakuake-3.0.4-r2.ebuild (limited to 'kde-misc/yakuake') diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest index 433aef9965d2..2c0dc9115e1b 100644 --- a/kde-misc/yakuake/Manifest +++ b/kde-misc/yakuake/Manifest @@ -1,9 +1,8 @@ AUX yakuake-3.0.4-qdbus-crash.patch 1425 SHA256 eaf60a7a4467710b40e005b936369670525e17ce0337f7014bcec02ebd38387f SHA512 04b1ecf9c01cb5917fd74d4983f60d81dd815da7e0c4f9da14715d796e5bb365ad1d4fbc1be43c7ddf1e84463bf51d1198693a8a95ca93ae26fe5fb248fe0119 WHIRLPOOL a6efd18da9a43ad96bd947e9da519a89770c146b7c26e85d0158e28c4b6d5d57182ad7109350767323ce1ef00310416d976f58d9ed22470cfce159616caebc0d AUX yakuake-3.0.4-qicon.patch 1405 SHA256 0363d0e2502f91f2151c602d52f3c0d9035069fc4dffacc00442e2f9e036e267 SHA512 fd2c68341a77cfedf4d34a854efc7c513c16741cf2e3cf4300c1b1ee4e45560d9e5f318303493d4112141255bd3288437db2b251a722db0ec410c2241f842b44 WHIRLPOOL 4d8a56d623f513cf85918acbb5d443a216ae9d601b2805a963b8f09956be270f2e91e5f3dd9fcca2bf37fff73c05877049ffca90a572cea3d77c1f89dd16fcac AUX yakuake-3.0.4-qt-5.9-wayland.patch 3408 SHA256 0f5c7d10be914cf3ce5fc57cf635cf5ce6905c67ba5c439b306b9cbcf5914f46 SHA512 1c0486b186e3443dc20c828cd241b2b07093d3314263a6cda16b97ae4aea883281124988f0c989d2116ecc3fa832587b54fa5027555d12157fe40bdd5201ce42 WHIRLPOOL 9fb1d125352ce1110a1f25add35fb467b412170379718bf4a12eddd9edd2dedcda9005bf92d23a1895a1db7dba3a8e4933dc29098939b3bdf6284f4931179f4e -AUX yakuake-3.0.4-wayland.patch 783 SHA256 359aa9a723cb962a2511e16344fb92100c4c67ebde1276df4858526c9f85c2ef SHA512 20599bca17ca2df29aacf0d8b0e0df22b30b9ce17a71a4a4b5055d1cb56b85729495fe4faa472e9d1b46217071b5fb8b823bea19e1abf9f3094ea53e5f35878d WHIRLPOOL 1e8f577fe82364abdbd653634df090fccf99730b82d741659696c059e2aa206e4a10bd4675474e377086178f66f86ce20080ec338122ec4c19d90ad134af7c89 DIST yakuake-3.0.4.tar.xz 367788 SHA256 10e2b57c508e2ec5bfd09eac38c4c16a1ac4b93b394b3ce3120b7d8859b861e0 SHA512 e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659 WHIRLPOOL 4223f973ddc5cb6d40289f8e9943740c9a734ffa9b05763c09a1baf1323065454e13f8fb86ff904672300a87bad6168e44808c23ea851cd92ecce9454f107d7d -EBUILD yakuake-3.0.4-r1.ebuild 1373 SHA256 da3d8b95e4c99aa88bc06fbe6033daec89217d859bba5d07013cb500bfb6e9e2 SHA512 0c46b9561c97eee17414776919f06e08df142e6f0748554959279fa74314d2540b0c2f77218805e3b58157727044b7639a9084c917ea6a14710dbbf3e0c43f29 WHIRLPOOL 16d582be58515e82d0457c6c0f4e18d4650552aa4e885b588662663b7a093b2f71d4dddef3af91fbaa768bd444ba8a87a4557c509b4e4e5a18f3bc0cbf3b199d +EBUILD yakuake-3.0.4-r2.ebuild 1339 SHA256 baa27e31f29a459a246cb3469a6a9b3ae88da96ce8c0c6b1bbb998443a5ee72d SHA512 0056d9c525b970dab5691746467602564d113b8c4bbd3309d914ba7b9043ec1920713a116df2ecce22940ca23fc869643202268085d102ccd34b7caecd689fe8 WHIRLPOOL 9538ff789fd3453827052f9dc1cd058ac790b78cccb6d063c2972f4ae40713912519d723d0de7f1b1a8bce9087f2f72ec51950d3c94a29a551df54ccff93328c EBUILD yakuake-3.0.4.ebuild 1213 SHA256 eadc132a22df56749e075c35b2558c9829b2cb45d36ed1f3afe1bac78115a008 SHA512 0613901cfa2d84b485c8ef3677f21b92c9eaf54770af211777b80923e7c13bb3cc3939cad9b4e18c7c85c941e6c46b78b78ec4ae9ad553d4f781648cea7039fd WHIRLPOOL 144dc1a045d3ae4443d826d7c5ad74a750bcc51191faedfddd3ca3f7f0f7d6d82d71b0a2f79ebda10d0373f909ddc975f62451989d7f69baa1dff0ecdc69a6f7 MISC ChangeLog 3929 SHA256 fbf7de6faad33e9607fa6e17621841b02efd86c90261f4013de8815278f91927 SHA512 19864f165278c9dec86d9a381ef6dd0dabc52865fe0b815580843749a4257aebc44e6370a21d0fc48886e92f05a939af92da7ac03df21636b6337da5481abf47 WHIRLPOOL 60641c2aa224d309ef0276e9c45b8b400fbc69a5fd088e8a87cf8ff09b5a593d64afcdfd3605542462379ca46b66d0ff8e43723ae6c76448db3b6042add192e1 MISC ChangeLog-2015 8962 SHA256 3071ef9697f9c8a21610f3e3930c50006872cc4ec375ebafdc16e9fbae1780ce SHA512 00b9ebd76416c927477918ffa8abb0cbb75d2e5a018eeb41c5fda1aed4d46dddb845bc2f242292adf4eb6584df1f7a9273ffe5f60c1fe4904b129f39980f4797 WHIRLPOOL f461ff48e69be9309ea5dbf5e80392740190620ed9c6aa8994ec09f04a0dc7ca26c8d7d8e4bf9de4b88ff0788ce8d5e925334c2c381e51baa6d5e7c449dcdc5b diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch b/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch deleted file mode 100644 index cce53b8ac612..000000000000 --- a/kde-misc/yakuake/files/yakuake-3.0.4-wayland.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3cdc1d0654dcd8e6eb3fc01d95fcccafe68cbb47 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Thu, 12 Oct 2017 18:41:58 +0200 -Subject: Fix (my) yakuake on a wayland session - -KWindowSystem::activeWindow and winId are two entirely different things. - -Reviewed by Eike ---- - app/mainwindow.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp -index 6fa9160..028bb9c 100644 ---- a/app/mainwindow.cpp -+++ b/app/mainwindow.cpp -@@ -1023,7 +1023,7 @@ void MainWindow::wmActiveWindowChanged() - return; - } - -- if (!Settings::keepOpen() && isVisible() && KWindowSystem::activeWindow() != winId()) { -+ if (!Settings::keepOpen() && hasFocus()) { - toggleWindowState(); - } - } --- -cgit v0.11.2 - diff --git a/kde-misc/yakuake/yakuake-3.0.4-r1.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r1.ebuild deleted file mode 100644 index 937b781bd665..000000000000 --- a/kde-misc/yakuake/yakuake-3.0.4-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Quake-style terminal emulator based on konsole" -HOMEPAGE="https://yakuake.kde.org/" -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" -fi - -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep konsole) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libX11 -" -RDEPEND="${DEPEND} - !kde-misc/yakuake:4 -" - -PATCHES=( - "${FILESDIR}/${P}-qicon.patch" - "${FILESDIR}/${P}-qt-5.9-wayland.patch" - "${FILESDIR}/${P}-qdbus-crash.patch" - "${FILESDIR}/${P}-wayland.patch" -) diff --git a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild new file mode 100644 index 000000000000..e82c0cbc12da --- /dev/null +++ b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Quake-style terminal emulator based on konsole" +HOMEPAGE="https://yakuake.kde.org/" +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" +fi + +LICENSE="GPL-2 LGPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwayland) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_kdeapps_dep konsole) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libX11 +" +RDEPEND="${DEPEND} + !kde-misc/yakuake:4 +" + +PATCHES=( + "${FILESDIR}/${P}-qicon.patch" + "${FILESDIR}/${P}-qt-5.9-wayland.patch" + "${FILESDIR}/${P}-qdbus-crash.patch" +) -- cgit v1.2.3