From c81b9d377051613501491849cb9dfae6f7ea8b75 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 15 Jan 2020 17:22:10 +0100
Subject: [PATCH] texmaker, bump version (#4588)

---
 ...5.0.3.patchset => texmaker-5.0.4.patchset} | 30 ++++++++++++-------
 ...ker-5.0.3.recipe => texmaker-5.0.4.recipe} |  5 ++--
 2 files changed, 23 insertions(+), 12 deletions(-)
 rename app-office/texmaker/patches/{texmaker-5.0.3.patchset => texmaker-5.0.4.patchset} (75%)
 rename app-office/texmaker/{texmaker-5.0.3.recipe => texmaker-5.0.4.recipe} (92%)

diff --git a/app-office/texmaker/patches/texmaker-5.0.3.patchset b/app-office/texmaker/patches/texmaker-5.0.4.patchset
similarity index 75%
rename from app-office/texmaker/patches/texmaker-5.0.3.patchset
rename to app-office/texmaker/patches/texmaker-5.0.4.patchset
index ec7d09234..ee20ba7c1 100644
--- a/app-office/texmaker/patches/texmaker-5.0.3.patchset
+++ b/app-office/texmaker/patches/texmaker-5.0.4.patchset
@@ -1,4 +1,4 @@
-From 04446c1bd04d49422e4c04b058aa8c3fc88315bf Mon Sep 17 00:00:00 2001
+From 3fdb931572500f23420cbc7cd648709affcd0ae3 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Wed, 30 Oct 2019 11:01:35 +0000
 Subject: Add Haiku to the platforms
@@ -27,10 +27,10 @@ index f4fc2e8..5c9aa84 100644
  #endif  // _FX_OS_
  
 -- 
-2.23.0
+2.24.1
 
 
-From 1610bcbdcbe9c42088273c1cb0d1f6b23e7188ca Mon Sep 17 00:00:00 2001
+From 7c9ef884ff58495bf21fd210a81d32bfc1477d87 Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
 Date: Wed, 30 Oct 2019 11:02:46 +0000
 Subject: Haiku doesn't have d_type
@@ -61,28 +61,38 @@ index abd84a8..65c0551 100644
  #endif
  }
 -- 
-2.23.0
+2.24.1
 
 
-From a57e6dea86fc92d48c66cdf907395927511538f2 Mon Sep 17 00:00:00 2001
+From 7d4ba7fb63d82f57ae2fde3d3327b82b7f36e6ed Mon Sep 17 00:00:00 2001
 From: begasus <begasus@gmail.com>
-Date: Wed, 30 Oct 2019 11:04:00 +0000
+Date: Wed, 15 Jan 2020 16:00:47 +0000
 Subject: Fix utilities.path
 
 
 diff --git a/texmaker.pro b/texmaker.pro
-index 9cffdcc..ff37035 100644
+index 399cc71..ed807de 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
-@@ -1064,7 +1064,7 @@ DEFINES += AUTHORIZE_LINUX_QSTYLES
+@@ -1043,6 +1043,9 @@ OBJECTS_DIR = .obj
+ isEmpty( PREFIX ) {
+     PREFIX=/usr
+ }
++isEmpty( UTILITIESDIR ) {
++	UTILITIESDIR=/usr/share/texmaker
++}
+ isEmpty( DESKTOPDIR ) {
+     DESKTOPDIR=/usr/share/applications
+ }
+@@ -1064,7 +1067,7 @@ DEFINES += AUTHORIZE_LINUX_QSTYLES
  
  
  target.path = $${PREFIX}/bin
 -utilities.path = $${PREFIX}/share/texmaker
-+utilities.path = $${PREFIX}/data/texmaker
++utilities.path = $${UTILITIESDIR}
  desktop.path = $${DESKTOPDIR}
  icon.path = $${ICONDIR}
  #not for openSUSE :
 -- 
-2.23.0
+2.24.1
 
diff --git a/app-office/texmaker/texmaker-5.0.3.recipe b/app-office/texmaker/texmaker-5.0.4.recipe
similarity index 92%
rename from app-office/texmaker/texmaker-5.0.3.recipe
rename to app-office/texmaker/texmaker-5.0.4.recipe
index 67d56cd67..0d76d778c 100644
--- a/app-office/texmaker/texmaker-5.0.3.recipe
+++ b/app-office/texmaker/texmaker-5.0.4.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="2003-2019 Pascal Brachet"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://xm1math.net/texmaker/texmaker-$portVersion.tar.bz2"
-CHECKSUM_SHA256="6074dffa82c431f8727c39e046f62cb70f5fe1457f158b46306e8f490b4f326f"
+CHECKSUM_SHA256="1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2"
 PATCHES="texmaker-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
@@ -47,6 +47,7 @@ BUILD_REQUIRES="
 	devel:libQt5Xml$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:ccache
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -56,7 +57,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	qmake texmaker.pro PREFIX=$prefix
+	qmake texmaker.pro PREFIX=$prefix UTILITIESDIR=$dataDir/texmaker
 	make $jobArgs
 }