texstudio, bump version (#9227)

This commit is contained in:
Schrijvers Luc
2023-08-15 20:02:28 +00:00
committed by GitHub
parent a99a0b05a3
commit 8d3830141c
2 changed files with 5 additions and 23 deletions

View File

@@ -1,31 +1,13 @@
From 463b888bf522688904335b0189086394976c9ae8 Mon Sep 17 00:00:00 2001
From 7d84f67229579af1e1f3ef56c946bf32fd6b0b98 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 24 May 2023 19:50:31 +0200
Subject: Force Qt6, disable xkb, set install paths
Date: Tue, 15 Aug 2023 21:15:00 +0000
Subject: Set proper install destinations
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfde6d4..ba5a568 100644
index ed9757c..4f2e8fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ if(WIN32 AND NOT MSVC)
add_compile_options(-Wa,-mbig-obj)
endif()
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets LinguistTools REQUIRED)
+find_package(QT NAMES Qt6 COMPONENTS Widgets LinguistTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Xml Concurrent Widgets UiTools REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS PrintSupport Svg Qml REQUIRED)
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
@@ -117,7 +117,7 @@ endif()
if(WIN32)
set(SOURCE_FILES ${SOURCE_FILES} win.rc)
endif()
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT HAIKU)
add_subdirectory(src/xkb)
endif()
@@ -430,7 +430,7 @@ endif()
## installation

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2009-2023 Benito van der Zander"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="d43dd21a111aacf57e40b0ee27c94b9923f8fdbddec5bad919596abf9a03f3cf"
CHECKSUM_SHA256="dc2a0f765291644de022bea8910fbdf2e08f06adb9ef2e053db7b41de785e29a"
SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
PATCHES="texstudio-$portVersion.patchset"
ADDITIONAL_FILES="texstudio.rdef.in"