@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.
From eaed1a7ea50235d5fc2d08f55fb1cf042dfbdc79 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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
-;; gnome-icon-theme was renamed to adwaita-icon-theme after version 3.12.0.
(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=" 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+))))
(define-public tango-icon-theme
(package
--
2.26.2
From c3a126bd464b01c49551e07aa09e3a10d912100c Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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/~hughsient/";
- "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=false"
- "-Dintrospection=false" ; avoid g-ir-scanner dependency
- "-Drpm=false"
- "-Dstemmer=false")
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas.
+ #:configure-flags
+ (list
+ "-Dgtk-doc=true"
+ "-Ddep11=false"
+ "-Drpm=false"
+ "-Dstemmer=false")
#: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-xml")
+ "/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 help
-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+)))
(define perl-net-dbus
--
2.26.2
From 9e782e9033a688c8e4725eab8e10dcc6044ef277 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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.")
(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=true")
- #: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" output.
- (substitute* "doc/libatspi/meson.build"
- (("docpath =.*")
- (string-append "docpath = '" (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 writable HOME
- ;; Run test-suite under a dbus session.
- (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
- (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=true")
+ #: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" output.
+ (substitute* "doc/libatspi/meson.build"
+ (("docpath =.*")
+ (string-append "docpath = '" (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-xml")
+ "/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 writable HOME
+ ;; Run test-suite under a dbus session.
+ (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service
+ (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 components")
- (description
- "The Assistive Technology Service Provider Interface, core components,
-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 components")
+ (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+)))
(define-public at-spi2-atk
(package
--
2.26.2
From d8c0a625b5b85bb41c2b467411529cbbf4fcc95d Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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.")
(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 bindings")
- (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 bindings")
+ (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+)))
(define-public gtk+-2
(package
--
2.26.2
From 48190760d645bc6143a02dacd2b30ed6dd437e52 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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 @@
(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 implemented
-by other toolkits and applications. Using the ATK interfaces, accessibility
-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 interfaces,
+accessibility tools have full access to view and control running applications.")
+ (home-page "https://wiki.gnome.org/Accessibility";)
+ (license license:lgpl2.1+)))
(define-public cairo
(package
--
2.26.2
From cb95f360b20c1214455ae0878e755dd1db4ba315 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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 installer 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 installer using wine.")
;; The build tools put a 'static' suffix on the static libraries, 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 installer using wine.")
(string-append lib "libbrotlienc.a"))
#t))))
#:configure-flags
- (list ;; Defaults to "lib64" on 64-bit archs.
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (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=" (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 using a
+ (description "Google-Brotli is a reference implementation of Brotli, a
+generic-purpose lossless compression algorithm that compresses data using a
combination of a modern variant of the LZ77 algorithm, Huffman coding and 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 specification of the
+Brotli Compressed Data Format is defined in RFC 7932.")
+ (home-page "https://brotli.org/";)
(license license:expat)))
(define-public brotli
--
2.26.2
From be6bf3afea3211b0db1ad54091b584e72f7f2516 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
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."))))
(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-fonts/"
- (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)))
+(define-public font-abattis-cantarell
+ (deprecated-package "font-abattis-cantarell" font-cantarell))
+
(define-public font-lato
(package
(name "font-lato")
--
2.26.2
signature.asc
Description: OpenPGP digital signature
