From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4AjgNpzC0l6caAAA0tVLHw (envelope-from ) for ; Sat, 30 May 2020 20:31:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id MKeWMpzC0l5tcQAAbx9fmQ (envelope-from ) for ; Sat, 30 May 2020 20:31:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 112E2940308 for ; Sat, 30 May 2020 20:31:24 +0000 (UTC) Received: from localhost ([::1]:44994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jf88Y-0002wh-W8 for larch@yhetil.org; Sat, 30 May 2020 16:31:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jf88N-0002wV-Bg for guix-devel@gnu.org; Sat, 30 May 2020 16:31:11 -0400 Received: from knopi.disroot.org ([178.21.23.139]:48440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jf88K-00080P-EO for guix-devel@gnu.org; Sat, 30 May 2020 16:31:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 268EF55F72; Sat, 30 May 2020 22:31:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b7mge6Wy6IHH; Sat, 30 May 2020 22:31:03 +0200 (CEST) Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1590870663; bh=9PFEvB/NpHCyIhTRLf9jYIyrp64JvJNf/nTI6+cUClE=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=FeupccdiWudwGMx8Lox9JbxnawY7yTtNMzDSIS/jNdJlR26VEHPNsrJvIQShDyGJc pEM2/8RN2JM+agPUaP/cNrb/0/far4oky4Gm7qUrfx9L4fl6Bk6jMYJK6sodktb+Fp StILp9bJYoNCmfDZx8ApVfIAj/ivptBcaoviHfzwvyHwSqK9KDQzTfG36Kwnr7qx2e q3+cU0/r3mENEsIxEi4wDoVj1IOxhTyjcu2oV6mwgV2nVJBaT6QQkVNsCI+maPJwTP 0MQDvXd0EV+LpsMS8ubJ5Bijb7BND4y56Eej5nCor7Q1prmIsqx2r5Yy2H061MAben wAr4eaM35nFmw== From: Raghav Gururajan To: guix-devel@gnu.org References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Message-ID: <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> Date: Sat, 30 May 2020 16:30:18 -0400 Mime-Version: 1.0 In-Reply-To: <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="BSedVljn3IF0wVmooIUBmDLwOzBozxcyA" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/30 16:31:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=Feupccdi; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: trmzSOX4goFL This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --BSedVljn3IF0wVmooIUBmDLwOzBozxcyA Content-Type: multipart/mixed; boundary="KLCGqZhMOEspu2HkjLL3THx1i165f6vnu"; protected-headers="v1" From: Raghav Gururajan To: guix-devel@gnu.org Cc: =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Danny Milosavljevic , Tobias Geerinckx-Rice Message-ID: <1742d1f9-43ed-83a5-1354-bf1c94c2f679@disroot.org> Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> In-Reply-To: <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> --KLCGqZhMOEspu2HkjLL3THx1i165f6vnu Content-Type: multipart/mixed; boundary="------------213E8FBE62218B83262F0FA5" Content-Language: en-US This is a multi-part message in MIME format. --------------213E8FBE62218B83262F0FA5 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable @Danny Please find attached patches. Regards, RG. --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-dconf-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-dconf-Update-package-definition.patch" =46rom ab08598eb7183cae716b86cee5107646a555dc9a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 29 May 2020 18:29:17 -0400 Subject: [PATCH 05/10] gnu: dconf: Update package definition. * gnu/packages/gnome.scm (dconf) [version]: Update to 0.36.0. [patches]: Remove dconf-meson-0.52.patch. [outputs]: New output 'doc'. [arguments]<#:phases>['patch-timeout-tests]: New phase. ['move-doc]: New phase. [native-inputs]: Add python-wrapper. [home-page]: Modify. --- gnu/packages/gnome.scm | 69 +++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a741a6a284..d935eda499 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3651,44 +3651,63 @@ and RDP protocols.") (define-public dconf (package (name "dconf") - (version "0.34.0") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (patches (search-patches "dconf-meson-0.52.patch")) - (sha256 - (base32 - "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll"))= )) + (version "0.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append + "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz")))) (build-system meson-build-system) - (propagated-inputs - ;; In Requires of dconf.pc. - `(("glib" ,glib))) - (inputs - `(("gtk+" ,gtk+) - ("dbus" ,dbus))) + (outputs '("out" "doc")) + (arguments + `(#:glib-or-gtk? #t + #:configure-flags + (list + "-Dgtk_doc=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-timeout-tests + (lambda _ + (substitute* "tests/meson.build" + (("^ \\['engine', .*$") + "")) + #t)) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t)))))) (native-inputs `(("bash-completion" ,bash-completion) - ("libxslt" ,libxslt) ;for xsltproc - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") ("gtk-doc" ,gtk-doc) + ("libxml2" ,libxml2) + ("libxslt" ,libxslt) ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) ("vala" ,vala))) - (arguments - `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/mach= ine-id - ; or /etc/machine-id. - #:glib-or-gtk? #t - #:configure-flags '("-Denable-gtk-doc=3Dtrue"))) - (home-page "https://developer.gnome.org/dconf/") + (inputs + `(("dbus" ,dbus) + ("gtk+" ,gtk+))) + (propagated-inputs + `(("glib" ,glib))) (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main p= urpose is to provide a backend to GSettings on platforms that don't already hav= e configuration storage systems.") + (home-page "https://wiki.gnome.org/Projects/dconf") (license license:lgpl2.1+))) =20 (define-public json-glib --=20 2.26.2 --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-catch-framework2-Update-to-2.3.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-catch-framework2-Update-to-2.3.0.patch" =46rom 8312e0fd2c607939a813bbdcdcf515fe42b54822 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 May 2020 14:41:17 -0400 Subject: [PATCH 06/10] gnu: catch-framework2: Update to 2.3.0. * gnu/packages/check.scm (catch-framework2) [version]: Update to 2.3.0. [source][sha256]: Modify base32 hash. --- gnu/packages/check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7d7fd189bc..4e50bf70d5 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -236,7 +236,7 @@ a multi-paradigm automated test framework for C++ and= Objective-C.") (define-public catch-framework2 (package (name "catch2") - (version "2.1.2") + (version "2.3.0") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -246,7 +246,7 @@ a multi-paradigm automated test framework for C++ and= Objective-C.") (file-name (git-file-name name version)) (sha256 (base32 - "14vcckqmbydjsg40ngi6iv999zimysh2l7fmrqj1d7xl990qz233"))= )) + "1akcgx3a3f3ql69lsaf1jdp8br2irm50mkv5zv3v3ri055ln9bc8"))= )) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) --=20 2.26.2 --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-Add-ronn.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-Add-ronn.patch" =46rom 085bd32a75691967e7e64eaec260b8765a5217d6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 May 2020 15:05:13 -0400 Subject: [PATCH 07/10] gnu: Add ronn. * gnu/packages/man.scm (ronn): New variable. --- gnu/packages/man.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 4dfac4f87b..c2ad98aa8f 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -30,6 +30,7 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (guix build-system ruby) #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -39,6 +40,30 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages linux)) =20 +(define-public ronn + (package + (name "ronn") + (version "0.7.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/rtomayko/ronn.git") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0fkniz7j1jp8v3i05m6hks3nsh6rzvjfi0ichpi7h4gwk5byxb94"))= )) + (build-system ruby-build-system) + (arguments + `(#:tests? #f)) ; Library hpricot not available + (synopsis "Manual authoring tool") + (description "Ronn builds manuals. It converts simple, human readab= le +textfiles to roff for terminal display, and also to HTML for the web.") + (home-page "https://rtomayko.github.io/ronn/") + (license expat))) + (define-public libpipeline (package (name "libpipeline") --=20 2.26.2 --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0008-gnu-Add-nuspell.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0008-gnu-Add-nuspell.patch" =46rom 563281dd116c08385d6bd4ada159a2896ffabeb3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 May 2020 15:28:31 -0400 Subject: [PATCH 08/10] gnu: Add nuspell. * gnu/packages/enchant.scm (nuspell): New variable. --- gnu/packages/enchant.scm | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index ff4fc03363..4f582f1bff 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -22,17 +22,60 @@ (define-module (gnu packages enchant) #:use-module (gnu packages) #:use-module (gnu packages aspell) + #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages icu4c) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages man) + #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages version-control) #:use-module (guix packages) + #:use-module (guix git-download) #:use-module (guix download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix licenses) #:use-module (srfi srfi-1)) =20 +(define-public nuspell + (package + (name "nuspell") + (version "3.1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nuspell/nuspell.git") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"))= )) + (build-system cmake-build-system) + (native-inputs + `(("catch" ,catch-framework2) + ("git" ,git-minimal) + ("perl" ,perl) + ;;FIX-ME: Building with ronn fails. + ;;("ronn" ,ronn) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost))) + (propagated-inputs + `(("icu4c" ,icu4c))) + (synopsis "Fast and safe spellchecking C++ library") + (description "Nuspell is a fast and safe spelling checker software +program. It is designed for languages with rich morphology and complex = word +compounding. Nuspell is written in modern C++ and it supports Hunspell +dictionaries.") + (home-page "https://nuspell.github.io/") + (license lgpl3+))) + (define-public enchant (package (name "enchant") --=20 2.26.2 --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0009-gnu-enchant-1.6-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0009-gnu-enchant-1.6-Update-package-definition.patch" =46rom 90936e9bb7e7c033bf8cbe7013da3771878c509e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 May 2020 15:51:17 -0400 Subject: [PATCH 09/10] gnu: enchant-1.6: Update package definition. * gnu/packages/enchant.scm (enchant-1.6): Remove inheritance from enchant. [build-system]: Change from gnu to glib-or-gtk. [arguments]: Remove. [inputs]: Add hunspell and nuspell. [synopsis]: Modify. [description]: Modify. --- gnu/packages/enchant.scm | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 4f582f1bff..64eaa37cff 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -35,6 +35,7 @@ #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix licenses) @@ -120,18 +121,35 @@ working\".") ;; conflict with 1.x, so it's OK if both end up in the same profile. (define-public enchant-1.6 (package - (inherit enchant) + (name "enchant") (version "1.6.0") - (arguments '(#:configure-flags '("--disable-static"))) - (native-inputs (alist-delete "unittest-cpp" - (package-native-inputs enchant))) - (source (origin - (method url-fetch) - (uri (string-append "http://www.abisource.com/downloads/en= chant/" - version "/enchant-" version ".tar.gz")= ) - (sha256 - (base32 - "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))= )))) + (source + (origin + (method url-fetch) + (uri + (string-append "http://www.abisource.com/downloads/enchant/" + version "/enchant-" version ".tar.gz")) + (sha256 + (base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))= )) + (build-system glib-or-gtk-build-system) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config) + ("unittest-cpp" ,unittest-cpp))) + (inputs + `(("aspell" ,aspell) + ("hunspell" ,hunspell) + ("nuspell" ,nuspell))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Generic spell checking library and program") + (description "Enchant is a library and command-line program, that wr= aps a +number of different spelling libraries and programs with a consistent +interface. By using Enchant, you can use a wide range of spelling libra= ries, +including some specialised for particular languages, without needing to = program +to each library's interface.") + (home-page "https://abiword.github.io/enchant/") + (license lgpl2.1+))) =20 (define-public python-pyenchant (package --=20 2.26.2 --------------213E8FBE62218B83262F0FA5 Content-Type: text/x-patch; charset=UTF-8; name="0010-gnu-enchant-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0010-gnu-enchant-Update-package-definition.patch" =46rom bd695b64ff7214d0b494d70d96ba0df659c31f4c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 30 May 2020 16:28:25 -0400 Subject: [PATCH 10/10] gnu: enchant: Update package definition. * gnu/packages/enchant.scm (enchant): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [inputs]: Add hunspell. [synopsis]: Modify. [description]: Modify. --- gnu/packages/enchant.scm | 53 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 64eaa37cff..a91ace8c29 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -81,38 +81,37 @@ dictionaries.") (package (name "enchant") (version "2.2.8") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/AbiWord/enchant/re= leases" - "/download/v" version "/enchant-" - version ".tar.gz")) - (sha256 - (base32 - "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"))= )) - (build-system gnu-build-system) + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/AbiWord/enchant/releases" + "/download/v" version "/enchant-" + version ".tar.gz")) + (sha256 + (base32 "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"))= )) + (build-system glib-or-gtk-build-system) (arguments - '(#:configure-flags '("--disable-static" - ;; Tests require a relocatable build. - "--enable-relocatable"))) - (inputs - `(("aspell" ,aspell))) ;; Currently, the only supported backend i= n Guix - (propagated-inputs ;; is aspell. (This information might be o= ld) - ;; Required by enchant.pc. - `(("glib" ,glib))) + '(#:configure-flags + (list + "--disable-static" + ;; Tests require a relocatable build. + "--enable-relocatable"))) (native-inputs `(("glib:bin" ,glib "bin") ("pkg-config" ,pkg-config) ("unittest-cpp" ,unittest-cpp))) - (synopsis "Multi-backend spell-checking library wrapper") - (description - "On the surface, Enchant appears to be a generic spell checking li= brary. -Looking closer, you'll see the Enchant is more-or-less a fancy wrapper a= round -the dlopen() system call. - -Enchant steps in to provide uniformity and conformity on top of these li= braries, -and implement certain features that may be lacking in any individual pro= vider -library. Everything should \"just work\" for any and every definition o= f \"just -working\".") + (inputs + `(("aspell" ,aspell) + ("hunspell" ,hunspell))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Generic spell checking library and program") + (description "Enchant is a library and command-line program, that wr= aps a +number of different spelling libraries and programs with a consistent +interface. By using Enchant, you can use a wide range of spelling libra= ries, +including some specialised for particular languages, without needing to = program +to each library's interface.") (home-page "https://abiword.github.io/enchant/") (license lgpl2.1+))) =20 --=20 2.26.2 --------------213E8FBE62218B83262F0FA5-- --KLCGqZhMOEspu2HkjLL3THx1i165f6vnu-- --BSedVljn3IF0wVmooIUBmDLwOzBozxcyA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl7SwloACgkQrm7zBG1v e1c4hwf9Fzvs9eNF8zLf2lLLQ11GLxlcSgNDWL4QtOtasZLMvHts4WySSl6UzrXa PL7GlhlJ802ZDWFdX8oMdChcw+FV24La7SNExg8RAvg4qkid4sJVYWR3zh0KVupU GlFQtb8e581Db2PzfhNgB9AL1GoO04Jl8QZf7K462y6irwEYKaiW6j7Jq167cxUD hRkg9EzxuA6Y174vyS380KRU0QjUes1ppC41ewS4DpuqsSLqy4V4zwUc3mCy3/BB OJsfpA5p1BGE4hG6+jfT9YWNjGnIxG6UISeSbwi0BXvXjmd37k1BH2D5NRuVrGba d2VBZFex6ElkELlYBy5muerIIxVaeQ== =PjUA -----END PGP SIGNATURE----- --BSedVljn3IF0wVmooIUBmDLwOzBozxcyA--