From 4af67d6f8303c9e5d7a0a77f03896ac654720235 Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Sun, 17 May 2026 01:35:15 +0300
Subject: trinity-base/libkonq: fix build with gcc-16/C++20

Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/508
Closes: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/issues/510
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
---
 ...ine-enum-TextSortOrders-as-type-name-inst.patch | 37 ++++++++++++++++++++++
 trinity-base/libkonq/libkonq-14.1.5-r1.ebuild      | 20 ++++++++++++
 trinity-base/libkonq/libkonq-14.1.5.ebuild         | 16 ----------
 trinity-base/libkonq/libkonq-14.1.6-r1.ebuild      | 20 ++++++++++++
 trinity-base/libkonq/libkonq-14.1.6.ebuild         | 16 ----------
 5 files changed, 77 insertions(+), 32 deletions(-)
 create mode 100644 trinity-base/libkonq/files/libkonq-14.1.6-Define-enum-TextSortOrders-as-type-name-inst.patch
 create mode 100644 trinity-base/libkonq/libkonq-14.1.5-r1.ebuild
 delete mode 100644 trinity-base/libkonq/libkonq-14.1.5.ebuild
 create mode 100644 trinity-base/libkonq/libkonq-14.1.6-r1.ebuild
 delete mode 100644 trinity-base/libkonq/libkonq-14.1.6.ebuild

diff --git a/trinity-base/libkonq/files/libkonq-14.1.6-Define-enum-TextSortOrders-as-type-name-inst.patch b/trinity-base/libkonq/files/libkonq-14.1.6-Define-enum-TextSortOrders-as-type-name-inst.patch
new file mode 100644
index 00000000..00acfc08
--- /dev/null
+++ b/trinity-base/libkonq/files/libkonq-14.1.6-Define-enum-TextSortOrders-as-type-name-inst.patch
@@ -0,0 +1,37 @@
+From ba59b3eb4927f2e124c6cf5984d00da30f83fefe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
+Date: Tue, 5 May 2026 00:09:10 +0200
+Subject: [PATCH] libkonq: Define enum TextSortOrders as type name instead of a
+ variable.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This resolves multiple definition of `TextSortOrders' with GCC 16.x.
+This relates to issue #735.
+
+Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
+---
+ libkonq/konq_sort_constants.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libkonq/konq_sort_constants.h b/libkonq/konq_sort_constants.h
+index f6c695b19..91e1cf969 100644
+--- a/libkonq/konq_sort_constants.h
++++ b/libkonq/konq_sort_constants.h
+@@ -4,10 +4,10 @@
+ typedef unsigned short TextSortOrder;
+   // Can't use name 'SortOrder' because that's part of TQt
+ 
+-enum {
++enum TextSortOrders {
+   UNICODE_UNMODIFIED      = 0,
+   LOCALE_UNMODIFIED       = 1,
+   UNICODE_CASEINSENSITIVE = 2,
+-} TextSortOrders;
++};
+ 
+ #endif // KONQ_SORT_CONSTANTS_H
+-- 
+2.53.0
+
diff --git a/trinity-base/libkonq/libkonq-14.1.5-r1.ebuild b/trinity-base/libkonq/libkonq-14.1.5-r1.ebuild
new file mode 100644
index 00000000..64b0d675
--- /dev/null
+++ b/trinity-base/libkonq/libkonq-14.1.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020-2026 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+TRINITY_NEED_ARTS="optional"
+TRINITY_MODULE_NAME="tdebase"
+TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="never"
+inherit trinity-meta-2
+
+DESCRIPTION="The embeddable part of konqueror"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+PATCHES=(
+	"$FILESDIR/${PN}-14.1.6-Define-enum-TextSortOrders-as-type-name-inst.patch"
+)
diff --git a/trinity-base/libkonq/libkonq-14.1.5.ebuild b/trinity-base/libkonq/libkonq-14.1.5.ebuild
deleted file mode 100644
index 603f2b7b..00000000
--- a/trinity-base/libkonq/libkonq-14.1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Copyright 2020-2026 The Trinity Desktop Project
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-TRINITY_NEED_ARTS="optional"
-TRINITY_MODULE_NAME="tdebase"
-TRINITY_MODULE_TYPE="core"
-TRINITY_HANDBOOK="never"
-inherit trinity-meta-2
-
-DESCRIPTION="The embeddable part of konqueror"
-if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
diff --git a/trinity-base/libkonq/libkonq-14.1.6-r1.ebuild b/trinity-base/libkonq/libkonq-14.1.6-r1.ebuild
new file mode 100644
index 00000000..0cfbadf3
--- /dev/null
+++ b/trinity-base/libkonq/libkonq-14.1.6-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020-2026 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+TRINITY_NEED_ARTS="optional"
+TRINITY_MODULE_NAME="tdebase"
+TRINITY_MODULE_TYPE="core"
+TRINITY_HANDBOOK="never"
+inherit trinity-meta-2
+
+DESCRIPTION="The embeddable part of konqueror"
+if [[ ${PV} != *9999* ]] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+PATCHES=(
+	"$FILESDIR/${P}-Define-enum-TextSortOrders-as-type-name-inst.patch"
+)
diff --git a/trinity-base/libkonq/libkonq-14.1.6.ebuild b/trinity-base/libkonq/libkonq-14.1.6.ebuild
deleted file mode 100644
index 603f2b7b..00000000
--- a/trinity-base/libkonq/libkonq-14.1.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Copyright 2020-2026 The Trinity Desktop Project
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-TRINITY_NEED_ARTS="optional"
-TRINITY_MODULE_NAME="tdebase"
-TRINITY_MODULE_TYPE="core"
-TRINITY_HANDBOOK="never"
-inherit trinity-meta-2
-
-DESCRIPTION="The embeddable part of konqueror"
-if [[ ${PV} != *9999* ]] ; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-- 
cgit v1.2.3