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

cantor bump version (#10284)

Browse Source 
Update after libqalculate/qalculate-qt update
This commit is contained in:
Schrijvers Luc
2024-04-01 18:32:29 +02:00
committed by GitHub
parent 11fc9b5bbf
commit 3ed33b0c1a
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kde-apps/cantor/cantor-23.08.5.recipe → kde-apps/cantor/cantor-24.02.1.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="bf960b96f854cc25d4f13ec8ef52273e8b82f83baa1a75437c1d8ec6dc1fd81d"
CHECKSUM_SHA256="55e42ef94837a1b5ce41399ae92e866366f8c8496bf60c80b35919e94d896778"
SOURCE_DIR="cantor-$portVersion"
PATCHES="cantor-$portVersion.patchset"
ADDITIONAL_FILES="cantor.rdef.in"
@@ -47,6 +47,7 @@ REQUIRES="
lib:libgfortran$secondaryArchSuffix
lib:libpoppler$secondaryArchSuffix
lib:libpoppler_qt5$secondaryArchSuffix
lib:libspectre$secondaryArchSuffix
# KF5
lib:libAnalitza$secondaryArchSuffix
lib:libKF5Archive$secondaryArchSuffix
@@ -99,9 +100,11 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
shared_mime_info$secondaryArchSuffix
devel:libluajit_5.1$secondaryArchSuffix
devel:libmarkdown$secondaryArchSuffix
devel:libpoppler$secondaryArchSuffix
devel:libpoppler_qt5$secondaryArchSuffix
devel:libqalculate$secondaryArchSuffix
devel:libspectre$secondaryArchSuffix
# KF5
extra_cmake_modules$secondaryArchSuffix
devel:libAnalitza$secondaryArchSuffix
@@ -157,8 +160,8 @@ BUILD()
-DCMAKE_BUILD_TYPE=Release \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake -Wno-dev
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-Wno-dev
make -C build $jobArgs
}

23
kde-apps/cantor/patches/cantor-23.08.5.patchset → kde-apps/cantor/patches/cantor-24.02.1.patchset
View File

@@ -1,22 +1,23 @@
From 17c0ecf1e54f8e7fe7f716704a28a1c38cefb3c3 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 10 Jan 2024 15:47:05 +0100
From 76d3687ea47d6676431560eaa2dcbeddc900c607 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 bf775a3..e85d91b 100644
index f71f480..46c38b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
@@ -45,7 +45,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Config
Crash
Completion
- DocTools
+# DocTools
NewStuff
IconThemes
TextEditor
@@ -125,7 +124,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG_OUTPUT")
@@ -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
@@ -26,12 +27,12 @@ index bf775a3..e85d91b 100644
endif(NOT WIN32)
add_subdirectory(src)
--
2.42.1
2.43.2
From 77250c028463be02dd3c091135ec3b4bb78739bd Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Wed, 10 Jan 2024 15:51:57 +0100
From d428009fa51efa1b71789ee28e30fc94a46c5060 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
@@ -58,5 +59,5 @@ index 2868373..e1ccef5 100644
add_dependencies(Discount::Lib discount_project-build)
--
2.42.1
2.43.2