* [gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/, x11-misc/kdocker/files/
@ 2017-12-21 9:24 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2017-12-21 9:24 UTC (permalink / raw
To: gentoo-commits
commit: c9759f22f9cafb8c0fd673495aa4f22e58bf9dde
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 09:21:16 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 09:24:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9759f22
x11-misc/kdocker: remove 4.8-r2
Package-Manager: Portage-2.3.14, Repoman-2.3.6
x11-misc/kdocker/Manifest | 1 -
.../kdocker-4.8-unbundle-qtsingleapplication.patch | 17 ---------
x11-misc/kdocker/kdocker-4.8-r2.ebuild | 44 ----------------------
3 files changed, 62 deletions(-)
diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest
index e20d5b1218b..78eca9dd6fb 100644
--- a/x11-misc/kdocker/Manifest
+++ b/x11-misc/kdocker/Manifest
@@ -1,2 +1 @@
-DIST kdocker-4.8.tar.gz 379186 BLAKE2B 0ba5d39f5ecfaca1a67c1369239d90edf892db536f65a1f853788941ebb1891c0fd92ddce16250be3c8d613a40626bffebd2ea0e29fe4abf862327dcd62be5cf SHA512 4e7d716dba1ec7d45cb1134e4d28b4d4461a837d2f88f1460d54297594f617c414ba231515e1ca5c284e75099ac5db9762712085aba6c374991c8c642d903a91
DIST kdocker-5.0.tar.gz 152222 BLAKE2B b4e60a28f497476503f2a40aee4a776ece3a052adce4d29cb75095d9056ba0d6e4993838d6f771fad08532a3fb6d4022a07684f47cbd72289d34bce7196347aa SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3
diff --git a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch b/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 798769e6907..00000000000
--- a/x11-misc/kdocker/files/kdocker-4.8-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'kdocker.pro'
---- kdocker.pro 2011-05-31 00:46:31 +0000
-+++ kdocker.pro 2013-10-27 14:41:36 +0000
-@@ -2,7 +2,11 @@
- CONFIG += qt
- TARGET = kdocker
-
--include(solutions/qtsingleapplication/qtsingleapplication.pri)
-+isEmpty(SYSTEMQTSA) {
-+ include(3rdparty/qtsingleapplication/qtsingleapplication.pri)
-+} else {
-+ CONFIG += qtsingleapplication
-+}
-
- DEPENDPATH += src
- INCLUDEPATH += . src /usr/include/X11
-
diff --git a/x11-misc/kdocker/kdocker-4.8-r2.ebuild b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
deleted file mode 100644
index f3e8ad99e0d..00000000000
--- a/x11-misc/kdocker/kdocker-4.8-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-LANGS="it"
-inherit bash-completion-r1 qt4-r2
-
-DESCRIPTION="Helper to dock any application into the system tray"
-HOMEPAGE="https://github.com/user-none/KDocker"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV:0:3}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsingleapplication[qt4(+),X]
- x11-libs/libX11
- x11-libs/libXmu
- x11-libs/libXpm
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS ChangeLog CREDITS README TODO )
-PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
-
-src_prepare() {
- qt4-r2_src_prepare
-
- if ! use linguas_it ; then
- sed -e '/^INSTALLS +=/s/translations//' -i kdocker.pro || die "sed failed"
- fi
-
- sed -i -e "/completion.path/s%/etc/bash_completion.d%$(get_bashcompdir)%" \
- kdocker.pro || die "sed failed"
-}
-
-src_configure() {
- eqmake4 PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/, x11-misc/kdocker/files/
@ 2022-05-02 12:46 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2022-05-02 12:46 UTC (permalink / raw
To: gentoo-commits
commit: fad8fa869e3c589295310fb75928e93f6a6a52d6
Author: Nikos Chantziaras <realnc <AT> gmail <DOT> com>
AuthorDate: Fri Apr 29 06:11:56 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 2 12:46:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad8fa86
x11-misc/kdocker: delete old
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nikos Chantziaras <realnc <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25247
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-misc/kdocker/Manifest | 1 -
x11-misc/kdocker/files/qt-5.14.patch | 38 --------------------------
x11-misc/kdocker/kdocker-5.2.ebuild | 52 ------------------------------------
3 files changed, 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-05-02 12:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-02 12:46 [gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/, x11-misc/kdocker/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2017-12-21 9:24 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox