* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
@ 2017-01-06 12:55 Johannes Huber
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Huber @ 2017-01-06 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 8661758a8256de046691782730901271c55916ea
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 6 12:54:22 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 12:54:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8661758a
dev-util/kdevelop-pg-qt: Fix build w/ sys-devel/flex-2.6.3
Revision bump adds upstream patch to fix build with sys-devel/flex-2.6.3.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/kdevelop-pg-qt-2.0.0-flex263.patch | 31 ++++++++++++++++++++++
.../kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild | 25 +++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
new file mode 100644
index 00000000..2f2fbee
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
@@ -0,0 +1,31 @@
+commit 7aa292e5c4b2dc2b8a420e7e8b8e32f61268fe5b
+Author: Leslie Zhai <xiangzhai83@gmail.com>
+Date: Thu Jan 5 11:04:27 2017 +0100
+
+ Fix yymore_used_but_not_detected undefined issue
+
+ flex-2.6.3 failed to
+
+ ```
+ #define yymore() yymore_used_but_not_detected
+ ```
+
+ throw yymore_used_but_not_detected undefined issue, so I simply added --yymore option for CMakeLists.txt
+
+ REVIEW: 129766
+ BUG: 374523
+ FIXED-IN: 2.0.1
+
+diff --git a/kdev-pg/CMakeLists.txt b/kdev-pg/CMakeLists.txt
+index 5490835..19dc3a4 100644
+--- a/kdev-pg/CMakeLists.txt
++++ b/kdev-pg/CMakeLists.txt
+@@ -76,7 +76,7 @@ IF(FLEX_EXECUTABLE)
+ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
+ ${OPTIONAL_PARSER_HEADER_DEPENDENCY}
+ COMMAND ${FLEX_EXECUTABLE}
+- ARGS --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
++ ARGS --yymore --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
+ "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
+ )
+
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
new file mode 100644
index 00000000..b760d48
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_BRANCH="2.0"
+KDEBASE="kdevelop"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+LICENSE="LGPL-2+ LGPL-2.1+"
+IUSE=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ sys-devel/bison
+ sys-devel/flex
+"
+RDEPEND="
+ !dev-util/kdevelop-pg-qt:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-flex263.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
@ 2017-05-06 20:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2017-05-06 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 71f4d405c97982b726d646618b9f29c05c4c4bfe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 18:34:41 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 6 20:02:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f4d405
dev-util/kdevelop-pg-qt: Drop slot 4
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-util/kdevelop-pg-qt/Manifest | 2 -
.../files/kdevelop-pg-qt-1.0.0-bison3.patch | 45 ----------------------
.../kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild | 27 -------------
.../kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild | 26 -------------
4 files changed, 100 deletions(-)
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index dc093700f63..7edbbf86a0b 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1 @@
-DIST kdevelop-pg-qt-1.0.0.tar.bz2 830040 SHA256 49b395f5b45bc0aa094d6a283627bc53581a5eaae7892fd850df2f97d68bcdcc SHA512 1e3a41cd5570a2bdba98ebdf55b89cc2992ddd4859bd672ea1b8215d47db2203ec685717787f90cf382168495b4b53cc42a9089c4a92e17286eca6cf17c1bb27 WHIRLPOOL 04ee7d992535713d99b77da888207ce5924f6409fafc363d6b00bd695fe39e3896dc8eb9433c71b60c4a45137593896b6eebbec2dde1386866c5c87223bda056
-DIST kdevelop-pg-qt-1.1.0.tar.gz 1091846 SHA256 30f78dcf08e9da88bb0643629e17dd8e360afea40370b8772afff197cb2f1685 SHA512 e43f7be38ba50ced6c15988266ee6163cfdcf1fe1b26b02a1c4586394378234eb7a76d7fbc84fc9e395121e916515e4950de672959c9e1ebc72332a0ecdaf364 WHIRLPOOL 3830ce0e3b3ad27a9613efe07d7d4a19d88100cef393ca74af4bce54261e7f52a71dee0351f415e4ca26f7e95a0281ecc26713c02313732887272adcd0e4aa18
DIST kdevelop-pg-qt-2.0.tar.xz 635604 SHA256 2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993 SHA512 50eb540f16c0a32b78ecb1b53ce7005a70c53497f1ca755afd321eb09d12ab646fae216f34a1efc310510a5aa27cb3f895c34aa71e38bcc9c415ca36099e9022 WHIRLPOOL 0758f63b1da3fb607cffe6ea60177f61ba432da991540afd9aa3934a2c76c7206c2483cefb227e7c56d55c27766e5374ee3e9b4bc48611b914219371898c604a
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
deleted file mode 100644
index 3651ec47160..00000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-1.0.0-bison3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit ac587957cd0cabbc668604507e2cfebb6810ed09
-Author: Milian Wolff <mail@milianw.de>
-Date: Thu Nov 29 15:56:40 2012 +0100
-
- fix some warnings
-
-diff --git a/kdev-pg/kdev-pg-code-gen.cpp b/kdev-pg/kdev-pg-code-gen.cpp
-index e06c6be..badb461 100644
---- a/kdev-pg/kdev-pg-code-gen.cpp
-+++ b/kdev-pg/kdev-pg-code-gen.cpp
-@@ -51,7 +51,7 @@ namespace KDevPG
-
- void generateCondition(const World::NodeSet& s, QTextStream& out)
- {
-- if(s.size() == 0 || s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0)
-+ if(s.size() == 0 || (s.size() == 1 && nodeCast<Model::ZeroItem*>(*s.begin()) != 0))
- {
- out << "true /*epsilon*/";
- return;
-diff --git a/kdev-pg/kdev-pg-lexer.ll b/kdev-pg/kdev-pg-lexer.ll
-index a0864af..9261d71 100644
---- a/kdev-pg/kdev-pg-lexer.ll
-+++ b/kdev-pg/kdev-pg-lexer.ll
-@@ -425,7 +425,7 @@ void appendLineBuffer()
- strcpy(yyTextLine+currentOffset, yytext + (yymoreFlag ? lastTextLeng : 0)); /* append current */
- /* strcpy is faster than strcat */
-
-- Q_ASSERT(strlen(yyTextLine) < yyTextLineLeng);
-+ Q_ASSERT(strlen(yyTextLine) < size_t(yyTextLineLeng));
-
- lastTextLeng = strlen(yytext);
- yymoreFlag = false;
-diff --git a/kdev-pg/kdev-pg-parser.yy b/kdev-pg/kdev-pg-parser.yy
-index d5a25f5..8f8d604 100644
---- a/kdev-pg/kdev-pg-parser.yy
-+++ b/kdev-pg/kdev-pg-parser.yy
-@@ -309,7 +309,7 @@ opt_lexer_action
- | T_CONTINUE {
- r = "\nlxCONTINUE;\n";
- }
-- | /* empty */ { r = "\nlxSKIP\n" }
-+ | /* empty */ { r = "\nlxSKIP\n"; }
- ;
-
- regexp
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
deleted file mode 100644
index e0d777c6863..00000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit kde4-base
-
-if [[ $PV == *9999* ]]; then
- KEYWORDS=""
-else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="http://www.kdevelop.org"
-LICENSE="LGPL-2"
-SLOT="4"
-IUSE="debug"
-
-RDEPEND=""
-DEPEND="
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${FILESDIR}/${P}-bison3.patch" )
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
deleted file mode 100644
index f637e82f765..00000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDEBASE="kdevelop"
-inherit kde4-base
-
-if [[ $PV == *9999* ]]; then
- KEYWORDS=""
-else
- SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${PV%%.0} -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A LL(1) parser generator used mainly by KDevelop language plugins"
-LICENSE="LGPL-2"
-IUSE="debug"
-
-DEPEND="
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="dev-util/kdevelop:4"
-
-S="${WORKDIR}/${PN}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
@ 2017-12-16 12:45 Michael Palimaka
0 siblings, 0 replies; 5+ messages in thread
From: Michael Palimaka @ 2017-12-16 12:45 UTC (permalink / raw
To: gentoo-commits
commit: a81feffcd8b4c6dd4556e9f150fe6d9e13e3b032
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 12:45:19 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 12:45:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81feffc
dev-util/kdevelop-pg-qt: remove 2.0.0-r1
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-util/kdevelop-pg-qt/Manifest | 1 -
.../files/kdevelop-pg-qt-2.0.0-flex263.patch | 31 ----------------------
.../kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild | 27 -------------------
3 files changed, 59 deletions(-)
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index dca941e1ae0..3808c237d13 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-pg-qt-2.0.tar.xz 635604 BLAKE2B 3dd13de28b53aead0b4afbe4b6757e04d815e09488d9eb328a4a9e8e84a90ed79f1ed53fafdcf0e77e59909cf09fa8954b5829ae2e00b1af5907ba8697804539 SHA512 50eb540f16c0a32b78ecb1b53ce7005a70c53497f1ca755afd321eb09d12ab646fae216f34a1efc310510a5aa27cb3f895c34aa71e38bcc9c415ca36099e9022
DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
deleted file mode 100644
index 2f2fbee903c..00000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 7aa292e5c4b2dc2b8a420e7e8b8e32f61268fe5b
-Author: Leslie Zhai <xiangzhai83@gmail.com>
-Date: Thu Jan 5 11:04:27 2017 +0100
-
- Fix yymore_used_but_not_detected undefined issue
-
- flex-2.6.3 failed to
-
- ```
- #define yymore() yymore_used_but_not_detected
- ```
-
- throw yymore_used_but_not_detected undefined issue, so I simply added --yymore option for CMakeLists.txt
-
- REVIEW: 129766
- BUG: 374523
- FIXED-IN: 2.0.1
-
-diff --git a/kdev-pg/CMakeLists.txt b/kdev-pg/CMakeLists.txt
-index 5490835..19dc3a4 100644
---- a/kdev-pg/CMakeLists.txt
-+++ b/kdev-pg/CMakeLists.txt
-@@ -76,7 +76,7 @@ IF(FLEX_EXECUTABLE)
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
- ${OPTIONAL_PARSER_HEADER_DEPENDENCY}
- COMMAND ${FLEX_EXECUTABLE}
-- ARGS --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
-+ ARGS --yymore --nounistd -o"${CMAKE_CURRENT_BINARY_DIR}/kdev-pg-lexer.cc"
- "${CMAKE_CURRENT_SOURCE_DIR}/kdev-pg-lexer.ll"
- )
-
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
deleted file mode 100644
index 60b9707f24d..00000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="2.0"
-KDEBASE="kdevelop"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${PN}-${PV%.0}.tar.xz"
-LICENSE="LGPL-2+ LGPL-2.1+"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-DEPEND="
- sys-devel/bison
- sys-devel/flex
-"
-RDEPEND="
- !dev-util/kdevelop-pg-qt:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-flex263.patch" )
-
-S="${WORKDIR}/${PN}-${PV%.0}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
@ 2020-03-02 13:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-03-02 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 4ef3cc03d4e89dd8485970548ebf05924d7b995d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 2 13:04:51 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 2 13:04:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ef3cc03
dev-util/kdevelop-pg-qt: Drop 2.2.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/kdevelop-pg-qt/Manifest | 1 -
.../files/kdevelop-pg-qt-2.2.0-qt-5.14.patch | 60 ----------------------
.../kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild | 26 ----------
3 files changed, 87 deletions(-)
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 15735a52751..204afab54f4 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,2 +1 @@
-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
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 5a4dec36d88..00000000000
--- 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 <alexey.min@gmail.com>
-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<QBitArray>’
- 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<QBitArray>’
- QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray)
- ^
-```
-
-std::hash<QBitArray> 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 7aea0fc71f7..00000000000
--- 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
-"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/
@ 2024-08-11 6:54 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-08-11 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 8aaa2258ec50394eb68a7723b9ec76f4c0453495
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 21:19:54 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 06:53:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aaa2258
dev-util/kdevelop-pg-qt: drop 2.2.2-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-2.2.2-port-away-from-depr-QString_midRef.patch | 53 ----------------------
.../kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild | 22 ---------
2 files changed, 75 deletions(-)
diff --git a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch b/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
deleted file mode 100644
index 360010c49cb3..000000000000
--- a/dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.2.2-port-away-from-depr-QString_midRef.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c210967f753b33db48dbf942c7b32e67363ca204 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Sun, 30 Oct 2022 11:56:59 +0100
-Subject: [PATCH] Port away from deprecated QString::midRef
-
-GIT_SILENT
----
- kdev-pg/kdev-pg-debug-visitor-gen.cpp | 2 +-
- kdev-pg/kdev-pg-regexp.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/kdev-pg/kdev-pg-debug-visitor-gen.cpp b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-index 418d044..d4394f7 100644
---- a/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-+++ b/kdev-pg/kdev-pg-debug-visitor-gen.cpp
-@@ -72,7 +72,7 @@ void GenerateDebugVisitor::operator()()
- out << " tokenString += QStringLiteral(\" ...\");" << endl;
- out << " tokenString += QStringLiteral(\"%1 more\").arg(end-begin-20);" << endl;
- out << " tokenString += QStringLiteral(\"... \");" << endl;
-- out << " tokenString += m_content.midRef(end-10, 10);" << endl;
-+ out << " tokenString += QStringView(m_content).mid(end-10, 10);" << endl;
- out << " }" << endl;
- out << " else {" << endl;
- out << " tokenString = m_content.mid(begin, end-begin+1);" << endl;
-diff --git a/kdev-pg/kdev-pg-regexp.cpp b/kdev-pg/kdev-pg-regexp.cpp
-index fda19f9..808018f 100644
---- a/kdev-pg/kdev-pg-regexp.cpp
-+++ b/kdev-pg/kdev-pg-regexp.cpp
-@@ -71,10 +71,10 @@ inline QString codeForDot(QString str)
- int npos = str.indexOf("\n\01!ASIgnore\"!!\n# ", pos);
- if(npos == -1)
- {
-- out += str.midRef(pos);
-+ out += QStringView(str).mid(pos);
- break;
- }
-- out += str.midRef(pos, npos - pos);
-+ out += QStringView(str).mid(pos, npos - pos);
- int nlpos = str.indexOf('\n', npos + 17);
- int codeendpos = str.indexOf("\n\01!AS/Ignore\"!!\n", nlpos);
- if(nlpos == -1 || codeendpos == -1)
-@@ -82,7 +82,7 @@ inline QString codeForDot(QString str)
- out += "<junk>";
- break;
- }
-- out += str.midRef(nlpos + 1, codeendpos - nlpos - 1);
-+ out += QStringView(str).mid(nlpos + 1, codeendpos - nlpos - 1);
- pos = codeendpos + 17;
- }
- return out.replace('\"', "\\\"").replace('\n', '\t').trimmed();
---
-GitLab
-
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild
deleted file mode 100644
index 1d77f74d84fc..000000000000
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-inherit ecm kde.org
-
-DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
-HOMEPAGE="https://www.kdevelop.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-BDEPEND="
- app-alternatives/yacc
- app-alternatives/lex
-"
-
-PATCHES=( "${FILESDIR}/${P}-port-away-from-depr-QString_midRef.patch" )
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-11 6:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-16 12:45 [gentoo-commits] repo/gentoo:master commit in: dev-util/kdevelop-pg-qt/, dev-util/kdevelop-pg-qt/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 6:54 Andreas Sturmlechner
2020-03-02 13:05 Andreas Sturmlechner
2017-05-06 20:05 Andreas Sturmlechner
2017-01-06 12:55 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox