From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Oct 2020 13:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 44191@debbugs.gnu.org Cc: nicolo@nixo.xyz X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160354488425835 (code B ref -1); Sat, 24 Oct 2020 13:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2020 13:08:04 +0000 Received: from localhost ([127.0.0.1]:32938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJH4-0006iG-Rt for submit@debbugs.gnu.org; Sat, 24 Oct 2020 09:08:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:44590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJGz-0006i4-Qv for submit@debbugs.gnu.org; Sat, 24 Oct 2020 09:07:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWJGz-00026E-Ly for guix-patches@gnu.org; Sat, 24 Oct 2020 09:07:53 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWJGw-00042o-JC for guix-patches@gnu.org; Sat, 24 Oct 2020 09:07:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id n18so5848271wrs.5 for ; Sat, 24 Oct 2020 06:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=ebRRAPEkab4wh8gZjVIJTFZpaWQYGKgxJNDQi2woUTA=; b=Gk8TGH6XqHBeF3kcmsNJ1gXPaWkw+PM1WSwWi6ERoW6miVwLOYM0Nd/dgrIU6NH2Al dCPUFIge4BgbwpPGqTuoujsBmebELVmq1nWlpNcUpdvWMCVWTXSG7ekIXsapTpWYH+CK OF1Z4lrtmabzzXRPYS+P00mVmSmgn/I+2tPcoSouHIS3z8uI+nDa4tOOZ6mFCYXZneMX UhBQkvyKHEn/MD0B7KppWjTNIgkd0dlQSaezfg9MA3hNlpi0zb6I4znCQ7+sppyPTvta 7a5kTQSTh5WgZZD9kDDP0EAr9+3Jz8huIzbdW1v1FN/hzZ91gK9vEFV6E6L6SnRzLcmZ j8IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=ebRRAPEkab4wh8gZjVIJTFZpaWQYGKgxJNDQi2woUTA=; b=sfQLTd5un4FPlltOGsZF8Ks3A8CUjRlwTenc+3GPHgXrc2Wz/zxzL4x7j6PT10UH1m N27heOMRal5XpxtnQpeP6NPLgtTd8paHeCKwQGGOIoc41tScFrNw9UVJvgb9jdL0Ic4V 2tecAHNbDrz1CXKAHxTz/fJRRR/ygJo9GvgOBJ7e3nJ4pmVlw9OBMfk16A94Q3Eogk/8 jCkn+Cp7u9IaTfBzHlzPn2jwf4wY1hrDK6FKod+L47sRfqNCBsd9yYuIrd6v+S5Y+/Hz FQHbqyeuc/Li7yaAgUwNMM0Iz9ceixsOzxapg6DiFkr8er6k2I3vsy8BDrVE6C79XTmd bHsA== X-Gm-Message-State: AOAM533PlVOIgMIrIOiRNZ8pAkVn8H0YQxaYhBGB9lKUASywW0LgHJtt u2m/UukLzLgAGXEOgM0Urv1lvMSaEWc= X-Google-Smtp-Source: ABdhPJx1LDPIBvSMC5Zk7tTx1Gx7frIj09qAfF814Fh2d/BgDgoI5ZqSzt6uDfarQ8ghb8X+LS8GFQ== X-Received: by 2002:a5d:6cae:: with SMTP id a14mr7907070wra.187.1603544868905; Sat, 24 Oct 2020 06:07:48 -0700 (PDT) Received: from guixSD (host-95-237-183-89.retail.telecomitalia.it. [95.237.183.89]) by smtp.gmail.com with ESMTPSA id x65sm10733990wmg.1.2020.10.24.06.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 06:07:47 -0700 (PDT) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Date: Sat, 24 Oct 2020 15:07:46 +0200 Message-ID: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=anothersms@gmail.com; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not k [...] Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 2.0 SPOOFED_FREEMAIL No description available. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not k [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not know when a new release will happen). Let me know if it's fine. Without the wrap-qt-program icons were missing. guix lint reports no warnings. Thanks! Nicol=C3=B2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-kristall.patch Content-Transfer-Encoding: quoted-printable >From c52c3ea7297c1b11cb3dd2ca7f5a12492e42defe Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 24 Oct 2020 15:00:30 +0200 Subject: [PATCH] gnu: Add kristall. * gnu/packages/web-browsers.scm (kristall): New variable. --- gnu/packages/web-browsers.scm | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb49a8fdea..f564f25f20 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -13,6 +13,7 @@ ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2020 B. Wilson ;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -341,6 +342,64 @@ access.") (properties `((lint-hidden-cve . ("CVE-2016-9179")))) (license license:gpl2))) =20 +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kbn98pn8iplqkg7gxx4nysvgsn1621z95ynfr2f9jhsfsgz4r0z")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + ;; runs git describe --tags by default + (lambda _ + ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 = to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=3D).*" _ match) + (string-append match ,version "\n"))))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (inputs + `(("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://github.com/MasterQ32/kristall") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, http, https, gopher, finger), +bookmarks, TSL certificates management, outline generation, tabbed interfa= ce +and more.") + (license license:gpl3)))) + (define-public qutebrowser (package (name "qutebrowser") --=20 2.28.0 --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Oct 2020 09:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.1603619276694 (code B ref 44191); Sun, 25 Oct 2020 09:48:02 +0000 Received: (at 44191) by debbugs.gnu.org; 25 Oct 2020 09:47:56 +0000 Received: from localhost ([127.0.0.1]:35772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWcd1-0000B7-Tf for submit@debbugs.gnu.org; Sun, 25 Oct 2020 05:47:56 -0400 Received: from mira.cbaines.net ([212.71.252.8]:60524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWccz-0000Av-F2 for 44191@debbugs.gnu.org; Sun, 25 Oct 2020 05:47:53 -0400 Received: from localhost (92.41.179.191.threembb.co.uk [92.41.179.191]) by mira.cbaines.net (Postfix) with ESMTPSA id DB90227BBF0; Sun, 25 Oct 2020 09:47:51 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8587a535; Sun, 25 Oct 2020 09:47:48 +0000 (UTC) References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Sun, 25 Oct 2020 09:47:45 +0000 Message-ID: <87o8kqab7i.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > Hi guix! > > This patch adds kristall, a qt browser for gemini and gopher. > > There were some problems with the latest tagged version (V0.3), such as > directories that had to be created manually before install. I preferred > to use the latest commit (as the author still does not know when a new > release will happen). Let me know if it's fine. > > Without the wrap-qt-program icons were missing. > > guix lint reports no warnings. Hey! Thanks for the patch. I've had a quick look, and spotted one thing. The Git repository includes lib/BreezeStyleSheets and lib/cmark, which are both packaged for Guix (I'm unsure about luis-l-gist). It would be good to look at removing/not using the copied code from kristall and using the Guix packages instead. Does that make sense? Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+VScFfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XeEhg//dD0BhDfuZe43cWuf3rkk7VLUiLpi5It8 9R/4vQnp+OJO7h/cOKxOGVRqdY6ehRsoGVwNmnkWdAnzAKS4ZH4T1PpRM0sYmfCn A4ABPbJ5fYwUN1D+EECY+OIol7BbZAIuFeDtCU4kQbQPJ2wU4AfTaLO0KquTk+Vb MVHQZC8ZEfv95yirBrfsFQK+b6df0X6h8PY/TbOUs0utrpUPt7RHb3wVUL9J5Krq X+BmtQt55ufOALn15mkfwRTALXwR6/gYGu8mPM0tNY6HcE4+G1HLLX9kJWbSaaPH coB6792t0LMEx06K/hd7Z1Xlvixwiosi6m2QuFFsGJLw9bri/vSJO3NXAgfAo4dd WM6WT69ZxNN7WC5zvlIWmH6ZT52JxrWF6fcWlKqs/hNWcQkwko8iCcqT7SL26hfx bn7jsOHubDVhF94s+qJEInvAIIN2t3QGbFc+OLJbCYjtocS5Ix1W4TUYPo5nnBNY babE1QvHh3hAIlgYXsDDcD1rE9OvS7rUYFjhDfcuq6gbA0jXLk4vDLfr4+5pdAsM JAzN5lvA59nBGMr8NYl1TBOz9T/XiTYeztGQx97GOjCo58rY8R/VZsm13pVcb8Zr xWmAELIuG2/CV0WYouO/aT/UND8CWO5T3rbGuDS4+AHQbfMfaNadc4OPhTj1WDXN cPW2v/mIjaY= =BmoX -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Oct 2020 16:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Baines Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.160364444526408 (code B ref 44191); Sun, 25 Oct 2020 16:48:01 +0000 Received: (at 44191) by debbugs.gnu.org; 25 Oct 2020 16:47:25 +0000 Received: from localhost ([127.0.0.1]:37488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWjAw-0006pB-P1 for submit@debbugs.gnu.org; Sun, 25 Oct 2020 12:47:25 -0400 Received: from mail-ed1-f50.google.com ([209.85.208.50]:44205) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWjAr-0006h6-Gj for 44191@debbugs.gnu.org; Sun, 25 Oct 2020 12:47:21 -0400 Received: by mail-ed1-f50.google.com with SMTP id t20so6933955edr.11 for <44191@debbugs.gnu.org>; Sun, 25 Oct 2020 09:47:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=ztVP0Ok0r1ii0Y1jEIuHKLjD2yxKOAwIOwARvRePAcM=; b=R0HUaRaMB3w1JU/zYvAshOWc4IYaJajV0uUktMMLdXKAyFhQlC8cz3v4IY0aulXseg g1KAp406MjaFYXSxCz0SmlXnOvIAwfS2Dbn/xAxauqWSelkYDQxuR81xyCfvOoHSqBpS /R+D88TcJawNploNufca4GmX0L6vin+d73QG74zFjPuTcs9cmPJuRYWv9uC1qkNU2VJK GVDAtDiyAnYTjCJ4CAhJ2o4gjSwM+qXdbrZIDy4FuCgM9DSj271vOmd6fyDOUuxjwPBP /IFMcVNEfsdu4RsVjOd6QYjveCSjeps0lgVwkW8u742/Mu/Keh3hQTFLDo0AqZvFZuFp 30lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=ztVP0Ok0r1ii0Y1jEIuHKLjD2yxKOAwIOwARvRePAcM=; b=UFbTaYNEx7WGysG0jESIfP/d1haw1+3HjMu3Hg+/MFmUOlX8lbQhfCsABRs5nYs1Zo RQWc/X7cVi7euDQ/07KRYemO1WU47QwZFizO4D5bHA6suZAT2J5CeCz/VbHf9k2i8vok aGt6iC8o0vBMHkRlJ0sDR+NcDGcQupEFEnlhPhfmCsduuM1QB19FJ/2YkmsxXzlmPRgG zV4hOe/AjNJO86hT/HAJIy+ps813M4yWfmVQFoPjTbCHAUzEIaWX/8nMAmBDGTfqYgBS 8c3H6GMJl7PW+h2rYAL9DRMahqE/u0K5DCpQJpSaL60lsNwE2liA/W7cwZQ00TwWu0ZG /MrA== X-Gm-Message-State: AOAM532PYfUm9aCjKZZ7qUVAGSuM2jo8wQ62tFdldSpfepUOv+XUxW9+ SUju+yfVlIPuaJXiLtCig6o= X-Google-Smtp-Source: ABdhPJz9nhk0Qk5TjLNh1m4GsfJ3rsLj/Sv0xKHlAs+cJj1MV62kX5fGRXVKHmFPQjKzc8ZJ0R1QYw== X-Received: by 2002:aa7:dcc7:: with SMTP id w7mr12485921edu.54.1603644431387; Sun, 25 Oct 2020 09:47:11 -0700 (PDT) Received: from guixSD (host-95-237-183-89.retail.telecomitalia.it. [95.237.183.89]) by smtp.gmail.com with ESMTPSA id e16sm4249345ejr.91.2020.10.25.09.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2020 09:47:10 -0700 (PDT) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87o8kqab7i.fsf@cbaines.net> References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> Date: Sun, 25 Oct 2020 17:47:01 +0100 Message-ID: <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Chris! Thanks for the review. I tried, but: 1. breeze is a different package from the ones in the repo (url is https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to be compiled, I can try to package it. 2. there [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: kristall.pro (pro)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.50 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Hi Chris! Thanks for the review. I tried, but: 1. breeze is a different package from the ones in the repo (url is https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to be compiled, I can try to package it. 2. there are files in lib/cmark that are not present in the cmark distribution (thei are .h files generated by their .h.in), so I cannot extract our cmark source directly - I tried keeping those files, but build fails [[failed-build]]. Not su= re if it's a patched version or if it's an older one. But I can investigate probably 3. Should I do the same for fonts file? It depends on Noto (that we have in the store) and on OpenMoji (I can package it) Just for reference, I attached the current WIP package definition ([[current-package-definition]] which is getting complex. Is there a better way to achieve the "delete a folder, but keep some file"?) Thanks! Nicol=C3=B2 #+name: failed-build #+begin_example=20 ../src/renderers/markdownrenderer.cpp: In function =E2=80=98QString extract= NodeText(const cmark_node&)=E2=80=99: ../src/renderers/markdownrenderer.cpp:102:48: error: =E2=80=98const cmark_n= ode {aka const struct cmark_node}=E2=80=99 has no member named =E2=80=98dat= a=E2=80=99 return QString::fromUtf8((char const*)node.data, node.len); ^~~~ ../src/renderers/markdownrenderer.cpp:102:59: error: =E2=80=98const cmark_n= ode {aka const struct cmark_node}=E2=80=99 has no member named =E2=80=98len= =E2=80=99 return QString::fromUtf8((char const*)node.data, node.len); ^~~ ../src/renderers/markdownrenderer.cpp: In function =E2=80=98void renderNode= (RenderState&, const cmark_node&, QTextCharFormat)=E2=80=99: ../src/renderers/markdownrenderer.cpp:262:67: error: invalid cast from type= =E2=80=98const cmark_chunk=E2=80=99 to type =E2=80=98char*=E2=80=99 QUrl absolute_url =3D QString::fromUtf8((char*)node.as.link.url); #+end_example #+name: current-package-definition #+begin_src scheme (define-public kristall ;; Fixes to the build system applied after the latest tag ;; Use tagged release when updating (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") (revision "1")) (package (name "kristall") (version (string-append "0.3-" revision "." (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/MasterQ32/kristall") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "0kbn98pn8iplqkg7gxx4nysvgsn1621z95ynfr2f9jhsfsgz4r0z")) (modules '((guix build utils) (ice-9 match))) (snippet '(begin ;; /gnu/store/qy99msdihnam407659xdqdb4p99f0ava-font-google-not= o-20171025/share/fonts/truetype/NotoColorEmoji.ttf ;; Remove bundled programs. ;; kristall requires some files in the cmark dir that are not ;; available in cmark sources. Move it away from the directory ;; and then back in (with-directory-excursion "lib" (let ((files-to-keep '(("cmark/cmark.pri" "cmark.pri") ("cmark/src/config.h" "config.h") ("cmark/src/cmark.h" "cmark.h") ("cmark/src/cmark_export.h" "cmark_ex= port.h") ("cmark/src/cmark_version.h" "cmark_v= ersion.h")))) ;; Copy away files to keep (map (match-lambda ((src . (dest)) (rename-file src dest))) files-to-keep) ;; Delete extra (bundled) files (map (lambda (dir) (delete-file-recursively dir)) '("cmark" ;; "BreezeStyleSheets" )) ;; Put files to keep back in their original place (mkdir-p "cmark/src") (map (match-lambda ((dest . (src)) (rename-file src dest))) files-to-keep))) ;; Remove bundled fonts (delete-file-recursively "fonts") #t)))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) (guix build qt-utils) (guix build utils)) #:imported-modules (,@%gnu-build-system-modules (guix build qt-utils)) #:make-flags (list (string-append "PREFIX=3D" %output)) #:phases (modify-phases %standard-phases (delete 'configure) ; no ./configure script (delete 'check) ; no check target (add-after 'unpack 'replace-bundled-libs (lambda* (#:key inputs #:allow-other-keys) (let ((cmark (assoc-ref inputs "cmark-sources")) ;; (breeze (assoc-ref inputs "breeze-sources")) ) ;; (invoke "tar" "-xf" breeze "-C" "./lib/") ;; (rename-file "./lib/breeze-5.19.5" "./lib/BreezeStyleSh= eets") (invoke "tar" "-xf" cmark "-C" "./lib/cmark" "--strip-comp= onents" "1") #t))) (add-before 'build 'set-program-version ;; runs git describe --tags by default (lambda _ ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 t= o get the version. ;; Patch it to just return the real version number directly. (substitute* "src/kristall.pro" (("(KRISTALL_VERSION=3D).*" _ match) (string-append match ,version "\n"))))) (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (wrap-qt-program out "kristall")) #t))))) (inputs `(("breeze-sources" ,(package-source breeze-assets)) ("cmark-sources" ,(package-source cmark)) ("openssl" ,openssl) ("qtbase" ,qtbase) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg))) (home-page "https://github.com/MasterQ32/kristall") (synopsis "Small-internet graphical client") (description "Graphical small-internet client with with many features including multi-protocol support (gemini, http, https, gopher, finger), bookmarks, TSL certificates management, outline generation, tabbed interface and more.") (license license:gpl3)))) #+end_src Christopher Baines writes: > Nicol=C3=B2 Balzarotti writes: > >> Hi guix! >> >> This patch adds kristall, a qt browser for gemini and gopher. >> >> There were some problems with the latest tagged version (V0.3), such as >> directories that had to be created manually before install. I preferred >> to use the latest commit (as the author still does not know when a new >> release will happen). Let me know if it's fine. >> >> Without the wrap-qt-program icons were missing. >> >> guix lint reports no warnings. > > Hey! > > Thanks for the patch. > > I've had a quick look, and spotted one thing. The Git repository > includes lib/BreezeStyleSheets and lib/cmark, which are both packaged > for Guix (I'm unsure about luis-l-gist). It would be good to look at > removing/not using the copied code from kristall and using the Guix > packages instead. > > Does that make sense? > > Thanks, > > Chris From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Oct 2020 16:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.160373061322247 (code B ref 44191); Mon, 26 Oct 2020 16:44:02 +0000 Received: (at 44191) by debbugs.gnu.org; 26 Oct 2020 16:43:33 +0000 Received: from localhost ([127.0.0.1]:41085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX5am-0005mk-Qf for submit@debbugs.gnu.org; Mon, 26 Oct 2020 12:43:33 -0400 Received: from mira.cbaines.net ([212.71.252.8]:35902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX5ak-0005mc-Fs for 44191@debbugs.gnu.org; Mon, 26 Oct 2020 12:43:31 -0400 Received: from localhost (92.41.179.191.threembb.co.uk [92.41.179.191]) by mira.cbaines.net (Postfix) with ESMTPSA id 8A2C527BBF1; Mon, 26 Oct 2020 16:43:29 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 46c05ab4; Mon, 26 Oct 2020 16:43:27 +0000 (UTC) References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Mon, 26 Oct 2020 16:43:24 +0000 Message-ID: <87imaxym37.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti writes: > Hi Chris! > > Thanks for the review. > > I tried, but: > 1. breeze is a different package from the ones in the repo (url is > https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: kristall.pro (pro)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > Hi Chris! > > Thanks for the review. > > I tried, but: > 1. breeze is a different package from the ones in the repo (url is > https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to > be compiled, I can try to package it. > 2. there are files in lib/cmark that are not present in the cmark > distribution (thei are .h files generated by their .h.in), so I cannot > extract our cmark source directly > - I tried keeping those files, but build fails [[failed-build]]. Not = sure if it's > a patched version or if it's an older one. But I can investigate > probably I think you might be overcomplicating this. kristall shouldn't be trying to build cmark, as it's a library, it should just be linking against it. Therefore, you shouldn't need to keep the .h.in files. Making kristall use cmark, rather than the copy in the kristall source probably requires adapting/fixing src/kristall.pro. It hopefully isn't that difficult, but I don't know what this .pro file is, it also looks pretty odd in parts, especially the references to /home/felix/... ! It doesn't look like the copy of cmark in the kristall source has been modified much, which also raises the question of why there is a copy of the cmark source inside kristall? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+W/KxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xe94xAAhFeEOwS90Cse87J+jWhaY68P/x7WDqvr jY6U85/E+EmBGdaEC7o2qognlePfQV/YZK6NNiQFRTGNGAG5XlDJ1h6CukTPmLhC Ilh6RiyLgUnMKKwhvtGiw4ahoR8qskEkuX7pKzVwO6fY95p1/Ffj6OWCh+Y3Wn9p uV3CSUyjsIu/r0JFAAfcpzyN7Ov2K00T8h1s1bDskEyBm7qhhbwzHZhQYCZgfIXg /+EJfhtNd/nATpkPdz1eoXs+9d96hIbxqUio0O3R1GmPTwP+gmWNIaE4oWoWA8wo zh61Y18ntYq14Zgqnz2KlPZTRauG6cvsExY4MaAu729TWcYSOGxuLk6Mf/2AugmW S6mvJ1w1ECscruELjvwJndy7PcOjOuJKdmPoxDIUgcSsCefHeyLraKjB5nPkM4/P ASNyllFHEd7R+heFp3P0LfGANxTbpf9gYJWIOG/gsVQH+U2a+3g3lng7Sbpaikqu 5xvD3EAI83dlX2JaR7JUWfNXDk2RoAvJUhfd0boDzeTBp1O0XQXSH+nmI6pRQhnA LbZV6AcjIz48I/laJQYCuhkv6JoWcFnJFVmrhbHkRCmjDLzU6KuczWtMNNAzHPoy cXZcmV+WeIY6hNtmwmlJ3Xv77sxbL8HbeERV/TRB9fwB6Scfobc20i7qbRxELD+w hl85+TTM8sI= =L3K9 -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Oct 2020 18:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Baines Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.16037359696626 (code B ref 44191); Mon, 26 Oct 2020 18:13:02 +0000 Received: (at 44191) by debbugs.gnu.org; 26 Oct 2020 18:12:49 +0000 Received: from localhost ([127.0.0.1]:41260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX6zB-0001io-G9 for submit@debbugs.gnu.org; Mon, 26 Oct 2020 14:12:49 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:54066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kX6z9-0001iZ-EB for 44191@debbugs.gnu.org; Mon, 26 Oct 2020 14:12:48 -0400 Received: by mail-wm1-f46.google.com with SMTP id d78so12618714wmd.3 for <44191@debbugs.gnu.org>; Mon, 26 Oct 2020 11:12:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=qEnMzPhHekX3qgkAY0yD4rIcx0hcx4ynWXCQtLhxbe8=; b=CNYpjz0tz/RQMKz3fMbdWRWSfjwhVHO2WenqleZd2wMp8alfKqkBHp/QUd45hyBZNs KcsVyWONDug7ViFqxaHFzAj+qv/j4zZnrw2+pVRaBT7CZMzIxCMbp9aycqfaUbWY49uq ekews2sK0pRaxX7yye6gtIqdItALbUcs8Y1hjwtadOLonAZFcNHpuGLrwvc50IpUESV1 /pozh41vk3hApjGcfqmx1un2MjrtK5ClKH5LI1bv4D3IZeKrYmrvkiSggH4azJyaLlrp rGDNojWKT0xN5rbZ/riGsNY4GfvM12RgbejuXM51dABWSlcIAKZM3wtnsOnn5S2HCqOn r9HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=qEnMzPhHekX3qgkAY0yD4rIcx0hcx4ynWXCQtLhxbe8=; b=VkpfZAa4ZYjveYOX1n33Y7MFog4oiSXy8w7JmYbOsZaTlHzf907JE8ftQI8GirRKdr 1GmZoOMgBx8J2gP8aA17aJd1e78q+cGq+cD9EmgHmkPM/hqg2u91OIG4afF2VDcVZWYM mmGvSy6J88k+sv+XlPY1vKPUEV//fZj4mrZN7TQS+ahhB/EebeB9tZQ2mQCfi57MBCcd vh0KZaiF44pASqARR7tcy4uVa9wb7cVHTj7LGYmvBumfPD5sgzCLYkhFI8ltA8j8uNoz DxRFt5dK3w8AdCSa5jXZZYe4Xz15tO+2Bmw6F7bDs6DKSWxxbqL2FOXTmhYQN5UM9DEd jgwg== X-Gm-Message-State: AOAM530h6IYxTu9wb1cyXfwy9RdwbqwVFkQF54YBsTPBVEBsZYes2LAy UMJVAwig7y/GiO4dJfUSaQ8= X-Google-Smtp-Source: ABdhPJwAkbzMmQoniKD87rLDpvtMTuNwF/3qn6610HX04kjK+rnLGca31+6DQI6zG7rU2uQaGjzNuA== X-Received: by 2002:a7b:c181:: with SMTP id y1mr17132809wmi.58.1603735961634; Mon, 26 Oct 2020 11:12:41 -0700 (PDT) Received: from guixSD (host-87-8-141-238.retail.telecomitalia.it. [87.8.141.238]) by smtp.gmail.com with ESMTPSA id q7sm23142800wrr.39.2020.10.26.11.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 11:12:40 -0700 (PDT) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87imaxym37.fsf@cbaines.net> References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> Date: Mon, 26 Oct 2020 19:12:39 +0100 Message-ID: <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Just linking to it would be easier. However, the file markdownrenderer requires access to implementation details of the struct cmark_node (it includes the file node.h, which is not installed by cmark, [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: kristall.pro (pro)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.46 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.46 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) Just linking to it would be easier. However, the file markdownrenderer requires access to implementation details of the struct cmark_node (it includes the file node.h, which is not installed by cmark, and fails with: ../src/renderers/markdownrenderer.cpp:83:23: error: invalid use of in= complete type =E2=80=98const cmark_node {aka const struct cmark_node}=E2=80= =99) I replaced references such as `node.as.heading.level` to `cmark_node_get_heading_level(node)` and so on. I could compile it (by also adding -I/gnu/store and -lcmark to the build process), and markdown seems to be working (tested here gemini://tilde.team/~supernova/blog/this-is-a-test-of-using-markdown.md). I'm going to send a patch to the author, linking to this mail exchange. I'll let you know. Christopher Baines writes: > Nicol=C3=B2 Balzarotti writes: > >> Hi Chris! >> >> Thanks for the review. >> >> I tried, but: >> 1. breeze is a different package from the ones in the repo (url is >> https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to >> be compiled, I can try to package it. >> 2. there are files in lib/cmark that are not present in the cmark >> distribution (thei are .h files generated by their .h.in), so I cannot >> extract our cmark source directly >> - I tried keeping those files, but build fails [[failed-build]]. Not= sure if it's >> a patched version or if it's an older one. But I can investigate >> probably > > I think you might be overcomplicating this. kristall shouldn't be trying > to build cmark, as it's a library, it should just be linking against > it. Therefore, you shouldn't need to keep the .h.in files. > > Making kristall use cmark, rather than the copy in the kristall source > probably requires adapting/fixing src/kristall.pro. > > It hopefully isn't that difficult, but I don't know what this .pro file > is, it also looks pretty odd in parts, especially the references to > /home/felix/... ! > > It doesn't look like the copy of cmark in the kristall source has been > modified much, which also raises the question of why there is a copy of > the cmark source inside kristall? From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Oct 2020 13:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Baines Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.16038049437357 (code B ref 44191); Tue, 27 Oct 2020 13:23:01 +0000 Received: (at 44191) by debbugs.gnu.org; 27 Oct 2020 13:22:23 +0000 Received: from localhost ([127.0.0.1]:43298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXOva-0001uV-3V for submit@debbugs.gnu.org; Tue, 27 Oct 2020 09:22:23 -0400 Received: from mail-wr1-f48.google.com ([209.85.221.48]:39992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXOvW-0001u2-90 for 44191@debbugs.gnu.org; Tue, 27 Oct 2020 09:22:17 -0400 Received: by mail-wr1-f48.google.com with SMTP id h5so1881288wrv.7 for <44191@debbugs.gnu.org>; Tue, 27 Oct 2020 06:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=Gaawjbe8hdWWxotgose/cFbIBgJ6XGodIodsbBiPsxQ=; b=ncCHzAvmBJlwRyfgcTp4KB1aLqMzoA+wnAlFvYtk+wOsmSjqhJ9Mh8wGmgQAZsd74F BlkpOereyFhczDpubeJX1s1oaSGj2XQQgNw8+TybfuZ7xHf3JP6M17qN6+z9O56byAX8 Y4iLLzr0Ko5tf3Zseo/YvihyhJFgpwpVYXVAbDy5OWkZtmvJa4ugzdFIAEvG3aU/P4QE ArrjmK+DKCeKNJMR2fX/7ngJja0rlTltOS7f89mbV7s1GKIqryUKaJWpYw05fUlxzfGi PnWo5eaEV5WkFU14bwZwV1uK4MM0AcxLQSiJ7EjaNJDPopRM9taS+wCBySqZr57QXui0 j+3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=Gaawjbe8hdWWxotgose/cFbIBgJ6XGodIodsbBiPsxQ=; b=NLBB9vHLBHB0R737mZT+41VvLwcvvyqtEPtEeSRFFAj+ukibk+p37WughtR/kMI2Is zKmAXj1fhHQvsCwFjNnk2g89vk3EASUjgitH3hVsgmeBqBSANLwX7ecA+h7JUcoMVfc7 usAHzHZm+wI9QztquDwXyV3HtALKAaB6L6jr2qGidiCiIt13GaWSyrMbb6hgxFfFJ3FO m32CpVsLbt23cRruuQFsGNLy+M3bHtpG5p1qidOaukBxQ1XC9F+tKW3/BGkAPGX7N+1b e25G5zrr7bDV1iH1QJpAzkb9oprKuWEd+z7S3uQoCXKSho8o51+7DJOzDomWT+rmW5IA tsvg== X-Gm-Message-State: AOAM532AQij5lBkQleqmCLXSqhJshaVCsIZ1ROKHW0lrAlwrBZIm0sRE J2wWTUywkQr46ugiKjg9dIM= X-Google-Smtp-Source: ABdhPJwfNq2u7z6RdTQeqDBjgnEEVYImV1pJZaGYscb6EBeVJAVeNS8Rl2Ia4q4ufgXBhiDWb0HVMQ== X-Received: by 2002:adf:a354:: with SMTP id d20mr3069188wrb.29.1603804928409; Tue, 27 Oct 2020 06:22:08 -0700 (PDT) Received: from guixSD (host-87-8-141-238.retail.telecomitalia.it. [87.8.141.238]) by smtp.gmail.com with ESMTPSA id x21sm1863405wmi.3.2020.10.27.06.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 06:22:07 -0700 (PDT) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 27 Oct 2020 14:22:05 +0100 Message-ID: <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi! The PR has been merged (so now I can link to cmark just fine). Find attached the new patches. I'm unsure about BreezeStyleSheets, as the install instructions specifically say: Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: kristall.pro (pro)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.48 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.48 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi! The PR has been merged (so now I can link to cmark just fine). Find attached the new patches. I'm unsure about BreezeStyleSheets, as the install instructions specifically say: #+begin_quote Copy breeze.qrc, dark.qss, light.qss and the dark and light folders into your project directory and add the qrc file to your project file. #+end_quote Note on fonts: I'm using pre-built ttf as I'm not able to build them (lot of javascript required) Let me know! Nicol=C3=B2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-font-openmoji.patch Content-Transfer-Encoding: quoted-printable >From 4fc57649d12f0ef6e3e5b1c01ce0e2ff5a4382e1 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 27 Oct 2020 14:10:06 +0100 Subject: [PATCH 1/2] gnu: Add font-openmoji * gnu/packages/fonts.scm (font-openmoji): New variable. --- gnu/packages/fonts.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f39c529beb..8982551dda 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -37,6 +37,7 @@ ;;; Copyright =C2=A9 2020 Zhu Zihao ;;; Copyright =C2=A9 2020 Simen Endsj=C3=B8 ;;; Copyright =C2=A9 2020 Tim Van den Langenbergh +;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -1430,6 +1431,30 @@ emphasis while still being readable.") (define-public font-open-dyslexic (deprecated-package "font-open-dyslexic" font-opendyslexic)) =20 +(define-public font-openmoji + (package + (name "font-openmoji") + (version "12.4.0") + (source + (origin + (method url-fetch/zipbomb) + (uri + ;; It's also possible to build openmoji from source, but requires + ;; hundreds of libraries still not available in guix + (string-append "https://github.com/hfg-gmuend/openmoji/" + "releases/download/" version + "/openmoji-font.zip")) + (sha256 + (base32 + "0wvvg5vnc950h8v23wfgjyi7rv89mgm5hqq6viqv0bxcc3azglxb")))) + (build-system font-build-system) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://openmoji.org") + (synopsis "Emojis for designers, developers and everyone else") + (description "OpenMoji provides emojis for designers, developers and +everyone else.") + (license license:cc-by-sa4.0))) + (define-public font-dosis (package (name "font-dosis") --=20 2.28.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-Add-kristall.patch Content-Transfer-Encoding: quoted-printable >From 23527b87e86dbbf92c37718dc449d8ad0a8d3758 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 27 Oct 2020 14:18:23 +0100 Subject: [PATCH 2/2] gnu: Add kristall. * gnu/packages/web-browsers.scm (kristall): New variable. --- gnu/packages/web-browsers.scm | 99 +++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb49a8fdea..30bc9ca9cf 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -60,6 +61,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -341,6 +343,103 @@ access.") (properties `((lint-hidden-cve . ("CVE-2016-9179")))) (license license:gpl2))) =20 +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit "bf5b2ecd0fde117d550adeadee48d74034ed2cdb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zakhxr30n7dawig7c8mizaqxwnqn3a7pz0yi7hc55nn7n7iyr6l")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled programs. + (with-directory-excursion "lib" + ;; Delete extra (bundled) files + (map (lambda (dir) (delete-file-recursively dir)) + ;; "BreezeStyleSheets" + '("cmark"))) + ;; Contains executable of 7z and pscp + (delete-file-recursively "ci/tools") + ;; Remove bundled fonts + (delete-file-recursively "src/fonts") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + ;; runs git describe --tags by default + (lambda _ + ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 = to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=3D).*" _ match) + (string-append match ,version "\n"))))) + (add-before 'build 'replace-bundled-cmark + (lambda _ + (substitute* "src/kristall.pro" + (("(^include\\(.*cmark.*)" _ match) + (string-append + "LIBS +=3D -I" (assoc-ref %build-inputs "cmark") " -lcm= ark"))) + (substitute* "src/renderers/markdownrenderer.cpp" + (("(include.*node.*)" _ match) + (string-append "// " match))))) + (add-before 'build 'replace-bundled-fonts + (lambda _ + (let ((noto (assoc-ref %build-inputs "font-google-noto")) + (openmoji (assoc-ref %build-inputs "font-openmoji")) + (srcdir "/share/fonts/truetype/") + (outdir "src/fonts/")) + (mkdir-p outdir) + (copy-file + (string-append noto srcdir "NotoColorEmoji.ttf") + (string-append outdir "NotoColorEmoji.ttf")) + (copy-file + (string-append openmoji srcdir "OpenMoji-Color.ttf") + (string-append outdir "OpenMoji-Color.ttf"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (inputs + `(("cmark" ,cmark) + ("font-google-noto" ,font-google-noto) + ("font-openmoji" ,font-openmoji) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://github.com/MasterQ32/kristall") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, http, https, gopher, finger), +bookmarks, TSL certificates management, outline generation, tabbed interfa= ce +and more.") + (license license:gpl3)))) + (define-public qutebrowser (package (name "qutebrowser") --=20 2.28.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > Just linking to it would be easier. However, the file markdownrenderer > requires access to implementation details of the struct cmark_node > (it includes the file node.h, which is not installed by cmark, and fails > with: ../src/renderers/markdownrenderer.cpp:83:23: error: invalid use of = incomplete type =E2=80=98const cmark_node {aka const struct cmark_node}=E2= =80=99) > > I replaced references such as `node.as.heading.level` to > `cmark_node_get_heading_level(node)` and so on. I could compile it (by > also adding -I/gnu/store and -lcmark to the build process), and markdown > seems to be working (tested here > gemini://tilde.team/~supernova/blog/this-is-a-test-of-using-markdown.md). > > I'm going to send a patch to the author, linking to this mail exchange. > > I'll let you know. > > Christopher Baines writes: > >> Nicol=C3=B2 Balzarotti writes: >> >>> Hi Chris! >>> >>> Thanks for the review. >>> >>> I tried, but: >>> 1. breeze is a different package from the ones in the repo (url is >>> https://github.com/Alexhuszagh/BreezeStyleSheets). It does not seems to >>> be compiled, I can try to package it. >>> 2. there are files in lib/cmark that are not present in the cmark >>> distribution (thei are .h files generated by their .h.in), so I cannot >>> extract our cmark source directly >>> - I tried keeping those files, but build fails [[failed-build]]. No= t sure if it's >>> a patched version or if it's an older one. But I can investigate >>> probably >> >> I think you might be overcomplicating this. kristall shouldn't be trying >> to build cmark, as it's a library, it should just be linking against >> it. Therefore, you shouldn't need to keep the .h.in files. >> >> Making kristall use cmark, rather than the copy in the kristall source >> probably requires adapting/fixing src/kristall.pro. >> >> It hopefully isn't that difficult, but I don't know what this .pro file >> is, it also looks pretty odd in parts, especially the references to >> /home/felix/... ! >> >> It doesn't look like the copy of cmark in the kristall source has been >> modified much, which also raises the question of why there is a copy of >> the cmark source inside kristall? --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Oct 2020 20:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.16041760255599 (code B ref 44191); Sat, 31 Oct 2020 20:28:02 +0000 Received: (at 44191) by debbugs.gnu.org; 31 Oct 2020 20:27:05 +0000 Received: from localhost ([127.0.0.1]:34643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYxSq-0001SE-Jb for submit@debbugs.gnu.org; Sat, 31 Oct 2020 16:27:05 -0400 Received: from mira.cbaines.net ([212.71.252.8]:46472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYxSl-0001Rk-Bw for 44191@debbugs.gnu.org; Sat, 31 Oct 2020 16:27:03 -0400 Received: from localhost (188.28.126.167.threembb.co.uk [188.28.126.167]) by mira.cbaines.net (Postfix) with ESMTPSA id 7C49C27BBF2; Sat, 31 Oct 2020 20:26:58 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 784c2a16; Sat, 31 Oct 2020 20:26:56 +0000 (UTC) References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Sat, 31 Oct 2020 20:26:55 +0000 Message-ID: <87sg9uxhtc.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti writes: > The PR has been merged (so now I can link to cmark just fine). Great, that's good news :) Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: kristall.pro (pro)] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > The PR has been merged (so now I can link to cmark just fine). Great, that's good news :) > Find attached the new patches. I've gone ahead and pushed the font-openmoji package. I tweaked the synopsis and description a bit to try and make them more objective, and removed the comment about building the font, as that could (hopefully) get out of date. > I'm unsure about BreezeStyleSheets, as the install instructions > specifically say: > > #+begin_quote > Copy breeze.qrc, dark.qss, light.qss and the dark and light folders into > your project directory and add the qrc file to your project file. > #+end_quote Given this is a stylesheet, rather than cmark, I don't think it's a blocker, although I do think it would be neater to have a package for it. I've made some more comments below, and I wanted to enquire about exactly how the fonts are used, but I think this is pretty much ready to merge. +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit "bf5b2ecd0fde117d550adeadee48d74034ed2cdb"))) You can use the commit here, so (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zakhxr30n7dawig7c8mizaqxwnqn3a7pz0yi7hc55nn7n7iyr6l")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled programs. + (with-directory-excursion "lib" + ;; Delete extra (bundled) files + (map (lambda (dir) (delete-file-recursively dir)) + ;; "BreezeStyleSheets" + '("cmark"))) + ;; Contains executable of 7z and pscp + (delete-file-recursively "ci/tools") + ;; Remove bundled fonts + (delete-file-recursively "src/fonts") + #t))) I'd rework this so that rather than saying what's deleted, it says what's kept, as that's the important thing. So something like: (modules '((srfi srfi-1) (ice-9 ftw) (guix build utils))) (snippet '(let ((preserved-lib-files '("BreezeStyleSheets" "luis-l-gist"))) (with-directory-excursion "lib" (for-each (lambda (directory) (simple-format #t "deleting: ~A\n" directory) (delete-file-recursively directory)) (lset-difference string=3D? (scandir ".") (cons* "." ".." preserved-lib-files)))) ;; Contains executable of 7z and pscp (delete-file-recursively "ci/tools") ;; Remove bundled fonts (delete-file-recursively "src/fonts") #t)))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + ;; runs git describe --tags by default This comment above is probably unnecessary, the one below is better. + (lambda _ + ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 = to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=3D).*" _ match) + (string-append match ,version "\n"))))) I think it's still practice to have #t at the end of phases, so I'd add that in here. + (add-before 'build 'replace-bundled-cmark This doesn't really replace the bundled cmark, it's stripped out by the source snippet. I'd say something like dont-use-bundled-cmark. + (lambda _ + (substitute* "src/kristall.pro" + (("(^include\\(.*cmark.*)" _ match) + (string-append + "LIBS +=3D -I" (assoc-ref %build-inputs "cmark") " -lcm= ark"))) + (substitute* "src/renderers/markdownrenderer.cpp" + (("(include.*node.*)" _ match) + (string-append "// " match))))) As above with #t at the end. + (add-before 'build 'replace-bundled-fonts + (lambda _ + (let ((noto (assoc-ref %build-inputs "font-google-noto")) + (openmoji (assoc-ref %build-inputs "font-openmoji")) + (srcdir "/share/fonts/truetype/") + (outdir "src/fonts/")) + (mkdir-p outdir) + (copy-file + (string-append noto srcdir "NotoColorEmoji.ttf") + (string-append outdir "NotoColorEmoji.ttf")) + (copy-file + (string-append openmoji srcdir "OpenMoji-Color.ttf") + (string-append outdir "OpenMoji-Color.ttf"))) + #t)) I'd maybe use symlink rather than copy file, since you want the fonts to be used from the respective packages in the store, however, is this just to satisfy the build system? It looks to me like the XDG_DATA_DIRS wrapping is probably what'll make the fonts work at runtime (if anything)? + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (inputs + `(("cmark" ,cmark) + ("font-google-noto" ,font-google-noto) + ("font-openmoji" ,font-openmoji) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://github.com/MasterQ32/kristall") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, http, https, gopher, finger), +bookmarks, TSL certificates management, outline generation, tabbed interfa= ce +and more.") I think this is good, but I'd change the end to "outline generation and tabbed interface.", "and more" is a bit too unnecessary/unobjective for me. + (license license:gpl3)))) The README suggests the intention is gpl3+, additionally, with the bundled copy of BreezeStyleSheets it would be good to mention expat here as well, so something like: (license (list license:gpl3+ license:expat)) ; for BreezeStyleSheets --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+dyI9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XccHQ/9GwA+yJgolNGCsjXHKm0l2iXW68CPVpke LlDuZe2xa32mr7e86f/M0w18RvPNP2xcMchIxwVATpuohiqQD83O/6RJ8yjxICPD SsBBuGQpNH26zc/tQj+zWfAX262DepeuGU8+6ANvGk5qxlLf1L/1sUA7RwSiysTH LdPesiVoL8H/FT0uE8r0YnI/yvShSuE/qGQSBStNISIgivuPec1Vwzhu59HiwcD0 xiqE7J7HgDUO1HMn7XOQAQhLJFscq3twDtZ0+UNgrT288EzgsGbThr29YCgnNt/1 1S+jAuqXth/vujKJUG5KHqje5dhGnrg9P0B28MTsM59/KO6pJxzdetZfDmZCUP8P PnqA+4NCRG6Reb7tDcZK2927o3reb8eUu44/ixu/prF7vT3grSuAkNTtBLygF/Kb zYFiM0TIIgcaqsPLfQXYbpzmBZQx4nQpzVW6owT5bt+jTLQpuctrw+TJjd5CcKMR xuLvtqqe4WaM5cbnxvugj0AN3hHr6cEv2pmlROZUirT7zr3JRWqFOJel2Pw4Uu2g IvEtVZA1d81rHV84gRj3AWK0wCBmDWVAvheOb1+HVCXxylbZRcQlSWjCfFcTvDJO HDLqO/EKAL4qXwDRJBFgV49REizgAqzJh2LR+joOy1TPf6WdmxhoKI1wRHhelbsu uI4WQT3a/v0= =q8ha -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Nov 2020 10:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Baines Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.16043984614804 (code B ref 44191); Tue, 03 Nov 2020 10:15:02 +0000 Received: (at 44191) by debbugs.gnu.org; 3 Nov 2020 10:14:21 +0000 Received: from localhost ([127.0.0.1]:43478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZtKW-0001FQ-PP for submit@debbugs.gnu.org; Tue, 03 Nov 2020 05:14:21 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:40441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kZtKU-0001FA-5x for 44191@debbugs.gnu.org; Tue, 03 Nov 2020 05:14:19 -0500 Received: by mail-wm1-f41.google.com with SMTP id k18so12180470wmj.5 for <44191@debbugs.gnu.org>; Tue, 03 Nov 2020 02:14:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=FEMfCPfDgBsZ3kjkxoV3WK6NSP5OmbZ52+5rW0bOPcw=; b=C+aduZaYEBvKcPsWJ0/iw0e0HYVKMIg2w92MjjC7JWJNSB/R82yt8iLWy2gT9GOngD wIKvsH7EOVjs9X8c5DK1vTpaVU0gB1NOKI7ZyPXoFZRxNQN2BXP1jkYike5lxtySqcOH bP2PONp57JbTYqneREWTBJgdC8GS9IkpEZiYx2PeUmB5kNNOskxAYkOt9prXnpVqxnsO pKBkAE8C6OGGuvi/0A0h7X46EQCOTyazr3DaROSDrc6IwILXeICjwnTiet7xJcQfYtB6 5nvQGPkatS4uHwDqHXMdYcefwN4eiZ0Bvc3P5TR2rVhHW8EKiiEtAlHRsxmui54l/aGw hThA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=FEMfCPfDgBsZ3kjkxoV3WK6NSP5OmbZ52+5rW0bOPcw=; b=UAGtCa7BSbXCKc87HyqcZaBHAYet4mbrzvhyGqVMsggt0hR5dKSd1AFK/WaDxC0i5B I31y15MqGcT1DTYHc/FuiCthmamtpW0xDMV9iM3vwvAUECDBINjkrue3mkuH6RNres4m cMpO+Vp8wQ8bqQFdcgmUA8O3svZBHUh/O0lOb5gJXvpx8NmDxp3PKtaHcKVHQ3h/7Oeb 1h+xW0FsbkS7hVXXGSEqRocpU/Ytc6890sYuwsn7oGoRqtvxi6yc5JKgJcK6F1aG6Bl4 5KEyr8+vqxYOYwLlVBkYcNIrqvBoravENl2Rd501PluZOCZTUFvo/Y/6dnlWjD0nJeu6 I+6w== X-Gm-Message-State: AOAM531WfRx/oQNIN/2jWAAr4x5kWqAH7YCL861v3jsUxYtcepHyelOS 1Pk84+CK47et8jda2f8jeJE= X-Google-Smtp-Source: ABdhPJz5ZBkz/lPBY8xE0kx+lKgMsMzt7El6imBVzFxgHfvaWQHyXMrdBL+PF87+g/FguVY9JCtmkA== X-Received: by 2002:a1c:1906:: with SMTP id 6mr2632173wmz.87.1604398452316; Tue, 03 Nov 2020 02:14:12 -0800 (PST) Received: from guixSD (host-87-8-141-238.retail.telecomitalia.it. [87.8.141.238]) by smtp.gmail.com with ESMTPSA id d8sm2270981wmb.11.2020.11.03.02.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 02:14:11 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87sg9uxhtc.fsf@cbaines.net> References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87sg9uxhtc.fsf@cbaines.net> Date: Tue, 03 Nov 2020 11:14:10 +0100 Message-ID: <87k0v2ycgd.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Christopher Baines writes: > > Given this is a stylesheet, rather than cmark, I don't think it's a > blocker, although I do think it would be neater to have a package for > it. > Would it be better to at least pass it's origin as an input? #+begin_src scheme ("breeze-stylesheet" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/Alexhuszagh/BreezeStyleSheets") (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) (file-name (git-file-name name version)) (sha256 (base32 "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))) #+end_src I'm ok with making a package for it, but in that case I'm not sure what to do. I think I'd use the copy-build-system, right? Should the package be hidden? > I've made some more comments below, and I wanted to enquire about > exactly how the fonts are used, but I think this is pretty much ready to > merge. > > I'd maybe use symlink rather than copy file, since you want the fonts to > be used from the respective packages in the store, however, is this just > to satisfy the build system? It looks to me like the XDG_DATA_DIRS > wrapping is probably what'll make the fonts work at runtime (if > anything)? Regarding fonts, I tried removing both from the inputs, and emojis at this page [1] rendered just fine. Should I just remove them from the inputs and let the user install them? The code tries to load them with the relative path: #+begin_src cpp // Provide OpenMoji font for a safe fallback QFontDatabase::addApplicationFont(":/fonts/OpenMoji-Color.ttf"); QFontDatabase::addApplicationFont(":/fonts/NotoColorEmoji.ttf"); #+end_src This function fails silently (The function returns -1 if the font could not be loaded.) and the error code is not checked, so we don't even need to patch kristall source for this. Let me know and thanks again, Nicol=C3=B2 [1] https://unicode.org/Public/emoji/1.0/emoji-data.txt From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Nov 2020 19:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.1605038281303 (code B ref 44191); Tue, 10 Nov 2020 19:58:02 +0000 Received: (at 44191) by debbugs.gnu.org; 10 Nov 2020 19:58:01 +0000 Received: from localhost ([127.0.0.1]:38976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcZmD-0008WV-BZ for submit@debbugs.gnu.org; Tue, 10 Nov 2020 14:58:01 -0500 Received: from mira.cbaines.net ([212.71.252.8]:39638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcZmB-0008WN-Jx for 44191@debbugs.gnu.org; Tue, 10 Nov 2020 14:58:00 -0500 Received: from localhost (188.28.119.85.threembb.co.uk [188.28.119.85]) by mira.cbaines.net (Postfix) with ESMTPSA id 6F46F27BBF6; Tue, 10 Nov 2020 19:57:58 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 358183be; Tue, 10 Nov 2020 19:57:56 +0000 (UTC) References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87sg9uxhtc.fsf@cbaines.net> <87k0v2ycgd.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <87k0v2ycgd.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Tue, 10 Nov 2020 19:57:51 +0000 Message-ID: <87ft5hougw.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > Christopher Baines writes: >> >> Given this is a stylesheet, rather than cmark, I don't think it's a >> blocker, although I do think it would be neater to have a package for >> it. >> > Would it be better to at least pass it's origin as an input? > > #+begin_src scheme > ("breeze-stylesheet" > ,(origin > (method git-fetch) > (uri > (git-reference > (url "https://github.com/Alexhuszagh/BreezeStyleSheets") > (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) > (file-name (git-file-name name version)) > (sha256 > (base32 > "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))) > #+end_src > > I'm ok with making a package for it, but in that case I'm not sure what > to do. I think I'd use the copy-build-system, right? Should the package > be hidden? I don't mind, I think it's OK as is. >> I've made some more comments below, and I wanted to enquire about >> exactly how the fonts are used, but I think this is pretty much ready to >> merge. >> >> I'd maybe use symlink rather than copy file, since you want the fonts to >> be used from the respective packages in the store, however, is this just >> to satisfy the build system? It looks to me like the XDG_DATA_DIRS >> wrapping is probably what'll make the fonts work at runtime (if >> anything)? > > Regarding fonts, > I tried removing both from the inputs, and emojis at this page [1] > rendered just fine. > Should I just remove them from the inputs and let the user install them? > The code tries to load them with the relative path: > > #+begin_src cpp > // Provide OpenMoji font for a safe fallback > QFontDatabase::addApplicationFont(":/fonts/OpenMoji-Color.ttf"); > QFontDatabase::addApplicationFont(":/fonts/NotoColorEmoji.ttf"); > #+end_src > > This function fails silently (The function returns -1 if the font could > not be loaded.) and the error code is not checked, so we don't even need > to patch kristall source for this. If there's an expectation or a use in making sure these fonts are available, it would be good to patch the relative paths to be the absolute paths within the font-openmoji package. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+q8L9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfWqxAAsQ0fQ1536/c/794nMRRYnTgXniYT+1VB Gnwe18SvlMT+No4GhVPlcU2+bJxd+/dyNJbeNmMEGm8tFxgbf948n64SvEYjTCrA hg7toI3LYwF0HqD5jvaAhC6PTydGhb/OkuudldtAIgek4GZoCZQ1KM9huOJQj8PL SOkZMD8tsBtZ2MKqoYI2SduKK/LI/eB2Zo4vxO73sX3lYsAFEN6twGLMIUENJylr E17HX2d1/IVgvE8C1K+9JfWmQX8l6Bo7ic98LI0U5yXZsTVWQRxpkIe/ckGv6ZE4 jRA5JhG+NDue0rOGCQKWLo+exEEorvplF0IcGESXDyo15DsYDWFoRvmpBLR21zJ8 255S2/C2qFGhaN6X6INbmm/swcEvkHSNw2DqdFh7FzzNK6NIOJyJTtkMEpcI4yKA 2kGtQLnPp3XFvhMTEj8yQPxmTqHdAE+basMUshKn7W2Oj+qugYgj1xLpfSSqgml/ h4UOVvyTe1mNFkTQtKEOGoP45EfyzSoRQwTt3dZw9ldvJ8SIDC5UO2CScICeobqv 7IwVsXgG5O5UWqTIEEzC2BSCEui94l0fmAX1h7cniWLzHL1xAUj9uf3dRSysOxul 3AYqjxM6x/z/mb+5FkdfAKY7zI0qcxUfrPNoftc8elRSJnUG2kP9bT8TrBB/b8AY bfWJBPfvFjk= =pmCC -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#44191] gnu: Add kristall Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Nov 2020 14:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44191 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Christopher Baines Cc: 44191@debbugs.gnu.org, nicolo@nixo.xyz Received: via spool by 44191-submit@debbugs.gnu.org id=B44191.16053655741436 (code B ref 44191); Sat, 14 Nov 2020 14:53:02 +0000 Received: (at 44191) by debbugs.gnu.org; 14 Nov 2020 14:52:54 +0000 Received: from localhost ([127.0.0.1]:50214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdwv1-0000Mv-R9 for submit@debbugs.gnu.org; Sat, 14 Nov 2020 09:52:54 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:42118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdwuy-0000Mh-1x for 44191@debbugs.gnu.org; Sat, 14 Nov 2020 09:52:47 -0500 Received: by mail-wr1-f42.google.com with SMTP id l1so13526352wrb.9 for <44191@debbugs.gnu.org>; Sat, 14 Nov 2020 06:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=GRKy0y3yiHQwsVnpphdWuvmckF7ypNlBQtgsduF51O0=; b=X814RB1ElrnYfHPB2grExcpkz0qqbrbRQ9uWg/Rm3FXJ5tv1xVaejvlELKDoB53lFR iAD0Yy4ZEJPzWRmG/j1ctY0ANXwptU1Ae/rwjDcrACPJYvREEVIDJnOcnWKjmaEjQdBe mzI13B4dPsrMCdXVznb1AjpRDdpMOutRE+K8lJpIuh0zP/33dnWPrLk1OZJLhVkhwlAs a93PchT/JCSPOoC7YXm8JI0dsXmRZ3/VsdzgcjsX9SLlkp83UCnJ52+hoakMrNv1Isit LC7RCS6vWa3chdD05iH7wjReOhexiFCXFxfYU1XoeSpmYDc3yqogbkV8iSVADHvsebsa kebQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=GRKy0y3yiHQwsVnpphdWuvmckF7ypNlBQtgsduF51O0=; b=CZT4Le0V3JUtHsRt42cm3d9Wqr+RwAKZH3Nmmo5JrMAInnZK9fbxZawnJWbQFGCh/d 725mF/JgxRhTSj4IwLOMOWz2HN8GY6jlr3PWtKn1jN/MXUKGukMpPyV8oDL8OFJaFAKQ dvhdU9Y6hak07iOKcg1v16VMAckfhzN4WsZ9WdneBWfaQ46Yq5beOCsEzGSO+YWVWLDp m5Y+QLlY8WjkxQ2lL0axsiXpqx7C1mp+lckx5O3n5LCkbj6+YYWqUewQuzZen4dkebGh 9yi0Xb0dBTx3RRXZVeRXjDkJcerBAPppu3F7m/d4BM864N3oMV3/C8RZ1r1SjVImwsk4 MXSg== X-Gm-Message-State: AOAM531TaKaTpUXInYsLdW5rO3IFbZFhJIbalB/hlDsjrDRIIlDUfSO7 bn7Geq4OwvRcwWyUsLhm+mI= X-Google-Smtp-Source: ABdhPJwguEAuWXSjR0PGrZLhO1mz5m04x3cF9hvB5xQEJKXTY7xwKfdVzkBLWDQxZYOBnrVpvaVpDg== X-Received: by 2002:adf:dc47:: with SMTP id m7mr9861298wrj.21.1605365558110; Sat, 14 Nov 2020 06:52:38 -0800 (PST) Received: from guixSD (host-95-244-15-230.retail.telecomitalia.it. [95.244.15.230]) by smtp.gmail.com with ESMTPSA id 90sm15724199wrl.30.2020.11.14.06.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2020 06:52:36 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <87ft5hougw.fsf@cbaines.net> References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87sg9uxhtc.fsf@cbaines.net> <87k0v2ycgd.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87ft5hougw.fsf@cbaines.net> Date: Sat, 14 Nov 2020 15:52:35 +0100 Message-ID: <87y2j47zyk.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Chris! Sorry for the delay, here's the updated patch. I addedd breeze-stylesheet as an input, and added the phase "dont-use-bundled-fonts" that replaces relative links to absolute links to the fonts, as you [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.42 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.42 listed in wl.mailspike.net] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Chris! Sorry for the delay, here's the updated patch. I addedd breeze-stylesheet as an input, and added the phase "dont-use-bundled-fonts" that replaces relative links to absolute links to the fonts, as you suggested. I also added the copyright line I forgot. Thanks again! Nicol=C3=B2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=v2-0001-gnu-Add-kristall.patch Content-Transfer-Encoding: quoted-printable >From 08f2cf3033d763ffc0c753bbb7817cdb5484f362 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 27 Oct 2020 14:18:23 +0100 Subject: [PATCH v2] gnu: Add kristall. * gnu/packages/web-browsers.scm (kristall): New variable. --- gnu/packages/web-browsers.scm | 122 ++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb49a8fdea..11928ef696 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -13,6 +13,7 @@ ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2020 B. Wilson ;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -60,6 +62,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages lua) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -341,6 +344,125 @@ access.") (properties `((lint-hidden-cve . ("CVE-2016-9179")))) (license license:gpl2))) =20 +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zakhxr30n7dawig7c8mizaqxwnqn3a7pz0yi7hc55nn7n7iyr6l")) + (modules '((srfi srfi-1) + (ice-9 ftw) + (guix build utils))) + (snippet + '(let ((preserved-lib-files '("luis-l-gist"))) + (with-directory-excursion "lib" + (for-each + (lambda (directory) + (simple-format #t "deleting: ~A\n" directory) + (delete-file-recursively directory)) + (lset-difference string=3D? + (scandir ".") + (cons* "." ".." preserved-lib-files)))) + ;; Contains executable of 7z and pscp + (delete-file-recursively "ci/tools") + ;; Remove bundled fonts + (delete-file-recursively "src/fonts") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + (lambda _ + ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 = to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=3D).*" _ match) + (string-append match ,version "\n"))) + #t)) + (add-before 'build 'dont-use-bundled-cmark + (lambda _ + (substitute* "src/kristall.pro" + (("(^include\\(.*cmark.*)" _ match) + (string-append + "LIBS +=3D -I" (assoc-ref %build-inputs "cmark") " -lcm= ark"))) + #t)) + (add-before 'build 'dont-use-bundled-breeze-stylesheet + (lambda _ + (substitute* "src/kristall.pro" + (("../lib/BreezeStyleSheets/breeze.qrc") + (string-append + (assoc-ref %build-inputs "breeze-stylesheet") "/breeze.= qrc"))) + #t)) + (add-before 'build 'dont-use-bundled-fonts + (lambda _ + (substitute* "src/kristall.pro" + ((".*fonts.qrc.*") "")) + (substitute* "src/main.cpp" + (("/fonts/OpenMoji-Color") + (string-append + (assoc-ref %build-inputs "font-openmoji") + "/share/fonts/truetype/OpenMoji-Color")) + (("/fonts/NotoColorEmoji") + (string-append + (assoc-ref %build-inputs "font-google-noto") + "/share/fonts/truetype/NotoColorEmoji"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (inputs + `(("breeze-stylesheet" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Alexhuszagh/BreezeStyleSheets") + (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))) + ("cmark" ,cmark) + ("font-google-noto" ,font-google-noto) + ("font-openmoji" ,font-openmoji) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://kristall.random-projects.net") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, http, https, gopher, finger), +bookmarks, TSL certificates management, outline generation and tabbed +interface.") + (license (list license:gpl3+ + ;; for breeze-stylesheet + license:expat))))) + (define-public qutebrowser (package (name "qutebrowser") --=20 2.29.2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Christopher Baines writes: > Nicol=C3=B2 Balzarotti writes: > >> Christopher Baines writes: >>> >>> Given this is a stylesheet, rather than cmark, I don't think it's a >>> blocker, although I do think it would be neater to have a package for >>> it. >>> >> Would it be better to at least pass it's origin as an input? >> >> #+begin_src scheme >> ("breeze-stylesheet" >> ,(origin >> (method git-fetch) >> (uri >> (git-reference >> (url "https://github.com/Alexhuszagh/BreezeStyleSheets") >> (commit "2d595a956f8a5f493aa51139a470b768a6d82cce"))) >> (file-name (git-file-name name version)) >> (sha256 >> (base32 >> "1kvkxkisi3czldnb43ig60l55pi4a3m2a4ixp7krhpf9fc5wp294")))) >> #+end_src >> >> I'm ok with making a package for it, but in that case I'm not sure what >> to do. I think I'd use the copy-build-system, right? Should the package >> be hidden? > > I don't mind, I think it's OK as is. > >>> I've made some more comments below, and I wanted to enquire about >>> exactly how the fonts are used, but I think this is pretty much ready to >>> merge. >>> >>> I'd maybe use symlink rather than copy file, since you want the fonts to >>> be used from the respective packages in the store, however, is this just >>> to satisfy the build system? It looks to me like the XDG_DATA_DIRS >>> wrapping is probably what'll make the fonts work at runtime (if >>> anything)? >> >> Regarding fonts, >> I tried removing both from the inputs, and emojis at this page [1] >> rendered just fine. >> Should I just remove them from the inputs and let the user install them? >> The code tries to load them with the relative path: >> >> #+begin_src cpp >> // Provide OpenMoji font for a safe fallback >> QFontDatabase::addApplicationFont(":/fonts/OpenMoji-Color.ttf"); >> QFontDatabase::addApplicationFont(":/fonts/NotoColorEmoji.ttf"); >> #+end_src >> >> This function fails silently (The function returns -1 if the font could >> not be loaded.) and the error code is not checked, so we don't even need >> to patch kristall source for this. > > If there's an expectation or a use in making sure these fonts are > available, it would be good to patch the relative paths to be the > absolute paths within the font-openmoji package. --=-=-=-- From unknown Sat Sep 06 13:38:02 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Subject: bug#44191: closed (Re: [bug#44191] gnu: Add kristall) Message-ID: References: <877dqndi0f.fsf@cbaines.net> <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> X-Gnu-PR-Message: they-closed 44191 X-Gnu-PR-Package: guix-patches Reply-To: 44191@debbugs.gnu.org Date: Sat, 14 Nov 2020 16:24:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1605371042-27925-1" This is a multi-part message in MIME format... ------------=_1605371042-27925-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #44191: gnu: Add kristall which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 44191@debbugs.gnu.org. --=20 44191: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44191 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1605371042-27925-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 44191-done) by debbugs.gnu.org; 14 Nov 2020 16:23:50 +0000 Received: from localhost ([127.0.0.1]:51730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdyL8-0007G2-LM for submit@debbugs.gnu.org; Sat, 14 Nov 2020 11:23:50 -0500 Received: from mira.cbaines.net ([212.71.252.8]:42566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdyL6-0007Ft-07 for 44191-done@debbugs.gnu.org; Sat, 14 Nov 2020 11:23:49 -0500 Received: from localhost (188.28.119.104.threembb.co.uk [188.28.119.104]) by mira.cbaines.net (Postfix) with ESMTPSA id CEA1E27BBF4; Sat, 14 Nov 2020 16:23:46 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 4bb245fe; Sat, 14 Nov 2020 16:23:44 +0000 (UTC) References: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8kqab7i.fsf@cbaines.net> <87tuui1ce2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87imaxym37.fsf@cbaines.net> <87sga0n9ew.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87o8knn6rm.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87sg9uxhtc.fsf@cbaines.net> <87k0v2ycgd.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <87ft5hougw.fsf@cbaines.net> <87y2j47zyk.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines To: =?utf-8?Q?Nicol=C3=B2?= Balzarotti Subject: Re: [bug#44191] gnu: Add kristall In-reply-to: <87y2j47zyk.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Sat, 14 Nov 2020 16:23:44 +0000 Message-ID: <877dqndi0f.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 44191-done Cc: 44191-done@debbugs.gnu.org, nicolo@nixo.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Nicol=C3=B2 Balzarotti writes: > Sorry for the delay, here's the updated patch. I addedd > breeze-stylesheet as an input, and added the phase > "dont-use-bundled-fonts" that replaces relative links to absolute links > to the fonts, as you suggested. I also added the copyright line I > forgot. Thanks, I've gone ahead and pushed this as 199ebb12981e13a1a29501276bcb1675a53080b6. I did tweak the commit/hash for kristall, as I got a hash mismatch when trying to build locally, and when I fixed that, I got a cmark related compilation failure I think. I used a later commit to avoid this. I also tweaked the breeze stylesheet input, making it a native-input (just because it's only used at build time), and changed the file-name so it doesn't use the same one as the kristall checkout. Thanks again, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl+wBJBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcGvBAApihTEfQgr0XZq5w4Fuf9hKNp/KL/xx2T t47Te/zv4up0Xg4Gk9DTAw57CvVLaGqeetPdKYGUazC00FW1i4RaDX2Hvc3EMJp/ pN6Cvxti3mw53rQbWfIFK0EffYefPZRGGTW38Rma7XAPwzW1ZuDVZvJdm/TH936q jmt0+v30d219TvasRADj6JYdZmeMqUrqqPPWNJFpZqQewc3GI3QrmACFnS5AiwI4 gt6SKAGVijqhYGQ0ZJnOe+RGwSIh8J8SR7g13wBibylfx20kaJ7r7+4hbnP7fPD/ dQ+ZdKfit1KwEzDVJYZjPklzT7iPFE/DMwTMbQ4naGx9VsvGBxVuSqBYtmPc79ME fu43Sm3uMYp8hcC2UGkf+52mY38eOB9iiHKb2G2AKr4q52ID0kuLckznXBIGzWgr 5zS+FdNR8sRphGgj5ons9eDHxwCQhO/l2qYtodMDW8skJ+hyvCKdteZBwOLaz4xt xHsZvhZkEEzqrVe9eVOE7aDO08PaIT4GjJYlyk1dbd/qC6pcGFXfTTaMIorKs3nl tDAYIprvDPtJu0hHnKOl1tKIl/7pPyDO7dEWiLM85gDMtjO1n9UAZsB44nb0v4Yv VX7IJGclL85PzsDXu3gUOLgbsq+tguflVwdY/s69J+5TID3iJZ0JTfa+kI0SOBcf w0Qq1uIvoV0= =7teW -----END PGP SIGNATURE----- --=-=-=-- ------------=_1605371042-27925-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 24 Oct 2020 13:08:04 +0000 Received: from localhost ([127.0.0.1]:32938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJH4-0006iG-Rt for submit@debbugs.gnu.org; Sat, 24 Oct 2020 09:08:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:44590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kWJGz-0006i4-Qv for submit@debbugs.gnu.org; Sat, 24 Oct 2020 09:07:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kWJGz-00026E-Ly for guix-patches@gnu.org; Sat, 24 Oct 2020 09:07:53 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kWJGw-00042o-JC for guix-patches@gnu.org; Sat, 24 Oct 2020 09:07:53 -0400 Received: by mail-wr1-x434.google.com with SMTP id n18so5848271wrs.5 for ; Sat, 24 Oct 2020 06:07:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=ebRRAPEkab4wh8gZjVIJTFZpaWQYGKgxJNDQi2woUTA=; b=Gk8TGH6XqHBeF3kcmsNJ1gXPaWkw+PM1WSwWi6ERoW6miVwLOYM0Nd/dgrIU6NH2Al dCPUFIge4BgbwpPGqTuoujsBmebELVmq1nWlpNcUpdvWMCVWTXSG7ekIXsapTpWYH+CK OF1Z4lrtmabzzXRPYS+P00mVmSmgn/I+2tPcoSouHIS3z8uI+nDa4tOOZ6mFCYXZneMX UhBQkvyKHEn/MD0B7KppWjTNIgkd0dlQSaezfg9MA3hNlpi0zb6I4znCQ7+sppyPTvta 7a5kTQSTh5WgZZD9kDDP0EAr9+3Jz8huIzbdW1v1FN/hzZ91gK9vEFV6E6L6SnRzLcmZ j8IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=ebRRAPEkab4wh8gZjVIJTFZpaWQYGKgxJNDQi2woUTA=; b=sfQLTd5un4FPlltOGsZF8Ks3A8CUjRlwTenc+3GPHgXrc2Wz/zxzL4x7j6PT10UH1m N27heOMRal5XpxtnQpeP6NPLgtTd8paHeCKwQGGOIoc41tScFrNw9UVJvgb9jdL0Ic4V 2tecAHNbDrz1CXKAHxTz/fJRRR/ygJo9GvgOBJ7e3nJ4pmVlw9OBMfk16A94Q3Eogk/8 jCkn+Cp7u9IaTfBzHlzPn2jwf4wY1hrDK6FKod+L47sRfqNCBsd9yYuIrd6v+S5Y+/Hz FQHbqyeuc/Li7yaAgUwNMM0Iz9ceixsOzxapg6DiFkr8er6k2I3vsy8BDrVE6C79XTmd bHsA== X-Gm-Message-State: AOAM533PlVOIgMIrIOiRNZ8pAkVn8H0YQxaYhBGB9lKUASywW0LgHJtt u2m/UukLzLgAGXEOgM0Urv1lvMSaEWc= X-Google-Smtp-Source: ABdhPJx1LDPIBvSMC5Zk7tTx1Gx7frIj09qAfF814Fh2d/BgDgoI5ZqSzt6uDfarQ8ghb8X+LS8GFQ== X-Received: by 2002:a5d:6cae:: with SMTP id a14mr7907070wra.187.1603544868905; Sat, 24 Oct 2020 06:07:48 -0700 (PDT) Received: from guixSD (host-95-237-183-89.retail.telecomitalia.it. [95.237.183.89]) by smtp.gmail.com with ESMTPSA id x65sm10733990wmg.1.2020.10.24.06.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Oct 2020 06:07:47 -0700 (PDT) From: =?utf-8?Q?Nicol=C3=B2_Balzarotti?= To: guix-patches@gnu.org Subject: gnu: Add kristall Date: Sat, 24 Oct 2020 15:07:46 +0200 Message-ID: <8736233h7h.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=anothersms@gmail.com; helo=mail-wr1-x434.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not k [...] Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 2.0 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit Cc: nicolo@nixo.xyz X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not k [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: nixo.xyz (xyz)] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anothersms[at]gmail.com) -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi guix! This patch adds kristall, a qt browser for gemini and gopher. There were some problems with the latest tagged version (V0.3), such as directories that had to be created manually before install. I preferred to use the latest commit (as the author still does not know when a new release will happen). Let me know if it's fine. Without the wrap-qt-program icons were missing. guix lint reports no warnings. Thanks! Nicol=C3=B2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-kristall.patch Content-Transfer-Encoding: quoted-printable >From c52c3ea7297c1b11cb3dd2ca7f5a12492e42defe Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 24 Oct 2020 15:00:30 +0200 Subject: [PATCH] gnu: Add kristall. * gnu/packages/web-browsers.scm (kristall): New variable. --- gnu/packages/web-browsers.scm | 59 +++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index eb49a8fdea..f564f25f20 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -13,6 +13,7 @@ ;;; Copyright =C2=A9 2020 Raghav Gururajan ;;; Copyright =C2=A9 2020 B. Wilson ;;; Copyright =C2=A9 2020 Michael Rohleder +;;; Copyright =C2=A9 2020 Nicol=C3=B2 Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -341,6 +342,64 @@ access.") (properties `((lint-hidden-cve . ("CVE-2016-9179")))) (license license:gpl2))) =20 +(define-public kristall + ;; Fixes to the build system applied after the latest tag + ;; Use tagged release when updating + (let ((commit "b684f94f1af9a19c1a6fd70d72097a13b75e1ca6") + (revision "1")) + (package + (name "kristall") + (version (string-append "0.3-" revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MasterQ32/kristall") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0kbn98pn8iplqkg7gxx4nysvgsn1621z95ynfr2f9jhsfsgz4r0z")) + (modules '((guix build utils))))) + (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:make-flags + (list (string-append "PREFIX=3D" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no ./configure script + (delete 'check) ; no check target + (add-before 'build 'set-program-version + ;; runs git describe --tags by default + (lambda _ + ;; configure.ac relies on =E2=80=98git --describe=E2=80=99 = to get the version. + ;; Patch it to just return the real version number directly. + (substitute* "src/kristall.pro" + (("(KRISTALL_VERSION=3D).*" _ match) + (string-append match ,version "\n"))))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "kristall")) + #t))))) + (inputs + `(("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg))) + (home-page "https://github.com/MasterQ32/kristall") + (synopsis "Small-internet graphical client") + (description "Graphical small-internet client with with many features +including multi-protocol support (gemini, http, https, gopher, finger), +bookmarks, TSL certificates management, outline generation, tabbed interfa= ce +and more.") + (license license:gpl3)))) + (define-public qutebrowser (package (name "qutebrowser") --=20 2.28.0 --=-=-=-- ------------=_1605371042-27925-1--