From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 15D3D138335 for ; Wed, 1 Jan 2020 07:55:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3031E09D5; Wed, 1 Jan 2020 07:55:46 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8DC32E09D5 for ; Wed, 1 Jan 2020 07:55:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8618B34DE12 for ; Wed, 1 Jan 2020 07:55:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10F5E36 for ; Wed, 1 Jan 2020 07:55:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1577865309.a3976f8b771939a59857f3f6e5f7557aa49cb65f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/kdocker/files/, x11-misc/kdocker/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/kdocker/files/qt-5.14.patch x11-misc/kdocker/kdocker-5.2.ebuild X-VCS-Directories: x11-misc/kdocker/ x11-misc/kdocker/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a3976f8b771939a59857f3f6e5f7557aa49cb65f X-VCS-Branch: master Date: Wed, 1 Jan 2020 07:55:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0333ffb3-b7f6-4269-a7b0-e056447dc0e0 X-Archives-Hash: e04d077cb35d043c8f088d47920703b4 commit: a3976f8b771939a59857f3f6e5f7557aa49cb65f Author: Nikos Chantziaras gmail com> AuthorDate: Mon Dec 30 14:22:51 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 1 07:55:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3976f8b x11-misc/kdocker: fix Qt 5.14 build, EAPI 7 Closes: https://bugs.gentoo.org/703882 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Nikos Chantziaras gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14181 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/kdocker/files/qt-5.14.patch | 38 ++++++++++++++++++++++++++++++++++++ x11-misc/kdocker/kdocker-5.2.ebuild | 18 +++++++---------- 2 files changed, 45 insertions(+), 11 deletions(-) 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 00000000000..ca1237965aa --- /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.2.ebuild b/x11-misc/kdocker/kdocker-5.2.ebuild index 43c6d71eef6..a97ab33e91e 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 -}