20 files changed, 33 insertions, 67 deletions
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 81b5c5d06..425151f3a 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-37
+40
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 00750edc0..1e8b31496 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-3
+6
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/kdev-python b/source/kde/kde/build/kdev-python
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kdev-python
+++ b/source/kde/kde/build/kdev-python
@@ -1 +1 @@
-1
+2
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/kig b/source/kde/kde/build/kig
index d00491fd7..b8626c4cf 100644
--- a/source/kde/kde/build/kig
+++ b/source/kde/kde/build/kig
@@ -1 +1 @@
-1
+4
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index e85087aff..bb95160cb 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-31
+33
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 0cfbf0888..b8626c4cf 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-2
+4
diff --git a/source/kde/kde/build/kmymoney b/source/kde/kde/build/kmymoney
index 00750edc0..b8626c4cf 100644
--- a/source/kde/kde/build/kmymoney
+++ b/source/kde/kde/build/kmymoney
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/build/kopeninghours b/source/kde/kde/build/kopeninghours
index d00491fd7..b8626c4cf 100644
--- a/source/kde/kde/build/kopeninghours
+++ b/source/kde/kde/build/kopeninghours
@@ -1 +1 @@
-1
+4
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index 7ed6ff82d..f599e28b8 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-5
+10
diff --git a/source/kde/kde/build/krusader b/source/kde/kde/build/krusader
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/krusader
+++ b/source/kde/kde/build/krusader
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kstars b/source/kde/kde/build/kstars
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kstars
+++ b/source/kde/kde/build/kstars
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 0cfbf0888..b8626c4cf 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-2
+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/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/krusader.patch b/source/kde/kde/patch/krusader.patch
deleted file mode 100644
index fbe2a558e..000000000
--- a/source/kde/kde/patch/krusader.patch
+++ /dev/null
@@ -1 +0,0 @@
-cat $CWD/patch/krusader/e5a71586952049ac92fab6f05ed1ab05c1e733c4.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/krusader/e5a71586952049ac92fab6f05ed1ab05c1e733c4.patch b/source/kde/kde/patch/krusader/e5a71586952049ac92fab6f05ed1ab05c1e733c4.patch
deleted file mode 100644
index b56bc567a..000000000
--- a/source/kde/kde/patch/krusader/e5a71586952049ac92fab6f05ed1ab05c1e733c4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 2bd5cd0db362db944bdea639bf0be33f6f439268 Mon Sep 17 00:00:00 2001
-From: Evgeny Brazgin <xapienz@phystech.edu>
-Date: Sun, 5 Mar 2023 22:48:27 -0800
-Subject: [PATCH 1/2] Add workaround for icon size in HiDPI environment
-
----
- app/Panel/PanelView/listmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/app/Panel/PanelView/listmodel.cpp b/app/Panel/PanelView/listmodel.cpp
-index d6ad6c5f8..7731e8951 100644
---- a/app/Panel/PanelView/listmodel.cpp
-+++ b/app/Panel/PanelView/listmodel.cpp
-@@ -177,7 +177,7 @@ QVariant ListModel::data(const QModelIndex& index, int role) const
-             if (properties()->displayIcons) {
-                 if (_justForSizeHint)
-                     return QPixmap(_view->fileIconSize(), _view->fileIconSize());
--                return _view->getIcon(fileitem);
-+                return QIcon(_view->getIcon(fileitem));
-             }
-             break;
-         }
--- 
-GitLab
-
-
-From f447f96f14fdb4f86ccc1286692accbec535ecb0 Mon Sep 17 00:00:00 2001
-From: Evgeny Brazgin <xapienz@phystech.edu>
-Date: Sun, 12 Mar 2023 21:35:27 -0700
-Subject: [PATCH 2/2] Don't set QStyle::State_None for brief view
-
----
- app/Panel/PanelView/krinterbriefview.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/app/Panel/PanelView/krinterbriefview.cpp b/app/Panel/PanelView/krinterbriefview.cpp
-index 69496f890..4042c163c 100644
---- a/app/Panel/PanelView/krinterbriefview.cpp
-+++ b/app/Panel/PanelView/krinterbriefview.cpp
-@@ -401,7 +401,6 @@ void KrInterBriefView::paintEvent(QPaintEvent *e)
-     intersectionSet(area, intersectVector);
- 
-     foreach(const QModelIndex &mndx, intersectVector) {
--        option.state = QStyle::State_None;
-         option.rect = visualRect(mndx);
-         painter.save();
- 
--- 
-GitLab
-