From patchwork Sun Jul 23 08:44:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 51971 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 0FF0927BBE2; Sun, 23 Jul 2023 09:48:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham 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 1E5F427BBE9 for ; Sun, 23 Jul 2023 09:48:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNUlD-0002fX-Ug; Sun, 23 Jul 2023 04:48:15 -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 1qNUl5-0002bT-AN for guix-patches@gnu.org; Sun, 23 Jul 2023 04:48:07 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNUl5-0006lq-2U for guix-patches@gnu.org; Sun, 23 Jul 2023 04:48:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNUl4-0006Vl-TY for guix-patches@gnu.org; Sun, 23 Jul 2023 04:48:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 038/209] gnu: kcontacts: Update to 5.108.0. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 08:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169010207424886 (code B ref 64798); Sun, 23 Jul 2023 08:48:06 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 08:47:54 +0000 Received: from localhost ([127.0.0.1]:38124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNUkr-0006TC-KD for submit@debbugs.gnu.org; Sun, 23 Jul 2023 04:47:54 -0400 Received: from out203-205-251-60.mail.qq.com ([203.205.251.60]:53760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNUkh-0006Q3-Gk for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 04:47:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690102055; bh=raQ7Gq10/dlINhPzzRp7OiSqs3RVZ9nHo/9Meai5CnU=; h=From:To:Subject:Date:In-Reply-To:References; b=mhtk/oI1VpmFbm2WND+AGWE5+RK0JvO32stj5z1b6Mo8O/cvnv7HOaWUpRfZhZo5i Djr1rcl5jOEb8GyfEjzxV/xJiApFpCS4S9pdE3G7uMcAa3milmoxsI7OKKDAJ5S15U hGHpVyI9AdvJWRbt+qggffSH5BVmOUabkgz2MKQ4= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id BDD078CB; Sun, 23 Jul 2023 16:47:29 +0800 X-QQ-mid: xmsmtpt1690102053tvhsz9c8n Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAj5iyT2f+VspCEvr8CSP3vflEbbjujgDCpQO71QJL7wk9Whij8E0 kVwsLv71NqkKXriMtIPZRpUPvwyno5tDiKkuh8F+tWipQdJ3CvoE+fd8zxjABu8DX7blGtvhbL8G sOm7gGJMxmwxYrotcUSU6Ef9ye09JuE/UyfAEUkc6R7PCWriNUokiWCJ9GvPlYO1axM7ZS7YskmV GFc3/vobxUPbQmhKbFNNKdzJL7A+9hGeCK7xoiZ6HK30gD969N/GQCMhmMIkXziSrbgmBw9TH9Ih eeTEEkEMyZt/UbcWmbGlnzrjfgz9GKRZnghcyb5Qcd9v2LBRmCHZoj3phB48ti5JAFrIXUvQoGzH 0rOUO8ZOhG3c8kHpahLafqIv2zkVoXdYrMOBp7IRDBiGXSQaTlwJYlvgTIsctoq1St/P7iid6Qld 5ZpxFSFuRt7i9BWclJIpnn2LlRfZEGShPWbUpEY7/BrpyzB9sEmeGLR8J7wFZMkecF34fSgKlcSt H9EkkHO2P4sMejp5aLeSiorjteMMwH/Tkjb9j1be1NroDlArvE/vp4JC5IaLL1utCUmwd9s9ujvy 0UzeQb45Gq3MtxqgLX6twRPcts/TegcLtP/SiGNHcnKzuhARP6AaZYxzRJrG1/gMYfO2xAqoVMSv qmnJ28QVpJvaZP5gAX6oXlR+QgMRJUrbDfDWoFPfgSvdqsko04NwLuLfglVh+rcxyBbI3mNilgM2 ImbpStXlzn0Knb7d7izVefpPzSBWQhoBj81MVpa4VqS/3PpUL4AonvDJF+ZuLZ3w6fEcekCJ84bJ PTkKJ/t2bHcBGY2jErbqcZ16VV7LYhxCXZ1z2UQW9VNsq8s+uYP1RLTy68SW0W/qTtyjdULaGv3M Z9C95fRaaz/Xu8nGgdgJ3ewWWKh4swaRztVQcnhkmj36WuJFForS22jjDJEiarsB0RSdmTUU8bsD hzaEQUQlvkpvBCDREXAxj9sLI2IfTcsVoZ1etAQ//la9kyhQguC6Y38C8wWuyMpSGC0UcVYpqNXu ZNKGv1f4UodoNn3kql X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= Date: Sun, 23 Jul 2023 16:44:18 +0800 X-OQ-MSGID: <6541becd66125964af6290361be62afedfe9cb3b.1690099026.git.873216071@qq.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (kcontacts): Update to 5.108.0. [native-inputs]: use XORG-SERVER-FOR-TESTS replace XORG-SERVER. [arguments]: stop replace check phase, add check-setup phase. --- gnu/packages/kde-frameworks.scm | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5b246109e8..62c7a1d2b5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1617,7 +1617,7 @@ (define-public kcompletion (define-public kcontacts (package (name "kcontacts") - (version "5.98.0") + (version "5.108.0") (source (origin (method url-fetch) (uri (string-append @@ -1628,10 +1628,10 @@ (define-public kcontacts (search-patches "kcontacts-incorrect-country-name.patch")) (sha256 (base32 - "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106")))) + "15x6f05ngs3nmxpdi11bi4k4zpjnvx5cy3yxbdklls3f2wpq6jd4")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules xorg-server)) ; for the tests + (list extra-cmake-modules xorg-server-for-tests)) ; for the tests (inputs (list qtbase-5)) (propagated-inputs @@ -1640,18 +1640,11 @@ (define-public kcontacts (arguments `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; The test suite requires a running X server. - ;; Xvfb doesn't have proper glx support and needs a pixeldepth - ;; of 24 bit to avoid "libGL error: failed to load driver: swrast" - ;; "Could not initialize GLX" - (when tests? - (setenv "HOME" (getcwd)) - (system "Xvfb :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1") - (invoke "ctest" "-E" - "(kcontacts-birthdaytest|kcontacts-testroundtrip|kcontacts-addresstest)"))))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &") + (setenv "DISPLAY" ":1")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "API for contacts/address book data following the vCard standard") (description "This library provides a vCard data model, vCard