[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
commit: ce8230d95586977986f7e83fe2e727e294b0d325 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 14:37:08 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 16:45:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8230d9 app-office/kexi: EAPI-8 bump, fix PostgreSQL 14 detection Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kexi/files/kexi-3.2.0-postgresql-9.14.patch| 25 ++ app-office/kexi/kexi-3.2.0-r3.ebuild | 93 ++ 2 files changed, 118 insertions(+) diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch new file mode 100644 index ..faea50c0ac85 --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch @@ -0,0 +1,25 @@ +From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001 +From: Pino Toscano +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 + diff --git a/app-office/kexi/kexi-3.2.0-r3.ebuild b/app-office/kexi/kexi-3.2.0-r3.ebuild new file mode 100644 index ..dc023a04abd9 --- /dev/null +++ b/app-office/kexi/kexi-3.2.0-r3.ebuild @@ -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_us
[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
commit: 489cdf92cbff00d5f9946533a5928b15e81f17b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 14 14:43:54 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 14 16:13:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489cdf92 app-office/kexi: Fix build with modern CMake Closes: https://bugs.gentoo.org/812392 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kexi/files/kexi-3.2.0-fix-find-marble.patch| 80 ++ app-office/kexi/kexi-3.2.0-r1.ebuild | 3 +- 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch new file mode 100644 index 000..74716a2c37f --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch @@ -0,0 +1,80 @@ +From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001 +From: Johannes Zarl-Zierl +Date: Wed, 5 May 2021 00:09:49 +0200 +Subject: [PATCH] Use plain Marble package instead of KexiMarble + +Marble has shipped with a MarbleConfig.cmake file since ~2016. Kexi +already depends on KF5 versions that are much newer than that. + +* asturm 2021-09-14: Backported to 3.2.0. + - s/KEXI/Kexi/ in set_package_properties(Marble ...) to fix patch context + - partially merging d09be29f56b94d6a522fa30a5b661926baca973c (drop MARBLE_MIN_VERSION) + +--- + CMakeLists.txt| 8 +- + src/plugins/forms/widgets/CMakeLists.txt | 2 +- + .../forms/widgets/mapbrowser/CMakeLists.txt | 3 +- + 3 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97c58fa10..548b2708f 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -196,17 +196,14 @@ endif() + ## + ## Test for marble + ## +-set(MARBLE_MIN_VERSION "0.19.2") +-find_package(KexiMarble ${MARBLE_MIN_VERSION}) +-set_package_properties(KexiMarble PROPERTIES ++find_package(Marble CONFIG) ++set_package_properties(Marble PROPERTIES + DESCRIPTION "KDE World Globe Widget library" + URL "https://marble.kde.org"; + TYPE RECOMMENDED + PURPOSE "Required by Kexi form map widget" + ) +-if(NOT MARBLE_FOUND) +-set(MARBLE_INCLUDE_DIR "") +-else() ++if(Marble_FOUND) + set(HAVE_MARBLE TRUE) + endif() + set_package_properties(GLIB2 PROPERTIES TYPE RECOMMENDED PURPOSE "${_REQUIRED_BY_MDB}") +diff --git a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt +index 107d578a8..109341fe0 100644 +--- a/src/plugins/forms/widgets/CMakeLists.txt b/src/plugins/forms/widgets/CMakeLists.txt +@@ -11,7 +11,7 @@ endmacro() + # the main widgets plugin + add_subdirectory(main) + +-if(MARBLE_FOUND) ++if(Marble_FOUND) + #TODO add_subdirectory(mapbrowser) + endif() + +diff --git a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt +--- a/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/src/plugins/forms/widgets/mapbrowser/CMakeLists.txt +@@ -1,7 +1,6 @@ + include_directories( + ${CMAKE_SOURCE_DIR}/src/formeditor + ${CMAKE_SOURCE_DIR}/src/core +-${MARBLE_INCLUDE_DIR} + ) + + set(kexiforms_mapwidgetplugin_SRCS +@@ -20,8 +19,8 @@ target_link_libraries(kexiforms_mapwidgetplugin + kexiextendedwidgets + kexiformutils + kexidataviewcommon +-${MARBLE_LIBRARIES} + ++Marble + Qt5::Xml + ) + +-- +GitLab + diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild index 73ce61cd446..89fe7316ecc 100644 --- a/app-office/kexi/kexi-3.2.0-r1.ebuild +++ b/app-office/kexi/kexi-3.2.0-r1.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${P}-missing-header.patch "${FILESDIR}"/${P}-postgresql-9.12.patch "${FILESDIR}"/${P}-glib-2.68.patch # bug 784974 + "${FILESDIR}"/${P}-fix-find-marble.patch # bug 812392 ) src_prepare() { @@ -84,7 +85,7 @@ src_configure() { -DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug) -DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental) -DKEXI_SCRIPTS_SUPPORT=$(usex experimental) - $(cmake_use_find_package marble KexiMarble) + $(cmake_use_find_package marble Marble) $(cmake_use_find_package mdb GLIB2) $(cmake_use_find_package mysql MySQL) $(cmake_use_find_package postgres PostgreSQL)
[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
commit: af7adfc22385edcf84b5d0e217ee2aecedf1380d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 27 20:17:11 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 27 20:21:16 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7adfc2 app-office/kexi: Let cmake detect PostgreSQL 12 Let's do something useful with that revbump. Closes: https://bugs.gentoo.org/692924 Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kexi/files/kexi-3.2.0-postgresql-9.12.patch| 24 ++ app-office/kexi/kexi-3.2.0-r1.ebuild | 86 ++ 2 files changed, 110 insertions(+) diff --git a/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch new file mode 100644 index 000..8835c5ea13d --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-postgresql-9.12.patch @@ -0,0 +1,24 @@ +From 88ac2b4a1386bc05f0e3965f31949039eaf4d3ff Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Sat, 25 May 2019 07:12:17 +0200 +Subject: cmake: find PostgreSQL 12 + +--- + 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 56e6e56..1579be0 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") ++"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} ) +-- +cgit v1.1 diff --git a/app-office/kexi/kexi-3.2.0-r1.ebuild b/app-office/kexi/kexi-3.2.0-r1.ebuild new file mode 100644 index 000..fcd7857e501 --- /dev/null +++ b/app-office/kexi/kexi-3.2.0-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# KDE_HANDBOOK="true" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Visual database applications creator" +HOMEPAGE="https://kde.org/applications/office/kexi/ http://www.kexi-project.org/"; +[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz" + +KEYWORDS="amd64 x86" +IUSE="debug experimental marble mdb mysql postgres sqlite webkit" + +BDEPEND="sys-devel/gettext" +DEPEND=" + $(add_frameworks_dep breeze-icons-rcc) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep designer) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + >=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] + marble? ( $(add_kdeapps_dep marble) ) + mdb? ( + dev-libs/glib:2 + virtual/libiconv + ) + mysql? ( dev-db/mysql-connector-c:= ) + postgres? ( + dev-db/postgresql:* + dev-libs/libpqxx + ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-missing-header.patch + "${FILESDIR}"/${P}-postgresql-9.12.patch +) + +src_prepare() { + if ! use webkit; then + punt_bogus_dep Qt5 WebKit + punt_bogus_dep Qt5 WebKitWidgets + fi + + kde5_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug) + -DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental) + -DKEXI_SCRIPTS_SUPPORT=$(usex experimental) + $(cmake-utils_use_find_package marble KexiMarble) + $(cmake-utils_use_find_package mdb GLIB2) + $(cmake-utils_use_find_package mysql MySQL) + $(cmake-utils_use_
[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
commit: b675fe5d09b4da9666c1a9a79d4501f1a7eed450 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 11 10:49:56 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 11 11:06:39 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b675fe5d app-office/kexi: Fix missing header with Frameworks 5.61 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kexi/files/kexi-3.2.0-missing-header.patch | 24 ++ app-office/kexi/kexi-3.2.0.ebuild | 2 ++ 2 files changed, 26 insertions(+) diff --git a/app-office/kexi/files/kexi-3.2.0-missing-header.patch b/app-office/kexi/files/kexi-3.2.0-missing-header.patch new file mode 100644 index 000..673fea4a80b --- /dev/null +++ b/app-office/kexi/files/kexi-3.2.0-missing-header.patch @@ -0,0 +1,24 @@ +From 511d99b7745a6ce87a208bdbf69e631f1f136d53 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame +Date: Sun, 21 Jul 2019 09:07:44 +0200 +Subject: Fix build with Qt 5.13 + +The QDate include is no longer included transitively. +--- + src/plugins/forms/widgets/kexidbdatepicker.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/forms/widgets/kexidbdatepicker.cpp b/src/plugins/forms/widgets/kexidbdatepicker.cpp +index 1e0692d..92a5c88 100644 +--- a/src/plugins/forms/widgets/kexidbdatepicker.cpp b/src/plugins/forms/widgets/kexidbdatepicker.cpp +@@ -22,6 +22,7 @@ + #include "kexidbdatepicker.h" + #include + ++#include + #include + #include + +-- +cgit v1.1 diff --git a/app-office/kexi/kexi-3.2.0.ebuild b/app-office/kexi/kexi-3.2.0.ebuild index c2ea1c5ddca..5bef8c3c826 100644 --- a/app-office/kexi/kexi-3.2.0.ebuild +++ b/app-office/kexi/kexi-3.2.0.ebuild @@ -56,6 +56,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) + src_prepare() { if ! use webkit; then punt_bogus_dep Qt5 WebKit
[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/files/, app-office/kexi/
commit: 6b6a048bc18c3c4532aa4ba3c9e8326108224018 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Mar 19 23:10:55 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 19 23:56:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6a048b app-office/kexi: Fix build with Qt 5.11 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-office/kexi/files/kexi-3.1.0-qt-5.11.patch | 24 app-office/kexi/kexi-3.1.0.ebuild | 2 ++ 2 files changed, 26 insertions(+) diff --git a/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch new file mode 100644 index 000..a879b2a4604 --- /dev/null +++ b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch @@ -0,0 +1,24 @@ +From c7b9215e7ae30a052fa11aa4199e7adea517c7e2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 20 Mar 2018 00:06:46 +0100 +Subject: [PATCH] Fix build with Qt 5.11 (missing headers) + +--- + src/main/startup/KexiNewProjectAssistant.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp +index 59e819acc..6568f1b5c 100644 +--- a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp +@@ -48,6 +48,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +2.16.2 + diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild index fa15f9b5f72..8ceeaf7b7c7 100644 --- a/app-office/kexi/kexi-3.1.0.ebuild +++ b/app-office/kexi/kexi-3.1.0.ebuild @@ -62,6 +62,8 @@ RDEPEND="${COMMON_DEPEND} !app-office/calligra-l10n:4[calligra_features_kexi(+)] " +PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch ) + src_prepare() { if ! use webkit; then punt_bogus_dep Qt5 WebKit