From 66966fb4f72a21f539eda0a6f87d6dfb3240e95d Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 5 Feb 2022 11:46:48 +0100
Subject: [PATCH] texstudio, bump version (#6586)

---
 .../patches/texstudio-4.1.1.patchset          | 28 -------
 .../patches/texstudio-4.2.1.patchset          | 75 +++++++++++++++++++
 ...io-4.1.1.recipe => texstudio-4.2.1.recipe} |  6 +-
 3 files changed, 77 insertions(+), 32 deletions(-)
 delete mode 100644 app-office/texstudio/patches/texstudio-4.1.1.patchset
 create mode 100644 app-office/texstudio/patches/texstudio-4.2.1.patchset
 rename app-office/texstudio/{texstudio-4.1.1.recipe => texstudio-4.2.1.recipe} (94%)

diff --git a/app-office/texstudio/patches/texstudio-4.1.1.patchset b/app-office/texstudio/patches/texstudio-4.1.1.patchset
deleted file mode 100644
index e1bbf1220..000000000
--- a/app-office/texstudio/patches/texstudio-4.1.1.patchset
+++ /dev/null
@@ -1,28 +0,0 @@
-From 37d0687949a31f3d4975bf3395eefb80fcaf18a9 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sat, 30 Oct 2021 14:02:31 +0000
-Subject: Fix build with QuaZip-1.0
-
-
-diff --git a/texstudio.pro b/texstudio.pro
-index 0873fec..a9ce848 100644
---- a/texstudio.pro
-+++ b/texstudio.pro
-@@ -381,11 +381,9 @@ include(src/symbolpanel/symbolpanel.pri)
- isEmpty(USE_SYSTEM_QUAZIP) {
-     include(src/quazip/quazip/quazip.pri)
- } else {
--        message(System quazip5)
--        isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
--        isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
--        INCLUDEPATH += $${QUAZIP_INCLUDE}
--        LIBS += $${QUAZIP_LIB}
-+        message(System QuaZip)
-+        CONFIG += link_pkgconfig
-+        PKGCONFIG += quazip1-qt5
- }
- 
- include(src/pdfviewer/pdfviewer.pri)
--- 
-2.30.2
-
diff --git a/app-office/texstudio/patches/texstudio-4.2.1.patchset b/app-office/texstudio/patches/texstudio-4.2.1.patchset
new file mode 100644
index 000000000..e1eb8a632
--- /dev/null
+++ b/app-office/texstudio/patches/texstudio-4.2.1.patchset
@@ -0,0 +1,75 @@
+From 0bad7efb0d1ce81edb42bf0193f311c67c780862 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 30 Oct 2021 14:02:31 +0000
+Subject: Fix build with QuaZip-1.0
+
+
+diff --git a/texstudio.pro b/texstudio.pro
+index 05831aa..60d8798 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -381,11 +381,9 @@ include(src/symbolpanel/symbolpanel.pri)
+ isEmpty(USE_SYSTEM_QUAZIP) {
+     include(src/quazip/quazip/quazip.pri)
+ } else {
+-        message(System quazip5)
+-        isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
+-        isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
+-        INCLUDEPATH += $${QUAZIP_INCLUDE}
+-        LIBS += $${QUAZIP_LIB}
++        message(System QuaZip)
++        CONFIG += link_pkgconfig
++        PKGCONFIG += quazip1-qt5
+ }
+ 
+ include(src/pdfviewer/pdfviewer.pri)
+-- 
+2.30.2
+
+
+From 46d2c521a2a8fcdd71878778026fe2d91f9926b2 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 30 Jan 2022 08:27:46 +0000
+Subject: Don't include xkb for Haiku
+
+
+diff --git a/texstudio.pro b/texstudio.pro
+index 60d8798..4ba9ed1 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -196,7 +196,9 @@ unix:!macx {
+     }
+     INSTALLS += applicationmenu
+     INSTALLS += icon
++!haiku {
+     include(src/xkb/xkb.pri)
++    }
+ }
+ 
+ # ##########UNIX + MACX###############
+-- 
+2.30.2
+
+
+From f80b194fe346aaeed460836dcdf24afeeac61964 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 30 Jan 2022 14:32:02 +0000
+Subject: Don't define WS_X11 for Haiku
+
+
+diff --git a/src/bidiextender.cpp b/src/bidiextender.cpp
+index 0e3794e..9dd55e1 100644
+--- a/src/bidiextender.cpp
++++ b/src/bidiextender.cpp
+@@ -4,7 +4,7 @@
+ 
+ //mostly taken from biditexmaker
+ 
+-#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) )
++#if defined( Q_OS_LINUX ) || ( defined( Q_OS_UNIX ) && !defined( Q_OS_MAC ) && !defined( Q_OS_HAIKU ) )
+ #define WS_X11
+ #endif
+ 
+-- 
+2.30.2
+
diff --git a/app-office/texstudio/texstudio-4.1.1.recipe b/app-office/texstudio/texstudio-4.2.1.recipe
similarity index 94%
rename from app-office/texstudio/texstudio-4.1.1.recipe
rename to app-office/texstudio/texstudio-4.2.1.recipe
index 57f66bddf..c2c88cd60 100644
--- a/app-office/texstudio/texstudio-4.1.1.recipe
+++ b/app-office/texstudio/texstudio-4.2.1.recipe
@@ -4,11 +4,11 @@ LaTeX documents. Our goal is to make writing LaTeX as easy and comfortable as \
 possible. Therefore TeXstudio has numerous features like syntax-highlighting, \
 integrated viewer, reference checking and various assistants. "
 HOMEPAGE="https://www.texstudio.org/"
-COPYRIGHT="2009-2021 Benito van der Zander"
+COPYRIGHT="2009-2022 Benito van der Zander"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="f1d4cb04e90b8970b5d8d7617a8b483d3d59684161f7b21730f97336c507c6c9"
+CHECKSUM_SHA256="cac3842c06189745963ef9197373c9c2cbd6cd03cfa4148f0d55d252ad84b7f3"
 SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
 PATCHES="texstudio-$portVersion.patchset"
 ADDITIONAL_FILES="texstudio.rdef.in"
@@ -36,7 +36,6 @@ REQUIRES="
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libQt5Xml$secondaryArchSuffix
 	lib:libquazip1_qt5$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -55,7 +54,6 @@ BUILD_REQUIRES="
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
 	devel:libquazip1_qt5$secondaryArchSuffix
-	devel:libX11$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="