Hello Maxim!
Am Wed, Mar 29, 2023 at 08:32:08AM -0400 schrieb Maxim Cournoyer:
> I'll
> gladly volunteer to do the tricky merge after staging is merged into
> master (and removed).
Great, thanks! It should be quite feasible when paying attention to this
special case, but I only did a merge once and do not feel confident about it.
Concerning kcodecs, attached is a patch that disables the test (but keeps
the class in that is supposed to work around the fixed Qt bug; so it is
quite possible that this class is wrong currently). However I did compile
a KDE program with it and launched it successfully, so I would be in favour
of applying the patch to staging (and thus later merge it to core-updates).
What do you think?
Apart from this, all of my profile is built (and available through CI),
so I would be happy with the merge.
Andreas
>From f8694bf4f32ea8f817fbc32abe28de52472b61f4 Mon Sep 17 00:00:00 2001
Message-Id:
<f8694bf4f32ea8f817fbc32abe28de52472b61f4.1680094311.git.andr...@enge.fr>
From: Andreas Enge <andr...@enge.fr>
Date: Wed, 29 Mar 2023 14:50:49 +0200
Subject: [PATCH] gnu: kcodecs: Disable obsolete test.
* gnu/packages/patches/kcodecs-5.98-drop-test.patch: New file.
* gnu/packages/kde-frameworks.scm (kcodecs): Add patch.
* gnu/local.mk (dist_patch_DATA): Register patch.
---
gnu/local.mk | 1 +
gnu/packages/kde-frameworks.scm | 3 ++-
.../patches/kcodecs-5.98-drop-test.patch | 20 +++++++++++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/kcodecs-5.98-drop-test.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 65662f8667..45c786f136 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1397,6 +1397,7 @@ dist_patch_DATA =
\
%D%/packages/patches/lightdm-vncserver-check.patch \
%D%/packages/patches/lightdm-vnc-color-depth.patch \
%D%/packages/patches/localed-xorg-keyboard.patch \
+ %D%/packages/patches/kcodecs-5.98-drop-test.patch \
%D%/packages/patches/kcontacts-incorrect-country-name.patch \
%D%/packages/patches/kde-cli-tools-delay-mime-db.patch \
%D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 10b8ac0134..65c4ccb4f4 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -532,7 +532,8 @@ (define-public kcodecs
name "-" version ".tar.xz"))
(sha256
(base32
- "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz"))))
+ "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz"))
+ (patches (search-patches "kcodecs-5.98-drop-test.patch"))))
(build-system cmake-build-system)
(native-inputs
(list extra-cmake-modules gperf qttools-5))
diff --git a/gnu/packages/patches/kcodecs-5.98-drop-test.patch
b/gnu/packages/patches/kcodecs-5.98-drop-test.patch
new file mode 100644
index 0000000000..fbb9bf42bc
--- /dev/null
+++ b/gnu/packages/patches/kcodecs-5.98-drop-test.patch
@@ -0,0 +1,20 @@
+diff -u -r kcodecs-5.98.0.alt/autotests/CMakeLists.txt
kcodecs-5.98.0/autotests/CMakeLists.txt
+--- kcodecs-5.98.0.alt/autotests/CMakeLists.txt 2023-03-29
12:40:12.904883966 +0200
++++ kcodecs-5.98.0/autotests/CMakeLists.txt 2023-03-29 12:40:28.952883548
+0200
+@@ -25,16 +25,6 @@
+ LINK_LIBRARIES KF5::Codecs Qt${QT_MAJOR_VERSION}::Test ${_qt5_compat_libs}
+ )
+
+-ecm_add_test(
+- ${CMAKE_SOURCE_DIR}/src/kusasciitextcodec.cpp
+- kusasciitextcodectest.cpp
+- TEST_NAME kusasciitextcodectest
+- LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ${_qt5_compat_libs}
+-)
+-target_include_directories(kusasciitextcodectest
+- PRIVATE "${CMAKE_SOURCE_DIR}/src"
+-)
+-
+ # Benchmark, compiled, but not run automatically with ctest
+ add_executable(base64benchmark base64benchmark.cpp)
+ target_link_libraries(base64benchmark KF5::Codecs Qt${QT_MAJOR_VERSION}::Test)
--
2.39.2
