From patchwork Sun Nov 28 19:12:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34866 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 A499927BBEB; Sun, 28 Nov 2021 19:14:17 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_PDS_PRO_TLD,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 0E39627BBE9 for ; Sun, 28 Nov 2021 19:14:17 +0000 (GMT) Received: from localhost ([::1]:35514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrPcu-0002tB-6m for patchwork@mira.cbaines.net; Sun, 28 Nov 2021 14:14:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrPch-0002sv-1b for guix-patches@gnu.org; Sun, 28 Nov 2021 14:14:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53047) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrPcg-0000zB-P6 for guix-patches@gnu.org; Sun, 28 Nov 2021 14:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrPcg-0001Ws-IU for guix-patches@gnu.org; Sun, 28 Nov 2021 14:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51920] [PATCH v2] gnu: Add inkbox. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Nov 2021 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 51920@debbugs.gnu.org X-Debbugs-Original-Cc: 51920@debbugs.gnu.org, phodina via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.16381267875807 (code B ref -1); Sun, 28 Nov 2021 19:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2021 19:13:07 +0000 Received: from localhost ([127.0.0.1]:36360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrPbi-0001VR-KN for submit@debbugs.gnu.org; Sun, 28 Nov 2021 14:13:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:37168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrPbZ-0001Un-Jj for submit@debbugs.gnu.org; Sun, 28 Nov 2021 14:12:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrPbY-0002ps-LL for guix-patches@gnu.org; Sun, 28 Nov 2021 14:12:53 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:44500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrPbV-0000vW-Ma for guix-patches@gnu.org; Sun, 28 Nov 2021 14:12:52 -0500 Date: Sun, 28 Nov 2021 19:12:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1638126761; bh=Nq9gJqVQPRN3s/b1THFMOlETUlXHpzIe5lOtrCzJtTA=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=xyHNAFuKesPJ1LuxWGV4VysJegiPbFyW+q76cJPAW9oxgnUCXZuozSDvN4rPtYf1y V2bdCUSq6fuemP21ID2O+XOZEHWcyaS6Zcwzs95ws96mB+OrrEKjCaNEF/SHL7bs/Y xOyJlVecqoMjx4UnHvhlgVKBCQjOo5vs3kLhSxIg= Message-ID: In-Reply-To: <878rxhut7a.fsf@nicolasgoaziou.fr> References: <878rxhut7a.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=phodina@protonmail.com; helo=mail-40134.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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_FROM=0.001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01 autolearn=ham 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: 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 Nicolas, > Hello, > > phodina via Guix-patches via guix-patches@gnu.org writes: > > > - gnu/packages/qt.scm (inkbox): New variable. > > Thank you. Some comments follow. > > First, this should go to "ebook.scm" instead of "qt.scm". Thanks, that is a better place to put it. > > > - (source (origin > > You should instead a newline before "(origin". Fixed. > > > - (method git-fetch) > > > > > > - (uri > > > > > > - (git-reference > > > > > > - (url "https://alpinekobox.ddns.net/InkBox/inkbox/") > > > > > > - (commit version))) > > > > > > - (file-name (git-file-name name version)) > > > > > > - (sha256 > > > > > > - (base32 > > > > > > - "126cqn0ixcn608lv2hd9f7zmzj4g448bnpxc7wv9cvg83qqajh5n")))) > > > > > > Nitpick: hash should go on the same line as base32. Fixed. > > > - (build-system qt-build-system) > > - (arguments > > - '(#:tests? #f > > > > > > You should add a comment explaining why tests are disabled (i.e.: there > > is no tests). Fixed. > > > - #:phases > > > > > > - (modify-phases %standard-phases > > > > > > - (add-after 'unpack 'prefix-opt > > > > > > - (lambda* _ > > > > > > - (substitute* "inkbox.pro" > > > > > > - (("/opt/\\\\$\\\\$\\\\{TARGET\\\\}") (string-append (assoc-ref %outputs "out")))))) > > > > > > You should use (lambda* (#:key outputs #:allow-other-keys) ...) and then > > (assoc-ref outputs "out") instead. > > > - (replace 'configure > > > > > > - (lambda* (#:key make-flags #:allow-other-keys) > > Thanks, that is the correct syntax. > > > > - (apply invoke (cons "qmake" make-flags))))))) > > > > > > - (native-inputs > > - `(("qtbase" ,qtbase-5))) > > > > > > Does it fail with qtbase 6? Unfortunately it does not compile though it shouldn't be that hard to port it. But here it is about packaging. > > > - (license license:gpl1))) > > License is actually gpl3, according to LICENSE file. Sorry, my mistake. > > Could you send an updated patch? > > Regards, > -------------------------------------------------------------------------------------------------- > > Nicolas Goaziou Thanks for the remarks! ---- Petr From 9de0cd711006728bfbaaf6f0bc39bc7cd2c22915 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 10 Nov 2021 22:24:33 +0100 Subject: [PATCH v2] gnu: Add inkbox. * gnu/packages/qt.scm (inkbox): New variable. diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index abb04b6d93..b2bf4e6dfb 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 la snesne +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ (define-module (gnu packages ebook) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) @@ -376,6 +378,42 @@ (define-public ebook-tools accessing and converting various ebook file formats.") (license license:expat))) +(define-public inkbox + (package + (name "inkbox") + (version "1.7") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://alpinekobox.ddns.net/InkBox/inkbox/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "126cqn0ixcn608lv2hd9f7zmzj4g448bnpxc7wv9cvg83qqajh5n")))) + (build-system qt-build-system) + (arguments + '(#:tests? #f ; no test suite + #:make-flags + (list (string-append "PREFIX=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'prefix-opt + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "inkbox.pro" + (("/opt/\\$\\$\\{TARGET\\}") (string-append (assoc-ref outputs "out")))))) + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke (cons "qmake" make-flags))))))) + (native-inputs + `(("qtbase" ,qtbase-5))) + (home-page "https://alpinekobox.ddns.net/InkBox/inkbox/") + (synopsis "EBook reader") + (description "This package provides InkBox eBook reader.") + (license license:gpl3))) + (define-public liblinebreak (package (name "liblinebreak") -- 2.33.0