From patchwork Fri May 21 16:29:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 29452 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 2F99327BC81; Fri, 21 May 2021 17:30:11 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL, URIBL_SBL_A 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 4C73C27BC78 for ; Fri, 21 May 2021 17:30:10 +0100 (BST) Received: from localhost ([::1]:57186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lk82L-0007EU-BU for patchwork@mira.cbaines.net; Fri, 21 May 2021 12:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk82E-0007Co-AP for guix-patches@gnu.org; Fri, 21 May 2021 12:30:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lk82E-0001f5-2C for guix-patches@gnu.org; Fri, 21 May 2021 12:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lk82D-0000Hf-Tz for guix-patches@gnu.org; Fri, 21 May 2021 12:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48570] [WIP] [PATCH] Add Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 May 2021 16:30:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48570@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16216145681019 (code B ref -1); Fri, 21 May 2021 16:30:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 May 2021 16:29:28 +0000 Received: from localhost ([127.0.0.1]:37451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk81Y-0000GD-7B for submit@debbugs.gnu.org; Fri, 21 May 2021 12:29:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:42710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lk81V-0000G4-Uz for submit@debbugs.gnu.org; Fri, 21 May 2021 12:29:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lk81V-0005ts-M1 for guix-patches@gnu.org; Fri, 21 May 2021 12:29:17 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lk81T-0001YR-0w for guix-patches@gnu.org; Fri, 21 May 2021 12:29:17 -0400 Received: by mail-ej1-x634.google.com with SMTP id n2so31341843ejy.7 for ; Fri, 21 May 2021 09:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=vU76GKTvWT4oIcRBTRwOOBKPlfJqT3UUM6zSevG4V6I=; b=cxPN83vu1doqa9iYu2QNLHAl0U9ZTmbJeD36Y94wA5UtxvZUxWfp49x9qYxf6P3+Ic jQ/R8tghiiVMztMzc2bRLdWPdV7fnXC+iUI6FV6Skva3io2pXF1WzxEFxo4dy0PfvkAx tH6QczuJ9Xs/65SNYWRDlDpP3RXAKnjs+3P0Ywp/qbKoenhFuqglWt9Ke+JNJy5uQgrt mZA/ZLKxWm8It1tCbIdtyNaZyJsihJ3vjjzcLAMdR5ymrfBIyQ91ax5HOHgv7xj23BEs Ns/1Tou6PXHG2p/nMiJjoVqjaL25cIx5l4i6lvouGgTD8mq/eg1GH6HozG14jL+BYVWD btvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=vU76GKTvWT4oIcRBTRwOOBKPlfJqT3UUM6zSevG4V6I=; b=e4sE0XTSzMefrWa+RkdKzytIokVsj3iQGp3v7F2ieMob3sJkrdRvxoH/CVu1/TBIrN 8FxjsrgzWgtDkyMs1hTLHtU6d5QEEvFPj12JjBxZWPBGNz/y3Cu9ySnGIwdn1TXaTnsc Pcbmgq9owJgW2mXRo5LJifMKwx9yezutrKWRhic8bDKGen5zV9dYw32TZLCtA8Wg0C5L o6xgtb0kJQ0D69GYtZ9I18ay5qEW8d7RXElfNVUsVj6rl1USeK3MSHRouLq0UWgQiAjS E6QGJdOPEa9W9oQdeKlP/PXPQCaPwYZuTKRn6E89f20YCdVObAcMIwcDE913jTTcp7a7 e/ng== X-Gm-Message-State: AOAM531Vf0HjjZgajY44neVYT/gizgTbHIh79HGkipad8FH+ac8VhIlm +nByhJAHqv4IN1Zw1LBKARV85uAmJ/Y= X-Google-Smtp-Source: ABdhPJyEla7GmjrbMC9r8bglpSDrCTaWSOxGsLT37FzBMNuCmiTfSqDn8JEvnVGXq/gz8gzVk1MioQ== X-Received: by 2002:a17:906:c1ca:: with SMTP id bw10mr11329375ejb.512.1621614551113; Fri, 21 May 2021 09:29:11 -0700 (PDT) Received: from guixSD (host-79-17-142-89.retail.telecomitalia.it. [79.17.142.89]) by smtp.gmail.com with ESMTPSA id cn21sm4280845edb.36.2021.05.21.09.29.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 May 2021 09:29:10 -0700 (PDT) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Date: Fri, 21 May 2021 18:29:09 +0200 Message-ID: <87v97ct5ii.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=anothersms@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 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" X-getmail-retrieved-from-mailbox: Patches Hi! I created a package for tagainijisho and its dependency (kanjivg). I marked this as WIP because I have a few doubts: - kanjivg distributes an xml file generated by joining xml files stored in the repo. I'm not sure where this xml should be installed (under /share/something?) - kanjivg: guix lint fails with: updater 'github' failed to find upstream releases, but I don't know why - two other xml required by tagainijisho use non-versioned urls, is there something we can do about this? It's the first time I use this program but it seems to be working ok. Thanks, Nicolò From aff1c570b2885f5c36810f5faddedd801ad55f0e Mon Sep 17 00:00:00 2001 From: nixo Date: Fri, 21 May 2021 18:15:38 +0200 Subject: [PATCH 2/2] gnu: Add tagainijisho. * gnu/packages/education.scm (tagainijisho): New variable. --- gnu/packages/education.scm | 94 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 043933abe0..cd28e35b78 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -449,6 +449,100 @@ Using KanjiVG, it is possible to create stroke order diagrams or animations and kanji dictionaries.") (home-page "https://kanjivg.tagaini.net") (license license:cc-by-sa3.0))) + +(define-public tagainijisho + ;; latest release (1.0.3) requires qt4, using latest commit + (let ((commit "18078719be75b6b49cffb2f8a22978c635c6b617")) + (package + (name "tagainijisho") + (version (string-append "1.0.3." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Gnurou/tagainijisho") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1i6vcj30q0427ggdjqrsyqb9dg8b8kd0vzmjdzrxabn9wv05vnz4")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; no test target + #:configure-flags + `("-DEMBED_SQLITE=OFF" + ,(string-append "-DCMAKE_PREFIX_PATH=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-before 'build 'make-output-bin + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/bin")))) + (add-after 'unpack 'add-extra-src + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((jmdict (assoc-ref inputs "jmdict")) + (gunzip (which "gunzip")) + (out "3rdparty/JMdict.gz")) + (mkdir-p "3rdparty") + (copy-file jmdict out) + (invoke gunzip out)))) + (add-after 'unpack 'add-kanjidic2 + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((kanjidic2 (assoc-ref inputs "kanjidic2")) + (gunzip (which "gunzip")) + (out "3rdparty/kanjidic2.xml.gz")) + (mkdir-p "3rdparty") + (copy-file kanjidic2 out) + (invoke gunzip out)))) + (add-after 'unpack 'add-kanjivg + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((fname "kanjivg.xml") + (kanjivg + (string-append (assoc-ref inputs "kanjivg") "/" fname)) + (out (string-append "3rdparty/" fname))) + (mkdir-p "3rdparty") + (copy-file kanjivg out)))) + (add-after 'unpack 'make-source-writable + ;; build requires to modify a .cc file + (lambda _ + (chmod "src/core/kanjidic2/DictionaryDescriptions.cc" #o600)))))) + (inputs + `(("jmdict" + ;; URL is not versioned! + ;; https://github.com/Gnurou/tagainijisho/blob/master/src/core/jmdict/CMakeLists.txt#L5 + ,(origin + (method url-fetch) + (uri + '("http://ftp.edrdg.org/pub/Nihongo/JMdict.gz" + "http://www.bcit-broadcast.com/monash/JMdict.gz" + "ftp://ftp.net.usf.edu/pub/ftp.monash.edu.au/pub/nihongo/JMdict.gz")) + (sha256 + (base32 + "0nw39gg2i485b85zx7a5isiims83dpmdchcks9974ryb3z0zackm")))) + ("kanjidic2" + ;; URL is not versioned! + ;; https://github.com/Gnurou/tagainijisho/blob/master/src/core/kanjidic2/CMakeLists.txt#L4 + ,(origin + (method url-fetch) + (uri "http://www.edrdg.org/kanjidic/kanjidic2.xml.gz") + (sha256 + (base32 + "0l2n3bqcfz2x6xns7w02dv01xz3cssbfvbjhlymd88sqsdbfn456")))) + ("kanjivg" ,kanjivg) + ("qtbase" ,qtbase) + ("qttools" ,qttools) + ("sqlite" ,sqlite))) + (synopsis "Japanese dictionary and learning assistant") + (description "Tagaini Jisho is a Japanese dictionary and learning +assistant. It is designed to help you remember Japanese vocabulary and +kanji (later referred as 'entries') by presenting them in a way that makes it +easy to create connections between them. It does so by keeping track of all +the entries you already know and want to study, and letting you tag and annote +them, in addition to providing easy navigation between related entries. A +powerful search engine also allows you to search for entries very precisely. +Finally, Tagaini let you produce printed material (including a handy foldable +pocket book) so let you study anywhere.") + (home-page "https://www.tagaini.net/") + (license license:gpl3+)))) + (define-public childsplay (package (name "childsplay") -- 2.31.1