From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id AIwiLtDwz16GdgAA0tVLHw (envelope-from ) for ; Thu, 28 May 2020 17:11:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kEEEKtDwz16jXgAA1q6Kng (envelope-from ) for ; Thu, 28 May 2020 17:11:44 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8010794066D for ; Thu, 28 May 2020 17:11:43 +0000 (UTC) Received: from localhost ([::1]:37808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeM4E-0006PX-GM for larch@yhetil.org; Thu, 28 May 2020 13:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeM41-0006OF-B9 for guix-devel@gnu.org; Thu, 28 May 2020 13:11:29 -0400 Received: from knopi.disroot.org ([178.21.23.139]:36880) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeM3x-0001RF-Py for guix-devel@gnu.org; Thu, 28 May 2020 13:11:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D136055E61; Thu, 28 May 2020 19:11:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TqLfLQWJMFdH; Thu, 28 May 2020 19:11:19 +0200 (CEST) Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1590685878; bh=+MX8m/BgvTH5ST++Sze9ArpeRz9oLeCVOwt+KY2AddA=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=j0LAP4E9xK3q1/QRDrv4H69fSCYuHPAE24qtTJfYhR6FSCzuLj6UjroZFwQhAKfeR VNx9HGx6PJJJ+ao81Os0z/EGnUWwWcKIriWGutjwA4CIEpZabdSfQWwxykUWMI3KkM rMZroJKljnxBCXFjO2VuPyi14tp8r6Rd7WOhLBjsHmdjogjGqlIv8Jb+nVVSTV+2xN /ZZKLUaLwBzIDxUuS9vneNgNElrDi5R4iWwIt9gXIuNjWEBT2ZKPLiiDYs5uGmImOs bzE3FVEx2BCe/f6htZvCM2bOax8J6Wa9HESu52sa0o0iYrntbArHA8DqLIkyn45oT5 2r6ZXpsJ2sbkw== From: Raghav Gururajan To: guix-devel@gnu.org References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Message-ID: Date: Thu, 28 May 2020 13:10:39 -0400 Mime-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0ynFrXsFCSEum5YKcrEsktCUkluTRpZGf" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/28 13:11:22 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=j0LAP4E9; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: L/tcXZ1Y/zor This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0ynFrXsFCSEum5YKcrEsktCUkluTRpZGf Content-Type: multipart/mixed; boundary="or5H3PHWMtrdZhD5WErw8jhh9nAQNDyBT"; protected-headers="v1" From: Raghav Gururajan To: guix-devel@gnu.org Cc: =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Danny Milosavljevic , Tobias Geerinckx-Rice Message-ID: Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> In-Reply-To: --or5H3PHWMtrdZhD5WErw8jhh9nAQNDyBT Content-Type: multipart/mixed; boundary="------------74D5E89ED520FACB1340AE97" Content-Language: en-US This is a multi-part message in MIME format. --------------74D5E89ED520FACB1340AE97 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable @Danny I am in the process of updating/debugging gnome packages one-by-one. I have started with gnome-sdk packages. I initially thought I could finish up all gnome-sdk and send patches at once. But it will not be efficient use of your time, while I am generating patches. So I have attached a few with this email. I'll send patches in few sets. Thank you! Regards, RG. --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-adwaita-icon-theme-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename*0="0001-gnu-adwaita-icon-theme-Update-package-definition.patch" =46rom eaed1a7ea50235d5fc2d08f55fb1cf042dfbdc79 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 09:10:39 -0400 Subject: [PATCH 1/7] gnu: adwaita-icon-theme: Update package definition. * gnu/packages/gnome.scm (adwaita-icon-theme): Remove inheritance from gnome-icon-theme. [build-system]: Change from gnu to glib-or-gtk. [native-inputs]: Add python-wrapper. [description]: Rewrite. [license]: List the licenses. --- gnu/packages/gnome.scm | 46 +++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c769b2b9c..df29ba0000 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2011,21 +2011,43 @@ GNOME and KDE desktops to the icon names proposed= in the specification.") (description "Icons for the GNOME desktop.") (license license:lgpl3))) ; or Creative Commons BY-SA 3.0 =20 -;; gnome-icon-theme was renamed to adwaita-icon-theme after version 3.12= =2E0. (define-public adwaita-icon-theme - (package (inherit gnome-icon-theme) + (package (name "adwaita-icon-theme") - (version "3.34.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7"))= )) + (version "3.36.1") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674")))) + (build-system glib-or-gtk-build-system) + (arguments + '(#:configure-flags + ;; Don't create 'icon-theme.cache'. + (let* + ((coreutils (assoc-ref %build-inputs "coreutils")) + (true (string-append coreutils "/bin/true"))) + (list + (string-append "GTK_UPDATE_ICON_CACHE=3D" true))))) (native-inputs - `(("gtk-encode-symbolic-svg" ,gtk+ "bin"))))) + `(("gtk+:bin" ,gtk+ "bin") + ("icon-naming-utils" ,icon-naming-utils) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (synopsis "GNOME icon theme") + (description "The standard icon theme for GNOME desktop environment.= ") + (home-page "https://wiki.gnome.org/Personalization") + (license + ;; Any one of the following licenses can be chosen. + (list + license:cc-by-sa3.0 + license:lgpl3+)))) =20 (define-public tango-icon-theme (package --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-appstream-glib-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-appstream-glib-Update-package-definition.patch" =46rom c3a126bd464b01c49551e07aa09e3a10d912100c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 10:08:58 -0400 Subject: [PATCH 2/7] gnu: appstream-glib: Update package definition. * gnu/packages/glib.scm (appstream-glib): Update package definition. [outputs]: New output 'doc'. [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#:configure-flags>[-Dgtk-doc]: New flag. [-Dintrospection]: Remove flag. [arguments]<#:phases>['move-doc]: New phase. ['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, docbook-xsl, gobject-introspection and gtk-doc. [inputs]: Add fontconfig, freetype and libxslt. Remove glib and libarchive. [propagated-inputs]: Add glib and libarchive. Remove gcab. [description]: Rewrite. [home-page]: Update. --- gnu/packages/glib.scm | 98 ++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 12ba6e939b..2ae57d4dbb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) @@ -908,48 +909,79 @@ programming language. It also contains the utility= (package (name "appstream-glib") (version "0.7.17") - (source (origin - (method url-fetch) - (uri (string-append "https://people.freedesktop.org/~hughs= ient/" - "appstream-glib/releases/" - "appstream-glib-" version ".tar.xz")) - (sha256 - (base32 - "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "https://people.freedesktop.org/~hughsient/" + "appstream-glib/releases/" + "appstream-glib-" version ".tar.xz")) + (sha256 + (base32 "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))= )) (build-system meson-build-system) - (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("pkg-config" ,pkg-config))) - (propagated-inputs - `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file - ("libuuid" ,util-linux "lib"))) ; for .pc file - (inputs - `(("glib" ,glib) - ("gperf" ,gperf) - ("gtk+" ,gtk+) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("libsoup" ,libsoup))) + (outputs '("out" "doc")) (arguments - `(#:configure-flags - (list "-Ddep11=3Dfalse" - "-Dintrospection=3Dfalse" ; avoid g-ir-scanner dependenc= y - "-Drpm=3Dfalse" - "-Dstemmer=3Dfalse") + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:configure-flags + (list + "-Dgtk-doc=3Dtrue" + "-Ddep11=3Dfalse" + "-Drpm=3Dfalse" + "-Dstemmer=3Dfalse") #:phases (modify-phases %standard-phases + (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")) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc")) + #t))) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xm= l") + "/xml/dtd/docbook"))) + (substitute* "docs/api/appstream-glib-docs.xml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) (add-after 'unpack 'patch-tests (lambda _ (substitute* "libappstream-glib/as-self-test.c" - (("g_test_add_func.*as_test_store_local_appdata_func);") = "")) + (("g_test_add_func.*as_test_store_local_appdata_func);") + "")) #t))))) - (home-page "https://github.com/hughsie/appstream-glib") + (native-inputs + `(("docbook-xml" ,docbook-xml-4.2) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config))) + (inputs + `(("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gperf" ,gperf) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("libsoup" ,libsoup) + ("libxslt" ,libxslt))) + (propagated-inputs + `(("glib" ,glib) + ("gdk-pixbuf" ,gdk-pixbuf) + ("libarchive" ,libarchive) + ("libuuid" ,util-linux "lib"))) (synopsis "Library for reading and writing AppStream metadata") - (description "This library provides objects and helper methods to he= lp -reading and writing @uref{https://www.freedesktop.org/wiki/Distributions= /AppStream,AppStream} -metadata.") + (description "AppStream-Glib provides objects and helper methods to = help +reading and writing AppStream metadata. It also provides a simple DOM +implementation that makes it easy to edit nodes and convert to and from = the +standardized XML representation.") + (home-page "https://people.freedesktop.org/~hughsient/appstream-glib= /") (license license:lgpl2.1+))) =20 (define perl-net-dbus --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-at-spi2-core-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0003-gnu-at-spi2-core-Update-package-definition.patch" =46rom 9e782e9033a688c8e4725eab8e10dcc6044ef277 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 10:46:33 -0400 Subject: [PATCH 3/7] gnu: at-spi2-core: Update package definition. * gnu/packages/gtk.scm (at-spi2-core): Update package definition. [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#:phases>['patch-docbook-sgml]: New phase. [native-inputs]: Add docbook-xml and python-wrapper. [propagated-inputs]: Add libx11. [home-page]: Update. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 144 ++++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 65 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 385e4e97e4..32d62bc120 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -582,72 +582,86 @@ in the GNOME project.") =20 (define-public at-spi2-core (package - (name "at-spi2-core") - (version "2.34.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"))))= - (build-system meson-build-system) - (outputs '("out" "doc")) - (arguments - '(#:configure-flags - (list "-Ddocs=3Dtrue") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-documentation-path - (lambda* (#:key outputs #:allow-other-keys) - ;; Ensure that the cross-references point to the "doc" outpu= t. - (substitute* "doc/libatspi/meson.build" - (("docpath =3D.*") - (string-append "docpath =3D '" (assoc-ref outputs "doc") = "/share/gtk-doc/html'\n"))) - #t)) - (add-before 'install 'prepare-doc-directory - (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share"))= - #t)) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)) - (add-after 'install 'check - (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writa= ble HOME - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.se= rvice - (string-append %output "/share")) - ;; Don't fail on missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (name "at-spi2-core") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"))= )) + (build-system meson-build-system) + (outputs '("out" "doc")) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:configure-flags + (list + "-Ddocs=3Dtrue") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-documentation-path + (lambda* (#:key outputs #:allow-other-keys) + ;; Ensure that the cross-references point to the "doc" outp= ut. + (substitute* "doc/libatspi/meson.build" + (("docpath =3D.*") + (string-append "docpath =3D '" (assoc-ref outputs "doc")= + "/share/gtk-doc/html'\n"))) + #t)) + (add-before 'install 'prepare-doc-directory + (lambda* (#:key outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "doc") + "/share")) + #t)) + (add-after 'unpack 'patch-docbook-sgml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xm= l") + "/xml/dtd/docbook"))) + (substitute* "doc/libatspi/libatspi-docs.sgml" + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) + (add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))) + #t)) + (add-after 'install 'check + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writ= able HOME + ;; Run test-suite under a dbus session. + (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.servi= ce + (string-append %output "/share")) + ;; Don't fail on missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") ; + (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) - (propagated-inputs - ;; atspi-2.pc refers to all these. - `(("dbus" ,dbus) - ("glib" ,glib) - ("libxi" ,libxi) - ("libxtst" ,libxtst))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) - ("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (synopsis "Assistive Technology Service Provider Interface, core comp= onents") - (description - "The Assistive Technology Service Provider Interface, core component= s, -is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (native-inputs + `(("docbook-xml" ,docbook-xml-4.3) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper))) + (propagated-inputs + `(("dbus" ,dbus) + ("glib" ,glib) + ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxtst" ,libxtst))) + (synopsis "Assistive Technology Service Provider Interface, core com= ponents") + (description "The Assistive Technology Service Provider Interface, +core components, is part of the GNOME accessibility project.") + (home-page "https://wiki.gnome.org/Accessibility/") + (license license:lgpl2.1+))) =20 (define-public at-spi2-atk (package --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-at-spi2-atk-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-at-spi2-atk-Update-package-definition.patch" =46rom d8c0a625b5b85bb41c2b467411529cbbf4fcc95d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 11:05:17 -0400 Subject: [PATCH 4/7] gnu: at-spi2-atk: Update package definition. * gnu/packages/gtk.scm (at-spi2-atk): Update package definition. [version]: Update to 2.34.2. [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: Add gobject-introspection. Remove dbus. [inputs]: Add dbus and glib. [home-page]: Update. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 71 +++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 32d62bc120..565eb9b525 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -665,40 +665,43 @@ core components, is part of the GNOME accessibility= project.") =20 (define-public at-spi2-atk (package - (name "at-spi2-atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "05ncp7s5nddjinffs26mcvpbd63vk1m3cv5y530p3plgfhqgjvbp"))))= - (build-system meson-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - ;; Run test-suite under a dbus session. - (lambda _ - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "meson" "test")))))) - (propagated-inputs - `(("at-spi2-core" ,at-spi2-core))) ; required by atk-bridge-2.0.pc - (inputs - `(("atk" ,atk))) - (native-inputs - `(("pkg-config" ,pkg-config) - ;; For tests. - ("dbus" ,dbus) - ("libxml2" ,libxml2))) - (synopsis "Assistive Technology Service Provider Interface, ATK bindi= ngs") - (description - "The Assistive Technology Service Provider Interface -is part of the GNOME accessibility project.") - (license license:lgpl2.0+) - (home-page "https://projects.gnome.org/accessibility/"))) + (name "at-spi2-atk") + (version "2.34.2") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1w7l4xg00qx3dwhn0zaa64daiv5f073hdvjdxh0mrw7fw37264wh")))) + (build-system meson-build-system) + (arguments + '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas. + #:phases + (modify-phases %standard-phases + (replace 'check + ;; Run test-suite under a dbus session. + (lambda _ + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "meson" "test")))))) + (native-inputs + `(("gobject-introspection" ,gobject-introspection) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config))) + (inputs + `(("atk" ,atk) + ("dbus" ,dbus) + ("glib" ,glib))) + (propagated-inputs + `(("at-spi2-core" ,at-spi2-core))) + (synopsis "Assistive Technology Service Provider Interface, ATK bind= ings") + (description "The Assistive Technology Service Provider Interface is= part of +the GNOME accessibility project.") + (home-page "https://wiki.gnome.org/Accessibility/") + (license license:lgpl2.1+))) =20 (define-public gtk+-2 (package --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-atk-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0005-gnu-atk-Update-package-definition.patch" =46rom 48190760d645bc6143a02dacd2b30ed6dd437e52 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 11:22:17 -0400 Subject: [PATCH 5/7] gnu: atk: Update package definition. * gnu/packages/gtk.scm (atk): Update package definition. [version]: Update to 2.36.0. [arguments]<#:glib-or-gtk?>: New argument. [home-page]: Update. [license]: Update to lgpl2.1+. --- gnu/packages/gtk.scm | 51 +++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 565eb9b525..fb67508b09 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -91,30 +91,33 @@ =20 (define-public atk (package - (name "atk") - (version "2.34.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"))))= - (build-system meson-build-system) - (propagated-inputs `(("glib" ,glib))) ; required by atk.pc - (native-inputs - `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ; glib-mkenums,= etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler= , etc. - (synopsis "GNOME accessibility toolkit") - (description - "ATK provides the set of accessibility interfaces that are implement= ed -by other toolkits and applications. Using the ATK interfaces, accessibi= lity -tools have full access to view and control running applications.") - (license license:lgpl2.0+) - (home-page "https://developer.gnome.org/atk/"))) + (name "atk") + (version "2.36.0") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"))= )) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas. + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("pkg-config" ,pkg-config))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "GNOME accessibility toolkit") + (description "ATK provides the set of accessibility interfaces that = are +implemented by other toolkits and applications. Using the ATK interface= s, +accessibility tools have full access to view and control running applica= tions.") + (home-page "https://wiki.gnome.org/Accessibility") + (license license:lgpl2.1+))) =20 (define-public cairo (package --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0006-gnu-google-brotli-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0006-gnu-google-brotli-Update-package-definition.patch" =46rom cb95f360b20c1214455ae0878e755dd1db4ba315 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 11:36:23 -0400 Subject: [PATCH 6/7] gnu: google-brotli: Update package definition. * gnu/packages/compression.scm (google-brotli): Cosmetic changes. [home-page]: Update. --- gnu/packages/compression.scm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index d21d79962a..b1ac51778e 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1814,9 +1814,10 @@ non-Windows systems without running the actual ins= taller using wine.") (source (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/google/brotli.git") - (commit (string-append "v" version)))) + (uri + (git-reference + (url "https://github.com/google/brotli.git") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"))= )) @@ -1828,7 +1829,8 @@ non-Windows systems without running the actual inst= aller using wine.") ;; The build tools put a 'static' suffix on the static librar= ies, but ;; other applications don't know how to find these. (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (string-append (assoc-ref %outputs "out") "/lib/= "))) + (let* ((lib (string-append (assoc-ref %outputs "out") + "/lib/"))) (rename-file (string-append lib "libbrotlicommon-static.a= ") (string-append lib "libbrotlicommon.a")) (rename-file (string-append lib "libbrotlidec-static.a") @@ -1837,19 +1839,19 @@ non-Windows systems without running the actual in= staller using wine.") (string-append lib "libbrotlienc.a")) #t)))) #:configure-flags - (list ;; Defaults to "lib64" on 64-bit archs. - (string-append "-DCMAKE_INSTALL_LIBDIR=3D" - (assoc-ref %outputs "out") "/lib")))) - (home-page "https://github.com/google/brotli") + (list + ;; Defaults to "lib64" on 64-bit archs. + (string-append "-DCMAKE_INSTALL_LIBDIR=3D" (assoc-ref %outputs "= out") + "/lib")))) (synopsis "General-purpose lossless compression") - (description "This package provides the reference implementation of = Brotli, -a generic-purpose lossless compression algorithm that compresses data us= ing a + (description "Google-Brotli is a reference implementation of Brotli,= a +generic-purpose lossless compression algorithm that compresses data usin= g a combination of a modern variant of the LZ77 algorithm, Huffman coding an= d 2nd order context modeling, with a compression ratio comparable to the best currently available general-purpose compression methods. It is similar = in speed -with @code{deflate} but offers more dense compression. - -The specification of the Brotli Compressed Data Format is defined in RFC= 7932.") +with @code{deflate} but offers more dense compression. The specificatio= n of the +Brotli Compressed Data Format is defined in RFC 7932.") + (home-page "https://brotli.org/") (license license:expat))) =20 (define-public brotli --=20 2.26.2 --------------74D5E89ED520FACB1340AE97 Content-Type: text/x-patch; charset=UTF-8; name="0007-gnu-font-cantarell-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0007-gnu-font-cantarell-Update-package-definition.patch" =46rom be6bf3afea3211b0db1ad54091b584e72f7f2516 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 11:52:12 -0400 Subject: [PATCH 7/7] gnu: font-cantarell: Update package definition. * gnu/packages/fonts.scm (font-cantarell): Rename package. [name]: Change from font-abattis-cantarell to font-cantarell. * gnu/packages/fonts.scm (font-abattis-cantarell): New variable for deprecated-package name font-abattis-cantarell. --- gnu/packages/fonts.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9284609373..bb39da1f23 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -195,25 +195,30 @@ itself.")))) =20 (define-public font-cantarell (package - (name "font-abattis-cantarell") + (name "font-cantarell") (version "0.201") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/cantarell-font= s/" - (version-major+minor version) - "/cantarell-fonts-" version ".tar.xz")= ) - (sha256 - (base32 - "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn"))= )) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/cantarell-fonts/" + (version-major+minor version) + "/cantarell-fonts-" version ".tar.xz")) + (sha256 + (base32 + "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn")))) (build-system meson-build-system) (native-inputs - `(("gettext" ,gettext-minimal))) ; for msgfmt - (home-page "https://wiki.gnome.org/Projects/CantarellFonts") + `(("gettext" ,gettext-minimal))) (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist sans-serif designed for on-screen reading. It is used by GNOME@tie{}3."= ) + (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (license license:silofl1.1))) =20 +(define-public font-abattis-cantarell + (deprecated-package "font-abattis-cantarell" font-cantarell)) + (define-public font-lato (package (name "font-lato") --=20 2.26.2 --------------74D5E89ED520FACB1340AE97-- --or5H3PHWMtrdZhD5WErw8jhh9nAQNDyBT-- --0ynFrXsFCSEum5YKcrEsktCUkluTRpZGf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl7P8JAACgkQrm7zBG1v e1esCQf+IC9SnHVDYIxivn/nEVEN0p8M8qD9+z4Iy2uXbbLPD4fX0/eWo1Id3mzx +ZMUu3ZmqocikIrMJUqx4uXbU19hEWTG1V1y43gXQ2z6Qswg8Ar4wIwwPknNr12v rXNbZz8Fc76EZ+3P2hHc0jeMQn69uoNfYMruU4U/AKvfQOlrOVWoGrpbtuUM4E6x UtVVzPOJ7eogdaYJLp3NUTR4x+TlX7xCMemVUHoSPbt7dlx/g2LeyiaF4usJr5TF qzW0ASANbuYPFLQpNCNdxjzJ4fXsMCDR7uFPNfNbJ3zp+TI6bqj4L86lx6uZ+uer 1ZQVtx6PM3eSAFdyFRJitSrEXMHrgw== =FxVQ -----END PGP SIGNATURE----- --0ynFrXsFCSEum5YKcrEsktCUkluTRpZGf--