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

cantor, bump version, switch to KF6 (#11857)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-03-03 10:45:00 +01:00
committed by GitHub
parent 8ca81462f2
commit df1bb23db0
2 changed files with 118 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
kde-apps/cantor/cantor-24.05.2.recipe → kde-apps/cantor/cantor-24.12.2.recipe
View File

@@ -21,7 +21,7 @@ COPYRIGHT="2016 Filipe Saraiva
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/cantor-$portVersion.tar.xz"
CHECKSUM_SHA256="41fb9b47ab194d393e4ff33f3afba24267b409f30801c09934f05c52e7ba533f"
CHECKSUM_SHA256="3ed32518fa56e4ee3712afe5baba433eb44cadb4aad21284537cb773d3238cd3"
SOURCE_DIR="cantor-$portVersion"
PATCHES="cantor-$portVersion.patchset"
ADDITIONAL_FILES="cantor.rdef.in"
@@ -44,48 +44,40 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libAnalitza$secondaryArchSuffix
lib:libgfortran$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libpoppler$secondaryArchSuffix
lib:libpoppler_qt5$secondaryArchSuffix
lib:libpoppler_Qt6$secondaryArchSuffix
lib:libspectre$secondaryArchSuffix
# KF5
lib:libKF5Archive$secondaryArchSuffix
lib:libKF5Attica$secondaryArchSuffix
lib:libKF5Auth$secondaryArchSuffix
lib:libKF5Bookmarks$secondaryArchSuffix
lib:libKF5Codecs$secondaryArchSuffix
lib:libKF5Completion$secondaryArchSuffix
lib:libKF5ConfigCore$secondaryArchSuffix
lib:libKF5ConfigGui$secondaryArchSuffix
lib:libKF5ConfigWidgets$secondaryArchSuffix
lib:libKF5CoreAddons$secondaryArchSuffix
lib:libKF5Crash$secondaryArchSuffix
lib:libKF5I18n$secondaryArchSuffix
lib:libKF5IconThemes$secondaryArchSuffix
lib:libKF5ItemViews$secondaryArchSuffix
lib:libKF5KIOCore$secondaryArchSuffix
lib:libKF5JobWidgets$secondaryArchSuffix
lib:libKF5NewStuff$secondaryArchSuffix
lib:libKF5Parts$secondaryArchSuffix
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5SonnetCore$secondaryArchSuffix
lib:libKF5SyntaxHighlighting$secondaryArchSuffix
lib:libKF5TextEditor$secondaryArchSuffix
lib:libKF5TextWidgets$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
lib:libKF5WindowSystem$secondaryArchSuffix
lib:libKF5XmlGui$secondaryArchSuffix
# Qt5
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Svg$secondaryArchSuffix
lib:libQt5Webengine$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
# KF6
lib:libKF6Archive$secondaryArchSuffix
lib:libKF6Attica$secondaryArchSuffix
lib:libKF6Bookmarks$secondaryArchSuffix
lib:libKF6ColorScheme$secondaryArchSuffix
lib:libKF6Completion$secondaryArchSuffix
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6Crash$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6IconThemes$secondaryArchSuffix
lib:libKF6ItemViews$secondaryArchSuffix
lib:libKF6KIOCore$secondaryArchSuffix
lib:libKF6JobWidgets$secondaryArchSuffix
lib:libKF6NewStuffCore$secondaryArchSuffix
lib:libKF6Parts$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
lib:libKF6Solid$secondaryArchSuffix
lib:libKF6SyntaxHighlighting$secondaryArchSuffix
lib:libKF6TextEditor$secondaryArchSuffix
lib:libKF6WidgetsAddons$secondaryArchSuffix
lib:libKF6XmlGui$secondaryArchSuffix
# Qt6
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libQt6Svg$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
"
PROVIDES_devel="
@@ -99,55 +91,47 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
shared_mime_info$secondaryArchSuffix
devel:libAnalitza$secondaryArchSuffix >= 8.0.0
devel:libAnalitza$secondaryArchSuffix >= 9.0.0
devel:libluajit_5.1$secondaryArchSuffix
devel:libmarkdown$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix
devel:libpoppler_qt5$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix >= 146
devel:libpoppler_Qt6$secondaryArchSuffix
devel:libqalculate$secondaryArchSuffix
# devel:libRmath$secondaryArchSuffix
devel:libspectre$secondaryArchSuffix
# KF5
devel:libxml2$secondaryArchSuffix
devel:libxslt$secondaryArchSuffix
# KF6
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
devel:libKF5Attica$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5Crash$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5IconThemes$secondaryArchSuffix
devel:libKF5KIOCore$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5NewStuff$secondaryArchSuffix
devel:libKF5Parts$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5SonnetCore$secondaryArchSuffix
devel:libKF5SyntaxHighlighting$secondaryArchSuffix
devel:libKF5TextEditor$secondaryArchSuffix
devel:libKF5TextWidgets$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
# Qt5
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Help$secondaryArchSuffix
devel:libQt5Webengine$secondaryArchSuffix
devel:libKF6Archive$secondaryArchSuffix
devel:libKF6Completion$secondaryArchSuffix
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
devel:libKF6KIOCore$secondaryArchSuffix
devel:libKF6NewStuffCore$secondaryArchSuffix
devel:libKF6Parts$secondaryArchSuffix
devel:libKF6SyntaxHighlighting$secondaryArchSuffix
devel:libKF6TextEditor$secondaryArchSuffix
devel:libKF6TextWidgets$secondaryArchSuffix
devel:libKF6XmlGui$secondaryArchSuffix
# Qt6
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Core5Compat$secondaryArchSuffix
devel:libQt6Svg$secondaryArchSuffix
# required for embedded documentation
# devel:libQt6Help$secondaryArchSuffix
# devel:libQt6Webengine$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt
cmd:msgmerge
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:python3
cmd:r
"
TEST_REQUIRES="
@@ -156,12 +140,13 @@ TEST_REQUIRES="
BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DENABLE_EMBEDDED_DOCUMENTATION=OFF \
-Wno-dev
make -C build $jobArgs
}
@@ -172,13 +157,14 @@ INSTALL()
# don't mess with shared_mime_info files
rm -rf $dataDir/mime/{aliases,generic-icons,globs,globs2,icons,magic}
rm -rf $dataDir/mime/{mime.cache,subclasses,treemagic,types,version,XMLnamespaces}
rm -rf $dataDir/{applications,metainfo}
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local APP_NAME="Cantor"
local LONG_INFO="$SUMMARY"
local APP_SIGNATURE="application/x-vnd.cantor"
local APP_SIGNATURE="application/x-vnd.kde-cantor"
sed \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \

85
kde-apps/cantor/patches/cantor-24.05.2.patchset → kde-apps/cantor/patches/cantor-24.12.2.patchset
View File

@@ -1,46 +1,14 @@
From 1cf94c724ef70d59756a3d8a4d4588f3aba4102a Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 31 Mar 2024 16:00:23 +0200
Subject: Disable DocTools
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90855da..dfafd0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Config
Crash
Completion
- DocTools
+# DocTools
NewStuff
IconThemes
TextEditor
@@ -125,7 +125,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
kde_enable_exceptions()
# FIXME Looks like docbook on Windows don't buildable at all, so it are temporarily disabled
-if(NOT WIN32)
+if(NOT WIN32 AND NOT HAIKU)
add_subdirectory(doc)
endif(NOT WIN32)
add_subdirectory(src)
--
2.45.2
From a8ec7431372d87cbdd78027bc2cc6a64b28193bd Mon Sep 17 00:00:00 2001
From a7b94e9764b8dea8c17dc9930b734a70ce3aafc3 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 31 Mar 2024 16:02:09 +0200
Subject: Disable POSITION_INDEPENDENT_CODE
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 2868373..e1ccef5 100644
index bf676e7..b4be872 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -10,7 +10,7 @@ ExternalProject_Add(
@@ -11,7 +11,7 @@ ExternalProject_Add(
URL ${CMAKE_CURRENT_SOURCE_DIR}/discount-2.2.6-patched
SOURCE_SUBDIR cmake
CMAKE_ARGS -DDISCOUNT_ONLY_LIBRARY:BOOL=ON -DDISCOUNT_MAKE_INSTALL:BOOL=OFF -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
@@ -49,7 +17,7 @@ index 2868373..e1ccef5 100644
PREFIX ${CMAKE_CURRENT_BINARY_DIR}
INSTALL_COMMAND ""
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/discount_project-build
@@ -24,7 +24,7 @@ add_library(Discount::Lib STATIC IMPORTED GLOBAL)
@@ -25,7 +25,7 @@ add_library(Discount::Lib STATIC IMPORTED GLOBAL)
set_target_properties(Discount::Lib PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${source_dir}
IMPORTED_LOCATION ${binary_dir}/libmarkdown${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -59,5 +27,48 @@ index 2868373..e1ccef5 100644
add_dependencies(Discount::Lib discount_project-build)
--
2.45.2
2.48.1
From a29423551cda644fc6b9250b4f5201cfea3342f7 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 3 Mar 2025 07:34:27 +0100
Subject: Fixes for DocTools
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c62ec6..e3364b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED
Config
Crash
Completion
- DocTools
NewStuffCore
NewStuff
IconThemes
@@ -57,6 +56,8 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED
KIO
XmlGui
I18n
+ OPTIONAL_COMPONENTS
+ DocTools
)
find_package(LibXml2 REQUIRED)
@@ -139,9 +140,9 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
kde_enable_exceptions()
# FIXME Looks like docbook on Windows isn't buildable at all, so it is temporarily disabled
-if(NOT WIN32)
+if(KF6DocTools_FOUND)
add_subdirectory(doc)
-endif(NOT WIN32)
+endif()
add_subdirectory(src)
add_subdirectory(icons)
--
2.48.1