From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-util/kdevelop-pg-qt/Manifest | 5 +- .../files/kdevelop-pg-qt-2.2.0-qt-5.14.patch | 60 ---------------------- .../kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild | 26 ---------- .../kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 91 deletions(-) delete mode 100644 dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch delete mode 100644 dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild (limited to 'dev-util/kdevelop-pg-qt') diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest index 419c3a711084..aa1ba3abdb3b 100644 --- a/dev-util/kdevelop-pg-qt/Manifest +++ b/dev-util/kdevelop-pg-qt/Manifest @@ -1,6 +1,3 @@ -AUX kdevelop-pg-qt-2.2.0-qt-5.14.patch 1988 BLAKE2B cffef4d7f61981b3f8e236e225e54b9ccb1964b1648c78b506678a76c0082f4e9ad8b6f1b68ff5d7e7a6f2413c7589513bf0db288d57cbc176d37a3b5959d7c9 SHA512 6b4429de2c8770c869e821a1a196cafdb52c6aa350c8d0dffd9d232fb1cb1ca3ef1da01fee70195b7344685ee82b735f9baea6e1365e58a98b52dbb4d29fdf2d -DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4 DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9 -EBUILD kdevelop-pg-qt-2.2.0.ebuild 531 BLAKE2B 00ef3f6743a06fd8fd3a7c2bc3e1a8f0bf49110b6c75908d935924930420ec7ae886b3473f062a3358b7e59e9b4803dd9d7b1a30879e484497741fa446c6bcc9 SHA512 920d51678d03733ba0a2cac526fc84f6ef1456e1353127a0f30f13201bb148253c5a6df42f9ccd53bea7539a96fed794cd039277262e9abd976cd501e5641cbb -EBUILD kdevelop-pg-qt-2.2.1.ebuild 494 BLAKE2B 43152b853defb577067030dd3b02f33591d63f711682b3ee4c644be0b0059c59d79a004c494aa0877a699dc1b42083b897055950fb3a3b81d94a0298514dc6d5 SHA512 157b6276f146565be3f22db86b7ae1746fa55b7e7b9eb8dad71cb63adcdc7ba411190e8feb33ec392114dada2a0ca93cf8c8869939147ff7c3c08e2ac1534437 +EBUILD kdevelop-pg-qt-2.2.1.ebuild 492 BLAKE2B db1956e6282aa0caf8ef3ba25430d663edb699a05b26d16951f66c2552aabc1d7af75e9804050e76836a62da2ff1b138ab5b036c875839a9c29a9fe2fbaf3eda SHA512 2be1178ad167df317436653d1154b1ce3d5ffb425e34117c1e451d3bae4f35766edfeec0351dba1912b92f52e57939dfd4a8a8b4b33fdad7761faf61d58d504e MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch deleted file mode 100644 index 5a4dec36d887..000000000000 --- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.0-qt-5.14.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d05d0b19e9d6f47fee3e11d837c2c21125589763 Mon Sep 17 00:00:00 2001 -From: Alexey Min -Date: Thu, 24 Oct 2019 14:34:45 +0300 -Subject: Fix build with Qt 5.14 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Summary: -Trying to build kdevelop-pg-qt with Qt 5.14 results in an error: -``` -.../kdev-pg/kdev-pg-regexp.cpp:44:23: error: redefinition of ‘struct std::hash’ - template<> struct hash< type > \ - ^~~~~~~~~~~~ -.../kdev-pg/kdev-pg-regexp.cpp:53:1: note: in expansion of macro ‘q_Hash_to_tr1_hash’ - q_Hash_to_tr1_hash(QBitArray) - ^~~~~~~~~~~~~~~~~~ -In file included from .../prefix514/include/QtCore/qvector.h:47:0, - from .../prefix514/include/QtCore/QVector:1, - from .../kdevelop-pg-qt/include/kdev-pg-char-sets.h:36, - from .../kdevelop-pg-qt/kdev-pg/kdev-pg-regexp.cpp:20: -.../prefix514/include/QtCore/qhashfunctions.h:209:1: note: previous definition of ‘struct std::hash’ - QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray) - ^ -``` - -std::hash is already specialized in Qt 5.14, so avoid redefinition with conditional compilation - -Test Plan: try to build with Qt 5.14 - -Reviewers: apol - -Reviewed By: apol - -Subscribers: kdevelop-devel - -Tags: #kdevelop - -Differential Revision: https://phabricator.kde.org/D24914 ---- - kdev-pg/kdev-pg-regexp.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp -index 8cc0b95..9fee81c 100644 ---- a/kdev-pg/kdev-pg-regexp.cpp -+++ b/kdev-pg/kdev-pg-regexp.cpp -@@ -50,7 +50,10 @@ namespace std \ - }; \ - } - -+#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) -+// Qt >= 5.14 already has std::hash for QBitArray - q_Hash_to_tr1_hash(QBitArray) -+#endif - - namespace KDevPG - { --- -cgit v1.1 diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild deleted file mode 100644 index 7aea0fc71f7d..000000000000 --- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -inherit ecm kde.org - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins" -HOMEPAGE="https://www.kdevelop.org/" - -LICENSE="LGPL-2+ LGPL-2.1+" -SLOT="5" -IUSE="" - -PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" ) - -BDEPEND=" - sys-devel/bison - sys-devel/flex -" diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild index 196935633101..715ae9df9aa8 100644 --- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild +++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild @@ -8,7 +8,7 @@ inherit ecm kde.org if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins" -- cgit v1.2.3