[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/, profiles/, app-office/kexi/files/

[gentoo-commits] repo/gentoo:master commit in: app-office/kexi/, profiles/, app-office/kexi/files/

[Andreas Sturmlechner]

commit:     512eeb95de18984bbf8a28ab6f20255a0b249e3a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  6 00:10:37 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  6 01:20:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512eeb95

app-office/kexi: treeclean

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kexi/Manifest                           |  1 -
 .../kexi/files/kexi-3.2.0-fix-find-marble.patch    | 80 ------------------
 app-office/kexi/files/kexi-3.2.0-glib-2.68.patch   | 40 ---------
 .../kexi/files/kexi-3.2.0-missing-header.patch     | 24 ------
 .../kexi/files/kexi-3.2.0-postgresql-9.14.patch    | 25 ------
 app-office/kexi/kexi-3.2.0-r4.ebuild               | 96 ----------------------
 app-office/kexi/metadata.xml                       | 16 ----
 profiles/package.mask                              |  8 --
 8 files changed, 290 deletions(-)

diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
deleted file mode 100644
index f4cf1d3a3565..000000000000
--- a/app-office/kexi/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kexi-3.2.0.tar.xz 3624956 BLAKE2B 8d0b3712f07d13f606c4c0d714b3d4ea0fe9f56e4d4a3aeeb144ffda56cd5ef89e4f08d5660550364103c86acd60923ddc74fcea135a23fffbae87853a7c00f4 SHA512 5cb9e0747c8e7ea19020b62345571ba10f65278dcc718bb0772827721bf8812d0ffee3c35d53b57285884c66e0406520835c7b00789fbe5459717722dff13e93

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
deleted file mode 100644
index 74716a2c37f3..000000000000
--- a/app-office/kexi/files/kexi-3.2.0-fix-find-marble.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 3280c5ec9940f329dc75b2b8d9a52285b20209f0 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-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/files/kexi-3.2.0-glib-2.68.patch b/app-office/kexi/files/kexi-3.2.0-glib-2.68.patch
deleted file mode 100644
index 66f7c78d5b18..000000000000
--- a/app-office/kexi/files/kexi-3.2.0-glib-2.68.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 73d3fa8e7a1028c89b20c74f6444a76a722d8041 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Sun, 18 Apr 2021 11:47:30 +0200
-Subject: [PATCH] Include <glib.h> outside of the extern block
-
-This fixes the build with glib >= 2.68. It's caused by [1] and glib
-upstream did not want to include a workaround because the fixes
-downstream seem trivial [2][3].
-
-[1] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
-[2] https://gitlab.gnome.org/GNOME/glib/-/issues/2331
-[3] https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1935
----
- src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-index 31f48c171..56276e2d6 100644
---- a/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-+++ b/src/migration/mdb/3rdparty/mdbtools/include/mdbtools.h
-@@ -18,6 +18,8 @@
- #ifndef _mdbtools_h_
- #define _mdbtools_h_
- 
-+#include <glib.h>
-+
- #ifdef __cplusplus
-   extern "C" {
- #endif
-@@ -32,7 +34,6 @@
- #endif
- #include <ctype.h>
- #include <string.h>
--#include <glib.h>
- 
- #ifdef HAVE_ICONV
- #include <iconv.h>
--- 
-GitLab
-

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
deleted file mode 100644
index 673fea4a80ba..000000000000
--- a/app-office/kexi/files/kexi-3.2.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 511d99b7745a6ce87a208bdbf69e631f1f136d53 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-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 <kexiutils/utils.h>
- 
-+#include <QDate>
- #include <QLineEdit>
- #include <QInputMethodEvent>
- 
--- 
-cgit v1.1

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
deleted file mode 100644
index faea50c0ac85..000000000000
--- a/app-office/kexi/files/kexi-3.2.0-postgresql-9.14.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 49c3b55019ebb563852c8ee1172def3288cd0fda Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-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-r4.ebuild b/app-office/kexi/kexi-3.2.0-r4.ebuild
deleted file mode 100644
index ca00029db3ea..000000000000
--- a/app-office/kexi/kexi-3.2.0-r4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 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/ https://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:6
-		>=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
-}

diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
deleted file mode 100644
index 47e7abfd6584..000000000000
--- a/app-office/kexi/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
-	</upstream>
-	<use>
-		<flag name="experimental">Enable features deemed experimental by upstream</flag>
-		<flag name="marble">Enable displaying of maps using <pkg>kde-apps/marble</pkg></flag>
-		<flag name="mdb">Enable support for Microsoft Access database</flag>
-	</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 309bced1e1be..a12fe1d13205 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -255,14 +255,6 @@ dev-ruby/base64:0.1
 # See also: https://github.com/gentoo/gentoo/pull/36091
 ~sys-boot/plymouth-24.004.60
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2024-10-05)
-# Masked for removal in 30 days. Broken since KF6 incapacitated
-# breeze-icons-rcc, but no one even complained. Upstream porting
-# effort stalled indefinitely:
-# https://invent.kde.org/office/kexi/-/issues/152
-# Removal on 2024-11-04.
-app-office/kexi
-
 # Sebastian Pipping <sping@gentoo.org> (2024-10-03)
 # Masked for removal in 30 days.  Last release in 2021,
 # last commit two years ago, has open bugs, .. (bug #940725).