Skip to content

Commit

Permalink
app-office/kexi: EAPI-8 bump, fix PostgreSQL 14 detection
Browse files Browse the repository at this point in the history
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Feb 21, 2022
1 parent 0805a4e commit ce8230d
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 0 deletions.
25 changes: 25 additions & 0 deletions app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001
From: Pino Toscano <[email protected]>
Date: Fri, 21 May 2021 13:33:49 +0200
Subject: [PATCH] cmake: find PostgreSQL 14

---
cmake/modules/FindPostgreSQL.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
index 16e3cc32a..12b1469b4 100644
--- a/cmake/modules/FindPostgreSQL.cmake
+++ b/cmake/modules/FindPostgreSQL.cmake
@@ -86,7 +86,7 @@ set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache e
set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4")

set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
- "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ "14" "13" "12" "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")

# Define additional search paths for root directories.
foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
--
GitLab

93 changes: 93 additions & 0 deletions app-office/kexi/kexi-3.2.0-r3.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

# ECM_HANDBOOK="true"
ECM_TEST="forceoptional"
KFMIN=5.82.0
QTMIN=5.15.2
inherit ecm kde.org

DESCRIPTION="Visual database applications creator"
HOMEPAGE="https://apps.kde.org/kexi-3.3/ http://kexi-project.org/
https://userbase.kde.org/Kexi"

if [[ ${KDE_BUILD_TYPE} != live ]]; then
SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi

LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
IUSE="debug experimental marble mdb mysql postgres sqlite"

DEPEND="
>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
>=dev-libs/kproperty-3.1.0:5=
>=dev-libs/kreport-3.1.0:5=[scripting]
>=dev-qt/designer-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/breeze-icons-rcc-${KFMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcodecs-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kitemviews-${KFMIN}:5
>=kde-frameworks/ktexteditor-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
marble? ( kde-apps/marble:5= )
mdb? (
dev-libs/glib:2
virtual/libiconv
)
mysql? ( dev-db/mysql-connector-c:= )
postgres? (
dev-db/postgresql:*
dev-libs/libpqxx
)
"
RDEPEND="${DEPEND}"
BDEPEND="sys-devel/gettext"

PATCHES=(
"${FILESDIR}"/${P}-missing-header.patch
"${FILESDIR}"/${P}-postgresql-9.14.patch
"${FILESDIR}"/${P}-glib-2.68.patch # bug 784974
"${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392
)

src_prepare() {
ecm_punt_qt_module WebKit
ecm_punt_qt_module WebKitWidgets

ecm_src_prepare
}

src_configure() {
local mycmakeargs=(
-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
$(cmake_use_find_package marble Marble)
$(cmake_use_find_package mdb GLIB2)
$(cmake_use_find_package mysql MySQL)
$(cmake_use_find_package postgres PostgreSQL)
)
use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )

ecm_src_configure
}

0 comments on commit ce8230d

Please sign in to comment.