diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-03-24 00:31:53 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-24 00:31:53 +0000 |
commit | 72e4c0bc86eea366d063d15b3d5611e8f82ffd05 (patch) | |
tree | be4116935e605807f4a03de97c876e050718881a /kde-apps | |
parent | add1c3acddd7a3f49fdb230135725463d2662921 (diff) |
gentoo auto-resync : 24:03:2025 - 00:31:53
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/Manifest.gz | bin | 36054 -> 36050 bytes | |||
-rw-r--r-- | kde-apps/gwenview/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/gwenview/files/gwenview-24.08.0-odr.patch | 58 | ||||
-rw-r--r-- | kde-apps/umbrello/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch | 41 |
5 files changed, 0 insertions, 101 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex 90efd40b2991..ec785c000dae 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz 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 - diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest index 39118b3e3f97..06783f4d9298 100644 --- a/kde-apps/umbrello/Manifest +++ b/kde-apps/umbrello/Manifest @@ -1,4 +1,3 @@ -AUX umbrello-23.03.80-gentoo-docbundledir.patch 2064 BLAKE2B 4645a03331876abd1876360f0165585441c192a43a56135da66150bf8f691b30120a8b32143c52e3421022f26b2b4ab2c57ea7b421826527c6d3aa7da66bf921 SHA512 c6e7458ac419af6d66968f4d8a1badb4795fcfdbeda61902ab0b99a205a80fc2e1e35b24d39ab925203f66c9e145e56427851fb5d4c297a4b5068fd5ed33331e AUX umbrello-24.11.80-gentoo-docbundledir.patch 2054 BLAKE2B 6ec1acd9de9905ca35a61cf1505ee10f441d07fd8fe779c86a6a9acca10a5f1d50a37d887ba2eca0f99558ba9c3a1e3cd679b5d8cf89d2356076a3370c9ffc51 SHA512 9588e2942a78dd7211d721dc4cbdcf1f92098546b6f0dc480e8bd2793eb6d94ab1f052bc8bdf5725a7aaced2be9d621d7ea064a94d70c3d3eab90c85bfcfd31c DIST umbrello-24.12.2.tar.xz 5617728 BLAKE2B 04d0e38a9f6e4178184e6ec602547856a2718a0627373020a1bf6151b15ca565ea4f3860e6644d622abf41f782e4f1ba8816789de47473c1413f30a950508edc SHA512 d8f11d688a33b270377745c7d4e584347ba0314f5e57d2f3c0fb65a3ef2d0446ce429d006553d5ccaa71582c112c5e795ed669c2d729130e12b72c731b9822c2 DIST umbrello-24.12.3.tar.xz 5617600 BLAKE2B c536485f9bd0363b7125fed4865f8203c8308fa7fff23d9c2670d6eeea5ad0ac6bc6de123d16faf18b157d2e7df2564b54c2f183aa7770c5bb2e5912ee0bc037 SHA512 af7d9d3716b876ce817041cf813ae936a29d243e58e4ddaadea725177d968d85a155420f8c1346ce120e4957af78f1f485daf39b965d0b8cc1a232bd5c6b608b diff --git a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch b/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch deleted file mode 100644 index c577a72f74a1..000000000000 --- a/kde-apps/umbrello/files/umbrello-23.03.80-gentoo-docbundledir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 20e7b4e1cf4e150e7de2d9fa3f0ee43f434e8ec3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 5 Nov 2020 14:39:51 +0100 -Subject: [PATCH] Fix hardcoded docbook install paths for Gentoo - -Gentoo sets KDE_INSTALL_DOCBUNDLEDIR="${EPREFIX}/usr/share/help". - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - umbrello/umlappprivate.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/umbrello/umlappprivate.cpp b/umbrello/umlappprivate.cpp -index 08c138518..28e5d3086 100644 ---- a/umbrello/umlappprivate.cpp -+++ b/umbrello/umlappprivate.cpp -@@ -33,17 +33,17 @@ QString UMLAppPrivate::findWelcomeFile() - - // from custom install - foreach(const QString &lang, langList) { -- dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/doc/HTML/%1/umbrello/apphelp")).arg(lang)); -+ dirList.append(QCoreApplication::applicationDirPath() + QString(QStringLiteral("/../share/help/%1/umbrello/apphelp")).arg(lang)); - } -- dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/doc/HTML/en/umbrello/apphelp")); -+ dirList.append(QCoreApplication::applicationDirPath() + QStringLiteral("/../share/help/en/umbrello/apphelp")); - - QStringList locations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); - // from real installation - foreach(const QString &location, locations) { - foreach(const QString &lang, langList) { -- dirList.append(QString(QStringLiteral("%1/doc/HTML/%2/umbrello/apphelp")).arg(location).arg(lang)); -+ dirList.append(QString(QStringLiteral("%1/help/%2/umbrello/apphelp")).arg(location).arg(lang)); - } -- dirList.append(QString(QStringLiteral("%1/doc/HTML/en/umbrello/apphelp")).arg(location)); -+ dirList.append(QString(QStringLiteral("%1/help/en/umbrello/apphelp")).arg(location)); - } - foreach(const QString &dir, dirList) { - QString filePath = dir + QStringLiteral("/index.cache.bz2"); --- -2.40.0 - |