summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-01-06 13:54:22 +0100
committerJohannes Huber <johu@gentoo.org>2017-01-06 13:54:40 +0100
commit8661758a8256de046691782730901271c55916ea (patch)
tree13fc643e4b8e0c4592ab3dc905142988a6188174 /dev-util/kdevelop-pg-qt
parentmedia-plugins/vdr-tvguide: Remove myself as maintainer (diff)
downloadgentoo-8661758a8256de046691782730901271c55916ea.tar.gz
gentoo-8661758a8256de046691782730901271c55916ea.tar.bz2
gentoo-8661758a8256de046691782730901271c55916ea.zip
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
Diffstat (limited to 'dev-util/kdevelop-pg-qt')
-rw-r--r--dev-util/kdevelop-pg-qt/files/kdevelop-pg-qt-2.0.0-flex263.patch31
-rw-r--r--dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.0.0-r1.ebuild25
2 files changed, 56 insertions, 0 deletions
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 000000000000..2f2fbee903c7
--- /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 000000000000..b760d48239c8
--- /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" )