From patchwork Sun Sep 12 11:49:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 32806 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 330D427BBE4; Sun, 12 Sep 2021 12:51:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90D3B27BBE3 for ; Sun, 12 Sep 2021 12:51:14 +0100 (BST) Received: from localhost ([::1]:48068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPO0v-0000c7-Mc for patchwork@mira.cbaines.net; Sun, 12 Sep 2021 07:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPO0k-0000bw-0z for guix-patches@gnu.org; Sun, 12 Sep 2021 07:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPO0j-0000sB-PW for guix-patches@gnu.org; Sun, 12 Sep 2021 07:51:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPO0j-0004Ka-OE for guix-patches@gnu.org; Sun, 12 Sep 2021 07:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50546] [PATCH] imv: Update to 4.1.0 and adjust arguments+inputs. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 Sep 2021 11:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50546@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163144742716594 (code B ref -1); Sun, 12 Sep 2021 11:51:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Sep 2021 11:50:27 +0000 Received: from localhost ([127.0.0.1]:42177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPO0B-0004JZ-6o for submit@debbugs.gnu.org; Sun, 12 Sep 2021 07:50:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:51476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1mPO09-0004JS-8O for submit@debbugs.gnu.org; Sun, 12 Sep 2021 07:50:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mPO08-0000aR-UZ for guix-patches@gnu.org; Sun, 12 Sep 2021 07:50:25 -0400 Received: from out203-205-221-149.mail.qq.com ([203.205.221.149]:52081) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1mPNzy-0000TO-Vd for guix-patches@gnu.org; Sun, 12 Sep 2021 07:50:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1631447405; bh=ydNhddHolcBnxFWrjgX1hioA+C21A2dGrKBII72+gsA=; h=From:To:Subject:Date; b=bxvh7AB9BD1onR7d7xmtG8KvN9/seQNg9ENXqn71fh0FVNxnf08T/3iehCwKjN01O IgJpSwz7tEbSK7AkNVXs+CD+Ha110/qbpu6EhQvr7C/58I/jvqPeqpXeLT1N8rTWAu 6hqrE2tALYNmjM/R/Ldmg9QcPBhyVA96cfbJ9/rk= Received: from asus ([2409:8928:12a4:1710:2b39:e24b:a492:11ec]) by newxmesmtplogicsvrszc7.qq.com (NewEsmtp) with SMTP id C83814B9; Sun, 12 Sep 2021 19:50:03 +0800 X-QQ-mid: xmsmtpt1631447403tg9ql5jlg Message-ID: X-QQ-XMAILINFO: NNehULFig4NedqRe3xHtjfpZc2k/UytkcGqrwFxhaPkvkClaxmFzDBqZ2WKl2k A7T7Jumo6XRV4JG9f2suYP33sT45AlSL3Ml54eg4LqywHYAdFFz+EtK+tu6+iraQgKIOgpxXbexa UWgWBzyICIim/cPznhQIsR43CIqIT5YDQXjqnRLVAy44iHzZsX4Q1fzwcLFwamp6nfhhyB25MTaL 72AcHBsn2S2I24zTu481kZOohusG3lwPpGs1G7VOVkS6FxVueI+wIPJYvPGBwVBVkla72+wMKlPl D9sJku3T/8y30t1x7YPuY8vFx8C12RBobnoMky3Yoxl+RiAfOG+6poZZbJcsRREQH+YyIZ9ngLz0 lw2f7Cef1Aj+OghuLFVe9vRLsFnCAzy6RFxpBz8nBkKqSASW4gbH2eBtorCaqhGg5tYe7qS2ixOe fbdIBohLPfllOrCFyrA5pEcBYpV0ZNDsE/8H6LSAlXujRec+Q8w6EQXEYrZFZekmDy54JJXPNlfZ d9yyw9H8PderUbVAkMJucH3v04AybUOVN069aTnNn+aCKwb+pvrWxgOT5pQA+RobCa+Rdy4W47L+ URiI81MCEjADSPgXGSQxIyTs94d5y6Zt6B6EaID2vh/kqrP9PDTEMvoaikMzVq4sI1gyXCfvHRbJ Vpfz6Zp+3IM22v6K9fWsaNxNUoBCXr77BoSOUKmvOSxlQDgJZ+ZF2yPXv+70+ZfLarZSkNOoQQpj SQoToNPF74G/gS7PPGyVCS4u0z9OD+Jr0iumiJCc5U13Y= User-agent: mu4e 1.6.5; emacs 28.0.50 Date: Sun, 12 Sep 2021 19:49:42 +0800 Message-ID: <87h7eq109g.fsf@qq.com> MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.221.149; envelope-from=873216071@qq.com; helo=out203-205-221-149.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> X-getmail-retrieved-from-mailbox: Patches From 69060bd446332a5e48f9ec44f4b71f07c3a3ca0c Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Thu, 9 Sep 2021 21:36:54 +0800 Subject: [PATCH] gnu: imv: Update to 4.1.0 and adjust arguments+inputs. * gnu/packages/image-viewers.scm (imv): [version]: Update to 4.1.0. [build-system]: Replace with meson-build-system. [phases]: Remove (delete 'configure) [make-flags]: Remove it. [inputs]: Remove asciidoc. Add libheif, libjpeg-turbo, libinih, libnsgif, librsvg-next, libtiff [native-inputs]: Add asciidoc, Add git-minimal --- gnu/packages/image-viewers.scm | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 3b45c25e21..80987a174c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 jgart +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages suckless) #:use-module (gnu packages terminals) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) @@ -739,7 +741,7 @@ displayed in a terminal.") (define-public imv (package (name "imv") - (version "4.1.0") + (version "4.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -747,13 +749,12 @@ displayed in a terminal.") (commit (string-append "v" version)))) (sha256 (base32 - "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx")) + "12xcayyzmfknbff04z8jdlxsnnimgisqiah0bw07cyxx8ksmdzqw")) (file-name (git-file-name name version)))) - (build-system gnu-build-system) + (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) (add-after 'install 'record-absolute-file-names (lambda* (#:key outputs #:allow-other-keys) ;; 'imv' is a script that execs 'imv-x11' or 'imv-wayland'. @@ -763,22 +764,24 @@ displayed in a terminal.") (substitute* (string-append bin "/imv") (("imv-") (string-append bin "/imv-"))) - #t)))) - #:make-flags - (list ,(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "CONFIGPREFIX=" - (assoc-ref %outputs "out") "/etc")))) + #t)))))) (inputs - `(("asciidoc" ,asciidoc) - ("freeimage" ,freeimage) + `(("freeimage" ,freeimage) ("glu" ,glu) - ("librsvg" ,librsvg) + ("libheif" ,libheif) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libinih" ,libinih) + ("libnsgif" ,libnsgif) + ("librsvg" ,librsvg-next) + ("libtiff" ,libtiff) ("libxkbcommon" ,libxkbcommon) ("pango" ,pango) ("wayland" ,wayland))) (native-inputs - `(("cmocka" ,cmocka) + `(("asciidoc" ,asciidoc) + ("cmocka" ,cmocka) + ;; why build need it? + ("git" ,git-minimal) ("pkg-config" ,pkg-config))) (synopsis "Image viewer for tiling window managers") (description "@code{imv} is a command line image viewer intended for use -- 2.33.0