gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Maxim Cournoyer]

Hi,

I've updated the following dependencies in a group (to try to make
things a bit more efficient) on the staging branch; the motivation
originally stemmed from the latest Jami now requiring FFmpeg 6.

It'd be useful if people tested it by reconfiguring their systems with
it or updating their profiles, and report any issues, as I'd like to
merge this branch into master in about a week time, if there are no
blockers.

-- 
Thanks,
Maxim

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Hello,

Am Tue, Mar 28, 2023 at 11:10:01PM -0400 schrieb Maxim Cournoyer:
> I've updated the following dependencies in a group (to try to make
> things a bit more efficient) on the staging branch; the motivation
> originally stemmed from the latest Jami now requiring FFmpeg 6.

that sounds good if it means we will get rid of the branch for good soon :-)
Otherwise I think it would have been better to work on merging staging and
core-updates and then use a feature branch.

However I am a bit afraid of repercussions on core-updates (originally I
had planned to first merge back staging into master, but somehow we ended
up working on core-updates first...). I have no idea what is the ordering
between packages in master, staging and core-updates - it may well be
possible that some packages are newer in staging, others in core-updates.
Or that they are the same in both, but with different patches.
For instance, I also updated qt to 5.15.8 on core-updates, but differently,
using a global version variable for making sure to update everything at
once. I think this is preferable. In any case, merging this will be a bit
difficult to sort out without mixing bits from the two parts.
So it would be nice if you could carefully merge master into core-updates
after the staging merge.

A typo in the title confused me, but it is gstreamer@1.22.1 instead of
@2.22, which is hopefully less of a change ;-)

Concerning ffmpeg, we now have 5 different versions of it; @2, @3 and @5
have almost no dependents, @4 and @6 have many. It would be nice to sort
this out later and hopefully drop most of them.

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Maxim Cournoyer]

Hi Andreas!

Andreas Enge <andreas@enge.fr> writes:

> Hello,
>
> Am Tue, Mar 28, 2023 at 11:10:01PM -0400 schrieb Maxim Cournoyer:
>> I've updated the following dependencies in a group (to try to make
>> things a bit more efficient) on the staging branch; the motivation
>> originally stemmed from the latest Jami now requiring FFmpeg 6.
>
> that sounds good if it means we will get rid of the branch for good soon :-)
> Otherwise I think it would have been better to work on merging staging and
> core-updates and then use a feature branch.

Yeah, I was thinking about removing the staging branch afterward, to
encourage the new teams workflow.

> However I am a bit afraid of repercussions on core-updates (originally I
> had planned to first merge back staging into master, but somehow we ended
> up working on core-updates first...). I have no idea what is the ordering
> between packages in master, staging and core-updates - it may well be
> possible that some packages are newer in staging, others in core-updates.
> Or that they are the same in both, but with different patches.
> For instance, I also updated qt to 5.15.8 on core-updates, but differently,
> using a global version variable for making sure to update everything at
> once. I think this is preferable. In any case, merging this will be a bit
> difficult to sort out without mixing bits from the two parts.
> So it would be nice if you could carefully merge master into core-updates
> after the staging merge.

Apologies for not noticing about the Qt update on core-updates; the
change was motivated by the open reports on our bug-guix tracker.  I'll
gladly volunteer to do the tricky merge after staging is merged into
master (and removed).  The reason I opted to keep the version
per-package instead of in a %qt5-version global variable was initially
for tooling; 'guix refresh --update' doesn't work otherwise; but then I
noticed that it doesn't work anyway with the 'qt-urls' scheme (it
doesn't find a newer release), so I guess I'll keep your approach here.

> A typo in the title confused me, but it is gstreamer@1.22.1 instead of
> @2.22, which is hopefully less of a change ;-)

Eh :-).  Yes, it's 1.22.1.

> Concerning ffmpeg, we now have 5 different versions of it; @2, @3 and @5
> have almost no dependents, @4 and @6 have many. It would be nice to sort
> this out later and hopefully drop most of them.

Agreed; the 5 to 6 transition is advertised as very uneventful (outside
of Mozilla stuff), with only a few deprecated bits that may cause
problems, such as:

1. https://github.com/FFmpeg/FFmpeg/commit/dd846bc4a9163f875cc2c4e99325c1a7b4ab8e7d
2. https://github.com/FFmpeg/FFmpeg/commit/8f72bb866e47bcb57586608086c77cf0a2e2f21a

Which easily fixed with a simple substitution, so hopefully we can get
rid of ffmpeg@5 soon.

-- 
Thanks,
Maxim

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

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


[-- Attachment #2: 0001-gnu-kcodecs-Disable-obsolete-test.patch --]
[-- Type: text/plain, Size: 3157 bytes --]

From f8694bf4f32ea8f817fbc32abe28de52472b61f4 Mon Sep 17 00:00:00 2001
Message-Id: <f8694bf4f32ea8f817fbc32abe28de52472b61f4.1680094311.git.andreas@enge.fr>
From: Andreas Enge <andreas@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

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Am Tue, Mar 28, 2023 at 11:10:01PM -0400 schrieb Maxim Cournoyer:
> It'd be useful if people tested it by reconfiguring their systems with
> it or updating their profiles, and report any issues

Supposedly the Qt update breaks kcodecs, which in turn breaks most of KDE.
This issue is also present on core-updates, so sorting it out would be
really helpful!

Apart from that all packages in my profile build.

Andreas

FAIL!  : KUsAsciiTextCodecTest::testBrokenBuiltinEncoding() Compared values are not the same
   Actual   (failConverterState.invalidChars): 1
   Expected (0)                              : 0
   Loc: [/tmp/guix-build-kcodecs-5.98.0.drv-0/kcodecs-5.98.0/autotests/kusasciitextcodectest.cpp(56)]
86% tests passed, 1 tests failed out of 7

Total Test time (real) =   2.58 sec

The following tests FAILED:
	  7 - kusasciitextcodectest (Failed)
Errors while running CTest
make: *** [Makefile:139: test] Error 8

Test suite failed, dumping logs.
error: in phase 'check': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("test" "-j" "4") exit-status: 2 term-signal: #f stop-signal: #f>
phase `check' failed after 2.6 seconds
command "make" "test" "-j" "4" failed with status 2
builder for `/gnu/store/hj533y1br1gmm31lgrnj0jjaa9nq1qps-kcodecs-5.98.0.drv' failed with exit code 1
build of /gnu/store/hj533y1br1gmm31lgrnj0jjaa9nq1qps-kcodecs-5.98.0.drv failed
View build log at '/var/log/guix/drvs/hj/533y1br1gmm31lgrnj0jjaa9nq1qps-kcodecs-5.98.0.drv.gz'.

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Am Wed, Mar 29, 2023 at 11:35:24AM +0200 schrieb Andreas Enge:
> FAIL!  : KUsAsciiTextCodecTest::testBrokenBuiltinEncoding() Compared values are not the same

We are not the only ones:
   https://bugs.gentoo.org/885615
for version 5.99, but there is no patch.

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Am Wed, Mar 29, 2023 at 11:35:24AM +0200 schrieb Andreas Enge:
> FAIL!  : KUsAsciiTextCodecTest::testBrokenBuiltinEncoding() Compared values are not the same
>    Actual   (failConverterState.invalidChars): 1
>    Expected (0)                              : 0
>    Loc: [/tmp/guix-build-kcodecs-5.98.0.drv-0/kcodecs-5.98.0/autotests/kusasciitextcodectest.cpp(56)]
> 86% tests passed, 1 tests failed out of 7

Looking at the file, it is a workaround for this Qt bug:
   https://bugreports.qt.io/browse/QTBUG-83081
which was fixed in 5.17.0.

The file was removed in commit
commit 2e7dc813c2b4672f34d135755e928c52c15a1c3a
Author: Volker Krause <vkrause@kde.org>
Date:   Sun Feb 19 20:15:29 2023 +0100
    Remove QTextCodec leftovers
    This is all unused internal API now.
of kcodecs, together with lots of other changes (wc shows 944 lines).

It is not part of the latest kcodecs release 5.104.0, made after the commit.

I do not know whether it would be safe to just disable the test for the
time being.

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Am Wed, Mar 29, 2023 at 11:53:22AM +0200 schrieb Andreas Enge:
> The file was removed in commit
> commit 2e7dc813c2b4672f34d135755e928c52c15a1c3a
> Author: Volker Krause <vkrause@kde.org>
> Date:   Sun Feb 19 20:15:29 2023 +0100
>     Remove QTextCodec leftovers
>     This is all unused internal API now.
> of kcodecs, together with lots of other changes (wc shows 944 lines).

> It is not part of the latest kcodecs release 5.104.0, made after the commit.

Sorry, this is not what I mean:
The *commit* is not part of the latest release,
so the *file* is still present in the latest release.
It is thus not enough to simply update kcodecs (and I do not know to which
extent this would even be feasible inside KDE, or whether we would need to
update everything at once; probably the latter).

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Hello Maxim,

Am Tue, Mar 28, 2023 at 11:10:01PM -0400 schrieb Maxim Cournoyer:
> It'd be useful if people tested it by reconfiguring their systems with
> it or updating their profiles, and report any issues, as I'd like to
> merge this branch into master in about a week time, if there are no
> blockers.

maybe you could proceed with the merge? Then we could also advance
on core-updates.

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Maxim Cournoyer]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Hello Maxim,
>
> Am Tue, Mar 28, 2023 at 11:10:01PM -0400 schrieb Maxim Cournoyer:
>> It'd be useful if people tested it by reconfiguring their systems with
>> it or updating their profiles, and report any issues, as I'd like to
>> merge this branch into master in about a week time, if there are no
>> blockers.
>
> maybe you could proceed with the merge? Then we could also advance
> on core-updates.

Reviewing the list of newly broken things, there was a flaky test spot
in python-pyopenssl (IIRC!) that led me to attempt to upgrade
python-cryptography, which is a bit more involved than I'd like.

As a happy side effect though, I think it'll fix many of the rust
package failures seen on staging that are building on master.

To be continued...

-- 
Thanks,
Maxim

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Andreas Enge]

Am Fri, Apr 07, 2023 at 05:24:41PM -0400 schrieb Maxim Cournoyer:
> Reviewing the list of newly broken things, there was a flaky test spot
> in python-pyopenssl (IIRC!) that led me to attempt to upgrade
> python-cryptography, which is a bit more involved than I'd like.

Okay, so I cherry-picked your staging commits for extra-cmake-modules
and kcodecs to core-updates, which should bring us further in building KDE
(once gtk+ is sorted out).

Andreas

Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging

[Josselin Poiret]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

Hi Andreas,

Andreas Enge <andreas@enge.fr> writes:

> Am Fri, Apr 07, 2023 at 05:24:41PM -0400 schrieb Maxim Cournoyer:
>> Reviewing the list of newly broken things, there was a flaky test spot
>> in python-pyopenssl (IIRC!) that led me to attempt to upgrade
>> python-cryptography, which is a bit more involved than I'd like.
>
> Okay, so I cherry-picked your staging commits for extra-cmake-modules
> and kcodecs to core-updates, which should bring us further in building KDE
> (once gtk+ is sorted out).

Is gtk+@3 not sorted out?  I have it built on my machine.  gtk@4 is also
available from bordeaux.

Best,
-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]