summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-15 18:01:08 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-15 19:21:01 +0200
commit43db3df98a9e0d911d9ac310078ebc1fd4666674 (patch)
treedbc5e2ad768233199de916f2246d30218538b112
parent536acabc6f9ac3c03f0b6d9bd914293be6b6b0db (diff)
downloaddesktop-43db3df98a9e0d911d9ac310078ebc1fd4666674.tar.gz
desktop-43db3df98a9e0d911d9ac310078ebc1fd4666674.tar.xz
texmaker: Version bump to 5.0.2
-rw-r--r--packages/app-text/texmaker/files/texmaker-5.0.2-install-destinations.patch (renamed from packages/app-text/texmaker/files/texmaker-4.5-install-destinations.patch)14
-rw-r--r--packages/app-text/texmaker/texmaker-5.0.2.exheres-0 (renamed from packages/app-text/texmaker/texmaker-4.5.exheres-0)25
2 files changed, 16 insertions, 23 deletions
diff --git a/packages/app-text/texmaker/files/texmaker-4.5-install-destinations.patch b/packages/app-text/texmaker/files/texmaker-5.0.2-install-destinations.patch
index 2565085..05a4333 100644
--- a/packages/app-text/texmaker/files/texmaker-4.5-install-destinations.patch
+++ b/packages/app-text/texmaker/files/texmaker-5.0.2-install-destinations.patch
@@ -3,9 +3,9 @@ Upstream: no
Fix install destinations by introducing a BINDIR variable.
---- texmaker-4.5/texmaker.pro
-+++ texmaker-4.5/texmaker.pro
-@@ -317,11 +317,14 @@
+--- texmaker-5.0.2/texmaker.pro
++++ texmaker-5.0.2/texmaker.pro
+@@ -1043,11 +1043,14 @@
isEmpty( PREFIX ) {
PREFIX=/usr
}
@@ -20,10 +20,10 @@ Fix install destinations by introducing a BINDIR variable.
- ICONDIR=/usr/share/pixmaps
+ ICONDIR=$${PREFIX}/share/pixmaps
}
-
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
-@@ -329,7 +332,7 @@
- LIBS += -lz
+ isEmpty( METAINFODIR ) {
+ METAINFODIR=/usr/share/metainfo
+@@ -1063,7 +1066,7 @@
+ }
-target.path = $${PREFIX}/bin
diff --git a/packages/app-text/texmaker/texmaker-4.5.exheres-0 b/packages/app-text/texmaker/texmaker-5.0.2.exheres-0
index 4cf7359..9f68f4a 100644
--- a/packages/app-text/texmaker/texmaker-4.5.exheres-0
+++ b/packages/app-text/texmaker/texmaker-5.0.2.exheres-0
@@ -1,7 +1,7 @@
# Copyright 2012 Kim Højgaard-Hansen <kimrhh@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require qmake
+require qmake [ slot=5 ]
SUMMARY="Free cross-platform LaTeX editor"
DESCRIPTION="
@@ -18,20 +18,14 @@ DOWNLOADS="http://www.xm1math.net/${PN}/${PNV}.tar.bz2"
LICENCES="|| ( GPL-2 GPL-3 )"
SLOT="0"
PLATFORMS="~amd64 ~x86"
-MYOPTIONS="qt5"
+MYOPTIONS=""
+
+QT_MIN_VER=5.7.0
DEPENDENCIES="
build+run:
- qt5? (
- app-text/poppler[>=0.24][qt5]
- x11-libs/qtbase:5
- x11-libs/qtscript:5
- x11-libs/qtwebkit:5
- )
- !qt5? (
- app-text/poppler[>=0.18][qt4]
- x11-libs/qt:4[>=4.7][webkit]
- )
+ x11-libs/qtbase:5[>=${QT_MIN_VER}]
+ x11-libs/qtscript:5[>=${QT_MIN_VER}]
recommendation:
app-text/texlive-core [[ description = [ Needed to produce dvi/pdf from
(La)TeX sources ] ]]
@@ -39,6 +33,7 @@ DEPENDENCIES="
app-text/ghostscript [[ description = [ For the LaTeX to html
conversion command ] ]]
"
+# NOTE: Bundles pdfium and hunspell
BUGS_TO="kimrhh@exherbo.org"
@@ -49,9 +44,7 @@ DEFAULT_SRC_PREPARE_PATCHES=(
EQMAKE_PARAMS=(
PREFIX="/usr"
BINDIR="/usr/$(exhost --target)/bin"
+ # Apparently a basic included browser, would need QtWebEngine
+ INTERNALBROWSER="no"
)
-src_configure() {
- eqmake $(option qt5 5 4)
-}
-