texstudio, revbump for 32bit, adjust patchset for GNUInstallDirs (#9887)

app-office/texstudio/patches/texstudio-4.7.1.patchset

@@ -1,20 +1,19 @@
-From 87ad532440d11eb0972dade43945b0e6d9e46577 Mon Sep 17 00:00:00 2001
+From 8c52ade59f64a1b555989d601b0c6937ae01d4f8 Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Tue, 15 Aug 2023 21:15:00 +0000
-Subject: Set proper install destinations
+Subject: Use GNUInstallDirs
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e77555..ec0a3f8 100644
+index 0e77555..b6d4695 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -433,54 +433,57 @@ endif()
+@@ -433,54 +433,56 @@ endif()
  
  ## installation
  
 -install(TARGETS texstudio DESTINATION bin)
-+set(CMAKE_INSTALL_BINDIR=bin)
-+set(CMAKE_INSTALL_DATADIR=share)
++include(GNUInstallDirs)
 +
 +install(TARGETS texstudio DESTINATION ${CMAKE_INSTALL_BINDIR})
  
@@ -88,7 +87,7 @@ index 0e77555..ec0a3f8 100644
 2.42.1
 
 
-From 11a9b64486149f635addb67b3e7b24b063b1b8b1 Mon Sep 17 00:00:00 2001
+From fd10a869f31b6033bbfa003f5f3b2b2de96aef7a Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sun, 10 Dec 2023 16:51:30 +0100
 Subject: Don't include libX11 in Haiku, disable installation for unneeded
@@ -96,7 +95,7 @@ Subject: Don't include libX11 in Haiku, disable installation for unneeded
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec0a3f8..2196351 100644
+index b6d4695..68adb5d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -400,7 +400,7 @@ if(ZLIB_FOUND)
@@ -108,7 +107,7 @@ index ec0a3f8..2196351 100644
  	find_package(X11 REQUIRED)
  	target_include_directories(texstudio PUBLIC ${X11_INCLUDE_DIRS})
  	target_link_libraries(texstudio PUBLIC ${X11_LIBRARIES})
-@@ -438,7 +438,7 @@ set(CMAKE_INSTALL_DATADIR=share)
+@@ -437,7 +437,7 @@ include(GNUInstallDirs)
  
  install(TARGETS texstudio DESTINATION ${CMAKE_INSTALL_BINDIR})
  

app-office/texstudio/texstudio-4.7.1.recipe

@@ -6,7 +6,7 @@ integrated viewer, reference checking and various assistants. "
 HOMEPAGE="https://www.texstudio.org/"
 COPYRIGHT="2009-2023 Benito van der Zander, Jan Sundermeyer, Daniel Braun, Tim Hoffmann"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="1de721d139bc66ac61f03fdd909d8bcf7943599ee8b097100d1968fc901b1b01"
 SOURCE_FILENAME="texstudio-$portVersion.tar.gz"