From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +FCqLwoGvWRgFwAASxT56A (envelope-from ) for ; Sun, 23 Jul 2023 12:50:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uNc7LwoGvWRDfwEAauVa8A (envelope-from ) for ; Sun, 23 Jul 2023 12:50:50 +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 9FA4E66BE0 for ; Sun, 23 Jul 2023 12:50:50 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=JZE6bNxU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690109450; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/U1N20w0uwdbpCxWhBKdY8fMyYKp1wLQkRfwMIfNs9Q=; b=e9vIo0Gl347zumJFaSWEiCm8oXuc8+nRu++M7RcCHOvXNZR+S945CmMRY3pZ83nIHwXgsy pabDndjYwo8raQTSjwOCTpKV2bb1+wAM9qOVz3ZtRS3HAb9G+ifYL3qeB70J2F+VXJ0USp aZNmV+7sLOH8U/hVQN99gNAtRL47KbvTprvJTSenb49dTTJL8ogWg0Sh/zrNRSLfa7Sab7 SMINIyUKJ37oBMUtlbmFa32BaZ8wkkn69vo7++5aaOASwPx7doMdmA4md6ZKcrFjuzMKcH FvYJm6uB3N9KvVPcaapqsy5pJ0QqAySgKCFBaiBaSwa7rBGK8xR4zlYJGLiPNA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=qq.com header.s=s201512 header.b=JZE6bNxU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690109450; a=rsa-sha256; cv=none; b=O+yJD2AXZjkyefI+ao2IJfE21qCSdpsG4QkEq6UBhiHPBvfJm5M9RiE/pzrLOODpcpBtMq EjZcIuq5+zQ2b2hhbbfnC4zPRzt+T9Wm9P7ynlp2g+eIqjvGUBP8hzEEVfYO3XZ5srn/vf wTVmIOllhfDz/Vo2vjlwGKh59+18gPkwcoWxowQikgP6GJxKyaMIA+hMEu7r0EnFxOSkCW 2GdltUgTyChtwWW7U7iEWzuy+AHb+MM1eHgu2Vdgyn4cZ9p26KVIqeKGfbHd98dhKu0gwW mx3qmgLJXDkqMBhO209Q+qqdXkdP549efWzFFSI/2uPCEgdEJb2J6Cmqs1i+zQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNWfN-0007fE-A8; Sun, 23 Jul 2023 06:50:22 -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 1qNWf7-0007d8-QM for guix-patches@gnu.org; Sun, 23 Jul 2023 06:50:08 -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 1qNWf6-0000iv-QB for guix-patches@gnu.org; Sun, 23 Jul 2023 06:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNWf6-000217-Mf for guix-patches@gnu.org; Sun, 23 Jul 2023 06:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 133/209] gnu: okular: Update to 23.04.3. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 10:50:04 +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.16901093547630 (code B ref 64798); Sun, 23 Jul 2023 10:50:04 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 10:49:14 +0000 Received: from localhost ([127.0.0.1]:38625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNWeI-0001yt-61 for submit@debbugs.gnu.org; Sun, 23 Jul 2023 06:49:14 -0400 Received: from out203-205-221-191.mail.qq.com ([203.205.221.191]:46242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNWe8-0001wp-6n for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 06:49:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690109334; bh=/U1N20w0uwdbpCxWhBKdY8fMyYKp1wLQkRfwMIfNs9Q=; h=From:To:Subject:Date:In-Reply-To:References; b=JZE6bNxUsSzpfal/ZpXSUGOTD4wLSsM/+x2WN42WcFNLXHkgtIQ1pSe6xAp2dZeMY Zro6OYbH8a7mN2dkNI1jgqzI5h7qla8kHV/WZyO5aoa5Dq64BQVkj9EWqpsbTlKqge 5LQNufO2VrGqtvYlgdQYUqIOhmmkv3RgM49kiCMM= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id C3418219; Sun, 23 Jul 2023 18:48:52 +0800 X-QQ-mid: xmsmtpt1690109333t8cu0uv0a Message-ID: X-QQ-XMAILINFO: MPEorwW6cFo9oG38sRTEiY+LnVq2IJv7ivhTMro+/KxEdDYAcxHbuQ17E8r2ls zcOy/d046tB3rItH0xA0HcpgpFWhC9HCA6rpbSPVSCxIVCV1iIIYtSJepNsCVdRkBvP9pIugPHlL CyJC+bD2Li0UyWQWYQPqJ7X7O/tOKF7MP3R6pCJJmwFwxK0p5wQs6PoVcsN5y1LyPDW05gFBZjGH PZdFkyR63sDI/D62f8XIlVDBN/1Cs/2YwrhIqdBMkE/WHUDeHaxHyZrIEh5oNcbTCadjr40wNgW4 bo9NW03Zfq6CdXdro1D1zXuJj/Ab7XG/36U+9WauBOqpPATBi9q/DXUjv4EZzPZ7Aje/X/0lqg1S bjFN+dIsAlm3QM2lb/zNBkLVgAPX6K/Bo9710ZwSWLEgti2Cpwqy+0tBvpiH13NjxEvV4djW128R wpviopZkdKsfiMEOj4sZ++NudUb42MkP0N3IbFxTc9rEC2eEaiPXY4Bhr/seeKN/Lt+7XGKeID3m cwMF85QF88H+lIPEjbUZFpc6nRSCCwx/K0XIHXNLGFnV0D0V6dbo9VZUUlM04Y9wDLEhA9uBVnBO esMvHkGa4t2GCxbcs1Npj98k/Wyg4YJXZqdUMCMz5VzZFTIXLgO6ZiJLDG6NFvDkMMpSN8Hkv1Zk iXznfG335gdKhX1r9ZTh7Z9rzWOzuNVg4Xf//ruLrA1ydzMCSgCuWjtKIXstcTiPxWuRY06cbdph 2FM+37Nxs5i0RTOeceCWrqpdad7FcaOAUF+vjRw+6SXpDZjCeDlYedqoFkm7ao6UzXtLyXzVGr1G A3pKlw4IMFaLcp/O457z4AHJL+ZFzw3utQJW3puLKO37RS82MRUCELAHoOJ5nWQRnGumMq8wsCEe oyNmQEzn54EZKYokZ7XzaJ/eD2gs6iYs3JgXpbiU8gsx6ewPRKWHGrgt8Dqa5X5rdOurh5exQqRo 9AUAT/d3TRAuHwckhmgmdUTxXYJ8VRSYaqcuSAokAir12DoqHDtw== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= Date: Sun, 23 Jul 2023 16:45:53 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Zheng Junjie via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -6.15 X-Migadu-Queue-Id: 9FA4E66BE0 X-Migadu-Spam-Score: -6.15 X-Migadu-Scanner: mx0.migadu.com X-TUID: S0djJ+v7NPFd * gnu/packages/kde.scm (okular): Update to 23.04.3. [native-inputs]: add desktop-file-utils. [inputs]: add qtx11extras. [arguments]: use G-expressions, move check phase after install phase, add check-setup phase. --- gnu/packages/kde.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 113dd31907..85cb458a97 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1272,24 +1272,42 @@ (define-public marble-qt (define-public okular (package (name "okular") - (version "22.08.1") + (version "23.04.3") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "0f98kfsb6sirpym27j2wwz4qr4p5vl4pbnckxd3gmgyfpz8mszln")))) + (base32 "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi")))) (build-system qt-build-system) - ;; The tests fail because they can't find the proper mimetype plugins: - ;; "org.kde.okular.core: No plugin for mimetype '"image/jpeg"'." - ;; The built program seems to work okay, so we skip the tests for now. (arguments - `(#:tests? #f - #:configure-flags - (list "-DBUILD_TESTING=OFF"))) + (list + #:phases + #~(modify-phases %standard-phases + (delete 'check) + ;; use installed data to check. + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" + "--output-on-failure" + "--rerun-failed" + "-E" + "(mainshelltest|parttest|chmgeneratortest)")))) + (add-before 'check 'check-setup + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") "/share"))) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" ".") + (setenv "XDG_DATA_DIRS" + (string-append + share ":" (getenv "XDG_DATA_DIRS"))) + (invoke "update-desktop-database" "-v" share))))))) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools pkg-config + ;; for test + desktop-file-utils)) (inputs (list ebook-tools breeze-icons @@ -1327,7 +1345,8 @@ (define-public okular qtwayland-5 threadweaver kcrash - kjs)) + kjs + qtx11extras)) (home-page "https://apps.kde.org/okular/") (synopsis "Document viewer") (description -- 2.41.0