diff options
Diffstat (limited to 'source/kde/kde/patch')
5 files changed, 85 insertions, 1 deletions
diff --git a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch index 7074bfcd1..6c8138c85 100644 --- a/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch +++ b/source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Fix compile with newer versions of poppler set(REQUIRED_KF5_VERSION "5.7.0") set(REQUIRED_QT_VERSION "5.3.0") -+set(CMAKE_CXX_STANDARD 17) ++set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + diff --git a/source/kde/kde/patch/kitinerary.patch b/source/kde/kde/patch/kitinerary.patch new file mode 100644 index 000000000..7183cf932 --- /dev/null +++ b/source/kde/kde/patch/kitinerary.patch @@ -0,0 +1 @@ +cat $CWD/patch/kitinerary/poppler.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kitinerary/poppler.diff b/source/kde/kde/patch/kitinerary/poppler.diff new file mode 100644 index 000000000..b52a24553 --- /dev/null +++ b/source/kde/kde/patch/kitinerary/poppler.diff @@ -0,0 +1,16 @@ +--- ./src/lib/pdf/pdfdocument.cpp.orig 2024-02-10 05:38:52.000000000 -0600 ++++ ./src/lib/pdf/pdfdocument.cpp 2024-05-21 17:08:28.607184297 -0500 +@@ -329,13 +329,9 @@ + return {}; + } + +- if (s->hasUnicodeMarker() || s->hasUnicodeMarkerLE()) { +- return QString::fromUtf16(reinterpret_cast<const char16_t*>(s->toStr().c_str()), s->toStr().size() / 2); +- } else { + int len = 0; + std::unique_ptr<const char[]> utf16Data(pdfDocEncodingToUTF16(s->toStr(), &len)); + return QString::fromUtf16(reinterpret_cast<const char16_t*>(utf16Data.get()), len / 2); +- } + + return QString::fromUtf8(s->c_str()); + } diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 77645b0cb..4a94c28a1 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1 +1,2 @@ cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/1181acfe30557d6646511df8d98d82589878a570.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/1181acfe30557d6646511df8d98d82589878a570.patch b/source/kde/kde/patch/plasma-workspace/1181acfe30557d6646511df8d98d82589878a570.patch new file mode 100644 index 000000000..ed1b67bbd --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/1181acfe30557d6646511df8d98d82589878a570.patch @@ -0,0 +1,66 @@ +From 1181acfe30557d6646511df8d98d82589878a570 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Tue, 4 Jun 2024 12:18:11 +0000 +Subject: [PATCH] Fix writing ICEAuthority file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit 9398f6cf8933055b31506ba155aef2fc2b3561d7 "Remove iceauth +dependency" introduced two bugs: + +1) "fp" is never closed, so the generated auth data stays buffered in + memory for some indeterminate time and the file stays empty on disk. + This completely breaks authentication and thus also session restore. + +2) Checking the return value of IceWriteAuthFileEntry() is inverted (the + function returns non-zero on success), so warnings are printed iff + everything goes well. + +BUG: 487912 + + +(cherry picked from commit 0dcf34458d99b07a3d9054ae0c86c656e0dfa7aa) + +Co-authored-by: Tomáš Trnka <tomastrnka@gmx.com> +--- + ksmserver/server.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp +index f88de40dba4..bba6b13ffae 100644 +--- a/ksmserver/server.cpp ++++ b/ksmserver/server.cpp +@@ -333,7 +333,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1"); + file_entry->auth_data = strdup((*authDataEntries)[i].auth_data); + file_entry->auth_data_length = MAGIC_COOKIE_LEN; +- if (IceWriteAuthFileEntry(fp, file_entry) != 0) { ++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) { + qWarning("Failed to write ice auth file entry"); + } + IceFreeAuthFileEntry(file_entry); +@@ -357,7 +357,7 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + file_entry->auth_name = strdup("MIT-MAGIC-COOKIE-1"); + file_entry->auth_data = strdup((*authDataEntries)[i + 1].auth_data); + file_entry->auth_data_length = MAGIC_COOKIE_LEN; +- if (IceWriteAuthFileEntry(fp, file_entry) != 0) { ++ if (IceWriteAuthFileEntry(fp, file_entry) == 0) { + qWarning("Failed to write xsmp ice auth file entry"); + } + IceFreeAuthFileEntry(file_entry); +@@ -366,6 +366,11 @@ Status SetAuthentication(int count, IceListenObj *listenObjs, IceAuthDataEntry * + IceSetPaAuthData(2, &(*authDataEntries)[i]); + } + ++ if (fclose(fp) != 0) { ++ qWarning() << "Could not close ICEAuthority file"; ++ return 0; ++ } ++ + return (1); + } + +-- +GitLab + |