@Danny Please find attached patches.
Regards, RG.
From ab08598eb7183cae716b86cee5107646a555dc9a Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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=true")
+ #: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/machine-id
- ; or /etc/machine-id.
- #:glib-or-gtk? #t
- #:configure-flags '("-Denable-gtk-doc=true")))
- (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 purpose
is to provide a backend to GSettings on platforms that don't already have
configuration storage systems.")
+ (home-page "https://wiki.gnome.org/Projects/dconf";)
(license license:lgpl2.1+)))
(define-public json-glib
--
2.26.2
From 8312e0fd2c607939a813bbdcdcf515fe42b54822 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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]<origin>[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)))
--
2.26.2
From 085bd32a75691967e7e64eaec260b8765a5217d6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan <raghavgurura...@disroot.org> 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)) +(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 readable +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") -- 2.26.2
From 563281dd116c08385d6bd4ada159a2896ffabeb3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan <raghavgurura...@disroot.org> 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)) +(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") -- 2.26.2
From 90936e9bb7e7c033bf8cbe7013da3771878c509e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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/enchant/";
- 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 wraps a
+number of different spelling libraries and programs with a consistent
+interface. By using Enchant, you can use a wide range of spelling libraries,
+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+)))
(define-public python-pyenchant
(package
--
2.26.2
From bd695b64ff7214d0b494d70d96ba0df659c31f4c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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/releases";
- "/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 in Guix
- (propagated-inputs ;; is aspell. (This information might be old)
- ;; 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 library.
-Looking closer, you'll see the Enchant is more-or-less a fancy wrapper around
-the dlopen() system call.
-
-Enchant steps in to provide uniformity and conformity on top of these libraries,
-and implement certain features that may be lacking in any individual provider
-library. Everything should \"just work\" for any and every definition of \"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 wraps a
+number of different spelling libraries and programs with a consistent
+interface. By using Enchant, you can use a wide range of spelling libraries,
+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+)))
--
2.26.2
signature.asc
Description: OpenPGP digital signature
