diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/kde-systemtools.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/dolphin-qt-6.9-compatibility-fix.patch | 28 |
3 files changed, 32 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index fe61242cc03..1f146ac0304 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1227,6 +1227,7 @@ dist_patch_DATA = \ | |||
| 1227 | %D%/packages/patches/doc++-segfault-fix.patch \ | 1227 | %D%/packages/patches/doc++-segfault-fix.patch \ |
| 1228 | %D%/packages/patches/dolphin-emu-unbundle-tinygltf.patch \ | 1228 | %D%/packages/patches/dolphin-emu-unbundle-tinygltf.patch \ |
| 1229 | %D%/packages/patches/dolphin-emu-unbundle-watcher.patch \ | 1229 | %D%/packages/patches/dolphin-emu-unbundle-watcher.patch \ |
| 1230 | %D%/packages/patches/dolphin-qt-6.9-compatibility-fix.patch \ | ||
| 1230 | %D%/packages/patches/dovecot-opensslv3.patch \ | 1231 | %D%/packages/patches/dovecot-opensslv3.patch \ |
| 1231 | %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ | 1232 | %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ |
| 1232 | %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ | 1233 | %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ |
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 4dab59c99cf..4d61dcbafc8 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm | |||
| @@ -91,14 +91,15 @@ This package contains GUI widgets for baloo.") | |||
| 91 | (define-public dolphin | 91 | (define-public dolphin |
| 92 | (package | 92 | (package |
| 93 | (name "dolphin") | 93 | (name "dolphin") |
| 94 | (version "25.12.3") | 94 | (version "26.04.1") |
| 95 | (source | 95 | (source |
| 96 | (origin | 96 | (origin |
| 97 | (method url-fetch) | 97 | (method url-fetch) |
| 98 | (uri (string-append "mirror://kde/stable/release-service/" version | 98 | (uri (string-append "mirror://kde/stable/release-service/" version |
| 99 | "/src/dolphin-" version ".tar.xz")) | 99 | "/src/dolphin-" version ".tar.xz")) |
| 100 | (sha256 | 100 | (sha256 |
| 101 | (base32 "0fws10g06bm75gs32ch9cw2s5yxwvspm6zxvk3axgnbnq1ydwqcr")))) | 101 | (base32 "0msgkvnq63k77zmspyf8pjfwzpfxiyqxyx5azs9g6iby5wcsakds")) |
| 102 | (patches (search-patches "dolphin-qt-6.9-compatibility-fix.patch")))) | ||
| 102 | (build-system qt-build-system) | 103 | (build-system qt-build-system) |
| 103 | (propagated-inputs | 104 | (propagated-inputs |
| 104 | (list kio)) | 105 | (list kio)) |
diff --git a/gnu/packages/patches/dolphin-qt-6.9-compatibility-fix.patch b/gnu/packages/patches/dolphin-qt-6.9-compatibility-fix.patch new file mode 100644 index 00000000000..6d35d901a27 --- /dev/null +++ b/gnu/packages/patches/dolphin-qt-6.9-compatibility-fix.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 8d566618e7db92c10882ee87d361907210b21865 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rodion Goritskov <rodion@goritskov.com> | ||
| 3 | Date: Wed, 19 Aug 2026 23:51:26 +0200 | ||
| 4 | Subject: [PATCH] Qt < 6.10 compatibility fix | ||
| 5 | |||
| 6 | Dolphin has minimal Qt version 6.4 specified in CMakeLists.txt, but doesn't build with Qt < 6.10 | ||
| 7 | Filed a bug upstream https://bugs.kde.org/show_bug.cgi?id=524475 | ||
| 8 | |||
| 9 | --- | ||
| 10 | src/settings/interface/panelsettingspage.cpp | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/settings/interface/panelsettingspage.cpp b/src/settings/interface/panelsettingspage.cpp | ||
| 14 | index c564e97fc..a42b9e9a5 100644 | ||
| 15 | --- a/src/settings/interface/panelsettingspage.cpp | ||
| 16 | +++ b/src/settings/interface/panelsettingspage.cpp | ||
| 17 | @@ -27,7 +27,7 @@ PanelSettingsPage::PanelSettingsPage(QWidget *parent) | ||
| 18 | |||
| 19 | { | ||
| 20 | QVBoxLayout *layout = new QVBoxLayout(this); | ||
| 21 | - layout->setVerticalSizeConstraint(QLayout::SetFixedSize); | ||
| 22 | + layout->setSizeConstraint(QLayout::SetFixedSize); | ||
| 23 | |||
| 24 | QFormLayout *topLayout = new QFormLayout(); | ||
| 25 | layout->addLayout(topLayout); | ||
| 26 | -- | ||
| 27 | 2.54.0 | ||
| 28 | |||
