gentoo auto-resync : 24:03:2025 - 00:31:53

2 files changed, 0 insertions, 59 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index f6e807adb9d8..438f1018266c 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,4 +1,3 @@
-AUX gwenview-24.08.0-odr.patch 2024 BLAKE2B b3de601985470bd6489fac15c84c973e0d17027f0cf0655f69860696103b0ecdf4f75c08d192634ed037da7c123ae21ffc9eac3c67854af825bdb736f8af632d SHA512 286f211c76c1a39023d00037eefa41ea7bee7b80b4cd6010b75f0b9d99ad7a39d792bade9ec408c075f6f2a2cfd13861e06c525c518e072fb6d27307c3ac951f
 DIST gwenview-24.12.2.tar.xz 6525696 BLAKE2B ebbbb9ed525bfd58faba88a6ddc73aec833e079ae224e4617d58b5099003c4026644a0c6ac81a538f90604555ae3e2a3f2fa4788b5b69d564bb9f31430fe2797 SHA512 a21d4b77d313d5b8e97bc874a58efa28c10dfa5aaafa23fb053f64586d87e3646439ef258f487b84499eef3a3155d998b185f395f904f1c8bb36465bedd8eea8
 DIST gwenview-24.12.3.tar.xz 6525684 BLAKE2B 69f4d71c334bafc087134aa41472e63ff0129c004d7161187a3216f0d76035a81ffddae7b7ab86321dfb8a3b05592d23bd8020c7ad282a1a76af15bfb3160989 SHA512 cfb435963c925abf418f63cc3d1acdcb51dd9b7be5da042cbffeb1193f6972939d93762a0e1535ec177f32fe914c34a084e8af43ea636673d452d1dcbcd2eda2
 EBUILD gwenview-24.12.2.ebuild 3063 BLAKE2B 6bf930622c1a5a18fb43f8b5a59b21a9fe6a8725162885316bd9500a463c211632d4eec3c0ed8bd035b4fd4ffbeddd3534408647f9ea9a0e7db1bcbc3f771b01 SHA512 c94078912453c4f4a26ecc99e1c0d61ae0b497ec0e4f3d85efb74a75f1bab3e9727f82b5efd3f603587a0f7e1b1605aa243f51bbfd81ba7e2f5b37b0b1a266d7
diff --git a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
deleted file mode 100644
index 148921f18169..000000000000
--- a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b5cc214574eeb62f469a058daf52cd92270e4aa9 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@gentoo.org>
-Date: Tue, 3 Sep 2024 00:40:11 -0400
-Subject: [PATCH] fix ODR violation: many files had the wrong definition of
- Enum
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This enum has a different number of values, depending on whether
-gwenview is configured with the semanticinfo backend "none" or
-fake/baloo.
-
-In order to avoid Undefined Behavior, every file that includes sorting.h
-also has to include config-gwenview.h *before* sorting.h, which was not
-true. Solve this by including the config header inside the sorting.h
-header.
-
-Fixes link failures when LTO is enabled, since LTO allows the compiler
-to do whole-program optimization and type-check across the entire
-program:
-
-```
-/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: error: type ‘Gwenview::Sorting::Enum’ violates the C++ One Definition Rule [-Werror=odr]
-   37 | enum Enum {
-      |      ^
-/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: note: an enum with different number of values is defined in another translation unit
-   37 | enum Enum {
-      |      ^
-lto1: some warnings being treated as errors
-lto-wrapper: fatal error: /usr/bin/x86_64-pc-linux-gnu-g++ returned 1 exit status
-compilation terminated.
-/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: lto-wrapper failed
-collect2: error: ld returned 1 exit status
-```
-
-Fixes: https://bugs.gentoo.org/921649
----
- lib/sorting.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/sorting.h b/lib/sorting.h
-index 529ea6fc9..c008865cf 100644
---- a/lib/sorting.h
-+++ b/lib/sorting.h
-@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
- #ifndef SORTING_H
- #define SORTING_H
- 
-+// Do not assume every file that includes this one, includes the config.h
-+#include <config-gwenview.h>
-+
- // Qt
- 
- // KF
--- 
-GitLab
-