kdb, revbump for postgresql (#12910)

This commit is contained in:
Schrijvers Luc
2025-09-06 13:13:37 +02:00
committed by GitHub
parent 8d8ef51bb6
commit 33f5854780
2 changed files with 38 additions and 14 deletions

View File

@@ -12,7 +12,7 @@ handling layer for Kexi and similar complex apps."
HOMEPAGE="https://community.kde.org/KDb"
COPYRIGHT="2010-2021 KDE Organisation"
LICENSE="GNU LGPL v2.1"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/KDE/kdb/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="c651d240c641b5cdd882a99c5ec6345387d0a4e05f8ca1d59f4daaf08c3f7141"
SOURCE_DIR="kdb-$portVersion"
@@ -61,7 +61,7 @@ BUILD_REQUIRES="
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libmysqlclient$secondaryArchSuffix
devel:libpq$secondaryArchSuffix
devel:libpq$secondaryArchSuffix >= 16
devel:libQt5Core$secondaryArchSuffix >= 5.15
devel:libsqlite3$secondaryArchSuffix
"
@@ -78,6 +78,7 @@ BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DPYTHON_EXECUTABLE=/system/bin/python3 \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt5 \

View File

@@ -1,4 +1,4 @@
From cc34c817d9960271a00c70179035097c7448664e Mon Sep 17 00:00:00 2001
From eb58b6469f990c601d008801ff07e204ba2924ca Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Mon, 19 Feb 2024 13:43:10 +0100
Subject: python3 changes
@@ -31,13 +31,13 @@ index 70f386e..0a69a94 100755
from __future__ import print_function, unicode_literals
#
--
2.42.1
2.50.1
From 137afd14448cbf4b0769d425b72e130666551cab Mon Sep 17 00:00:00 2001
From 0503606d30d93436d37d43c9048c0aff34458281 Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
Date: Tue, 29 Oct 2019 07:52:32 +0100
Subject: [PATCH] PgSQL driver: fix build with PostgreSQL 12+
Subject: PgSQL driver: fix build with PostgreSQL 12+
diff --git a/src/drivers/postgresql/PostgresqlTypes.cpp b/src/drivers/postgresql/PostgresqlTypes.cpp
@@ -64,13 +64,13 @@ index ea576d6..0697129 100644
//! @todo CIRCLEOID geometric circle '(center,radius)'
//! @todo CASHOID monetary amounts, $d,ddd.cc
--
2.42.1
2.50.1
From 85e408bfe1b73fe46f71ae1ceb532291ace63d3d Mon Sep 17 00:00:00 2001
From 863f48c984338b14e11c8c8308c53e38fbe348a5 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 16 Nov 2020 16:41:27 +0100
Subject: [PATCH] Fix build with newer Qt
Subject: Fix build with newer Qt
diff --git a/src/KDb.cpp b/src/KDb.cpp
@@ -129,19 +129,18 @@ index 5c3b601..ee92c2e 100644
return str;
}
--
2.42.1
2.50.1
From 6c83fd949c2d30aa7c2c759162e7067288677321 Mon Sep 17 00:00:00 2001
From b8d48282350b60c8482dfbeace4083d21260856d Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Sun, 13 Dec 2020 19:16:30 +0530
Subject: [PATCH] include KDEInstallDirs as first thing
Subject: include KDEInstallDirs as first thing
Otherwise ECMGeneratePriFile won't get correct paths and will install
pri file in wrong place and things wanting to use kdb with qmake won't
work.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c035b16..14f61ed 100644
--- a/CMakeLists.txt
@@ -161,5 +160,29 @@ index c035b16..14f61ed 100644
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
--
2.42.1
2.50.1
From 3a0b30ead00782edc9ceec41be43b070a7bd1140 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 6 Sep 2025 07:48:20 +0200
Subject: Fix build for cmake > 4
diff --git a/cmake/modules/SetKDbCMakePolicies.cmake b/cmake/modules/SetKDbCMakePolicies.cmake
index bc28d8a..bd400c2 100644
--- a/cmake/modules/SetKDbCMakePolicies.cmake
+++ b/cmake/modules/SetKDbCMakePolicies.cmake
@@ -8,9 +8,6 @@ cmake_policy(SET CMP0048 NEW) # for PROJECT_VERSION
cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's Qt5ModuleLocation.cmake
# "Simplify variable reference and escape sequence evaluation"
-if(POLICY CMP0059) # Dont treat DEFINITIONS as a built-in directory property.
- cmake_policy(SET CMP0059 OLD)
-endif()
if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3)
cmake_policy(SET CMP0063 NEW)
endif()
--
2.50.1