From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- x11-misc/kdocker/Manifest | 5 ++-- x11-misc/kdocker/files/qt-5.14.patch | 38 ++++++++++++++++++++++++ x11-misc/kdocker/kdocker-5.1.ebuild | 56 ------------------------------------ x11-misc/kdocker/kdocker-5.2.ebuild | 18 +++++------- 4 files changed, 47 insertions(+), 70 deletions(-) create mode 100644 x11-misc/kdocker/files/qt-5.14.patch delete mode 100644 x11-misc/kdocker/kdocker-5.1.ebuild (limited to 'x11-misc/kdocker') diff --git a/x11-misc/kdocker/Manifest b/x11-misc/kdocker/Manifest index 7c8dce740d3c..8924001c2c7e 100644 --- a/x11-misc/kdocker/Manifest +++ b/x11-misc/kdocker/Manifest @@ -1,7 +1,6 @@ -DIST KDocker-5.1.tar.gz 173340 BLAKE2B a15b833fba2a2d1e3f1b55ad4d115cb09f55a57981076332fc86b1e607bac470705b8bc909d15ddd912b43d301e8c217b1fd175947879f053b250d8684556424 SHA512 df5880e1c19a436ef6b8ee92426f989b77f4dfd11f3a6a2357f425419ea61cd69f51250a10e92962a893611f0a14504f698ccef09322d62d20f5d49a506c4a12 +AUX qt-5.14.patch 1037 BLAKE2B a6169aa7146a7e387cfba090177dea98a42d2311fd912deff98926b57f48c86bb39fa48ede81438a735f96de28eae0ec8e41f54641f03f9e67d06f7effda66ce SHA512 8c25af73914b2070aea45c173aad5f4a833e861d734d1d449d28ed595c542c001430af7f324489c6cc895adb7e580d98f41300c6d292eaa3ef3eb8148c3c4abb DIST KDocker-5.2.tar.gz 173508 BLAKE2B e44a924a085c2d237c113028f40a98cfa8a8a5398525aea4e38fadabd23a10cc91648a55f800afd2ad398b744ad450d9c7bc26dd5bae994603f6ea4b322b5804 SHA512 1a98bf7b6360f4ce042b3e5330798076d42bd463c16e41b259706811f11516a34acfb0ace59f2c10c07aa6b2ff8fc57b1b1fa3ccdd33d452e220ec46446e8b64 DIST kdocker-5.0.tar.gz 152222 BLAKE2B b4e60a28f497476503f2a40aee4a776ece3a052adce4d29cb75095d9056ba0d6e4993838d6f771fad08532a3fb6d4022a07684f47cbd72289d34bce7196347aa SHA512 7c7702000621204d7e4acab295d43d05f71982af91524bc237878bdc9aa8851dc01a718bbe32412f46c718a1e358de8e710489a4beba9ef5b39359fe43662ba3 EBUILD kdocker-5.0-r1.ebuild 964 BLAKE2B 34d68d6a6ce1518555e1312026e10aa8e92835c0e6600ad3d3a70b369650df76a568711e3a33727d1700db7dc9efaa7976ed0c7ad0a9633b3f497ba54c546044 SHA512 81d41b24645b5afab09d08f983fe29733ddaa8859df52e357d78258659cbe2e585f5fb3e47cb30cadb1138e3c1d6a5de3d7abbd046ecaf25134bda295eca2634 -EBUILD kdocker-5.1.ebuild 1085 BLAKE2B af70e64fad198e5689fb2a3ee7c0be8a72afe716cd783ea1254ecd6745f62dafae1c2822818d5012b1602c817b5cfc7bf8b8fb8c5e65c07abd4ae378ef429340 SHA512 d3c4319dadfa7353c3ccf8244868aea2e2db2246f981214e7fb725c9b12a9b51499902a02032d675af629b5e858460838b7c6c5025053d38020f20fc9c2fb8e1 -EBUILD kdocker-5.2.ebuild 1085 BLAKE2B ff54c8cf21bc4630b291121ba7f4775b80dd50c419b3296fb8c7c3f11c59470b30b45ff955aa852eb457366145dfcf4f7d0f2ebf84530eb79cca9125f5760494 SHA512 b768dcd72dea6333b4408823e9b57dc6f92d413f52f5122a29cb8fc5c7811abc754363fed72cd5f3d36830a7864a7ae4c9cddcc6e688af0a826b5167ce22e43b +EBUILD kdocker-5.2.ebuild 1025 BLAKE2B 8d3687ad7c32b7718d80a7f7b8e6c3f47774ebe4bddf36ac6859fa50c1fda78f870bf82b089433a0b372bab874ee63d4fd6bcd62a793be9582ffd8e839a18ec8 SHA512 285ef72f1cd6e018edf7bae87b439e9c05d2be0668449661bc99525471b114ae9a071ce4709d078557dff57c37ce51db812c32f22c6b7f763934e0612d530507 MISC metadata.xml 513 BLAKE2B 74790e6c3a0503c7092152bc6b74850ef0c2ae5fedc71a1ac887775054b5965a8c13aace575792488ee443552d17a5f2f5732d92255600a00082911857c9541f SHA512 51f230ff4133f037ad1d92a18224004d27d0382efe842cd9c3d012f4589c611f9788d333c5bdd33936964aabcce4d96d790a4045b6a3cbbd37fd11597a3a5ea0 diff --git a/x11-misc/kdocker/files/qt-5.14.patch b/x11-misc/kdocker/files/qt-5.14.patch new file mode 100644 index 000000000000..ca1237965aaf --- /dev/null +++ b/x11-misc/kdocker/files/qt-5.14.patch @@ -0,0 +1,38 @@ +From 1579ee388749a7b056ccdd8ef2d4deafe21bd3e7 Mon Sep 17 00:00:00 2001 +From: Nikos Chantziaras +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 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 defines a 'None' macro. ++#pragma push_macro("None") ++#undef None ++ + #include + #include + #include +@@ -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.1.ebuild b/x11-misc/kdocker/kdocker-5.1.ebuild deleted file mode 100644 index cc8d8ab4af6c..000000000000 --- a/x11-misc/kdocker/kdocker-5.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 qmake-utils gnome2-utils - -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 ) - -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 -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/kdocker/kdocker-5.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild index 43c6d71eef65..a97ab33e91ee 100644 --- a/x11-misc/kdocker/kdocker-5.2.ebuild +++ b/x11-misc/kdocker/kdocker-5.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit bash-completion-r1 gnome2-utils qmake-utils +inherit bash-completion-r1 qmake-utils xdg MY_P=KDocker-${PV} DESCRIPTION="Helper to dock any application into the system tray" @@ -29,6 +29,10 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS BUGS ChangeLog CREDITS README.md TODO ) +PATCHES=( + "${FILESDIR}"/qt-5.14.patch +) + S=${WORKDIR}/${MY_P} src_prepare() { @@ -46,11 +50,3 @@ src_install() { emake INSTALL_ROOT="${D}" install einstalldocs } - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3