diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-11 16:02:49 +0100 |
commit | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch) | |
tree | d80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /kde-misc | |
parent | 4645b6f17f0da81e9fe84081fb126a37102ba153 (diff) |
gentoo resync : 11.05.2018
Diffstat (limited to 'kde-misc')
-rw-r--r-- | kde-misc/Manifest.gz | bin | 5782 -> 5777 bytes | |||
-rw-r--r-- | kde-misc/kio-gdrive/Manifest | 3 | ||||
-rw-r--r-- | kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch | 11 | ||||
-rw-r--r-- | kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild | 48 | ||||
-rw-r--r-- | kde-misc/kshutdown/Manifest | 2 | ||||
-rw-r--r-- | kde-misc/kshutdown/kshutdown-4.0.ebuild | 52 | ||||
-rw-r--r-- | kde-misc/wacomtablet/Manifest | 2 | ||||
-rw-r--r-- | kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild | 51 | ||||
-rw-r--r-- | kde-misc/yakuake/Manifest | 5 | ||||
-rw-r--r-- | kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch | 44 | ||||
-rw-r--r-- | kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch | 32 | ||||
-rw-r--r-- | kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch | 120 | ||||
-rw-r--r-- | kde-misc/yakuake/yakuake-3.0.4-r2.ebuild | 53 |
13 files changed, 0 insertions, 423 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz Binary files differindex 7184b337b331..a0a3a588ddd2 100644 --- a/kde-misc/Manifest.gz +++ b/kde-misc/Manifest.gz diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest index f5c08e1fec71..96947872d238 100644 --- a/kde-misc/kio-gdrive/Manifest +++ b/kde-misc/kio-gdrive/Manifest @@ -1,6 +1,3 @@ -AUX kio-gdrive-1.2.1-doctools.patch 317 BLAKE2B 8b121a6642b1905cb46a2f36b5f7a4f4df2390b460a09ef18842ae16b0824b7540d13f5398e282d0cd500ebdaf712296b0ba22f7e03fde1f0f0af7c5a50694e4 SHA512 467e52dc07cf1726f1bd1231210cee145edd79de560814e9cc9514c1f4c13e369f062de0f8ba4eb961aec0878a96ce37e1555c5c968e70cf8bcbb014b13d1431 -DIST kio-gdrive-1.2.1.tar.xz 33820 BLAKE2B 5f1e4ec09b07b135b49bf887c560ee873eb32e918024899bd4790208e6d1e52957480acc9d5cdfa0d0a003c864cd554bf11b2466d123e4bf804306ea4508ff69 SHA512 021612192adc4173d936ee5f16d959db6c2d74aadae0d6dcb25aa1b8f1cd06f650e870d62eb72c9efbd9b581b06a949fcd78f494ec63eaac9ad67b16a0f0ab79 DIST kio-gdrive-1.2.3.tar.xz 44176 BLAKE2B b1cd14f4c3cf8f14b875543370816c105d5b494a3f0119e2ec1b49610bcde3d67757a7006cb6f5c1f529f9e10500edaf724736d2c3caf62a9be7782fdc50f383 SHA512 cd5ec02fa0f0a73a0016957276c07c9435137781da922c6aaa49c8f62c43dce9a5107cdd80acbf40d49ab88bf96a2a6ed43138678c8cd9accd472b6eb428203f -EBUILD kio-gdrive-1.2.1-r1.ebuild 1100 BLAKE2B f5a3d4f3b9de8bb89c19fe1e917c48c4b69340528faeb8102ed00b42ec5408342f8d2e0cc2668b3d55f5e140b9f8ba82e97315fa238caeb621117428d9a2fc27 SHA512 458806ab6fe62943f7d62ed470f0cc007db9b6ba5665c778fc74a0025551188c7074185ca1784874f62f7cca8a36215e9aa5904b8475ca1e39ecde5a3fce4c08 EBUILD kio-gdrive-1.2.3.ebuild 1053 BLAKE2B 0606cc225562a217065135f0b63100d8977b3492cabda25d97f005c81bd15c5dbd8803bc8ec2fc0d25d16785219696e5e7b6fb8d2f5acf922acbc048703203cd SHA512 3ff6b362993124e07f76e6bf417e0fa4efe637483872442fd605af6fd386b3c3fe49dc9ba77f111e148d579e6eae1c7b08c94f8cf2c6f255fb48d47f77a1ff50 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21 diff --git a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch b/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch deleted file mode 100644 index 7ddcf1428b52..000000000000 --- a/kde-misc/kio-gdrive/files/kio-gdrive-1.2.1-doctools.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2017-09-30 17:29:04.000000000 +0200 -+++ b/CMakeLists.txt 2017-10-19 20:51:03.198871146 +0200 -@@ -80,5 +80,6 @@ - find_package(KF5I18n CONFIG REQUIRED) - ki18n_install(po) - --find_package(KF5DocTools CONFIG REQUIRED) --kdoctools_install(po) -+if(KF5DocTools_FOUND) -+ kdoctools_install(po) -+endif() diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild deleted file mode 100644 index 3d124c2cd46c..000000000000 --- a/kde-misc/kio-gdrive/kio-gdrive-1.2.1-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" -inherit kde5 - -DESCRIPTION="KIO Slave for Google Drive service" -HOMEPAGE="https://phabricator.kde.org/project/profile/72/" - -if [[ ${KDE_BUILD_TYPE} != live ]] ; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -IUSE="+kaccounts" - -COMMON_DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_kdeapps_dep libkgapi) - $(add_qt_dep qtwidgets) - kaccounts? ( $(add_kdeapps_dep kaccounts-integration) ) - !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - dev-util/intltool -" -RDEPEND="${COMMON_DEPEND} - kaccounts? ( $(add_kdeapps_dep kaccounts-providers) ) -" - -DOCS=( README.md ) - -PATCHES=( "${FILESDIR}/${P}-doctools.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package kaccounts KAccounts) - ) - kde5_src_configure -} diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest index caca84f0a6ef..4e85f596ad8b 100644 --- a/kde-misc/kshutdown/Manifest +++ b/kde-misc/kshutdown/Manifest @@ -1,5 +1,3 @@ -DIST kshutdown-source-4.0.zip 459493 BLAKE2B 88718dacc682fc44461880767cc874e822e69d25359a5f8f66cec9bd99de7c4bb81173905ca12670788b191593128b325c03935d26757f260fe8d47b9bab768a SHA512 720ca297760bf0442fca10f64e966b16db32a0bdb5a6b456408a7245fba071b9bdb465bee312878b5cf82df0aa1e27566b06fc6fe5026edc3a84d2d8295ea6ee DIST kshutdown-source-4.2.zip 463140 BLAKE2B b398a004e91ebfa7651eed7bfffeccfc1cb332868ff3bbcea50ccd40088084ff1079d73ee2c922c8e882c0d39e1c6bc2741d0b416b5a2742eb5c6686b03f29a5 SHA512 00d4a5c1c8efdac0d86009bc0218a673435ca315f3b4fa949af414bf525ff65088f26edb0ed0d9fd2209ea81d58619efcffa5091d49bd2b841ddd4749b05a21f -EBUILD kshutdown-4.0.ebuild 1084 BLAKE2B 001707efd5292864eb5fc3331e322c22bcd14bbc2b0716540ba1f07abdc967e870241ed8e3d575e41adfb4d9d49faffda7584d06061af59cf54cf34586143046 SHA512 1921310d713d85122ae7553ca4f1c119dbe68e9913a4f297c7c83a1bafed00d26cba8e4208b0d06fc6908e768b660ef20e9f8b02b70d9560063a05150c338c25 EBUILD kshutdown-4.2.ebuild 1111 BLAKE2B 464b8451249ee35b987d175c5fca37b446084c789f1af1d6338d1988af70660f2660427838a35881f876b22cd893d5565f79da386828a2ca2771509be2b97c31 SHA512 b4e900b61414ead4f471c0a682bef779dd8fd061f296de3ed57180db777dd01bc772780eff45c34af74205ed02788c4cb91c276e6a4069a8ca337d746e50c328 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775 diff --git a/kde-misc/kshutdown/kshutdown-4.0.ebuild b/kde-misc/kshutdown/kshutdown-4.0.ebuild deleted file mode 100644 index 45ba4b1a52df..000000000000 --- a/kde-misc/kshutdown/kshutdown-4.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="false" -KDE_AUTODEPS="false" -MY_P=${PN}-source-${PV/_} -inherit kde5 - -DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma" -HOMEPAGE="https://kshutdown.sourceforge.io" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" - -LICENSE="GPL-2+" -KEYWORDS="amd64 x86" -IUSE="+kde" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - kde? ( - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kdbusaddons:5 - kde-frameworks/kglobalaccel:5 - kde-frameworks/ki18n:5 - kde-frameworks/kidletime:5 - kde-frameworks/knotifications:5 - kde-frameworks/knotifyconfig:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - ) - !kde-misc/kshutdown:4 -" -DEPEND="${RDEPEND} - app-arch/unzip - kde? ( kde-frameworks/extra-cmake-modules:5 ) - sys-devel/gettext -" - -src_configure() { - local mycmakeargs=( - -DKS_KF5=$(usex kde) - -DKS_PURE_QT=$(usex !kde) - ) - - kde5_src_configure -} diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest index 4c780b0c26ff..f4f2916f581a 100644 --- a/kde-misc/wacomtablet/Manifest +++ b/kde-misc/wacomtablet/Manifest @@ -1,5 +1,3 @@ -DIST wacomtablet-2.9.82.tar.xz 708508 BLAKE2B f9f10354f5db42e9acc43b05d00c168bd6f5200ea7d7f7fb4c7f0f3042ab2327d78145f6388e1c607528e14c6e6bd6a33929f952943dba330e02d761634ca37c SHA512 ba1b8d15ed4ce52c14ca0ac494cfb9200b9c891c6ac19ee5a306496e1c04f6abc8b83290bc31199a634ed8b4b4469dc185a967be183f1ed6b53956bc19038904 DIST wacomtablet-3.0.0.tar.xz 707852 BLAKE2B 76dd473a1dbb2b47395b5321df2dd307065d8dc7399748f70f69ea6b3d2dffe8a981ab8e24ee77d72579e00e86769b9d68822d551855432a2c0dc471cf81be6c SHA512 c953ea010fe672706506d15c594d1437e1f42c59abcdd0b5bed32b4cdccafbb612584057a641c66029261088a4b968976a7bcdd03952daa9f05a955ee83c721d EBUILD wacomtablet-3.0.0.ebuild 1126 BLAKE2B dffcf56c6e5f62a450f6f32dc38e0ca3cd558ff8c22575586886a981d1146dbe665018f7701a1b8e5007f10568a87a0eba0dbdab805e4ca1c9311a848b69d726 SHA512 f09680aa06fa34213c69075a6b34a9312bf3e2582110d14159f5c7b840d7d4518e46d690f2fd0f5458928d781d96822d25739d4cf826c30858e30d449d3cf8a5 -EBUILD wacomtablet-3.0.0_beta2.ebuild 1272 BLAKE2B a3d29c51a1f836e75dfeff33feb5339f9857f70136ad617892400020f0042d943305ccc0de27d558b19dc51eeed4a6b3eabeb66b6bc868b6c2f4d8b67635bc35 SHA512 d9e0d99e34885203d92691d7e536712bc62b70824d1d6e2d2482c4437bb3aaac097d3eaf56d08575ed04c5ecbef2db10644ec27c2ec89eba5fa0bcbd384f66cc MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild deleted file mode 100644 index 5a1691219aee..000000000000 --- a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="2.9.82" # avoid downgrade after upstream lowered version for beta2 -MY_P=${PN}-${MY_PV} -KDE_HANDBOOK="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KControl module for Wacom tablets" -HOMEPAGE="https://www.linux-apps.com/content/show.php?action=content&content=114856" -SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="" - -CDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - >=x11-drivers/xf86-input-wacom-0.20.0 - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXi - x11-libs/libXrandr -" -DEPEND="${CDEPEND} - sys-devel/gettext - x11-proto/xproto -" -RDEPEND="${CDEPEND} - !kde-misc/wacomtablet:4 -" - -S="${WORKDIR}/${MY_P}" diff --git a/kde-misc/yakuake/Manifest b/kde-misc/yakuake/Manifest index 2f495c516726..dfc6186e3ec7 100644 --- a/kde-misc/yakuake/Manifest +++ b/kde-misc/yakuake/Manifest @@ -1,8 +1,3 @@ -AUX yakuake-3.0.4-qdbus-crash.patch 1425 BLAKE2B 841120c4c714858157d0982582291d31a1c47ca9425ca6d29c2223b5d2f72dc4f8d0790bbc88d16e8a4511361502b190826bdeb1f35b824c0a5a4984ad773fd8 SHA512 04b1ecf9c01cb5917fd74d4983f60d81dd815da7e0c4f9da14715d796e5bb365ad1d4fbc1be43c7ddf1e84463bf51d1198693a8a95ca93ae26fe5fb248fe0119 -AUX yakuake-3.0.4-qicon.patch 1405 BLAKE2B 5d423fab1f7e9f3ad50017f58047d5d642e312f89502290be00341034a85975adcc38a4769b01c01820e26379248f16e1d1a5ec59e0162b43d9559302d385181 SHA512 fd2c68341a77cfedf4d34a854efc7c513c16741cf2e3cf4300c1b1ee4e45560d9e5f318303493d4112141255bd3288437db2b251a722db0ec410c2241f842b44 -AUX yakuake-3.0.4-qt-5.9-wayland.patch 3408 BLAKE2B 9c813f0ebb7b8044a62e4db14c478e235f19f20330edd1b696e0557a66b0254a9c1105018110f6142635394bb2de140538d76aca921f35cfa21d25d3416e528c SHA512 1c0486b186e3443dc20c828cd241b2b07093d3314263a6cda16b97ae4aea883281124988f0c989d2116ecc3fa832587b54fa5027555d12157fe40bdd5201ce42 -DIST yakuake-3.0.4.tar.xz 367788 BLAKE2B 6c151ac1fa70d7cf3cfd00854d8f5ab553345a9d12186514d405428e8e7ad32d8405b1c562b420c46a713347d1e00e037b92e20801c51cd90a81e299e94c51d1 SHA512 e50fe742349e02116bb9d7edd61178fcbc215ace39d50b48fb8ec3095c948a7ff91add7be5d8778c817f9d5b4663d4cefe3e0ef197c7ec6e0b88b3158ff39659 DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22 -EBUILD yakuake-3.0.4-r2.ebuild 1337 BLAKE2B 654711bb31bd14c19813e9d6fc71257a17d7b34c3a92dbe21aee30a348df84170c46f134eb1bab3f640540569f51c1cd95211175c395b60a9aa6576ee49c741b SHA512 821506da700802f928cf940ad19cd69894464da2d8a920199cf619aefe4d5ce90fe3865c805f7662787bb522d9e31a22b7475e5f34ed96696319f1718880255a EBUILD yakuake-3.0.5.ebuild 1214 BLAKE2B 795fdc5b109297743f947b585ba3cf5e10e1d8401933ca706ef99b68690071c3ce15594b929725cd52b0219bce3216efff979b2d3059015850be043ae1afef82 SHA512 f0e56b25047da712af7094963d03a16d4ed4355c5f56c4e70cbb6dc0932ed056048bb7e047ad290cbbcdea08deff39d362c2658d83b569756236e291af0011b3 MISC metadata.xml 527 BLAKE2B 6550b2f9744eaa38689006f338b02f0f5bc2a7a19942552176aba47d03832e7d39b5049515f768d819bd0f2f5bd26d4a8f572ee8d731b69940f286c3b31102d8 SHA512 9076d81d5e1f7b60667653334a649be515ce8c5b8224422bad089a5541b2438922d515abc11c66918a7bc0d00f4fc6f15f4a3cd20dd697b714195977d1c7baac diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch deleted file mode 100644 index da3b042d7012..000000000000 --- a/kde-misc/yakuake/files/yakuake-3.0.4-qdbus-crash.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09abe657c65ba482ce9253e54467d33276f88bc9 Mon Sep 17 00:00:00 2001 -From: Vangelis Tasoulas <cyberang3l@gmail.com> -Date: Sat, 16 Sep 2017 16:42:44 +0500 -Subject: Fixes a yakuake "index out of range" crash produced by QDBus exposed - function TabBar::sessionAtTab(int) - -Summary: -The function `TabBar::sessionAtTab(int index)` is exposed through QDBus and if a user/script passes a negative number, yakuake crashes with `index out of range`. - -This patch fixes that behaviour with a sanity check. If the user passes a negative number, return -1. - -Test Plan: -Run the command `qdbus org.kde.yakuake /yakuake/tabs org.kde.yakuake.sessionAtTab -1` -Yakuake will crash. - -Apply the patch and re-run the above `qdbus` command. It shouldn't be crashing now. - -Reviewers: #kde_applications, hein, alexeymin - -Reviewed By: #kde_applications, hein, alexeymin - -Subscribers: alexeymin - -Differential Revision: https://phabricator.kde.org/D7812 ---- - app/tabbar.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/tabbar.cpp b/app/tabbar.cpp -index b76cdee..1bc6fdd 100644 ---- a/app/tabbar.cpp -+++ b/app/tabbar.cpp -@@ -914,7 +914,7 @@ void TabBar::setTabTitleInteractive(int sessionId, const QString& newTitle) - - int TabBar::sessionAtTab(int index) - { -- if (index > m_tabs.count() - 1) -+ if (index < 0 || index > m_tabs.count() - 1) - return -1; - else - return m_tabs.at(index); --- -cgit v0.11.2 - diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch deleted file mode 100644 index 608a09cf39da..000000000000 --- a/kde-misc/yakuake/files/yakuake-3.0.4-qicon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 28138a891ff71236b3b8efcd1bc5fe7a2fe09b0d Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik <kde@privat.broulik.de> -Date: Wed, 2 Aug 2017 16:31:09 +0200 -Subject: [Appearance Settings] QIcon -> QIcon::fromTheme - -Most likely a porting error from KIcon - -Reviewed-By: Eike Hein ---- - app/config/appearancesettings.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/app/config/appearancesettings.cpp b/app/config/appearancesettings.cpp -index c21ac33..b7d5c6f 100644 ---- a/app/config/appearancesettings.cpp -+++ b/app/config/appearancesettings.cpp -@@ -63,9 +63,9 @@ AppearanceSettings::AppearanceSettings(QWidget* parent) : QWidget(parent) - connect(installButton, SIGNAL(clicked()), this, SLOT(installSkin())); - connect(removeButton, SIGNAL(clicked()), this, SLOT(removeSelectedSkin())); - -- installButton->setIcon(QIcon(QStringLiteral("folder"))); -- removeButton->setIcon(QIcon(QStringLiteral("edit-delete"))); -- ghnsButton->setIcon(QIcon(QStringLiteral("get-hot-new-stuff"))); -+ installButton->setIcon(QIcon::fromTheme(QStringLiteral("folder"))); -+ removeButton->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete"))); -+ ghnsButton->setIcon(QIcon::fromTheme(QStringLiteral("get-hot-new-stuff"))); - - m_knsConfigFileName = QLatin1String("yakuake.knsrc"); - m_knsDownloadManager = new KNSCore::DownloadManager(m_knsConfigFileName); --- -cgit v0.11.2 - diff --git a/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch b/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch deleted file mode 100644 index b24781dcc9ff..000000000000 --- a/kde-misc/yakuake/files/yakuake-3.0.4-qt-5.9-wayland.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 7534df21025b10fd236dd5a8f92d0dff7889e0ef Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org> -Date: Wed, 6 Sep 2017 18:42:01 +0200 -Subject: Make Yakuake work on Wayland with Qt 5.9 - -Summary: -Yakuake is also affected by the common problem that the integration -breaks once a window gets hidden, which is a very common feature of -Yakuake. - -This change tracks the PlasmaShellSurface, destroys it on hide and -recreates on show. Thus it's alwyas positioned as expected. - -Test Plan: -This commit was created using a yakuake which is positioned -correctly, although I pressed F12 a few times. - -Differential Revision: https://phabricator.kde.org/D7709 ---- - app/mainwindow.cpp | 33 ++++++++++++++++++++++++++------- - app/mainwindow.h | 3 +++ - 2 files changed, 29 insertions(+), 7 deletions(-) - -diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp -index a7b0d89..6fa9160 100644 ---- a/app/mainwindow.cpp -+++ b/app/mainwindow.cpp -@@ -95,6 +95,7 @@ MainWindow::MainWindow(QWidget* parent) - m_isWayland = QGuiApplication::platformName().startsWith(QLatin1String("wayland")); - #if HAVE_KWAYLAND - m_plasmaShell = Q_NULLPTR; -+ m_plasmaShellSurface = Q_NULLPTR; - initWayland(); - #endif - -@@ -176,6 +177,21 @@ void MainWindow::initWayland() - registry->setup(); - connection->roundtrip(); - } -+ -+void MainWindow::initWaylandSurface() -+{ -+ if (m_plasmaShellSurface) { -+ return; -+ } -+ if (!m_plasmaShell) { -+ return; -+ } -+ if (auto surface = KWayland::Client::Surface::fromWindow(windowHandle())) { -+ m_plasmaShellSurface = m_plasmaShell->createSurface(surface, this); -+ m_plasmaShellSurface->setPosition(pos()); -+ } -+} -+ - #endif - - bool MainWindow::queryClose() -@@ -861,13 +877,7 @@ void MainWindow::setWindowGeometry(int newWidth, int newHeight, int newPosition) - setGeometry(workArea.x() + workArea.width() * newPosition * (100 - newWidth) / 10000, - workArea.y(), targetWidth, maxHeight); - #if HAVE_KWAYLAND -- if (m_plasmaShell) { -- if (auto surface = KWayland::Client::Surface::fromWindow(windowHandle())) { -- if (auto plasmaSurface = m_plasmaShell->createSurface(surface, this)) { -- plasmaSurface->setPosition(pos()); -- } -- } -- } -+ initWaylandSurface(); - #endif - - maxHeight -= m_titleBar->height(); -@@ -1303,6 +1313,10 @@ void MainWindow::sharedAfterOpenWindow() - - applyWindowProperties(); - -+#if HAVE_KWAYLAND -+ initWaylandSurface(); -+#endif -+ - emit windowOpened(); - } - -@@ -1316,6 +1330,11 @@ void MainWindow::sharedAfterHideWindow() - { - if (Settings::pollMouse()) toggleMousePoll(true); - -+#if HAVE_KWAYLAND -+ delete m_plasmaShellSurface; -+ m_plasmaShellSurface = Q_NULLPTR; -+#endif -+ - emit windowClosed(); - } - -diff --git a/app/mainwindow.h b/app/mainwindow.h -index 8a46c89..bb6404e 100644 ---- a/app/mainwindow.h -+++ b/app/mainwindow.h -@@ -44,6 +44,7 @@ class KActionCollection; - namespace KWayland { - namespace Client { - class PlasmaShell; -+ class PlasmaShellSurface; - } - } - #endif -@@ -203,7 +204,9 @@ class MainWindow : public QMainWindow - - #if HAVE_KWAYLAND - void initWayland(); -+ void initWaylandSurface(); - KWayland::Client::PlasmaShell *m_plasmaShell; -+ KWayland::Client::PlasmaShellSurface *m_plasmaShellSurface; - #endif - }; - --- -cgit v0.11.2 - diff --git a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild b/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild deleted file mode 100644 index cd59332d3ebe..000000000000 --- a/kde-misc/yakuake/yakuake-3.0.4-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 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" -) |