From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/
Date: Thu, 26 Apr 2018 03:32:07 +0000 (UTC) [thread overview]
Message-ID: <1524713373.ba4c5a38588e9202314c548a7b4ff86a51f010c5.asturm@gentoo> (raw)
commit: ba4c5a38588e9202314c548a7b4ff86a51f010c5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 19:38:43 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 03:29:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c5a38
app-office/texmaker: Drop old
Bug: https://bugs.gentoo.org/653982
Package-Manager: Portage-2.3.31, Repoman-2.3.9
app-office/texmaker/Manifest | 1 -
.../files/texmaker-4.5-modern-styles.patch | 16 ----
.../texmaker/files/texmaker-4.5-unbundle.patch | 93 ----------------------
app-office/texmaker/texmaker-4.5-r2.ebuild | 84 -------------------
app-office/texmaker/texmaker-4.5-r3.ebuild | 84 -------------------
5 files changed, 278 deletions(-)
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index df727efaa2f..864c6fbfc32 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,2 +1 @@
-DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11
DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
deleted file mode 100644
index 73c3b92f761..00000000000
--- a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/texmaker.cpp 2014-11-26 09:06:56.000000000 -0300
-+++ b/texmaker.cpp 2015-06-19 20:49:58.801377000 -0300
-@@ -4451,7 +4451,12 @@
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
- if (modern_style)
- {
--qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+ if(desktop_env == 1){
-+ if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle")));
-+ else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows")));
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
-+ }
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion")));
- }
- // else
- // {
diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch
deleted file mode 100644
index 607b2c8b7e4..00000000000
--- a/app-office/texmaker/files/texmaker-4.5-unbundle.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configdialog.cpp b/configdialog.cpp
-index dddb11e..9a1aee7 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -222,7 +222,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/texmaker.cpp b/texmaker.cpp
-index b8a2143..a8bcd46 100644
---- a/texmaker.cpp
-+++ b/texmaker.cpp
-@@ -2787,7 +2787,7 @@ if (hasDecodingError)
- QString dicDir=QCoreApplication::applicationDirPath() + "/";
- #else
- #ifdef DEBIAN_SPELLDIR
--QString dicDir=PREFIX"/share/myspell/dicts/";
-+QString dicDir=PREFIX"/share/myspell/";
- #else
- QString dicDir=PREFIX"/share/texmaker/";
- #endif
-diff --git a/texmaker.pro b/texmaker.pro
-index 7e9b706..909eb62 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -98,29 +98,6 @@ HEADERS += texmaker.h \
- unicodeview.h \
- quickbeamerdialog.h \
- svnhelper.h \
-- hunspell/affentry.hxx \
-- hunspell/affixmgr.hxx \
-- hunspell/atypes.hxx \
-- hunspell/baseaffix.hxx \
-- hunspell/csutil.hxx \
-- hunspell/dictmgr.hxx \
-- hunspell/hashmgr.hxx \
-- hunspell/htypes.hxx \
-- hunspell/hunspell.hxx \
-- hunspell/hunspell.h \
-- hunspell/langnum.hxx \
-- hunspell/license.hunspell \
-- hunspell/phonet.hxx \
-- hunspell/suggestmgr.hxx \
-- hunspell/license.myspell \
-- hunspell/filemgr.hxx \
-- hunspell/hunzip.hxx \
-- hunspell/replist.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 \
-@@ -210,22 +187,6 @@ SOURCES += main.cpp \
- unicodeview.cpp \
- quickbeamerdialog.cpp \
- svnhelper.cpp \
-- hunspell/affentry.cxx \
-- hunspell/affixmgr.cxx \
-- hunspell/csutil.cxx \
-- hunspell/dictmgr.cxx \
-- hunspell/hashmgr.cxx \
-- hunspell/hunspell.cxx \
-- hunspell/phonet.cxx \
-- hunspell/suggestmgr.cxx \
-- hunspell/utf_info.cxx \
-- hunspell/filemgr.cxx \
-- hunspell/replist.cxx \
-- hunspell/hunzip.cxx \
-- singleapp/qtlocalpeer.cpp \
-- singleapp/qtlockedfile.cpp \
-- singleapp/qtsingleapplication.cpp \
-- singleapp/qtsinglecoreapplication.cpp \
- encodingprober/CharDistribution.cpp \
- encodingprober/ChineseGroupProber.cpp \
- encodingprober/JapaneseGroupProber.cpp \
-@@ -336,8 +297,7 @@ icon.path = $${ICONDIR}
-
- INSTALLS = target
- HEADERS += x11fontdialog.h
--SOURCES += x11fontdialog.cpp \
-- singleapp/qtlockedfile_unix.cpp
-+SOURCES += x11fontdialog.cpp
- FORMS += x11fontdialog.ui
-
- utilities.files = doc/doc1.png \
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
deleted file mode 100644
index 2c65b02c918..00000000000
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
- app-text/hunspell
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- app-text/poppler[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtsingleapplication[X,qt5]
- dev-qt/qtwebkit:5[printsupport]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl
- app-text/psutils
- media-libs/netpbm
- virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-unbundle.patch
- "${FILESDIR}"/${P}-modern-styles.patch
- )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- epatch "${PATCHES[@]}"
-
- 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
- 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
-}
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild
deleted file mode 100644
index 79f1a8da122..00000000000
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils readme.gentoo-r1
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
- app-text/hunspell
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXext
- app-text/poppler[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtsingleapplication[X,qt5]
- dev-qt/qtwebkit:5[printsupport]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-RDEPEND="${COMMON_DEPEND}
- app-text/ghostscript-gpl
- app-text/psutils
- media-libs/netpbm
- virtual/latex-base"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-unbundle.patch
- "${FILESDIR}"/${P}-modern-styles.patch
- )
-
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
-HTML_DOCS=( doc/. )
-
-src_prepare() {
- find singleapp hunspell -delete || die
-
- epatch "${PATCHES[@]}"
-
- 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
- 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
-}
next reply other threads:[~2018-04-26 3:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 3:32 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-02 21:37 [gentoo-commits] repo/gentoo:master commit in: app-office/texmaker/files/, app-office/texmaker/ Sam James
2025-05-14 20:44 Andreas Sturmlechner
2023-11-12 12:38 Andreas Sturmlechner
2017-07-20 10:57 Kristian Fiskerstrand
2015-11-26 11:46 Justin Lecher
2015-11-26 10:26 Justin Lecher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1524713373.ba4c5a38588e9202314c548a7b4ff86a51f010c5.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox