summaryrefslogtreecommitdiffstats
path: root/source/kde/patch/kdevelop-pg-qt
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/patch/kdevelop-pg-qt')
-rw-r--r--source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch53
-rw-r--r--source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff11
2 files changed, 0 insertions, 64 deletions
diff --git a/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch b/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch
deleted file mode 100644
index 7392fbf33..000000000
--- a/source/kde/patch/kdevelop-pg-qt/0011-fix-some-warnings.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ac587957cd0cabbc668604507e2cfebb6810ed09 Mon Sep 17 00:00:00 2001
-From: Milian Wolff <mail@milianw.de>
-Date: Thu, 29 Nov 2012 15:56:40 +0100
-Subject: [PATCH 11/17] fix some warnings
-
----
- kdev-pg/kdev-pg-code-gen.cpp | 2 +-
- kdev-pg/kdev-pg-lexer.ll | 2 +-
- kdev-pg/kdev-pg-parser.yy | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-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
---
-1.9.3
-
diff --git a/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff b/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff
deleted file mode 100644
index c18d1e4d3..000000000
--- a/source/kde/patch/kdevelop-pg-qt/kdevelop-pg-qt.ftbfs.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./kdev-pg/CMakeLists.txt.orig 2018-01-30 16:34:56.192631426 -0600
-+++ ./kdev-pg/CMakeLists.txt 2018-01-30 16:37:04.178643391 -0600
-@@ -79,7 +79,7 @@
- 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"
- )
-