haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

texstudio, bump version (#10264)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-03-28 16:52:37 +01:00
committed by GitHub
parent ddb90a1487
commit a0e4d3baa5
2 changed files with 5 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
app-office/texstudio/patches/texstudio-4.7.1.patchset
View File

@@ -1,121 +0,0 @@
From 8c52ade59f64a1b555989d601b0c6937ae01d4f8 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Tue, 15 Aug 2023 21:15:00 +0000
Subject: Use GNUInstallDirs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e77555..b6d4695 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,54 +433,56 @@ endif()
## installation
-install(TARGETS texstudio DESTINATION bin)
+include(GNUInstallDirs)
+
+install(TARGETS texstudio DESTINATION ${CMAKE_INSTALL_BINDIR})
if(UNIX AND NOT APPLE)
option(APPDATA "Install appdata" ON)
- install(FILES utilities/texstudio.desktop DESTINATION share/applications)
- install(FILES utilities/texstudio.svg DESTINATION share/icons/hicolor/scalable/apps)
+ install(FILES utilities/texstudio.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+ install(FILES utilities/texstudio.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
if(${APPDATA})
- install(FILES utilities/texstudio.metainfo.xml DESTINATION share/metainfo)
+ install(FILES utilities/texstudio.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
endif()
endif()
if(UNIX)
install(DIRECTORY translation/
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
FILES_MATCHING
PATTERN *.qm
)
install(DIRECTORY templates/
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
FILES_MATCHING
PATTERN *
)
install(DIRECTORY utilities/dictionaries/
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
FILES_MATCHING
PATTERN *
)
install(DIRECTORY utilities/manual/build/html/
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
FILES_MATCHING
PATTERN *.html
)
install(DIRECTORY utilities/manual/build/html/_images
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
FILES_MATCHING
PATTERN *.png
)
install(DIRECTORY utilities/manual/build/html/_sphinx_design_static
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
)
install(DIRECTORY utilities/manual/build/html/_static
- DESTINATION share/texstudio
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio
)
- install(FILES utilities/manual/build/html/searchindex.js DESTINATION share/texstudio)
- install(FILES utilities/latex2e.html DESTINATION share/texstudio)
- install(FILES utilities/latex2e.css DESTINATION share/texstudio)
- install(FILES utilities/list.png DESTINATION share/texstudio)
- install(FILES utilities/AUTHORS DESTINATION share/texstudio)
- install(FILES utilities/COPYING DESTINATION share/texstudio)
- install(FILES utilities/manual/source/CHANGELOG.md DESTINATION share/texstudio)
+ install(FILES utilities/manual/build/html/searchindex.js DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/latex2e.html DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/latex2e.css DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/list.png DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/COPYING DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
+ install(FILES utilities/manual/source/CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DATADIR}/texstudio)
endif()
--
2.42.1
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
files
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6d4695..68adb5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -400,7 +400,7 @@ if(ZLIB_FOUND)
target_link_libraries(texstudio PUBLIC ${ZLIB_LIBRARIES})
endif()
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT HAIKU)
find_package(X11 REQUIRED)
target_include_directories(texstudio PUBLIC ${X11_INCLUDE_DIRS})
target_link_libraries(texstudio PUBLIC ${X11_LIBRARIES})
@@ -437,7 +437,7 @@ include(GNUInstallDirs)
install(TARGETS texstudio DESTINATION ${CMAKE_INSTALL_BINDIR})
-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT HAIKU)
option(APPDATA "Install appdata" ON)
install(FILES utilities/texstudio.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
install(FILES utilities/texstudio.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
--
2.42.1

10
app-office/texstudio/texstudio-4.7.1.recipe → app-office/texstudio/texstudio-4.7.3.recipe
View File

@@ -4,13 +4,12 @@ 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-2023 Benito van der Zander, Jan Sundermeyer, Daniel Braun, Tim Hoffmann"
COPYRIGHT="2009-2024 Benito van der Zander, Jan Sundermeyer, Daniel Braun, Tim Hoffmann"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="1de721d139bc66ac61f03fdd909d8bcf7943599ee8b097100d1968fc901b1b01"
CHECKSUM_SHA256="57760be0c0855b79f98a6aa32c9839509fb64f4763790d06548109071cc00772"
SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
PATCHES="texstudio-$portVersion.patchset"
ADDITIONAL_FILES="texstudio.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -117,7 +116,8 @@ BUILD()
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir \
-DQT_VERSION_MAJOR=6
-DQT_VERSION_MAJOR=6 \
-DTEXSTUDIO_BUILD_ADWAITA=OFF
make -C build $jobArgs
}