kexi, revbump, switch python version, silence some warnings during build (#10124)

This commit is contained in:
Schrijvers Luc
2024-02-19 18:52:32 +00:00
committed by GitHub
parent 40d225e248
commit 1738c33ce9
2 changed files with 47 additions and 22 deletions

View File

@@ -11,10 +11,10 @@ Application Development (RAD) tools for database systems that are sufficiently \
powerful, inexpensive, open standards driven and portable across many operating \
systems and hardware platforms."
HOMEPAGE="http://kexi-project.org/"
COPYRIGHT="KEXI Team"
COPYRIGHT="2002-2019 The Kexi Team"
LICENSE="GNU LGPL v2
GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.kde.org/stable/kexi/src/kexi-$portVersion.tar.xz"
CHECKSUM_SHA256="7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff"
SOURCE_FILENAME="kexi-$portVersion.tar.xz"
@@ -69,6 +69,7 @@ REQUIRES="
lib:libKF5Service$secondaryArchSuffix
lib:libKF5Solid$secondaryArchSuffix
lib:libKF5SonnetCore$secondaryArchSuffix
lib:libKF5SyntaxHighlighting$secondaryArchSuffix
lib:libKF5TextEditor$secondaryArchSuffix
lib:libKF5TextWidgets$secondaryArchSuffix
lib:libKF5WidgetsAddons$secondaryArchSuffix
@@ -118,6 +119,7 @@ BUILD_REQUIRES="
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5SonnetCore$secondaryArchSuffix
devel:libKF5SyntaxHighlighting$secondaryArchSuffix
devel:libKF5TextEditor$secondaryArchSuffix
devel:libKF5TextWidgets$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
@@ -139,15 +141,12 @@ BUILD_PREREQUIRES="
cmd:make
cmd:perl
cmd:pkg_config$secondaryArchSuffix
cmd:python
cmd:python3
"
BUILD()
{
mkdir -p build
cd build
cmake .. \
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir/Calligra \
-DCMAKE_INSTALL_BINDIR=$appsDir/Calligra \
-DCMAKE_INSTALL_LIBDIR=$libDir \
@@ -159,15 +158,14 @@ BUILD()
-DICONV_INCLUDE_DIR=/system/$relativeIncludeDir \
-DKEXI_AUTORISE_TABBED_TOOLBAR=OFF \
-DKEXI_USE_KFILEWIDGET=OFF \
-DKEXI_SCRIPTS_SUPPORT=ON
make $jobArgs
-DKEXI_SCRIPTS_SUPPORT=ON \
-Wno-dev
make -Cbuild $jobArgs
}
INSTALL()
{
cd build
make install
make -Cbuild install
mv $appsDir/Calligra/kexi-3.2 $appsDir/Calligra/Kexi
@@ -192,6 +190,5 @@ INSTALL()
TEST()
{
cd build
make test
make -Cbuild test
}

View File

@@ -1,4 +1,4 @@
From 5c6783cd3866c73d1cbf22cda37a8af38c911376 Mon Sep 17 00:00:00 2001
From 1ecdf6d2548d160d9c4c8cfe4c32ad8c3a6b78dc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 2 Mar 2021 13:58:35 +1000
Subject: Fix build
@@ -34,10 +34,10 @@ index 82ebc70..71ac1c2 100644
+# kdoctools_install(po)
endif()
--
2.30.0
2.42.1
From 85bf19526e33a09dca35df0d901e62f2ba25fa20 Mon Sep 17 00:00:00 2001
From 890dec6463d5a1ebc0dab6e2a01e84b6fc7a3133 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 2 Mar 2021 14:04:08 +1000
Subject: Add missing header
@@ -56,10 +56,10 @@ index 1e0692d..92a5c88 100644
#include <QInputMethodEvent>
--
2.30.0
2.42.1
From 742151229356821b17d01bfbf64aeedf8e024d1f Mon Sep 17 00:00:00 2001
From 8431b7d95b194a8f1001d416f5c2eacac013cdcc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 3 Mar 2021 11:13:09 +1000
Subject: Use Fusion style for Haiku
@@ -79,10 +79,10 @@ index ad351c4..fef51a5 100644
return true;
}
--
2.30.0
2.42.1
From 18367a713bd868b4a00817d2f62099cba54a4ca9 Mon Sep 17 00:00:00 2001
From 7fa02c5c19bf51cf61c923f2ba479944b01f34ee Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 3 Mar 2021 13:04:47 +1000
Subject: Tune font sizes
@@ -119,5 +119,33 @@ index a0a7a2c..d114130 100644
QFont FontSettingsData::font(FontTypes fontType)
{
--
2.30.0
2.42.1
From cb3e6a48f86b5196eb106f952d52d554b320b141 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 19 Feb 2024 19:24:08 +0100
Subject: Silense some warning clobering the build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71ac1c2..c3eb6cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,6 +120,13 @@ add_definitions(
-DQT_USE_QSTRINGBUILDER
)
+if(HAIKU)
+add_definitions(
+ -Wno-deprecated-declarations
+ -Wno-suggest-override
+)
+endif(HAIKU)
+
# overcome some platform incompatibilities
if(WIN32)
find_package(KDEWin REQUIRED)
--
2.42.1