diff options
| author |   Nikos Chantziaras <realnc@gmail.com> | 2022-04-29 09:11:56 +0300 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2022-05-02 15:46:33 +0300 |
| commit | fad8fa869e3c589295310fb75928e93f6a6a52d6 (patch) | |
| tree | 605bff34587ef6ad757f8ccfad942892eb967292 | |
| parent | x11-misc/kdocker: add 5.4 (diff) | |
| download | gentoo-fad8fa86.tar.gz gentoo-fad8fa86.tar.bz2 gentoo-fad8fa86.zip | |
x11-misc/kdocker: delete old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nikos Chantziaras <realnc@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25247
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
| -rw-r--r-- | x11-misc/kdocker/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/kdocker/files/qt-5.14.patch | 38 | ||||
| -rw-r--r-- | x11-misc/kdocker/kdocker-5.2.ebuild | 52 |
3 files changed, 0 insertions, 91 deletions
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest index a2d109a151b7..f8ca7508572e 100644 --- a/x11-misc/kdocker/Manifest +++ b/x11-misc/kdocker/Manifest @@ -1,3 +1,2 @@ -DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64 DIST KDocker-5.3.tar.gz 180861 BLAKE2B b9ee9c2b035fb477e947b1b451d55e76fb4d9ae8788469fc2d05e1721b5ab71657e00e31331b5be6cf8776b37b7032720d4609df29f57e5c66a44d9fc5d38318 SHA512 8e5af389c402f337c75f861b4cc83036486903a9728fbcb6ea812392c297203fad7eec4e7b11eb1db83514fd615094ab9826277b73312ae8ea13b012d82524c4 DIST KDocker-5.4.tar.gz 181166 BLAKE2B 7a301cd36f73112f5a6df6ce65fc11c30b16089ccec98f46d435694b2bfb373eac11c2ba3be5c4e56a56cec1f5fad9bc17b014e47e55f886f0685b6f11707c51 SHA512 1bc1bc445ccc2406f3fe21deb68d9654b3d384ab88bce4bc49f123c343ece3dcc3dfdc49b796f6ad5251d050e57b4ad13e1900851519b3643263137550f0ccc9 diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch deleted file mode 100644 index ca1237965aaf..000000000000 --- a/x11-misc/kdocker/files/qt-5.14.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001 -From: Nikos Chantziaras <realnc@gmail.com> -Date: Mon, 30 Dec 2019 16:03:16 +0200 -Subject: [PATCH] Fix building with Qt 5.14 - -Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a -'None' macro. Work around the resulting mess by temporarily undefining the -macro. ---- - src/trayitem.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/trayitem.h b/src/trayitem.h -index 7698ea4..4b54cdd 100644 ---- a/src/trayitem.h -+++ b/src/trayitem.h -@@ -21,6 +21,10 @@ - #ifndef _TRAYITEM_H - #define _TRAYITEM_H - -+// Qt 5.14 introduced QActionGroup::ExclusionPolicy::None, but <X.h> defines a 'None' macro. -+#pragma push_macro("None") -+#undef None -+ - #include <QAction> - #include <QEvent> - #include <QIcon> -@@ -32,6 +36,10 @@ - - #include "xlibutil.h" - -+#ifndef None -+#pragma pop_macro("None") -+#endif -+ - #define DEFAULT_CustomIcon QString() - #define DEFAULT_BalloonTimeout 4000 // 4 seconds - #define DEFAULT_SkipTaskbar false diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild deleted file mode 100644 index e75cbf9228cc..000000000000 --- a/x11-misc/kdocker/kdocker-5.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 qmake-utils xdg - -MY_P=KDocker-${PV} -DESCRIPTION="Helper to dock any application into the system tray" -HOMEPAGE="https://github.com/user-none/KDocker" -SRC_URI="https://github.com/user-none/KDocker/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsingleapplication[qt5(+),X] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXpm -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO ) - -PATCHES=( - "${FILESDIR}"/qt-5.14.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \ - kdocker.pro || die "sed failed" -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} |