summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zstbin148724 -> 0 bytes
-rw-r--r--source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zstbin0 -> 149667 bytes
-rw-r--r--source/kde/fcitx5-configtool/slack-desc4
-rw-r--r--source/kde/kde/build/calligra2
-rw-r--r--source/kde/kde/build/cantor2
-rw-r--r--source/kde/kde/build/digikam2
-rw-r--r--source/kde/kde/build/kalgebra2
-rw-r--r--source/kde/kde/build/kapidox2
-rw-r--r--source/kde/kde/build/kdnssd2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/kile2
-rw-r--r--source/kde/kde/build/kitinerary2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/kwin2
-rw-r--r--source/kde/kde/build/okular2
-rw-r--r--source/kde/kde/build/step2
-rw-r--r--source/kde/kde/modules/all-packaged-applications3
-rw-r--r--source/kde/kde/modules/applications3
-rw-r--r--source/kde/kde/patch/calligra/upstream_Fix-compile-with-newer-versions-of-poppler.patch2
-rw-r--r--source/kde/kde/patch/kitinerary.patch1
-rw-r--r--source/kde/kde/patch/kitinerary/poppler.diff16
-rw-r--r--source/kde/kde/patch/plasma-workspace.patch1
-rw-r--r--source/kde/kde/patch/plasma-workspace/1181acfe30557d6646511df8d98d82589878a570.patch66
-rwxr-xr-xsource/kde/stellarsolver/stellarsolver.SlackBuild5
24 files changed, 106 insertions, 21 deletions
diff --git a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst
deleted file mode 100644
index 24264e24e..000000000
--- a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.5.tar.zst
+++ /dev/null
Binary files differ
diff --git a/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst
new file mode 100644
index 000000000..779db3f86
--- /dev/null
+++ b/source/kde/fcitx5-configtool/fcitx5-configtool-5.1.6.tar.zst
Binary files differ
diff --git a/source/kde/fcitx5-configtool/slack-desc b/source/kde/fcitx5-configtool/slack-desc
index 1b4b69421..8681b8178 100644
--- a/source/kde/fcitx5-configtool/slack-desc
+++ b/source/kde/fcitx5-configtool/slack-desc
@@ -6,9 +6,9 @@
# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
-fcitx5-configtool: fcitx5-configtool (Plasma config module for Fcitx5)
+fcitx5-configtool: fcitx5-configtool (Plasma config module for fcitx5)
fcitx5-configtool:
-fcitx5-configtool: Plasma/Qt config module for Fcitx5.
+fcitx5-configtool: Plasma/Qt config module for fcitx5.
fcitx5-configtool:
fcitx5-configtool: Homepage: https://fcitx-im.org/wiki/Fcitx_5
fcitx5-configtool:
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index e522732c7..425151f3a 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-38
+40
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 7ed6ff82d..1e8b31496 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-5
+6
diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/digikam
+++ b/source/kde/kde/build/digikam
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/kalgebra b/source/kde/kde/build/kalgebra
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kalgebra
+++ b/source/kde/kde/build/kalgebra
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kapidox b/source/kde/kde/build/kapidox
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kapidox
+++ b/source/kde/kde/build/kapidox
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kdnssd b/source/kde/kde/build/kdnssd
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kdnssd
+++ b/source/kde/kde/build/kdnssd
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index 00750edc0..0cfbf0888 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-3
+2
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index f5c89552b..bb95160cb 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-32
+33
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 00750edc0..b8626c4cf 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index 45a4fb75d..f599e28b8 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-8
+10
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kwin
+++ b/source/kde/kde/build/kwin
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 00750edc0..b8626c4cf 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/build/step b/source/kde/kde/build/step
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/step
+++ b/source/kde/kde/build/step
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/modules/all-packaged-applications b/source/kde/kde/modules/all-packaged-applications
index db2d4201f..714fa3f5e 100644
--- a/source/kde/kde/modules/all-packaged-applications
+++ b/source/kde/kde/modules/all-packaged-applications
@@ -222,5 +222,4 @@ ghostwriter
kde-inotify-survey
keysmith
kio-admin
-# Sorry, the mpv/libass deps are getting this one yeeted
-#tokodon
+tokodon
diff --git a/source/kde/kde/modules/applications b/source/kde/kde/modules/applications
index 99e1900e1..1a8687c1c 100644
--- a/source/kde/kde/modules/applications
+++ b/source/kde/kde/modules/applications
@@ -226,5 +226,4 @@ ghostwriter
kde-inotify-survey
keysmith
kio-admin
-# Sorry, the mpv/libass deps are getting this one yeeted
-#tokodon
+tokodon
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
+
diff --git a/source/kde/stellarsolver/stellarsolver.SlackBuild b/source/kde/stellarsolver/stellarsolver.SlackBuild
index de4dbc90d..f1477c3ed 100755
--- a/source/kde/stellarsolver/stellarsolver.SlackBuild
+++ b/source/kde/stellarsolver/stellarsolver.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=stellarsolver
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
+# GCC 14 "fix":
+SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM