[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/, app-office/texmaker/files/

[gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/, app-office/texmaker/files/

[Andreas Sturmlechner]

commit:     d47becbb92f35caa49fad3c6533d4bf9d489020d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 17:02:29 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:04:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47becbb

app-office/texmaker: add 5.1.4, EAPI-8 bump

- respin existing hunspell/singleapp patch for 5.1 rather than use sed
- add missing dev-qt/qtcore:5= slot op for private header use
- dev-qt/qtscript:5 was replaced by dev-qt/qtdeclarative:5 in >=5.1.0
- dev-qt/qtwebengine:5[widgets] is still required
- dev-qt/qtconcurrent:5 is not linked against

Bug: https://bugs.gentoo.org/915780
See also: https://github.com/gentoo/gentoo/pull/22948
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/texmaker/Manifest                       |  1 +
 .../texmaker-5.1-unbundle-hunspell-singleapp.patch | 60 +++++++++++++++
 app-office/texmaker/texmaker-5.1.4.ebuild          | 86 ++++++++++++++++++++++
 3 files changed, 147 insertions(+)

diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 3df03a9620af..05f8260b8f1c 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1 +1,2 @@
 DIST texmaker-5.0.4.tar.bz2 15812468 BLAKE2B ad252827c7db90ad20de5ca59958124714b7abe660998ef21b983a7888831aaa12fedc018a764ad8898780b18ca97b44145afe548817a867f74b407f0a2c9399 SHA512 34ff5773358c2fffbc9e7e61028cd74eef231152e3483531b66cb0d907dd8f70a4e8b6d6ea09b0b11387b592f6d1676ba8a1e737b26c86a45b16882e53edff1f
+DIST texmaker-5.1.4.tar.bz2 15277027 BLAKE2B c121569a599181ec480823fbe2429977aedad4cbd4a3a09647b7ebcaace873d56e27362148a729b1802454d8e38703d507f4f616886d4bbba4075fe91aed5a5f SHA512 6ae4be7ae9be98e494480d4574e783a5568f0dcc9c631ccbc9bf00cca9f69dc672ba72060c064748a4446d20302af89e3bc6f14e8977d1f1ddbd20458fcf6d4e

diff --git a/app-office/texmaker/files/texmaker-5.1-unbundle-hunspell-singleapp.patch b/app-office/texmaker/files/texmaker-5.1-unbundle-hunspell-singleapp.patch
new file mode 100644
index 000000000000..8af2428a449e
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-5.1-unbundle-hunspell-singleapp.patch
@@ -0,0 +1,60 @@
+--- a/texmaker.pro	2023-04-30 14:59:36.000000000 +0200
++++ b/texmaker.pro	2023-10-21 19:09:19.634531874 +0200
+@@ -127,28 +127,6 @@
+ 	x11fontdialog.h \
+ 	quickbeamerdialog.h \
+ 	cmdparser.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/filemgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunvisapi.h \
+-	hunspell/hunspell.h \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/langnum.hxx \
+-	hunspell/phonet.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/utf_info.hxx \
+-	hunspell/w_char.hxx \
+-	singleapp/qtlocalpeer.h \
+-	singleapp/qtlockedfile.h \
+-	singleapp/qtsingleapplication.h \
+-	singleapp/qtsinglecoreapplication.h \
+ 	encodingprober/CharDistribution.h \
+ 	encodingprober/ChineseGroupProber.h \
+ 	encodingprober/ctype_test_p.h \
+@@ -567,20 +545,6 @@
+ 	svnhelper.cpp \
+ 	x11fontdialog.cpp \
+ 	cmdparser.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/hunzip.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/suggestmgr.cxx \
+-	singleapp/qtlocalpeer.cpp \
+-	singleapp/qtlockedfile.cpp \
+-	singleapp/qtsingleapplication.cpp \
+-	singleapp/qtsinglecoreapplication.cpp \
+ 	encodingprober/CharDistribution.cpp \
+ 	encodingprober/ChineseGroupProber.cpp \
+ 	encodingprober/JapaneseGroupProber.cpp \
+@@ -1168,7 +1132,6 @@
+ DEFINES += DEBIAN_SPELLDIR
+ 
+ INSTALLS = target
+-SOURCES	+= singleapp/qtlockedfile_unix.cpp
+ 
+ utilities.files = doc/doc10.png \
+ 	doc/doc11.png \

diff --git a/app-office/texmaker/texmaker-5.1.4.ebuild b/app-office/texmaker/texmaker-5.1.4.ebuild
new file mode 100644
index 000000000000..106fa6d8b322
--- /dev/null
+++ b/app-office/texmaker/texmaker-5.1.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Powerful LaTeX-IDE"
+HOMEPAGE="https://xm1math.net/texmaker/"
+SRC_URI="https://xm1math.net/texmaker/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# dev-qt/qtcore slot op: includes private/qabstractitemmodel_p.h
+COMMON_DEPEND="
+	app-text/hunspell:=
+	app-text/poppler[qt5]
+	dev-qt/qtcore:5=
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtlockedfile
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[X,qt5(+)]
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+PATCHES=( "${FILESDIR}/${PN}-5.1-unbundle-hunspell-singleapp.patch" )
+
+src_prepare() {
+	default
+
+	find singleapp hunspell -delete || die
+
+	cat >> ${PN}.pro <<- EOF
+	exists(texmakerx_my.pri):include(texmakerx_my.pri)
+	EOF
+
+	cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+	sed \
+		-e '/^#include/s:hunspell/::g' \
+		-e '/^#include/s:singleapp/::g' \
+		-i *.cpp *.h || die
+
+	DOC_CONTENTS="A user manual with many screenshots is available at:
+	${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
+
+src_configure() {
+	local myeqmakeargs=(
+		${PN}.pro
+		QT_MAJOR_VERSION=5
+		PREFIX="${EPREFIX}/usr"
+		DESKTOPDIR="${EPREFIX}/usr/share/applications"
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+	)
+	eqmake5 ${myeqmakeargs[@]}
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+	readme.gentoo_create_doc
+}