From: Raghav Gururajan <raghavgururajan@disroot.org>
To: Danny Milosavljevic <dannym@scratchpost.org>
Cc: guix-devel@gnu.org
Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix
Date: Thu, 30 Jul 2020 19:51:36 -0400 [thread overview]
Message-ID: <f88ac4ec-4633-a44a-366a-eb80f1ed86a2@disroot.org> (raw)
In-Reply-To: <f8f75c75-a589-ddd2-f688-8133ede1e272@disroot.org>
[-- Attachment #1.1.1: Type: text/plain, Size: 11870 bytes --]
@Danny
Please find the attached patches.
@Others
Please find the following git-log.
*** START ***
commit 7d6b9fc0f0b463f27881805bb0b9a2d981d855b3
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 19:35:16 2020 -0400
gnu: tracker-miners: Update package definition.
* gnu/packages/gnome.scm (tracker-miners): Update package definition.
[arguments]<#:configure-flags>[-Dguarantee_metadata]: New flag.
[-Dbattery_detection]: New flag.
[-Dcharset_detection]: New flag.
[-Dgeneric_media_extractor]: New flag.
[-Dgstreamer_backend]: New flag.
[-Dsystemd_user_services]: New flag.
<#:phases>['disable-failing-tests]: New phase.
[native-inputs]: Move dbus to ...
[inputs]: ... here. Add gexiv2 and gst-plugins-base. Remove ffmpeg.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
commit 891b3bf662c1b8a3d2c0697d6940700d06ed9b61
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 18:16:05 2020 -0400
gnu: tracker: Update package definition.
* gnu/packages/gnome.scm (tracker): Update package definition.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[-Ddocs]: New flag.
[-Dunicode_support]: New flag.
[-Dsystemd_user_services]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['pre-check]: Modify phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and
python-wrapper.
[inputs]: Add network-manager and libstemmer.
[propagated-inputs]: Add glib.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
commit d3916961a3352f23115b0a589acf58a249f093cc
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 18:11:57 2020 -0400
gnu: Add libstemmer.
* gnu/packages/language.scm (libstemmer): New variable.
commit a5994a6443588953469753cd89bdbb98ae58e628
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 16:16:35 2020 -0400
gnu: totem-pl-parser: Update package definition.
* gnu/packages/gnome.scm (totem-pl-parser) [version]: Update to
3.26.5.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Denable-gtk-doc]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc.
[inputs]: Add libgcrypt and libquvi.
[propagated-inputs]: Add glib-networking. Remove gmime and libgcrypt.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
commit 0b6c493c6225e28a9fdae0ec7c5c58359bf3c14b
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 15:47:17 2020 -0400
gnu: libquvi: Update package definition.
* gnu/packages/web.scm (libquvi) [version]: Update to 0.9.4.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to glib-or-gtk.
[arguments]<#:configure-flags>: Remove argument.
<#:phases>['disable-failing-tests]: New phase.
[native-inputs]: Add doxygen and gettext-minimal.
[inputs]: Add glib, glib-networking and libproxy. Remove cyrus-sasl,
openssl and zlib.
[description]: Modify.
[license]: Modify.
commit b10c49007f83ee2cb02b7e6aebe269cfd2ff9cf0
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 14:45:29 2020 -0400
gnu: libquvi-scripts: Update package definition.
* gnu/packages/web.scm (libquvi-scripts) [version]: Update to
0.9.20131130.
[source]<origin>[sha256]: Modify base32.
[native-inputs]: Add pkg-config.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
commit ea09e79d0db662be7af00abb068b2f8700691eb0
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 14:20:05 2020 -0400
gnu: tepl: Update package definition.
* gnu/packages/gnome.scm (tepl): Update package definition.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--enable-gtk-doc]: New flag.
[--with-html-dir]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['disable-failing-tests]: New phase.
['pre-check]: New flag.
[native-inputs]: Add docbook-xml, gtk-doc and xorg-server-for-tests.
[inputs]: Move all to ...
[propagated-inputs]: ... here.
commit b41dc378aca5c1b0af17a33009fe8ab85c3de5f4
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 11:24:09 2020 -0400
gnu: vte: Update package definition.
* gnu/packages/gnome.scm (vte) [version]: Update to 0.60.3.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Ddocs]: New flag.
[-Dvapi]: Remove flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc. Remove gperf.
[inputs]: Add fribidi, gnutls, gperf, icu4c, pcre2 and zlib.
[propagated-inputs]: Add glib and pango. Remove gnutls and pcre2.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
commit b1b90f180883bc5a1de6e853b87aa36d173f4e3e
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 10:58:14 2020 -0400
gnu: Add libgrss.
* gnu/packages/gnome.scm (libgrss): New variable.
commit 0e4dfc5859dbb5d68a5adad11d828a7ea08ad468
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 08:32:57 2020 -0400
gnu: gtksourceview: Fix glade.
* gnu/packages/gtk.scm (gtksourceview) [inputs]: Change glade3 to glade.
commit 2cc46f80beaa4e3e90f564e7eae05518401f640c
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 08:32:02 2020 -0400
Revert "gnu: java-jakarta-oro: Update hash."
This reverts commit e2bb2bdd01a21d20f769dcc34eae06bfb47b15fd.
commit 1c1680e7f898c9f8d09df9043f4e4b7f45d1709f
Author: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun Jul 5 08:22:11 2020 +0200
download: Replace misconfigured Apache mirror.
E.g. <http://apache.belnet.be/jakarta/oro/jakarta-oro-2.0.8.tar.gz>
redirects to a bogus 200 HTML page.
* guix/download.scm (%mirrors): Replace apache.belnet.be with
ftp.nluug.nl.
commit e96e4102774ae26ee48528c9336555b59eec8418
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 08:00:14 2020 -0400
gnu: phodav: Update package definition.
* gnu/packages/gnome.scm (phodav): Update package definition.
[outputs]: New outputs "tools", "spice" and "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dsystemd]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['patch-udevdir]: New phase.
['move-doc]: New phase.
['move-tools]: New phase.
['move-spice]: New phase.
[native-inputs]: Add asciidoc, docbook-xml, docbook-xsl and xmlto.
[inputs]: Add eudev. Remove libgudev and libsoup.
[propagated-inputs]: Add glib, glib-networking, libsoup and libxml2.
[synopsis]: Modify.
[description]: Modify.
commit e0f0722c58692109f270ffef1d0a67964dfa2980
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 06:47:22 2020 -0400
gnu: network-manager-applet: Update package definition.
* gnu/packages/gnome.scm (network-manager-applet) [version]: Update
to 1.18.0.
[source]<origin>[sha256]: Modify base32.
[native-inputs]: Add desktop-file-utils and libxml2. Remove gtk-doc.
[propagated-inputs]: Remove dbus-glib. Move gtk+, network-manager and
libnma to ...
[inputs]: ... here. Add libappindicator, appstream-glib, glib,
and glib-networking.
[synopsis]: Modify.
[description]: Modify.
commit 3cc0c9f1adf9921fb3def703c76c23aa50e52bf8
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu Jul 30 06:24:56 2020 -0400
gnu: appstream-glib: Fix tests.
* gnu/packages/glib.scm (appstream-glib) [native-inputs]: Add
gsettings-desktop-schemas.
commit 74970d66874db079cf74afb227cd2b2635e1f3f5
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed Jul 29 08:21:17 2020 -0400
gnu: network-manager: Update package definition.
* gnu/packages/gnome.scm (network-manager) [version]: Update to 1.26.0.
[source]<origin>[sha256]: Modify base32.
[modules]: Remove field.
[snippet]: Remove field.
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dsystem_ca_path]: Modify flag.
[-Ddbus_conf_dir]: Modify flag.
[-Dkernel_firmware_dir]: New flag.
[-Diptables]: New flag.
[-Ddnsmasq]: New flag.
[-Ddnssec_trigger]: New flag.
[-Dsuspend_resume]: Modify flag.
[-Dconfig_auth_polkit_default]: New flag.
[-Dmodify_system]: New flag.
[-Dpolkit_agent]: New flag.
[-Dconfig_logging_backend_default]: New flag.
[-Dofono]: New flag.
[-Dnm_cloud_setup]: New flag.
[-Dbluez5_dun]: New flag.
[-Debpf]: New flag.
[-Dnetconfig]: New flag.
[-Dconfig_dns_rc_manager_default]: New flag.
[-Dconfig_dhcp_default]: New flag.
[-Dcrypto]: Modify flag.
[--sysconfdir]: Remove flag.
[--localstatedir]: Remove flag.
[-Ddhclient]: Remove flag.
<#:phases>['patch-docbook-xml]: Modify phase.
['pre-configure]: Modify phase.
['move-doc]: Modify phase.
['no-polkit-magic]: Remove phase.
[native-inputs]: Modify docbook-xml. Add gjs, lua and ruby.
[inputs]: Add bluez, dbus, dnsmasq, dnssec-trigger:nm, iptables,
libselinux, nss-certs and upower. Remove cyrus-sasl, libgcrypt and
libgudev.
[propagated-inputs]: Add glib-networking.
[synopsis]: Modify.
[description]: Modify.
[license]: Add fdl1.1+.
commit f2f16344786260b965bc9e18dd2c7ae276cfef3f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed Jul 29 15:49:38 2020 -0400
gnu: Add dnssec-trigger.
* gnu/packages/dns.scm (dnssec-trigger): New variable.
commit 07c0ba9d0cab30b08a4523264b4587e891743fe4
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed Jul 29 14:11:35 2020 -0400
gnu: libappindicator: Propagate gtk+ and libdbusmenu.
* gnu/packages/freedesktop.scm (libappindicator) [inputs]: Move gtk+
and libdbusmenu to ...
[propagated-inputs]: ... here.
commit d3202ad0d219e029f9429c5a12ec33fe573aab21
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed Jul 29 12:50:18 2020 -0400
gnu: Add ldns.
* gnu/packages/dns.scm (ldns): New variable.
* gnu/packages/patches/ldns-drill-examples.patch: New file.
* gnu/local.mk (ldns-drill-examples.patch): New reference.
commit c6a125456ba8c2b7b46ac4381cff7c23ac3de204
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue Jul 28 10:10:49 2020 -0400
gnu: mobile-broadband-provider-info: Update package definition.
* gnu/packages/gnome.scm (mobile-broadband-provider-info) [version]:
Update to 20190618.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:tests?>: Remove argument.
[native-inputs]: Add pkg-config, libxml2 and libxslt.
[description]: Modify.
[home-page]: Modify.
commit 4ae9e078bd1748833baf70a07637a44dafd3887b
Author: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue Jul 28 09:36:52 2020 -0400
gnu: mm-common: Update package definition.
* gnu/packages/gnome.scm (mm-common): Update package definition.
[native-inputs]: Remove gettext-minimal. Move coreutils and sed
to ...
[inputs]: ... here. Add automake.
*** END ***
Regards,
RG.
[-- Attachment #1.1.2: 0055-gnu-mm-common-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3936 bytes --]
From 4ae9e078bd1748833baf70a07637a44dafd3887b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 28 Jul 2020 09:36:52 -0400
Subject: [PATCH 55/75] gnu: mm-common: Update package definition.
* gnu/packages/gnome.scm (mm-common): Update package definition.
[native-inputs]: Remove gettext-minimal. Move coreutils and sed
to ...
[inputs]: ... here. Add automake.
---
gnu/packages/gnome.scm | 55 +++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c68c089133..342632a93f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -984,14 +984,15 @@ freedesktop.org desktop notification specification.")
(package
(name "mm-common")
(version "1.0.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/mm-common/"
- (version-major+minor version) "/"
- "mm-common-" version ".tar.xz"))
- (sha256
- (base32
- "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/mm-common/"
+ (version-major+minor version) "/"
+ "mm-common-" version ".tar.xz"))
+ (sha256
+ (base32 "1jasx9a9g7nqf7jcv3mrg4qh5cp9sq724jxjaz4wa1dzmxsxg8i8"))))
(build-system meson-build-system)
(arguments
`(#:phases
@@ -999,27 +1000,31 @@ freedesktop.org desktop notification specification.")
(add-after 'unpack 'patch
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "util/mm-common-prepare.in"
- (("ln") (string-append (assoc-ref inputs "coreutils")
- "/bin/ln"))
- (("cp") (string-append (assoc-ref inputs "coreutils")
- "/bin/cp"))
- (("sed") (string-append (assoc-ref inputs "sed")
- "/bin/sed"))
- (("cat") (string-append (assoc-ref inputs "coreutils")
- "/bin/cat")))
+ (("ln")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/ln"))
+ (("cp")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/cp"))
+ (("sed")
+ (string-append (assoc-ref inputs "sed")
+ "/bin/sed"))
+ (("cat")
+ (string-append (assoc-ref inputs "coreutils")
+ "/bin/cat")))
#t)))))
(native-inputs
- `(("coreutils" ,coreutils)
- ("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("sed" ,sed)))
+ `(("pkg-config" ,pkg-config)))
(inputs
- `(("python" ,python)))
+ `(("automake" ,automake)
+ ("coreutils" ,coreutils)
+ ("sed" ,sed)
+ ("python" ,python)))
(synopsis "Module of GNOME C++ bindings")
- (description "The mm-common module provides the build infrastructure
-and utilities shared among the GNOME C++ binding libraries. Release
-archives of mm-common include the Doxygen tag file for the GNU C++
-Library reference documentation.")
+ (description "The mm-common module provides the build infrastructure and
+utilities shared among the GNOME C++ binding libraries. Release archives of
+mm-common include the Doxygen tag file for the GNU C++ Library reference
+documentation.")
(home-page "https://gitlab.gnome.org/GNOME/mm-common")
(license license:gpl2+)))
--
2.27.0
[-- Attachment #1.1.3: 0056-gnu-mobile-broadband-provider-info-Update-package-de.patch --]
[-- Type: text/x-patch, Size: 2546 bytes --]
From c6a125456ba8c2b7b46ac4381cff7c23ac3de204 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Tue, 28 Jul 2020 10:10:49 -0400
Subject: [PATCH 56/75] gnu: mobile-broadband-provider-info: Update package
definition.
* gnu/packages/gnome.scm (mobile-broadband-provider-info) [version]:
Update to 20190618.
[source]<origin>[sha256]: Modify base32.
[arguments]<#:tests?>: Remove argument.
[native-inputs]: Add pkg-config, libxml2 and libxslt.
[description]: Modify.
[home-page]: Modify.
---
gnu/packages/gnome.scm | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 342632a93f..20a1a8ee51 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8711,22 +8711,26 @@ Cisco's AnyConnect SSL VPN.")
(define-public mobile-broadband-provider-info
(package
(name "mobile-broadband-provider-info")
- (version "20190116")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "mirror://gnome/sources/"
- "mobile-broadband-provider-info/" version "/"
- "mobile-broadband-provider-info-" version ".tar.xz"))
- (sha256
- (base32
- "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic"))))
+ (version "20190618")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "mirror://gnome/sources/"
+ "mobile-broadband-provider-info/" version "/"
+ "mobile-broadband-provider-info-" version ".tar.xz"))
+ (sha256
+ (base32 "0nyf7kxxhig80myi7j45yg34nqqqxzm2xvdnxjg5p5yicnjn8bf2"))))
(build-system gnu-build-system)
- (arguments
- `(#:tests? #f)) ; no tests
- (home-page "https://wiki.gnome.org/Projects/NetworkManager")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("xmllint" ,libxml2)
+ ("xsltproc" ,libxslt)))
(synopsis "Database of broadband connection configuration")
- (description "Database of broadband connection configuration.")
+ (description "Mobile-Broadband-Provider-Info contains mobile broadband
+settings for different service providers in different countries.")
+ (home-page "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info")
(license license:public-domain)))
(define-public network-manager-applet
--
2.27.0
[-- Attachment #1.1.4: 0057-gnu-Add-ldns.patch --]
[-- Type: text/x-patch, Size: 9503 bytes --]
From d3202ad0d219e029f9429c5a12ec33fe573aab21 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 29 Jul 2020 12:50:18 -0400
Subject: [PATCH 57/75] gnu: Add ldns.
* gnu/packages/dns.scm (ldns): New variable.
* gnu/packages/patches/ldns-drill-examples.patch: New file.
* gnu/local.mk (ldns-drill-examples.patch): New reference.
---
gnu/local.mk | 1 +
gnu/packages/dns.scm | 87 +++++++++++++++++++
.../patches/ldns-drill-examples.patch | 85 ++++++++++++++++++
3 files changed, 173 insertions(+)
create mode 100644 gnu/packages/patches/ldns-drill-examples.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 6fe674ffec..90b00eb4de 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1163,6 +1163,7 @@ dist_patch_DATA = \
%D%/packages/patches/lcms-CVE-2018-16435.patch \
%D%/packages/patches/ldc-bootstrap-disable-tests.patch \
%D%/packages/patches/ldc-disable-phobos-tests.patch \
+ %D%/packages/patches/ldns-drill-examples.patch \
%D%/packages/patches/leela-zero-gtest.patch \
%D%/packages/patches/less-hurd-path-max.patch \
%D%/packages/patches/lib2geom-enable-assertions.patch \
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 98dd425562..5ea3273fed 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages certs)
#:use-module (gnu packages check)
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
@@ -62,6 +63,7 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages shells)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages swig)
#:use-module (gnu packages tls)
@@ -77,6 +79,91 @@
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial))
+(define-public ldns
+ (package
+ (name "ldns")
+ (version "1.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://www.nlnetlabs.nl/downloads/"
+ name "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0ac242n7996fswq1a3nlh1bbbhrsdwsq4mx7xq8ffq6aplb4rj4a"))
+ (patches
+ (search-patches
+ ;; To create make-flag vairables,
+ ;; for splitting installation of drill and examples.
+ "ldns-drill-examples.patch"))))
+ (build-system gnu-build-system)
+ (outputs '("out" "drill" "examples" "pyldns"))
+ (arguments
+ `( ;; Tests require Tpkg.
+ ;; https://tpkg.github.io/
+ #:tests? #f
+ #:configure-flags
+ (list
+ "--disable-static"
+ "--enable-gost-anyway"
+ "--enable-rrtype-ninfo"
+ "--enable-rrtype-rkey"
+ "--enable-rrtype-ta"
+ "--enable-rrtype-avc"
+ "--enable-rrtype-doa"
+ "--enable-rrtype-amtrelay"
+ "--with-drill"
+ "--with-examples"
+ "--with-pyldns"
+ ;; Perl module DNS::LDNS not available.
+ ;; https://github.com/erikoest/DNS-LDNS.git
+ ;; "--with-p5-dns-ldns"
+ (string-append "--with-ssl="
+ (assoc-ref %build-inputs "openssl"))
+ (string-append "--with-ca-path="
+ (assoc-ref %build-inputs "nss-certs")
+ "/etc/ssl/certs"))
+ #:make-flags
+ (list
+ (string-append "drillbindir="
+ (assoc-ref %outputs "drill")
+ "/bin")
+ (string-append "drillmandir="
+ (assoc-ref %outputs "drill")
+ "/share/man")
+ (string-append "examplesbindir="
+ (assoc-ref %outputs "examples")
+ "/bin")
+ (string-append "examplesmandir="
+ (assoc-ref %outputs "examples")
+ "/share/man")
+ (string-append "python_site="
+ (assoc-ref %outputs "pyldns")
+ "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages"))))
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("ksh" ,oksh)
+ ("perl" ,perl)
+ ("perl-devel-checklib" ,perl-devel-checklib)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("swig" ,swig)))
+ (inputs
+ `(("libpcap" ,libpcap)
+ ("nss-certs" ,nss-certs)
+ ("openssl" ,openssl)))
+ (synopsis "DNS library that facilitates DNS tool programming")
+ (description "LDNS aims to simplify DNS programming, it supports recent
+RFCs like the DNSSEC documents, and allows developers to easily create
+software conforming to current RFCs, and experimental software for current
+Internet Drafts. A secondary benefit of using ldns is speed; ldns is written in
+C it should be a lot faster than Perl.")
+ (home-page "https://nlnetlabs.nl/projects/ldns/about/")
+ (license license:bsd-3)))
+
(define-public dnsmasq
(package
(name "dnsmasq")
diff --git a/gnu/packages/patches/ldns-drill-examples.patch b/gnu/packages/patches/ldns-drill-examples.patch
new file mode 100644
index 0000000000..f85e14cebe
--- /dev/null
+++ b/gnu/packages/patches/ldns-drill-examples.patch
@@ -0,0 +1,85 @@
+From 68916cd7ffb49ece9126d13ef984595595a156c4 Mon Sep 17 00:00:00 2001
+From: Raghav Gururajan <raghavgururajan@disroot.org>
+Date: Wed, 29 Jul 2020 12:32:48 -0400
+Subject: [PATCH] [PATCH]: Split installation of drill and examples.
+
+---
+ Makefile.in | 38 +++++++++++++++++++++-----------------
+ 1 file changed, 21 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 442067de..9d2d5f4d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,6 +14,10 @@ libdir = @libdir@
+ includedir = @includedir@
+ sysconfdir = @sysconfdir@
+ doxygen = @doxygen@
++drillbindir = @drillbindir@
++drillmandir = @drillmandir@
++examplesbindir = @examplesbindir@
++examplesmandir = @examplesmandir@
+ pywrapdir = $(srcdir)/contrib/python
+ pyldnsxwrapdir = $(srcdir)/contrib/ldnsx
+ p5_dns_ldns_dir = $(srcdir)/contrib/DNS-LDNS
+@@ -154,16 +158,16 @@ drill/drill.1: $(srcdir)/drill/drill.1.in
+ $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
+
+ install-drill: drill/drill drill/drill.1
+- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+- $(LIBTOOL) --mode=install cp drill/drill $(DESTDIR)$(bindir)
+- $(INSTALL) -m 644 drill/drill.1 $(DESTDIR)$(mandir)/man1/drill.1
++ $(INSTALL) -m 755 -d $(drillbindir)
++ $(INSTALL) -m 755 -d $(drillmandir)
++ $(INSTALL) -m 755 -d $(drillmandir)/man1
++ $(LIBTOOL) --mode=install cp drill/drill $(drillbindir)
++ $(INSTALL) -m 644 drill/drill.1 $(drillmandir)/man1/drill.1
+
+ uninstall-drill:
+- rm -f $(DESTDIR)$(bindir)/drill $(DESTDIR)$(mandir)/man1/drill.1
+- test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
+- test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
++ rm -f $(drillbindir)/drill $(drillmandir)/man1/drill.1
++ test ! -d $(drillmandir) || rmdir -p $(drillmandir)/man1 || :;
++ test ! -d $(drillbindir) || rmdir -p $(drillbindir) || : ;
+
+ clean-drill:
+ $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1
+@@ -202,23 +206,23 @@ examples/ldns-verify-zone.1: $(srcdir)/examples/ldns-verify-zone.1.in
+ $(edit) $(srcdir)/examples/ldns-verify-zone.1.in > examples/ldns-verify-zone.1
+
+ install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1
+- $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
+- $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
++ $(INSTALL) -m 755 -d $(examplesbindir)
++ $(INSTALL) -m 755 -d $(examplesmandir)
++ $(INSTALL) -m 755 -d $(examplesmandir)/man1
+ for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) ; do \
+- $(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(bindir) ; \
++ $(LIBTOOL) --mode=install cp $$p $(examplesbindir) ; \
+ if test -f $$p.1 ; \
+- then $(INSTALL) -m 644 $$p.1 $(DESTDIR)$(mandir)/man1 ; \
+- else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
++ then $(INSTALL) -m 644 $$p.1 $(examplesmandir)/man1 ; \
++ else $(INSTALL) -m 644 $(srcdir)/$$p.1 $(examplesmandir)/man1 ; \
+ fi ; \
+ done
+
+ uninstall-examples:
+ for p in $(EX_PROGS_BASENM) ; do \
+- rm -f $(DESTDIR)$(bindir)/$$p $(DESTDIR)$(mandir)/man1/$$p.1 ;\
++ rm -f $(examplesbindir)/$$p $(examplesmandir)/man1/$$p.1 ;\
+ done
+- test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
+- test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
++ test ! -d $(examplesmandir) || rmdir -p $(examplesmandir)/man1 || :;
++ test ! -d $(examplesbindir) || rmdir -p $(examplesbindir) || : ;
+
+ clean-examples:
+ $(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS)
+--
+2.27.0
+
--
2.27.0
[-- Attachment #1.1.5: 0058-gnu-libappindicator-Propagate-gtk-and-libdbusmenu.patch --]
[-- Type: text/x-patch, Size: 1325 bytes --]
From 07c0ba9d0cab30b08a4523264b4587e891743fe4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 29 Jul 2020 14:11:35 -0400
Subject: [PATCH 58/75] gnu: libappindicator: Propagate gtk+ and libdbusmenu.
* gnu/packages/freedesktop.scm (libappindicator) [inputs]: Move gtk+
and libdbusmenu to ...
[propagated-inputs]: ... here.
---
gnu/packages/freedesktop.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 02e25cf3e5..b471a6e46d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1934,14 +1934,15 @@ useful with system integration.")
("xvfb" ,xorg-server-for-tests)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("gtk+" ,gtk+)
- ("libdbusmenu" ,libdbusmenu)
("libindicator" ,libindicator)
("python@2" ,python-2)
("python2-pygtk" ,python2-pygtk)
("python2-pygobject-2" ,python2-pygobject-2)
;; ("mono" ,mono) ; requires non-packaged gapi
("vala" ,vala)))
+ (propagated-inputs
+ `(("gtk+" ,gtk+)
+ ("libdbusmenu" ,libdbusmenu)))
(arguments
;; FIXME: do not hardcode gtk version
`(#:configure-flags '("--with-gtk=3")
--
2.27.0
[-- Attachment #1.1.6: 0059-gnu-Add-dnssec-trigger.patch --]
[-- Type: text/x-patch, Size: 5910 bytes --]
From f2f16344786260b965bc9e18dd2c7ae276cfef3f Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 29 Jul 2020 15:49:38 -0400
Subject: [PATCH 59/75] gnu: Add dnssec-trigger.
* gnu/packages/dns.scm (dnssec-trigger): New variable.
---
gnu/packages/dns.scm | 106 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 106 insertions(+)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 5ea3273fed..a8f199290b 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -46,10 +46,12 @@
#:use-module (gnu packages crypto)
#:use-module (gnu packages datastructures)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
#:use-module (gnu packages groff)
#:use-module (gnu packages groff)
+ #:use-module (gnu packages gtk)
#:use-module (gnu packages libedit)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libidn)
@@ -75,6 +77,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
+ #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial))
@@ -164,6 +167,109 @@ C it should be a lot faster than Perl.")
(home-page "https://nlnetlabs.nl/projects/ldns/about/")
(license license:bsd-3)))
+(define-public dnssec-trigger
+ (package
+ (name "dnssec-trigger")
+ (version "0.17")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://www.nlnetlabs.nl/downloads/"
+ name "/" name "-" version ".tar.gz"))
+ (sha256
+ (base32 "10928q406x9r66a090xl5kznzgyxpja88w4srwcv454hd351j9f0"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "gui" "nm"))
+ (arguments
+ `(#:test-target "test"
+ #:configure-flags
+ (list
+ (string-append "--with-ssl="
+ (assoc-ref %build-inputs "openssl"))
+ "--with-hooks=networkmanager"
+ (string-append "--with-networkmanager-dispatch="
+ (assoc-ref %outputs "nm")
+ "/etc/NetworkManager/dispatcher.d")
+ (string-append "--with-xdg-autostart="
+ (assoc-ref %outputs "gui")
+ "/etc/xdg/autostart")
+ (string-append "--with-uidir="
+ (assoc-ref %outputs "gui")
+ "/share/dnssec-trigger")
+ (string-append "--with-python="
+ (assoc-ref %build-inputs "python")
+ "/bin/python")
+ (string-append "--with-unbound-control="
+ (assoc-ref %build-inputs "unbound")
+ "/sbin/unbound-control")
+ "--with-forward-zones-support")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-configure
+ (lambda _
+ (substitute* "configure"
+ (("appindicator-0.1")
+ "appindicator3-0.1"))
+ #t))
+ (add-before 'configure 'patch-makefile
+ (lambda _
+ (substitute* "Makefile.in"
+ (("/usr")
+ "$(prefix)")
+ (("/etc")
+ "$(prefix)/etc")
+ ((".*gtk-update-icon-cache.*")
+ ""))
+ #t))
+ (add-after 'install 'remove-systemd
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out")))
+ (delete-file-recursively
+ (string-append out "/lib/systemd"))
+ #t)))
+ (add-after 'remove-systemd 'move-gui
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (gui (assoc-ref outputs "gui")))
+ (mkdir-p (string-append gui "/bin"))
+ (mkdir-p (string-append gui "/share"))
+ (rename-file
+ (string-append out "/bin")
+ (string-append gui "/bin"))
+ (rename-file
+ (string-append out "/share/icons")
+ (string-append gui "/share/icons"))
+ #t)))
+ (add-after 'move-gui 'move-nm
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (nm (assoc-ref outputs "nm")))
+ (mkdir-p (string-append nm "/libexec"))
+ (rename-file
+ (string-append out "/libexec")
+ (string-append nm "/libexec"))
+ #t))))))
+ (native-inputs
+ `(("cmocka" ,cmocka)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)))
+ (inputs
+ `(("gtk+-2" ,gtk+-2)
+ ("ldns" ,ldns)
+ ("libappindicator" ,libappindicator)
+ ("openssl" ,openssl)
+ ("unbound" ,unbound)))
+ (synopsis "DNSSEC protection for the DNS traffic")
+ (description "DNSSEC-Trigger enables your computer to use DNSSEC protection
+for the DNS traffic. It relies on the Unbound DNS resolver running locally on
+your system, which performs DNSSEC validation. It reconfigures Unbound in such
+a way that it will signal it to to use the DHCP obtained forwarders if possible,
+fallback to doing its own AUTH queries if that fails, and if that fails it will
+prompt the user with the option to go with insecure DNS only.")
+ (home-page "https://www.nlnetlabs.nl/projects/dnssec-trigger/about/")
+ (license license:bsd-3)))
+
(define-public dnsmasq
(package
(name "dnsmasq")
--
2.27.0
[-- Attachment #1.1.7: 0060-gnu-network-manager-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 16188 bytes --]
From 74970d66874db079cf74afb227cd2b2635e1f3f5 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Wed, 29 Jul 2020 08:21:17 -0400
Subject: [PATCH 60/75] gnu: network-manager: Update package definition.
* gnu/packages/gnome.scm (network-manager) [version]: Update to 1.26.0.
[source]<origin>[sha256]: Modify base32.
[modules]: Remove field.
[snippet]: Remove field.
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dsystem_ca_path]: Modify flag.
[-Ddbus_conf_dir]: Modify flag.
[-Dkernel_firmware_dir]: New flag.
[-Diptables]: New flag.
[-Ddnsmasq]: New flag.
[-Ddnssec_trigger]: New flag.
[-Dsuspend_resume]: Modify flag.
[-Dconfig_auth_polkit_default]: New flag.
[-Dmodify_system]: New flag.
[-Dpolkit_agent]: New flag.
[-Dconfig_logging_backend_default]: New flag.
[-Dofono]: New flag.
[-Dnm_cloud_setup]: New flag.
[-Dbluez5_dun]: New flag.
[-Debpf]: New flag.
[-Dnetconfig]: New flag.
[-Dconfig_dns_rc_manager_default]: New flag.
[-Dconfig_dhcp_default]: New flag.
[-Dcrypto]: Modify flag.
[--sysconfdir]: Remove flag.
[--localstatedir]: Remove flag.
[-Ddhclient]: Remove flag.
<#:phases>['patch-docbook-xml]: Modify phase.
['pre-configure]: Modify phase.
['move-doc]: Modify phase.
['no-polkit-magic]: Remove phase.
[native-inputs]: Modify docbook-xml. Add gjs, lua and ruby.
[inputs]: Add bluez, dbus, dnsmasq, dnssec-trigger:nm, iptables,
libselinux, nss-certs and upower. Remove cyrus-sasl, libgcrypt and
libgudev.
[propagated-inputs]: Add glib-networking.
[synopsis]: Modify.
[description]: Modify.
[license]: Add fdl1.1+.
---
gnu/packages/gnome.scm | 287 +++++++++++++++++++++++++----------------
1 file changed, 175 insertions(+), 112 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 20a1a8ee51..e996acf096 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -84,6 +84,7 @@
#:use-module (gnu packages build-tools)
#:use-module (gnu packages calendar)
#:use-module (gnu packages cdrom)
+ #:use-module (gnu packages certs)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages code)
@@ -8390,58 +8391,115 @@ users.")
(define-public network-manager
(package
(name "network-manager")
- (version "1.24.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/NetworkManager/"
- (version-major+minor version) "/"
- "NetworkManager-" version ".tar.xz"))
- (patches (search-patches "network-manager-plugin-path.patch"))
- (sha256
- (base32
- "06044fl60bjlj7c6rqqfbm5795h61h6yzp7ch392hzcnm46wwhn3"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "src/devices/wwan/nm-modem-manager.c"
- (("systemd") "elogind"))
- #t))))
+ (version "1.26.0")
+ (properties '((upstream-name . "NetworkManager")))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/NetworkManager/"
+ (version-major+minor version) "/"
+ "NetworkManager-" version ".tar.xz"))
+ (sha256
+ (base32 "0isdqwp58d7r92sqsk7l2vlqwy518n8b7c7z94jk9gc1bdmjf8sj"))
+ (patches
+ (search-patches "network-manager-plugin-path.patch"))))
(build-system meson-build-system)
- (outputs '("out"
- "doc")) ; 8 MiB of gtk-doc HTML
+ (outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (let ((out (assoc-ref %outputs "out"))
- (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
- "/sbin/dhclient")))
- (list
- ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path
- ;; component.
- (string-append "-Dc_link_args=-Wl,-rpath="
- out "/lib:"
- out "/lib/NetworkManager/" ,version)
- "-Dsystemd_journal=false"
- "-Dsession_tracking=elogind"
- "-Dsuspend_resume=elogind"
- "-Dsystemdsystemunitdir=no"
- "-Dsession_tracking_consolekit=false"
- "-Ddhcpcd=no"
- "-Ddhcpcanon=no"
- "-Dcrypto=gnutls"
- "-Diwd=true"
- "-Dlibaudit=yes"
- "-Dqt=false"
- "-Ddocs=true"
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- (string-append "-Dudev_dir="
- out "/lib/udev")
- (string-append "-Ddbus_conf_dir="
- out "/etc/dbus-1/system.d")
-
- (string-append "-Ddhclient=" dhclient)))
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ ;; System Paths
+ "-Dsystemdsystemunitdir=no"
+ (string-append "-Dsystem_ca_path="
+ (assoc-ref %build-inputs "nss-certs")
+ "/etc/ssl/certs")
+ (string-append "-Dudev_dir="
+ (assoc-ref %outputs "out")
+ "/lib/udev")
+ (string-append "-Ddbus_conf_dir="
+ (assoc-ref %outputs "out")
+ "/share/dbus-1/system.d")
+ (string-append "-Dkernel_firmware_dir="
+ (assoc-ref %outputs "out")
+ "/lib/firmware")
+ (string-append "-Diptables="
+ (assoc-ref %build-inputs "iptables"))
+ (string-append "-Ddnsmasq="
+ (assoc-ref %build-inputs "dnsmasq"))
+ (string-append "-Ddnssec_trigger="
+ (assoc-ref %build-inputs "dnssec-trigger:nm")
+ "/libexec/dnssec-trigger-script")
+ ;; Platform
+ "-Dsession_tracking_consolekit=false"
+ "-Dsession_tracking=elogind"
+ "-Dsuspend_resume=upower"
+ "-Dconfig_auth_polkit_default=true"
+ "-Dmodify_system=true"
+ "-Dpolkit_agent=true"
+ "-Dsystemd_journal=false"
+ "-Dconfig_logging_backend_default=syslog"
+ "-Dlibaudit=yes"
+ ;; Features
+ "-Diwd=true"
+ "-Dofono=true"
+ "-Dnm_cloud_setup=true"
+ "-Dbluez5_dun=true"
+ "-Debpf=true"
+ ;; Handlers for resolv.conf
+ "-Dnetconfig=no"
+ "-Dconfig_dns_rc_manager_default=resolvconf"
+ ;; DHCP Clients
+ "-Ddhcpcanon=no"
+ "-Ddhcpcd=no"
+ "-Dconfig_dhcp_default=dhclient"
+ ;; Miscellaneous
+ "-Ddocs=true"
+ "-Dcrypto=gnutls"
+ "-Dqt=false"
+ ;; Otherwise, the RUNPATH will lack the final 'NetworkManager' path
+ ;; component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib"
+ ":"
+ (assoc-ref %outputs "out")
+ "/lib/NetworkManager/" ,version))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute*
+ '("docs/api/network-manager-docs.xml"
+ "docs/libnm/libnm-docs.xml")
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+ "/xml/dtd/docbook/")))
+ (substitute*
+ '("docs/api/network-manager-docs.xml"
+ "docs/libnm/libnm-docs.xml"
+ "man/NetworkManager.conf.xml"
+ "man/NetworkManager.xml"
+ "man/nm-initrd-generator.xml"
+ "man/nm-online.xml"
+ "man/nm-openvswitch.xml"
+ "man/nmcli-examples.xml"
+ "man/nmcli.xml"
+ "man/nmtui.xml")
+ (("http://www.oasis-open.org/docbook/xml/4.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.2")
+ "/xml/dtd/docbook/")))
+ (substitute*
+ '("docs/api/settings-spec.xsl"
+ "man/nm-settings-dbus.xsl"
+ "man/nm-settings-ifcfg-rh.xsl"
+ "man/nm-settings-keyfile.xsl"
+ "man/nm-settings-nmcli.xsl")
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml-4.3")
+ "/xml/dtd/docbook/")))
+ #t))
(add-before 'configure 'pre-configure
(lambda _
;; These tests try to test aspects of network-manager's
@@ -8450,101 +8508,106 @@ users.")
;; lacks some features that they would like to proxy over (like
;; a /sys mount).
(substitute* "src/platform/tests/meson.build"
- ((".*test-address-linux.*") "")
- ((".*test-cleanup-linux.*") "")
- ((".*test-link-linux.*") "")
- ((".*test-route-linux.*") ""))
+ ((".*test-address-linux.*")
+ "")
+ ((".*test-cleanup-linux.*")
+ "")
+ ((".*test-link-linux.*")
+ "")
+ ((".*test-route-linux.*")
+ "")
+ ((".*test-tc-linux.*")
+ ""))
(substitute* "src/devices/tests/meson.build"
- ((".*test-acd.*") "")
- ((".*test-lldp.*") ""))
+ ((".*test-acd.*")
+ "")
+ ((".*test-lldp.*")
+ ""))
#t))
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook")))
- (substitute* (find-files "." ".*\\.(xsl|xml)")
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd")))
- #t)))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
- (add-before 'install 'no-polkit-magic
- ;; Meson ‘magically’ invokes pkexec, which fails (not setuid).
- (lambda _
- (setenv "PKEXEC_UID" "something")
- #t))
(add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share"))
- (for-each (lambda (directory)
- (copy-recursively (string-append out directory)
- (string-append doc directory))
- (delete-file-recursively
- (string-append out directory)))
- '("/share/doc" "/share/gtk-doc"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
#t))))))
- (propagated-inputs
- `(("glib" ,glib)))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for gdbus-codegen
- ("gtk-doc" ,gtk-doc)
- ("gobject-introspection" ,gobject-introspection)
- ("docbook-xml" ,docbook-xml)
+ `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+ ("docbook-xml-4.2" ,docbook-xml-4.2)
+ ("docbook-xml-4.3" ,docbook-xml-4.3)
("docbook-xsl" ,docbook-xsl)
+ ("gjs" ,gjs)
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
- ("libxslt" ,libxslt)
- ("libxml2" ,libxml2)
+ ("lua" ,lua)
("pkg-config" ,pkg-config)
- ("vala" ,vala)
- ;; For testing.
("python" ,python-wrapper)
("python-dbus" ,python-dbus)
- ("python-pygobject" ,python-pygobject)))
+ ("python-pygobject" ,python-pygobject)
+ ("ruby" ,ruby)
+ ("vala" ,vala)
+ ("xmllint" ,libxml2)
+ ("xsltproc" ,libxslt)))
(inputs
- `(("curl" ,curl)
- ("cyrus-sasl" ,cyrus-sasl)
- ("dbus-glib" ,dbus-glib)
+ `(("audit" ,audit)
+ ("bluez" ,bluez)
+ ("dbus" ,dbus)
("dnsmasq" ,dnsmasq)
- ("eudev" ,eudev)
+ ("dnssec-trigger:nm" ,dnssec-trigger "nm")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
- ("iwd" ,iwd) ; wpa_supplicant alternative
+ ("iwd" ,iwd)
("jansson" ,jansson)
- ("libaudit" ,audit)
- ("libgcrypt" ,libgcrypt)
- ("libgudev" ,libgudev)
+ ("libcurl" ,curl)
+ ("libelogind" ,elogind)
("libndp" ,libndp)
+ ("libnewt" ,newt)
("libnl" ,libnl)
+ ("libpsl" ,libpsl)
+ ("libselinux" ,libselinux)
("libsoup" ,libsoup)
+ ("libudev" ,eudev)
+ ("mm-glib" ,modem-manager)
("mobile-broadband-provider-info" ,mobile-broadband-provider-info)
- ("modem-manager" ,modem-manager)
- ("newt" ,newt) ;for the 'nmtui' console interface
- ("openresolv" ,openresolv) ; alternative resolv.conf manager
+ ("nss" ,nss)
+ ("nss-certs" ,nss-certs)
+ ("openresolv" ,openresolv)
("polkit" ,polkit)
("ppp" ,ppp)
("readline" ,readline)
- ("util-linux" ,util-linux)
- ("elogind" ,elogind)))
- (synopsis "Network connection manager")
+ ("upower" ,upower)
+ ("util-linux" ,util-linux)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)))
+ (synopsis "Network Management Daemon")
+ (description "NetworkManager daemon attempts to make networking
+configuration and operation as painless and automatic as possible by managing
+the primary network connection and other network interfaces, like Ethernet,
+Wi-Fi, and Mobile Broadband devices. It will connect any network device when a
+connection for that device becomes available, unless that behavior is disabled.
+Information about networking is exported via a D-Bus interface to any interested
+application, providing a rich API with which to inspect and control network
+settings and operation.")
(home-page "https://wiki.gnome.org/Projects/NetworkManager")
- (description
- "NetworkManager is a system network service that manages your network
-devices and connections, attempting to keep active network connectivity when
-available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
-devices, and provides VPN integration with a variety of different VPN
-services.")
- ;; “This NetworkManager project consists of the daemon, client tools, and
- ;; libnm. libnm is licensed LGPL-2.1+, while the rest is licensed under
- ;; GPL-2.0+.”
- (license (list license:gpl2+
- license:lgpl2.1+))
- (properties '((upstream-name . "NetworkManager")))))
+ (license
+ (list
+ ;; Documentation
+ license:fdl1.1+
+ ;; Library
+ license:lgpl2.1+
+ ;; Others
+ license:gpl2+))))
(define-public network-manager-openvpn
(package
--
2.27.0
[-- Attachment #1.1.8: 0061-gnu-appstream-glib-Fix-tests.patch --]
[-- Type: text/x-patch, Size: 905 bytes --]
From 3cc0c9f1adf9921fb3def703c76c23aa50e52bf8 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 06:24:56 -0400
Subject: [PATCH 61/75] gnu: appstream-glib: Fix tests.
* gnu/packages/glib.scm (appstream-glib) [native-inputs]: Add
gsettings-desktop-schemas.
---
gnu/packages/glib.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a018686536..d621cebc13 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -956,6 +956,7 @@ programming language. It also contains the utility
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)))
(inputs
--
2.27.0
[-- Attachment #1.1.9: 0062-gnu-network-manager-applet-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3966 bytes --]
From e0f0722c58692109f270ffef1d0a67964dfa2980 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 06:47:22 -0400
Subject: [PATCH 62/75] gnu: network-manager-applet: Update package definition.
* gnu/packages/gnome.scm (network-manager-applet) [version]: Update
to 1.18.0.
[source]<origin>[sha256]: Modify base32.
[native-inputs]: Add desktop-file-utils and libxml2. Remove gtk-doc.
[propagated-inputs]: Remove dbus-glib. Move gtk+, network-manager and
libnma to ...
[inputs]: ... here. Add libappindicator, appstream-glib, glib,
and glib-networking.
[synopsis]: Modify.
[description]: Modify.
---
gnu/packages/gnome.scm | 58 +++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e996acf096..78170f9609 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8799,44 +8799,44 @@ settings for different service providers in different countries.")
(define-public network-manager-applet
(package
(name "network-manager-applet")
- (version "1.16.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/network-manager-applet/"
- (version-major+minor version) "/"
- "network-manager-applet-" version ".tar.xz"))
- (sha256
- (base32
- "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn"))))
+ (version "1.18.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/network-manager-applet/"
+ (version-major+minor version) "/"
+ "network-manager-applet-" version ".tar.xz"))
+ (sha256
+ (base32 "12xiy8g8qk18jvxvn78mvq03zvzp06bww49na765jjw0rq541fyx"))))
(build-system meson-build-system)
(arguments
- '(#:glib-or-gtk? #t))
+ `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas
(native-inputs
- `(("intltool" ,intltool)
- ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
+ `(("desktop-file-vaildate" ,desktop-file-utils)
+ ("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc)
- ("pkg-config" ,pkg-config)))
- (propagated-inputs
- ;; libnm-gtk.pc refers to all these.
- `(("dbus-glib" ,dbus-glib)
- ("gtk+" ,gtk+)
- ("network-manager" ,network-manager)
- ;; nm-applet need by org.gnome.nm-applet.gschema.xml
- ("libnma" ,libnma)))
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)
+ ("xmllint" ,libxml2)))
(inputs
- `(("gcr" ,gcr)
- ("libgudev" ,libgudev)
+ `(("appindicator" ,libappindicator)
+ ("appstream-util" ,appstream-glib)
+ ("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("gtk+" ,gtk+)
+ ("gudev" ,libgudev)
+ ("jansson" ,jansson)
+ ("libnm" ,network-manager)
+ ("libnma" ,libnma)
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libselinux" ,libselinux)
- ("jansson" ,jansson) ; for team support
- ("modem-manager" ,modem-manager)))
- (synopsis "Applet for managing network connections")
+ ("mm-glib" ,modem-manager)))
+ (synopsis "Applet for NetworkManager")
+ (description "Network-Manager-Applet is a tray applet and an advanced
+network connection editor.")
(home-page "https://wiki.gnome.org/Projects/NetworkManager")
- (description
- "This package contains a systray applet for NetworkManager. It displays
-the available networks and allows users to easily switch between them.")
(license license:gpl2+)))
(define-public libxml++
--
2.27.0
[-- Attachment #1.1.10: 0063-gnu-phodav-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5843 bytes --]
From e96e4102774ae26ee48528c9336555b59eec8418 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 08:00:14 -0400
Subject: [PATCH 63/75] gnu: phodav: Update package definition.
* gnu/packages/gnome.scm (phodav): Update package definition.
[outputs]: New outputs "tools", "spice" and "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Dsystemd]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['patch-udevdir]: New phase.
['move-doc]: New phase.
['move-tools]: New phase.
['move-spice]: New phase.
[native-inputs]: Add asciidoc, docbook-xml, docbook-xsl and xmlto.
[inputs]: Add eudev. Remove libgudev and libsoup.
[propagated-inputs]: Add glib, glib-networking, libsoup and libxml2.
[synopsis]: Modify.
[description]: Modify.
---
gnu/packages/gnome.scm | 111 +++++++++++++++++++++++++++++++----------
1 file changed, 85 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 78170f9609..297a008a86 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1031,32 +1031,91 @@ documentation.")
(define-public phodav
(package
- (name "phodav")
- (version "2.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/" name "/"
- (version-major+minor version) "/"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"))))
- (build-system meson-build-system)
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gtk-doc" ,gtk-doc)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("avahi" ,avahi)
- ("libgudev" ,libgudev)
- ("libsoup" ,libsoup)))
- (synopsis "WebDav server implementation using libsoup")
- (description "PhoDav was initially developed as a file-sharing mechanism for Spice,
-but it is generic enough to be reused in other projects,
-in particular in the GNOME desktop.")
- (home-page "https://wiki.gnome.org/phodav")
- (license license:lgpl2.1+)))
+ (name "phodav")
+ (version "2.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"))))
+ (build-system meson-build-system)
+ (outputs '("out" "tools" "spice" "doc"))
+ (arguments
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ "-Dsystemd=disabled")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "doc/reference"
+ (substitute* '("phodav-2.0-docs.sgml" "phodav-docs.sgml.in")
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-before 'configure 'patch-udevdir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "meson.build"
+ (("udev\\.get_pkgconfig_variable\\('udevdir'\\)")
+ (string-append "'"
+ (assoc-ref outputs "out")
+ "/lib/udev" "'")))
+ #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)))
+ (add-after 'move-doc 'move-tools
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (tools (assoc-ref outputs "tools")))
+ (mkdir-p (string-append tools "/bin"))
+ (rename-file
+ (string-append out "/bin")
+ (string-append tools "/bin"))
+ #t)))
+ (add-after 'move-tools 'move-spice
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (spice (assoc-ref outputs "spice")))
+ (mkdir-p (string-append spice "/sbin"))
+ (rename-file
+ (string-append out "/sbin")
+ (string-append spice "/sbin"))
+ #t))))))
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("docbook-xml" ,docbook-xml-4.3)
+ ("docbook-xsl" ,docbook-xsl)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)
+ ("xmlto" ,xmlto)))
+ (inputs
+ `(("avahi" ,avahi)
+ ("udev" ,eudev)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("libsoup" ,libsoup)
+ ("libxml2" ,libxml2)))
+ (synopsis "WebDAV Support for GNOME")
+ (description "PhoDav is a WebDav server implementation using libsoup
+(RFC 4918).")
+ (home-page "https://wiki.gnome.org/phodav")
+ (license license:lgpl2.1+)))
(define-public gnome-color-manager
(package
--
2.27.0
[-- Attachment #1.1.11: 0064-download-Replace-misconfigured-Apache-mirror.patch --]
[-- Type: text/x-patch, Size: 1064 bytes --]
From 1c1680e7f898c9f8d09df9043f4e4b7f45d1709f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jul 2020 08:22:11 +0200
Subject: [PATCH 64/75] download: Replace misconfigured Apache mirror.
E.g. <http://apache.belnet.be/jakarta/oro/jakarta-oro-2.0.8.tar.gz>
redirects to a bogus 200 HTML page.
* guix/download.scm (%mirrors): Replace apache.belnet.be with
ftp.nluug.nl.
---
guix/download.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/download.scm b/guix/download.scm
index e5df678315..b7931e568f 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -140,7 +140,7 @@
(apache ; from http://www.apache.org/mirrors/dist.html
"http://www.eu.apache.org/dist/"
"http://www.us.apache.org/dist/"
- "http://apache.belnet.be/"
+ "https://ftp.nluug.nl/internet/apache/"
"http://apache.mirror.iweb.ca/"
"http://mirrors.ircam.fr/pub/apache/"
"http://apache.mirrors.ovh.net/ftp.apache.org/dist/"
--
2.27.0
[-- Attachment #1.1.12: 0065-Revert-gnu-java-jakarta-oro-Update-hash.patch --]
[-- Type: text/x-patch, Size: 972 bytes --]
From 2cc46f80beaa4e3e90f564e7eae05518401f640c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 08:32:02 -0400
Subject: [PATCH 65/75] Revert "gnu: java-jakarta-oro: Update hash."
This reverts commit e2bb2bdd01a21d20f769dcc34eae06bfb47b15fd.
---
gnu/packages/java.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 601aecf8f8..48f9a52a56 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -10985,7 +10985,7 @@ inside a Zip archive.")
"jakarta-oro-" version ".tar.gz"))
(sha256
(base32
- "0v37kj8rj1s0s4dcs8zr1gb32i8ajzx3cxmsqhsbmgkr89vrgrqx"))
+ "0rpmnsskiwmsy8r0sckz5n5dbvh3vkxx8hpm177c754r8xy3qksc"))
(modules '((guix build utils)))
(snippet
`(begin
--
2.27.0
[-- Attachment #1.1.13: 0066-gnu-gtksourceview-Fix-glade.patch --]
[-- Type: text/x-patch, Size: 804 bytes --]
From 0e4dfc5859dbb5d68a5adad11d828a7ea08ad468 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 08:32:57 -0400
Subject: [PATCH 66/75] gnu: gtksourceview: Fix glade.
* gnu/packages/gtk.scm (gtksourceview) [inputs]: Change glade3 to glade.
---
gnu/packages/gtk.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9087f662a1..f3e00836ff 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -523,7 +523,7 @@ diagrams.")
("vala" ,vala)
("xorg-server" ,xorg-server-for-tests)))
(inputs
- `(("glade" ,glade3)))
+ `(("glade" ,glade)))
(propagated-inputs
`(("fribidi" ,fribidi)
("glib" ,glib)
--
2.27.0
[-- Attachment #1.1.14: 0067-gnu-Add-libgrss.patch --]
[-- Type: text/x-patch, Size: 2591 bytes --]
From b1b90f180883bc5a1de6e853b87aa36d173f4e3e Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 10:58:14 -0400
Subject: [PATCH 67/75] gnu: Add libgrss.
* gnu/packages/gnome.scm (libgrss): New variable.
---
gnu/packages/gnome.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 297a008a86..44bb1b41ff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -269,6 +269,53 @@ Desktop. It is designed to be as simple as possible and has some unique
features to enable users to create their discs easily and quickly.")
(license license:gpl2+)))
+(define-public libgrss
+ (package
+ (name "libgrss")
+ (version "0.7.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32 "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"))))
+ (build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--enable-gtk-doc"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "doc/reference"
+ (substitute* "libgrss-docs.sgml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t)))))
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.1.2)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("libsoup" ,libsoup)
+ ("libxml2" ,libxml2)))
+ (synopsis "Glib library for feeds")
+ (description "LibGRSS is a Glib abstaction to handle feeds in RSS, Atom and
+other formats.")
+ (home-page "https://wiki.gnome.org/Projects/Libgrss")
+ (license license:lgpl3+)))
+
(define-public gnome-js-common
(package
(name "gnome-js-common")
--
2.27.0
[-- Attachment #1.1.15: 0068-gnu-vte-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 5251 bytes --]
From b41dc378aca5c1b0af17a33009fe8ab85c3de5f4 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 11:24:09 -0400
Subject: [PATCH 68/75] gnu: vte: Update package definition.
* gnu/packages/gnome.scm (vte) [version]: Update to 0.60.3.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Ddocs]: New flag.
[-Dvapi]: Remove flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc. Remove gperf.
[inputs]: Add fribidi, gnutls, gperf, icu4c, pcre2 and zlib.
[propagated-inputs]: Add glib and pango. Remove gnutls and pcre2.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
[license]: Modify.
---
gnu/packages/gnome.scm | 89 +++++++++++++++++++++++++++++-------------
1 file changed, 62 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 44bb1b41ff..eb2c586411 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -105,6 +105,7 @@
#:use-module (gnu packages file-systems)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages fribidi)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@@ -4719,40 +4720,74 @@ targeting the GNOME stack simple.")
(define-public vte
(package
(name "vte")
- (version "0.60.2")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/vte/"
- (version-major+minor version) "/"
- "vte-" version ".tar.xz"))
- (sha256
- (base32
- "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"))))
+ (version "0.60.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/vte/"
+ (version-major+minor version) "/"
+ "vte-" version ".tar.xz"))
+ (sha256
+ (base32 "0al2v6fn061v4j1wwvppim1q283y2a6s0iyl29hxhmx3h48nxdzy"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- '("-Dvapi=true"
- "-D_systemd=false")))
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ "-Ddocs=true"
+ "-D_systemd=false")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "doc/reference"
+ (substitute* "vte-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #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
- `(("pkg-config" ,pkg-config)
+ `(("docbook-xml" ,docbook-xml-4.1.2)
("gettext" ,gettext-minimal)
- ("vala" ,vala)
+ ("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("glib" ,glib "bin") ; for glib-genmarshal, etc.
- ("gperf" ,gperf)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)
("xmllint" ,libxml2)))
+ (inputs
+ `(("fribidi" ,fribidi)
+ ("gnutls" ,gnutls)
+ ("gperf" ,gperf)
+ ("icu-uc" ,icu4c)
+ ("libpcre2" ,pcre2)
+ ("zlib" ,zlib)))
(propagated-inputs
- `(("gtk+" ,gtk+) ; required by vte-2.91.pc
- ("gnutls" ,gnutls) ; ditto
- ("pcre2" ,pcre2))) ; ditto
- (home-page "https://www.gnome.org/")
- (synopsis "Virtual Terminal Emulator")
- (description
- "VTE is a library (libvte) implementing a terminal emulator widget for
-GTK+, and a minimal sample application (vte) using that. Vte is mainly used in
-gnome-terminal, but can also be used to embed a console/terminal in games,
-editors, IDEs, etc.")
- (license license:lgpl2.1+)))
+ `(("glib" ,glib)
+ ("pango" ,pango)
+ ("gtk+" ,gtk+)))
+ (synopsis "Virtual Terminal library")
+ (description "VTE provides a virtual terminal widget for GTK applications.")
+ (home-page "https://wiki.gnome.org/Apps/Terminal/VTE")
+ (license
+ (list
+ ;; Documentation
+ license:cc-by-sa4.0
+ ;; Library
+ license:lgpl3+
+ ;; Others
+ license:gpl3+))))
(define-public vte-ng
(package
--
2.27.0
[-- Attachment #1.1.16: 0069-gnu-tepl-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3261 bytes --]
From ea09e79d0db662be7af00abb068b2f8700691eb0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 14:20:05 -0400
Subject: [PATCH 69/75] gnu: tepl: Update package definition.
* gnu/packages/gnome.scm (tepl): Update package definition.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[--enable-gtk-doc]: New flag.
[--with-html-dir]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['disable-failing-tests]: New phase.
['pre-check]: New flag.
[native-inputs]: Add docbook-xml, gtk-doc and xorg-server-for-tests.
[inputs]: Move all to ...
[propagated-inputs]: ... here.
---
gnu/packages/gnome.scm | 44 ++++++++++++++++++++++++++++++++++++------
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eb2c586411..fdbc394735 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -947,15 +947,47 @@ between different kinds of computer systems.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32
- "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"))))
+ (base32 "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"))))
(build-system glib-or-gtk-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:tests? #f)) ; FIX-ME: Requires gvfs
+ `(#:configure-flags
+ (list
+ "--enable-gtk-doc"
+ (string-append "--with-html-dir="
+ (assoc-ref %outputs "doc")
+ "/share/gtk-doc/html"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs/reference"
+ (substitute* '( "api-breaks.xml" "intro.xml.in"
+ "porting-guides.xml" "tepl-docs.xml.in")
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
+ (add-before 'configure 'disable-failing-tests
+ (lambda _
+ (substitute* "testsuite/Makefile.in"
+ (("test-file-loader\\$\\(EXEEXT\\) test-file-metadata\\$\\(EXEEXT\\)")
+ "test-file-loader$(EXEEXT)"))
+ #t))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 +extension GLX &")
+ (setenv "DISPLAY" ":1")
+ #t)))))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
- (inputs
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("intltool" ,intltool)
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests)))
+ (propagated-inputs
`(("amtk" ,amtk)
("glib" ,glib)
("gtk+" ,gtk+)
--
2.27.0
[-- Attachment #1.1.17: 0070-gnu-libquvi-scripts-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 2046 bytes --]
From b10c49007f83ee2cb02b7e6aebe269cfd2ff9cf0 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 14:45:29 -0400
Subject: [PATCH 70/75] gnu: libquvi-scripts: Update package definition.
* gnu/packages/web.scm (libquvi-scripts) [version]: Update to
0.9.20131130.
[source]<origin>[sha256]: Modify base32.
[native-inputs]: Add pkg-config.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
---
gnu/packages/web.scm | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c449267f3d..c23b8ea8be 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1508,21 +1508,24 @@ hash/signatures.")
(define-public libquvi-scripts
(package
(name "libquvi-scripts")
- (version "0.4.21")
+ (version "0.9.20131130")
(source
(origin
(method url-fetch)
- (uri (string-append
- "mirror://sourceforge/quvi/" (version-major+minor version) "/"
- name "/" name "-" version ".tar.xz"))
+ (uri
+ (string-append
+ "mirror://sourceforge/quvi/" (version-major+minor version) "/"
+ name "/" name "-" version ".tar.xz"))
(sha256
- (base32 "0d0giry6bb57pnidymvdl7i5x9bq3ljk3g4bs294hcr5mj3cq0kw"))))
+ (base32 "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (synopsis "Scripts for Libquvi")
+ (description "Libquvi-Scripts is a selection of Lua scripts that libquvi
+calls upon to parse the properties for a media URL.")
(home-page "http://quvi.sourceforge.net/")
- (synopsis "Media stream URL parser")
- (description "This package contains support scripts called by libquvi to
-parse media stream properties.")
- (license license:lgpl2.1+)))
+ (license license:agpl3+)))
(define-public libquvi
(package
--
2.27.0
[-- Attachment #1.1.18: 0071-gnu-libquvi-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 3497 bytes --]
From 0b6c493c6225e28a9fdae0ec7c5c58359bf3c14b Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 15:47:17 -0400
Subject: [PATCH 71/75] gnu: libquvi: Update package definition.
* gnu/packages/web.scm (libquvi) [version]: Update to 0.9.4.
[source]<origin>[sha256]: Modify base32.
[build-system]: Change from gnu to glib-or-gtk.
[arguments]<#:configure-flags>: Remove argument.
<#:phases>['disable-failing-tests]: New phase.
[native-inputs]: Add doxygen and gettext-minimal.
[inputs]: Add glib, glib-networking and libproxy. Remove cyrus-sasl,
openssl and zlib.
[description]: Modify.
[license]: Modify.
---
gnu/packages/web.scm | 53 +++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c23b8ea8be..68b64eef76 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1530,36 +1530,43 @@ calls upon to parse the properties for a media URL.")
(define-public libquvi
(package
(name "libquvi")
- (version "0.4.1")
+ (version "0.9.4")
(source
(origin
(method url-fetch)
- (uri (string-append
- "mirror://sourceforge/quvi/" (version-major+minor version) "/" name "/"
- name "-" version ".tar.xz"))
+ (uri
+ (string-append
+ "mirror://sourceforge/quvi/" (version-major+minor version) "/" name "/"
+ name "-" version ".tar.xz"))
(sha256
- (base32 "00x9gbmzc5cns0gnfag0hsphcr3cb33vbbb9s7ppvvd6bxz2z1mm"))))
- (build-system gnu-build-system)
- (native-inputs `(("pkg-config" ,pkg-config)))
+ (base32 "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"))))
+ (build-system glib-or-gtk-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "tests/Makefile.in"
+ (("script quvi playlist supports resolve media scan goto")
+ "playlist resolve media scan goto"))
+ #t)))))
+ (native-inputs
+ `(("doxygen" ,doxygen)
+ ("gettext" ,gettext-minimal)
+ ("pkg-config" ,pkg-config)))
(inputs
- `(("curl" ,curl)
- ("cyrus-sasl" ,cyrus-sasl)
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("libcurl" ,curl)
+ ("libgcrypt" ,libgcrypt)
+ ("libproxy" ,libproxy)
("libquvi-scripts" ,libquvi-scripts)
- ("lua" ,lua-5.1)
- ("openssl" ,openssl)
- ("zlib" ,zlib)))
- (arguments
- ;; Lua provides no .pc file, so add CFLAGS/LIBS manually.
- '(#:configure-flags
- (let ((lua (assoc-ref %build-inputs "lua")))
- (list
- (string-append "liblua_CFLAGS=-I" lua "/include")
- (string-append "liblua_LIBS=-L" lua "/libs -llua")))))
- (home-page "http://quvi.sourceforge.net/")
+ ("lua" ,lua-5.1)))
(synopsis "Media stream URL parser")
- (description "libquvi is a library with a C API for parsing media stream
-URLs and extracting their actual media files.")
- (license license:lgpl2.1+)))
+ (description "Libquvi is the library with an C API to parse the media
+stream properties.")
+ (home-page "http://quvi.sourceforge.net/")
+ (license license:agpl3+)))
(define-public quvi
(package
--
2.27.0
[-- Attachment #1.1.19: 0072-gnu-totem-pl-parser-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 4946 bytes --]
From a5994a6443588953469753cd89bdbb98ae58e628 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 16:16:35 -0400
Subject: [PATCH 72/75] gnu: totem-pl-parser: Update package definition.
* gnu/packages/gnome.scm (totem-pl-parser) [version]: Update to
3.26.5.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-Denable-gtk-doc]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and gtk-doc.
[inputs]: Add libgcrypt and libquvi.
[propagated-inputs]: Add glib-networking. Remove gmime and libgcrypt.
[synopsis]: Modify.
[description]: Modify.
[home-page]: Modify.
---
gnu/packages/gnome.scm | 93 +++++++++++++++++++++++++++---------------
1 file changed, 60 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fdbc394735..d5f474c513 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6036,39 +6036,66 @@ settings, themes, mouse settings, and startup of other daemons.")
(license license:gpl2+)))
(define-public totem-pl-parser
- (package
- (name "totem-pl-parser")
- (version "3.26.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/totem-pl-parser/"
- (version-major+minor version) "/"
- "totem-pl-parser-" version ".tar.xz"))
- (sha256
- (base32
- "13a45py2j1r9967zgww8kd24bn2fhycd4m3kzr90sxx9l2w03z8f"))))
- (build-system meson-build-system)
- (arguments
- ;; FIXME: Tests require gvfs.
- `(#:tests? #f))
- (native-inputs
- `(("intltool" ,intltool)
- ("glib" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)))
- (propagated-inputs
- `(("glib" ,glib)
- ("gmime" ,gmime)
- ("libarchive" ,libarchive)
- ("libgcrypt" ,libgcrypt)
- ("libxml2" ,libxml2)))
- (inputs
- `(("libsoup" ,libsoup)))
- (home-page "https://projects.gnome.org/totem")
- (synopsis "Library to parse and save media playlists for GNOME")
- (description "Totem-pl-parser is a GObjects-based library to parse and save
-playlists in a variety of formats.")
- (license license:lgpl2.0+)))
+ (package
+ (name "totem-pl-parser")
+ (version "3.26.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/totem-pl-parser/"
+ (version-major+minor version) "/"
+ "totem-pl-parser-" version ".tar.xz"))
+ (sha256
+ (base32 "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"))))
+ (build-system meson-build-system)
+ (outputs '("out" "doc"))
+ (arguments
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:tests? #f ; Tests require networking
+ #:configure-flags
+ (list
+ "-Denable-gtk-doc=true")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs/reference"
+ (substitute* "totem-pl-parser-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #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
+ `(("docbook-xml" ,docbook-xml-4.3)
+ ("intltool" ,intltool)
+ ("glib" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libgcrypt" ,libgcrypt)
+ ("libquvi" ,libquvi)
+ ("libsoup" ,libsoup)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)
+ ("libarchive" ,libarchive)
+ ("libxml2" ,libxml2)))
+ (synopsis "Totem Playlist Parser")
+ (description "Totem-pl-parser is a simple GObject-based library to parse a
+host of playlist formats, as well as save those.")
+ (home-page "http://wiki.gnome.org/Apps/Videos")
+ (license license:lgpl2.0+)))
(define-public aisleriot
(package
--
2.27.0
[-- Attachment #1.1.20: 0073-gnu-Add-libstemmer.patch --]
[-- Type: text/x-patch, Size: 2166 bytes --]
From d3916961a3352f23115b0a589acf58a249f093cc Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 18:11:57 -0400
Subject: [PATCH 73/75] gnu: Add libstemmer.
* gnu/packages/language.scm (libstemmer): New variable.
---
gnu/packages/language.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm
index c66718aa1e..8afa9663b4 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -43,6 +43,43 @@
#:use-module (guix git-download)
#:use-module (guix utils))
+(define-public libstemmer
+ (package
+ (name "libstemmer")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri "https://snowballstem.org/dist/libstemmer_c.tgz")
+ (sha256
+ (base32 "1z2xvrjsaaypc04lwz7dg8mjm5cq1gzmn0l544pn6y2ll3r7ckh5"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ; No tests exist
+ #:make-flags
+ (list
+ (string-append "CC=" ,(cc-for-target))
+ "CFLAGS=-fPIC")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (out-bin (string-append out "/bin"))
+ (out-include (string-append out "/include"))
+ (out-lib (string-append out "/lib")))
+ (install-file "stemwords" out-bin)
+ (install-file "include/libstemmer.h" out-include)
+ (rename-file "libstemmer.o" "libstemmer.a")
+ (install-file "libstemmer.a" out-lib)
+ #t))))))
+ (synopsis "Stemming Library")
+ (description "LibStemmer provides stemming library, supporting several
+languages.")
+ (home-page "https://snowballstem.org/")
+ (license bsd-3)))
+
(define-public perl-lingua-en-findnumber
(package
(name "perl-lingua-en-findnumber")
--
2.27.0
[-- Attachment #1.1.21: 0074-gnu-tracker-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 8259 bytes --]
From 891b3bf662c1b8a3d2c0697d6940700d06ed9b61 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 18:16:05 -0400
Subject: [PATCH 74/75] gnu: tracker: Update package definition.
* gnu/packages/gnome.scm (tracker): Update package definition.
[outputs]: New output "doc".
[arguments]<#:configure-flags>[-Ddocs]: New flag.
[-Dunicode_support]: New flag.
[-Dsystemd_user_services]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['pre-check]: Modify phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gtk-doc and
python-wrapper.
[inputs]: Add network-manager and libstemmer.
[propagated-inputs]: Add glib.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
---
gnu/packages/gnome.scm | 132 ++++++++++++++++++++++++++---------------
1 file changed, 85 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d5f474c513..d92ed90c73 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -128,6 +128,7 @@
#:use-module (gnu packages inkscape)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages kerberos)
+ #:use-module (gnu packages language)
#:use-module (gnu packages libcanberra)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunistring)
@@ -9731,71 +9732,108 @@ directories over the internet.")
(package
(name "tracker")
(version "2.3.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/tracker/"
- (version-major+minor version) "/"
- "tracker-" version ".tar.xz"))
- (sha256
- (base32
- "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/tracker/"
+ (version-major+minor version) "/"
+ "tracker-" version ".tar.xz"))
+ (sha256
+ (base32 "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
`(#:glib-or-gtk? #t
#:configure-flags
- ;; Otherwise, the RUNPATH will lack the final path component.
- (list (string-append "-Dc_link_args=-Wl,-rpath="
- (assoc-ref %outputs "out") "/lib:"
- (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+ (list
+ "-Ddocs=true"
+ "-Dunicode_support=icu"
+ "-Dsystemd_user_services=no"
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib"
+ ":"
+ (assoc-ref %outputs "out")
+ "/lib/tracker-"
+ ,(version-major version)
+ ".0"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs/reference"
+ (substitute*
+ '("libtracker-control/libtracker-control-docs.xml"
+ "libtracker-control/migrating-1to2.xml"
+ "libtracker-miner/libtracker-miner-docs.xml"
+ "libtracker-miner/migrating-1to2.xml"
+ "libtracker-sparql/libtracker-sparql-docs.xml"
+ "libtracker-sparql/migrating-1to2.xml"
+ "ontology/ontology-docs.sgml")
+ (("http://www.oasis-open.org/docbook/xml/4.5/")
+ (string-append (assoc-ref inputs "docbook-xml-4.5")
+ "/xml/dtd/docbook/"))
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml-4.3")
+ "/xml/dtd/docbook/"))
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (string-append (assoc-ref inputs "docbook-xml-4.1.2")
+ "/xml/dtd/docbook/"))))
+ #t))
(add-before 'check 'pre-check
(lambda _
;; Some tests expect to write to $HOME.
- (setenv "HOME" "/tmp")
- #t)))))
+ (setenv "HOME" (getcwd))
+ #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
- `(("glib:bin" ,glib "bin")
+ `(("docbook-xml-4.1.2" ,docbook-xml-4.1.2)
+ ("docbook-xml-4.3" ,docbook-xml-4.3)
+ ("docbook-xml-4.5" ,docbook-xml)
+ ("docbook-xsl" ,docbook-xsl)
+ ("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("python-pygobject" ,python-pygobject)
+ ("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("python-pygobject" ,python-pygobject)
("vala" ,vala)))
(inputs
`(("dbus" ,dbus)
- ("sqlite" ,sqlite)
- ("libxml2" ,libxml2)
- ("icu4c" ,icu4c) ; libunistring gets miner-miner-fs test to fail.
+ ("icu-uc" ,icu4c)
("json-glib" ,json-glib)
- ("libsoup" ,libsoup)))
- (synopsis "Metadata database, indexer and search tool")
+ ("libnm" ,network-manager)
+ ("libsoup" ,libsoup)
+ ("libstemmer" ,libstemmer)
+ ("libxml2" ,libxml2)
+ ("sqlite" ,sqlite)))
+ (propagated-inputs
+ `(("glib" ,glib)))
+ (synopsis "Search Engine and Triplestore")
+ (description "Tracker is a filesystem indexer, metadata storage system and
+search tool. This package provides Tracker-Core, that contains the database
+(tracker-store), the database ontologies, the commandline user interface
+(tracker), and several support libraries.")
(home-page "https://wiki.gnome.org/Projects/Tracker")
- (description
- "Tracker is a search engine and triplestore for desktop, embedded and mobile.
-
-It is a middleware component aimed at desktop application developers who want
-their apps to browse and search user content. It's not designed to be used
-directly by desktop users, but it provides a commandline tool named
-@command{tracker} for the adventurous.
-
-Tracker allows your application to instantly perform full-text searches across
-all documents. This feature is used by the @{emph{search} bar in GNOME Files, for
-example. This is achieved by indexing the user's home directory in the
-background.
-
-Tracker also allows your application to query and list content that the user
-has stored. For example, GNOME Music displays all the music files that are
-found by Tracker. This means that GNOME Music doesn't need to maintain a
-database of its own.
-
-If you need to go beyond simple searches, Tracker is also a linked data
-endpoint and it understands SPARQL. ")
- ;; https://gitlab.gnome.org/GNOME/tracker/-/blob/master/COPYING:
- ;; src/libtracker-*/* and src/tracker-extract/* are covered by lgpl2.1+,
- ;; libstemmer is bsd-3 and the rest is gpl2+.
- (license (list license:gpl2+
- license:bsd-3
- license:lgpl2.1+))))
+ (license
+ (list
+ ;; LibTracker, Tracker-Extract, Tracker-Utils and GVDB
+ license:lgpl2.1+
+ ;; LibStemmer
+ license:bsd-3
+ ;; Others
+ license:gpl2+))))
(define-public tracker-miners
(package
--
2.27.0
[-- Attachment #1.1.22: 0075-gnu-tracker-miners-Update-package-definition.patch --]
[-- Type: text/x-patch, Size: 6321 bytes --]
From 7d6b9fc0f0b463f27881805bb0b9a2d981d855b3 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 30 Jul 2020 19:35:16 -0400
Subject: [PATCH 75/75] gnu: tracker-miners: Update package definition.
* gnu/packages/gnome.scm (tracker-miners): Update package definition.
[arguments]<#:configure-flags>[-Dguarantee_metadata]: New flag.
[-Dbattery_detection]: New flag.
[-Dcharset_detection]: New flag.
[-Dgeneric_media_extractor]: New flag.
[-Dgstreamer_backend]: New flag.
[-Dsystemd_user_services]: New flag.
<#:phases>['disable-failing-tests]: New phase.
[native-inputs]: Move dbus to ...
[inputs]: ... here. Add gexiv2 and gst-plugins-base. Remove ffmpeg.
[synopsis]: Modify.
[description]: Modify.
[license]: Modify.
---
gnu/packages/gnome.scm | 95 +++++++++++++++++++++++++-----------------
1 file changed, 56 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d92ed90c73..e7b84ae41d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9839,45 +9839,60 @@ search tool. This package provides Tracker-Core, that contains the database
(package
(name "tracker-miners")
(version "2.3.3")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/tracker-miners/"
- (version-major+minor version)
- "/tracker-miners-" version ".tar.xz"))
- (sha256
- (base32
- "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/tracker-miners/"
+ (version-major+minor version)
+ "/tracker-miners-" version ".tar.xz"))
+ (sha256
+ (base32 "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:configure-flags
- (list "-Dminer_rss=false" ; libgrss is required.
- ;; Ensure the RUNPATH contains all installed library locations.
- (string-append "-Dc_link_args=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib/tracker-miners-2.0")
- ;; TODO: Enable functional tests. Currently, the following error
- ;; appears:
- ;; Exception: The functional tests require DConf to be the default
- ;; GSettings backend. Got GKeyfileSettingsBackend instead.
- "-Dfunctional_tests=false")))
+ (list
+ "-Dfunctional_tests=false"
+ "-Dguarantee_metadata=true"
+ "-Dbattery_detection=upower"
+ "-Dcharset_detection=icu"
+ "-Dgeneric_media_extractor=gstreamer"
+ "-Dgstreamer_backend=discoverer"
+ "-Dsystemd_user_services=no"
+ ;; Ensure the RUNPATH contains all installed library locations.
+ (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib/tracker-miners-"
+ ,(version-major version)
+ ".0"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ (substitute* "tests/libtracker-miners-common/meson.build"
+ (("'file-utils',")
+ ""))
+ #t)))))
(native-inputs
- `(("dbus" ,dbus)
- ("intltool" ,intltool)
- ("glib:bin" ,glib "bin")
+ `(("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("intltool" ,intltool)
("pkg-config" ,pkg-config)
("python-pygobject" ,python-pygobject)))
(inputs
- `(("exempi" ,exempi)
- ("ffmpeg" ,ffmpeg)
+ `(("dbus" ,dbus)
+ ("exempi" ,exempi)
("flac" ,flac)
+ ("gexiv2" ,gexiv2)
("giflib" ,giflib)
("glib" ,glib)
("gstreamer" ,gstreamer)
- ("icu4c" ,icu4c)
+ ("gst-plugins-base" ,gst-plugins-base)
+ ("icu-uc" ,icu4c)
("libcue" ,libcue)
("libexif" ,libexif)
+ ("libgrss" ,libgrss)
("libgsf" ,libgsf)
("libgxps" ,libgxps)
("libiptcdata" ,libiptcdata)
@@ -9886,25 +9901,27 @@ search tool. This package provides Tracker-Core, that contains the database
("libpng" ,libpng)
("libseccomp" ,libseccomp)
("libtiff" ,libtiff)
- ("libvorbis" ,libvorbis)
("libxml2" ,libxml2)
- ("poppler" ,poppler)
+ ("poppler-glib" ,poppler)
("taglib" ,taglib)
- ("totem-pl-parser" ,totem-pl-parser)
+ ("totem-plparser" ,totem-pl-parser)
("tracker" ,tracker)
- ("upower" ,upower)
+ ("upower-glib" ,upower)
+ ("vorbisfile" ,libvorbis)
("zlib" ,zlib)))
- (synopsis "Metadata database, indexer and search tool")
+ (synopsis "Search Engine and Triplestore")
+ (description "Tracker is a filesystem indexer, metadata storage system and
+search tool. This package provides Tracker-Miners, that contains the indexer
+daemon (tracker-miner-fs) and tools to extract metadata from many different
+filetypes.")
(home-page "https://wiki.gnome.org/Projects/Tracker")
- (description
- "Tracker is an advanced framework for first class objects with associated
-metadata and tags. It provides a one stop solution for all metadata, tags,
-shared object databases, search tools and indexing.")
- ;; src/libtracker-*/* and src/tracker-extract/* are covered by lgpl2.1+,
- ;; src/gvdb/* are covered by lgpl2.0+, and the rest is gpl2+.
- (license (list license:gpl2+
- license:lgpl2.1+
- license:lgpl2.0+))))
+ (license
+ (list
+ ;; LibTracker-Extract, LibTracker-Miners-Common
+ ;; and Tracker-Extract
+ license:lgpl2.1+
+ ;; Miners-Apps and Miners-FS
+ license:gpl2+))))
(define-public nautilus
(package
--
2.27.0
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-07-30 23:54 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 9:13 [OUTREACHY]: Integration of desktop environments into GNU Guix Raghav Gururajan
2020-05-06 14:19 ` Ludovic Courtès
2020-05-06 15:05 ` Gábor Boskovits
2020-05-06 15:49 ` Ricardo Wurmus
2020-05-06 16:03 ` Raghav Gururajan
2020-05-06 15:52 ` sirgazil
2020-05-06 16:04 ` Raghav Gururajan
2020-05-06 17:22 ` Jan Nieuwenhuizen
2020-05-06 17:23 ` Raghav Gururajan
2020-05-20 13:34 ` Raghav Gururajan
2020-05-20 13:51 ` Pierre Neidhardt
2020-05-20 13:57 ` Raghav Gururajan
2020-05-20 14:06 ` Pierre Neidhardt
2020-05-21 9:08 ` Efraim Flashner
2020-05-22 11:18 ` Raghav Gururajan
2020-05-22 11:25 ` Raghav Gururajan
2020-05-23 14:26 ` Raghav Gururajan
2020-05-25 20:08 ` Danny Milosavljevic
2020-05-28 17:11 ` Raghav Gururajan
2020-05-28 17:10 ` Raghav Gururajan
2020-05-28 18:23 ` Danny Milosavljevic
2020-05-29 21:01 ` Raghav Gururajan
2020-05-29 23:02 ` Danny Milosavljevic
2020-05-29 20:54 ` Raghav Gururajan
2020-05-29 21:08 ` Raghav Gururajan
2020-05-30 20:30 ` Raghav Gururajan
2020-05-31 13:31 ` Danny Milosavljevic
2020-06-10 13:12 ` Raghav Gururajan
2020-06-04 18:31 ` Raghav Gururajan
2020-06-04 18:52 ` Vincent Legoll
2020-06-10 13:06 ` Raghav Gururajan
2020-06-04 18:57 ` Danny Milosavljevic
2020-06-14 13:31 ` Raghav Gururajan
2020-06-19 23:37 ` Raghav Gururajan
2020-06-24 22:40 ` Danny Milosavljevic
2020-07-04 10:37 ` Raghav Gururajan
2020-07-04 11:14 ` Raghav Gururajan
2020-07-06 1:36 ` Raghav Gururajan
2020-07-06 19:24 ` Danny Milosavljevic
2020-07-06 19:56 ` Efraim Flashner
2020-07-05 19:25 ` Danny Milosavljevic
2020-07-06 5:05 ` Raghav Gururajan
2020-07-13 13:45 ` Ludovic Courtès
2020-07-13 13:50 ` Raghav Gururajan
2020-07-16 1:21 ` Raghav Gururajan
2020-07-17 12:38 ` Danny Milosavljevic
2020-07-18 13:29 ` Raghav Gururajan
2020-07-18 14:12 ` Danny Milosavljevic
2020-07-18 19:27 ` Raghav Gururajan
2020-07-18 20:18 ` Raghav Gururajan
2020-07-19 11:43 ` Danny Milosavljevic
2020-07-19 19:21 ` Danny Milosavljevic
2020-07-19 19:22 ` Danny Milosavljevic
2020-07-20 1:54 ` Raghav Gururajan
2020-07-24 18:29 ` Raghav Gururajan
2020-07-25 8:15 ` Raghav Gururajan
2020-07-25 8:18 ` Raghav Gururajan
2020-07-25 8:24 ` Raghav Gururajan
2020-07-25 9:12 ` Raghav Gururajan
2020-07-27 16:11 ` Raghav Gururajan
2020-07-30 23:51 ` Raghav Gururajan [this message]
2020-08-02 7:32 ` Raghav Gururajan
2020-08-03 22:29 ` Danny Milosavljevic
2020-08-04 10:22 ` Raghav Gururajan
2020-08-04 22:50 ` Raghav Gururajan
2020-08-05 15:14 ` Danny Milosavljevic
2020-08-07 2:14 ` Raghav Gururajan
2020-08-09 22:28 ` Danny Milosavljevic
2020-08-11 10:38 ` Raghav Gururajan
2020-08-12 4:05 ` Raghav Gururajan
2020-08-12 4:11 ` Raghav Gururajan
2020-08-12 8:02 ` Danny Milosavljevic
2020-08-19 15:06 ` Raghav Gururajan
2020-08-22 14:48 ` Pierre Neidhardt
2020-08-24 3:18 ` Maxim Cournoyer
2020-08-14 14:24 ` [20.08.2020 Hartmut Goebel
2020-08-14 14:28 ` [20.08.2020 Raghav Gururajan
2020-06-24 11:37 ` [OUTREACHY]: Integration of desktop environments into GNU Guix Danny Milosavljevic
2020-06-25 4:04 ` Raghav Gururajan
2020-06-25 11:47 ` Danny Milosavljevic
2020-06-28 5:56 ` Raghav Gururajan
2020-06-25 11:52 ` Danny Milosavljevic
2020-05-25 19:58 ` Danny Milosavljevic
2020-05-25 20:00 ` Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f88ac4ec-4633-a44a-366a-eb80f1ed86a2@disroot.org \
--to=raghavgururajan@disroot.org \
--cc=dannym@scratchpost.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).