From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WCChJ7JBJGSYdgEASxT56A (envelope-from ) for ; Wed, 29 Mar 2023 15:48:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UG4wJ7JBJGS7QAEAauVa8A (envelope-from ) for ; Wed, 29 Mar 2023 15:48:34 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5C9C626895 for ; Wed, 29 Mar 2023 15:48:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phVRc-0004Yq-6Y; Wed, 29 Mar 2023 09:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phVRZ-0004Ye-KU for guix-devel@gnu.org; Wed, 29 Mar 2023 09:02:25 -0400 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phVRX-000697-JJ for guix-devel@gnu.org; Wed, 29 Mar 2023 09:02:25 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 882AB293 for ; Wed, 29 Mar 2023 15:02:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id do-ByqENkEBE for ; Wed, 29 Mar 2023 15:02:18 +0200 (CEST) Received: from jurong (unknown [147.210.21.1]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BAA47C0B for ; Wed, 29 Mar 2023 15:02:18 +0200 (CEST) Resent-From: Andreas Enge Resent-Date: Wed, 29 Mar 2023 15:02:16 +0200 Resent-Message-ID: Resent-To: guix-devel@gnu.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id C6872283; Wed, 29 Mar 2023 14:58:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id be6ay4x679sV; Wed, 29 Mar 2023 14:58:29 +0200 (CEST) Received: from jurong (unknown [147.210.21.1]) by hera.aquilenet.fr (Postfix) with ESMTPSA id EB74B194; Wed, 29 Mar 2023 14:58:28 +0200 (CEST) Date: Wed, 29 Mar 2023 14:58:25 +0200 From: Andreas Enge To: Maxim Cournoyer Subject: Re: gstreamer 2.22, webkitgtk 2.40.0, qt 5.15.8 and ffmpeg 6 on staging Message-ID: References: <87v8ik2qye.fsf@gmail.com> <87jzyz3fhz.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="4BLihYs0QcgWYI28" Content-Disposition: inline In-Reply-To: <87jzyz3fhz.fsf@gmail.com> Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: guix-devel-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680097714; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-to:resent-from:resent-message-id: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=COoGP6RPdhhwHQhNQC9avR+yvPBkI2m3PWuJzgtsOzY=; b=Y+KmaDxwfLeUPf+M/m5VltNLzamO389XcmcWkDetgtGMvtJ0ZmWwfP2640YdyVBqdGkoOa EOay25p5Go/bYIBPY7AjeD1/Vd0dNkUH6MCqB0BerQ+NuhGXkGbs8m37ARYPZJjKEGqnnG vOtD/nETuSSwSeeGmu9HcNBBH1FGL7QqEhRPj7wNdYKeezxNFoA5iApS/H/kef8BwOAcV7 1Puq8PQQn8QIpblZM7VJ3nf26KlAd/pCWMaTKWUcFWC+wVRXH73280VYBxwyeNaCIInM3+ jcBsrvTvM9n8DwJeAWlqFCFDMYEJ/Ahvx8N2k4IxIKpirCMM+Pts9sZiXrBuYQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680097714; a=rsa-sha256; cv=none; b=ZwNqiuStdC8avSorb8ela2iOUn5ICo5XYroDO8Hekna9PkxstfjRHkJmoClFigdaFd8MKG 8gYyzV/GisxShrGjWsx1LXe1hjy22C07huPLByTB5fnLAzgnHLfXycuM9tKzzFD7tWfRx5 dx2jNEOS3+L+kkwfwc0gqdwTnw69cuwcOZHjUUuJsQecXkofdf08kTB7tPe1Intcri9PKM ytQcAssELJ9xnjz1wTL4FX5PF14Vxn7/2p8SA3VNAy6WB6na4B9WQIK9w8UzIPljRGTNzg jaf9HeUGpobUBHz0de3004CH0uWJLMH2x1xfK8iTqieeX4c0oMixqYqJc5iT1g== X-Migadu-Spam-Score: -1.60 X-Migadu-Scanner: scn1.migadu.com X-Migadu-Queue-Id: 5C9C626895 Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Spam-Score: -1.60 X-TUID: Ljpuwe63+XUb --4BLihYs0QcgWYI28 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --4BLihYs0QcgWYI28 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-kcodecs-Disable-obsolete-test.patch" >From f8694bf4f32ea8f817fbc32abe28de52472b61f4 Mon Sep 17 00:00:00 2001 Message-Id: From: Andreas Enge 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 --4BLihYs0QcgWYI28--