commit: 381daeecad2fed98ef97489272fffa8571a18553 Author: Zamarin Arthur <arthurzam <AT> gmail <DOT> com> AuthorDate: Mon May 10 10:14:33 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Aug 2 06:37:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381daeec
app-editors/juffed: drop 0.10_p20160323-r1 Signed-off-by: Zamarin Arthur <arthurzam <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20751 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-editors/juffed/Manifest | 1 - .../juffed-0.10_p20160323-qscintilla-2.10.3.patch | 71 ---------------------- .../juffed-0.10_p20160323-qscintilla-2.10.patch | 11 ---- .../files/juffed-0.10_p20160323-qt-5.11.patch | 28 --------- app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 58 ------------------ 5 files changed, 169 deletions(-) diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest index 1b04dfd2b82..14a8eb65f87 100644 --- a/app-editors/juffed/Manifest +++ b/app-editors/juffed/Manifest @@ -1,2 +1 @@ -DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5 DIST juffed-0.10_p20200103.tar.gz 1628731 BLAKE2B d49e6d8a9eab1edf8b4a74ec0dc9b2e4a4c7e99180c8faf1fdb73d406ee2055626623a72bf00e90f7af7e7380540f625bd9b5c53a662f5334edbebe298e40626 SHA512 6672dc68eb7e40d258dececc9b7389e8417709cad1346e1abb7cf97cf7f59394586c93bc40bb15096c2e5175256385595522dac8714ad5f37946e0bb7a3eb258 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 f4a22957480..00000000000 --- 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 <ast...@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 fcfab7f4072..00000000000 --- 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 4dfa7fae31f..00000000000 --- 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 <ast...@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_p20160323-r1.ebuild deleted file mode 100644 index 955c950bbf9..00000000000 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd -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" - -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/qtwidgets:5 - dev-qt/qtxml:5 - >=x11-libs/qscintilla-2.9.4:=[qt5(+)] -" -DEPEND="${RDEPEND}" - -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 - - cmake_src_prepare - - sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DUSE_ENCA=ON - -DUSE_QT5=ON - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - -DLIB_SUFFIX=${libdir/lib/} - ) - cmake_src_configure -}
