app-editors/juffed: Fix build with QScintilla-2.10.3

Closes: https://bugs.gentoo.org/652928
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
new file mode 100644 (file)
index 0000000..f4a2295
--- /dev/null
+++ b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
@@ -0,0 +1,71 @@
+From 49b6982336ad127b2b780d2ae7c1be1104d9dae5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 20:31:38 +0200
+Subject: [PATCH] Fix build with QScintilla-2.10.3
+
+---
+ src/app/qsci/lexers/qscilexerada.h     | 3 ---
+ src/app/qsci/lexers/qscilexerhaskell.h | 3 ---
+ src/app/qsci/lexers/qscilexerlisp.h    | 3 ---
+ src/app/qsci/lexers/qscilexernsis.h    | 3 ---
+ 4 files changed, 12 deletions(-)
+
+diff --git a/src/app/qsci/lexers/qscilexerada.h b/src/app/qsci/lexers/qscilexerada.h
+index 984f97e..30c6646 100644
+--- a/src/app/qsci/lexers/qscilexerada.h
++++ b/src/app/qsci/lexers/qscilexerada.h
+@@ -3,9 +3,6 @@
+ \r
+ #include <Qsci/qscilexer.h>\r
+ \r
+-// located in SciLexer.h\r
+-#define SCLEX_ADA 20\r
+-\r
+ #define SCE_ADA_DEFAULT 0\r
+ #define SCE_ADA_WORD 1\r
+ #define SCE_ADA_IDENTIFIER 2\r
+diff --git a/src/app/qsci/lexers/qscilexerhaskell.h b/src/app/qsci/lexers/qscilexerhaskell.h
+index 78c8978..56a3614 100644
+--- a/src/app/qsci/lexers/qscilexerhaskell.h
++++ b/src/app/qsci/lexers/qscilexerhaskell.h
+@@ -3,9 +3,6 @@
+ \r
+ #include <Qsci/qscilexer.h>\r
+ \r
+-// located in SciLexer.h\r
+-#define SCLEX_HASKELL 68\r
+-\r
+ #define SCE_HA_DEFAULT 0\r
+ #define SCE_HA_IDENTIFIER 1\r
+ #define SCE_HA_KEYWORD 2\r
+diff --git a/src/app/qsci/lexers/qscilexerlisp.h b/src/app/qsci/lexers/qscilexerlisp.h
+index 5b43d74..6e5dc32 100644
+--- a/src/app/qsci/lexers/qscilexerlisp.h
++++ b/src/app/qsci/lexers/qscilexerlisp.h
+@@ -3,9 +3,6 @@
+ \r
+ #include <Qsci/qscilexer.h>\r
+ \r
+-// located in SciLexer.h\r
+-#define SCLEX_LISP 21\r
+-\r
+ #define SCE_LISP_DEFAULT 0\r
+ #define SCE_LISP_COMMENT 1\r
+ #define SCE_LISP_NUMBER 2\r
+diff --git a/src/app/qsci/lexers/qscilexernsis.h b/src/app/qsci/lexers/qscilexernsis.h
+index 8b009ec..06efc40 100644
+--- a/src/app/qsci/lexers/qscilexernsis.h
++++ b/src/app/qsci/lexers/qscilexernsis.h
+@@ -3,9 +3,6 @@
+ \r
+ #include <Qsci/qscilexer.h>\r
+ \r
+-// located in SciLexer.h\r
+-#define SCLEX_NSIS 43\r
+-\r
+ #define SCE_NSIS_DEFAULT 0\r
+ #define SCE_NSIS_COMMENT 1\r
+ #define SCE_NSIS_STRINGDQ 2\r
+-- 
+2.17.0
+

diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
index 97e18f2d896c95c353c933a0c2fd5192ef58fe21..1c1f52f7c75b1b7de53f1955a51ebf8bf9c04de2 100644 (file)
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ DOCS=( ChangeLog README )
 PATCHES=(
        "${FILESDIR}/${P}-qscintilla-2.10.patch"
        "${FILESDIR}/${P}-qt-5.11.patch"
+       "${FILESDIR}/${P}-qscintilla-2.10.3.patch"
 )
 
 src_prepare() {