From patchwork Fri Jan 28 17:47:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 36859 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63D4127BBEA; Fri, 28 Jan 2022 17:49:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CAE2727BBE9 for ; Fri, 28 Jan 2022 17:49:44 +0000 (GMT) Received: from localhost ([::1]:34780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDVNX-0003ev-Uu for patchwork@mira.cbaines.net; Fri, 28 Jan 2022 12:49:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDVMv-0003Fb-5S for guix-patches@gnu.org; Fri, 28 Jan 2022 12:49:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDVMs-0002Iz-Bm for guix-patches@gnu.org; Fri, 28 Jan 2022 12:49:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nDVMs-0001OA-BD for guix-patches@gnu.org; Fri, 28 Jan 2022 12:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50862] [PATCH v3 01/10] gnu: extra-cmake-modules: Update to 5.90.0. References: <629540312.113485.1632806682555@office.mailbox.org> In-Reply-To: <629540312.113485.1632806682555@office.mailbox.org> Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Jan 2022 17:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50862 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "50862@debbugs.gnu.org" <50862@debbugs.gnu.org> Received: via spool by 50862-submit@debbugs.gnu.org id=B50862.16433921055277 (code B ref 50862); Fri, 28 Jan 2022 17:49:02 +0000 Received: (at 50862) by debbugs.gnu.org; 28 Jan 2022 17:48:25 +0000 Received: from localhost ([127.0.0.1]:60438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDVM3-0001Mm-Rc for submit@debbugs.gnu.org; Fri, 28 Jan 2022 12:48:25 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:31747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nDVM0-0001MY-RP for 50862@debbugs.gnu.org; Fri, 28 Jan 2022 12:48:10 -0500 Date: Fri, 28 Jan 2022 17:47:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1643392079; bh=CqEpWnTMXoiyNuuCTzkd5+SDepEEgC/q67DggtT66qc=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=Z7gkMeRs4UBqKbygbmhL97gUFHT2qcvwlBE2dUq+dMl2HBt/GOQmeTOOuw10g7JSu NWrAc8yafTc4iZ2lTmOtwDL5aF8Oz/Rao5xou778zfdMvZrAMM5065V71qI1ulLKUK pNEP25M+xFZ/fM9QcZRa5Ws7z4aP0h1bcSJweOdWl9VjpUxGfvc3eb7mDNg8xWEkme XNzkJHm2+9sQO5o9pbJyXumlaJ4UPeOYzjV2I0wN13z7UOS8dxVYpWHUQ2iIRdcJbQ Z8DmNGgIGF7A+R7dcQ5cylbxGfCmVB8Rq/tpSafmwOL5ohNBP5KQyJdRejXrjTlzde y1WWYF3MOHy2Q== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, thanks for the patches. I've just started applying them. However, there has been a merge of core-updates-frozen into master in commit 6dffced09ecda024e0884e352778c221ad066fd6. Also the syntax for inputs has changed so the patches now fail. I've been slowly applying them to the latest master as well as updating the package version if needed. Here are the few I've been through. ---- Petr From 3c85ff4f58ddb29affce783cb953a22178d7ac01 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Fri, 28 Jan 2022 17:36:19 +0100 Subject: [PATCH v3 09/10] gnu: kconfig: Update to 5.90.0. * gnu/packages/kde-frameworks.scm (kconfig): Update to 5.90.0. [native-inputs]: Remove apparently unneeded inputs. [arguments]: Disable failing test: kconfigcore-kconfigtest. set QT_QPA_PLATFORM=offscreen for tests. diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 82045cc31c..ed2e03c198 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -492,7 +492,7 @@ (define-public kcodecs (define-public kconfig (package (name "kconfig") - (version "5.70.0") + (version "5.90.0") (source (origin (method url-fetch) (uri (string-append @@ -501,11 +501,10 @@ (define-public kconfig name "-" version ".tar.xz")) (sha256 (base32 - "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) + "0yqs3ydxzhhb7rrl01swjc9xw8j1bs3n204bf9slb2bs7lfz56rn")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools - xorg-server-for-tests)) + (list extra-cmake-modules qttools)) (inputs (list qtbase-5)) (arguments @@ -517,9 +516,12 @@ (define-public kconfig (setenv "TMPDIR" (getcwd)) #t)) (replace 'check - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest" ".")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "kconfigcore-kconfigtest" ".")) + #t))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. -- 2.34.0