summaryrefslogtreecommitdiff
path: root/app-editors/juffed
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors/juffed')
-rw-r--r--app-editors/juffed/Manifest9
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch71
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch11
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch28
-rw-r--r--app-editors/juffed/juffed-0.10_p20200103.ebuild (renamed from app-editors/juffed/juffed-0.10_p20160323-r1.ebuild)24
-rw-r--r--app-editors/juffed/metadata.xml1
6 files changed, 13 insertions, 131 deletions
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 4f29ace5a09f..23e57aa0a053 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,7 +1,4 @@
AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e
-AUX juffed-0.10_p20160323-qscintilla-2.10.3.patch 2030 BLAKE2B 1946d32e43bb091b96f844955d65dfc956fccd6aabe1238d65cf962382312bb3246966d2ee8701da66e41922c3669e70e76bb8ca7cf9f745c1f066ecfa4e4071 SHA512 2a5a39674b38ab44db1f7eee7e1488b2004b050dc42db2e954442612ff63505c2b4abb831d0e1b711e4dcaacb1bc7943fe05112f6fc8bcf2ce52a0caf4e1d3b1
-AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3
-AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952
-DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
-EBUILD juffed-0.10_p20160323-r1.ebuild 1273 BLAKE2B 188811be9a80b210ed9d24e4eeca1dc327dc148a90a2cf8ada892be8331f20686754cd8f7457fec5200181570c8602b03c7cf7dc9362648ab038118a37fdcf7c SHA512 eb278d169660b5c3f76fe6c6bfcf1c8de24b0ea53b4e6f40a536500c92cc8d3e77c13388501ada64be7b51364835ff55ce0d5ae7ee768ecc3928d9a5d2dcde2f
-MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d
+DIST juffed-0.10_p20200103.tar.gz 1628731 BLAKE2B d49e6d8a9eab1edf8b4a74ec0dc9b2e4a4c7e99180c8faf1fdb73d406ee2055626623a72bf00e90f7af7e7380540f625bd9b5c53a662f5334edbebe298e40626 SHA512 6672dc68eb7e40d258dececc9b7389e8417709cad1346e1abb7cf97cf7f59394586c93bc40bb15096c2e5175256385595522dac8714ad5f37946e0bb7a3eb258
+EBUILD juffed-0.10_p20200103.ebuild 1253 BLAKE2B 39f4682dffbb014f6f511ccc8fcd36df38da72106e2d662759e08b1a05bb22e8b756347226d48b0ca774e706a477d887188598698c1a324deac43de815564b4d SHA512 4b5619bd01a7445ae2ddf98ada490d280b837960ab34e7f0e6ca9008a8c5f3d99c5ee42b477ba95f92ffb38e9dd7a3ccea709665f886ae5c9a92ce1e556e6df2
+MISC metadata.xml 378 BLAKE2B 8778271fc6002b4657c082f469f8e799310f25c69682a2121bc17dd19868df9cc069ac91e20e36fe94225987505d08fb4aca11c5f409e7f71c85eecc93594b72 SHA512 5426a1e8f652ef0f938e04c8d68416030b25d8b4e097c6f539c26632bdaabd6553c2a2a23ca16c857a3207a298036d8fd4d6cf9851cfbcb9773a16ba203d5b0c
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
deleted file mode 100644
index f4a22957480d..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_ADA 20
--
- #define SCE_ADA_DEFAULT 0
- #define SCE_ADA_WORD 1
- #define SCE_ADA_IDENTIFIER 2
-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 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_HASKELL 68
--
- #define SCE_HA_DEFAULT 0
- #define SCE_HA_IDENTIFIER 1
- #define SCE_HA_KEYWORD 2
-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 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_LISP 21
--
- #define SCE_LISP_DEFAULT 0
- #define SCE_LISP_COMMENT 1
- #define SCE_LISP_NUMBER 2
-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 @@
-
- #include <Qsci/qscilexer.h>
-
--// located in SciLexer.h
--#define SCLEX_NSIS 43
--
- #define SCE_NSIS_DEFAULT 0
- #define SCE_NSIS_COMMENT 1
- #define SCE_NSIS_STRINGDQ 2
---
-2.17.0
-
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
deleted file mode 100644
index fcfab7f4072f..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/FindQScintilla2.cmake 2016-03-23 20:43:22.000000000 +0100
-+++ b/cmake/FindQScintilla2.cmake 2017-10-08 17:25:06.984464985 +0200
-@@ -52,7 +52,7 @@
- ENDIF()
- ENDFOREACH()
-
-- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qt5scintilla2 libqt5scintilla2 libqscintilla2-qt5 qscintilla2-qt5)
-+ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 libqscintilla2_qt5 qscintilla2_qt5)
- GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION)
- GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH)
-
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
deleted file mode 100644
index 4dfa7fae31f7..000000000000
--- a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 10 Apr 2018 19:43:17 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- plugins/keybindings/KeysPage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp
-index 6579e3e..e68b039 100644
---- a/plugins/keybindings/KeysPage.cpp
-+++ b/plugins/keybindings/KeysPage.cpp
-@@ -1,9 +1,10 @@
- #include "KeysPage.h"
-
--#include <QPushButton>
-+#include <QAction>
- #include <QHeaderView>
- #include <QKeyEvent>
- #include <QMessageBox>
-+#include <QPushButton>
-
- #include "KeySettings.h"
- #include "Log.h"
---
-2.17.0
-
diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20200103.ebuild
index 955c950bbf9e..a53f1c7ee35d 100644
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20200103.ebuild
@@ -1,42 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
+COMMIT=74ab7236a30be17351edc5b83eb3579affd96913
inherit cmake xdg
DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/"
-SRC_URI="https://github.com/Mezomish/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+HOMEPAGE="http://juffed.com/en/ https://github.com/Mezomish/juffed"
+SRC_URI="https://github.com/Mezomish/juffed/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
RDEPEND="
app-i18n/enca
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
+ dev-qt/qtsingleapplication[X]
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ x11-libs/qscintilla
"
DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
DOCS=( ChangeLog README )
-S="${WORKDIR}/Mezomish-${PN}-5ba17f9"
-
-PATCHES=(
- "${FILESDIR}/${P}-qscintilla-2.10.patch"
- "${FILESDIR}/${P}-qt-5.11.patch"
- "${FILESDIR}/${P}-qscintilla-2.10.3.patch"
-)
-
src_prepare() {
# Upstream version outdated/dysfunctional and CRLF terminated
cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die
@@ -53,6 +46,7 @@ src_configure() {
-DUSE_QT5=ON
-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-DLIB_SUFFIX=${libdir/lib/}
+ -DQSCINTILLA_NAMES="qscintilla2;libqscintilla2;qscintilla2_qt5;qscintilla2_qt5"
)
cmake_src_configure
}
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
index 5d63c46383a4..f3d0db0262bf 100644
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">juffed</remote-id>
+ <remote-id type="github">Mezomish/juffed</remote-id>
</upstream>
</pkgmetadata>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-15 18:31:06 +0000