From 728ed83188846453f1319ea425847da8200a55a9 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 17 Jul 2023 09:05:03 +0100 Subject: gnu: Remove harfbuzz-5. As this package definition is redundant, harfbuzz is version 5.3.1. * gnu/packages/gtk.scm (harfbuzz-5): Remove. * gnu/packages/libreoffice.scm (libreoffice)[inputs]: Replace harfbuzz-5 with harfbuzz. * gnu/packages/qt.scm (qtwebengine)[inputs]: Remove redundant replace. --- gnu/packages/gtk.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ca41612e90..9621357b99 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -286,20 +286,6 @@ (define-public harfbuzz "See 'COPYING' in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) - -(define-public harfbuzz-5 - (package - (inherit harfbuzz) - (version "5.3.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/harfbuzz/harfbuzz" - "/releases/download/" version "/harfbuzz-" - version ".tar.xz")) - (sha256 - (base32 - "0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a")))))) - (define-public libdatrie (package (name "libdatrie") -- cgit v1.2.3 From 514d68b48fe2ebe96754b97e26951fd93ae1e656 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Jul 2023 02:00:13 +0200 Subject: gnu: spread-sheet-widget: Update to 0.8. * gnu/packages/gtk.scm (spread-sheet-widget): Update to 0.8. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9621357b99..5916742022 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2388,17 +2388,17 @@ (define-public graphene (define-public spread-sheet-widget (package (name "spread-sheet-widget") - (version "0.7") + (version "0.8") (source (origin (method url-fetch) (uri (string-append "https://alpha.gnu.org/gnu/ssw/" "spread-sheet-widget-" version ".tar.gz")) (sha256 - (base32 "09rzgp7gabnzab460x874a1ibgyjiibpwzsz5srn9zs6jv2jdxjb")))) + (base32 "0jwmx5i02jwmkp6gci2mapqglh2g3a0092wns185hfygiwlxi2c5")))) (build-system gnu-build-system) (native-inputs - (list `(,glib "bin") ; for glib-genmarshal, etc. + (list `(,glib "bin") ; for glib-genmarshal, etc. pkg-config)) ;; In 'Requires' of spread-sheet-widget.pc. (propagated-inputs -- cgit v1.2.3 From d40b71069f304bd5cc685ce89b24532317733687 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Jul 2023 02:00:01 +0200 Subject: gnu: spread-sheet-widget: Omit static library. * gnu/packages/gtk.scm (spread-sheet-widget)[arguments]: Add "--disable-static" to #:configure-flags. --- gnu/packages/gtk.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5916742022..8e9a9dc8b2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2397,6 +2397,9 @@ (define-public spread-sheet-widget (sha256 (base32 "0jwmx5i02jwmkp6gci2mapqglh2g3a0092wns185hfygiwlxi2c5")))) (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list "--disable-static"))) (native-inputs (list `(,glib "bin") ; for glib-genmarshal, etc. pkg-config)) -- cgit v1.2.3 From 69142dbea4eb5148ed165b494cae0ad730bf5514 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Sun, 11 Jun 2023 12:35:50 +0200 Subject: gnu: cairo: Support building for the Hurd. Gobject-introspection and libdrm does not build for the Hurd. Poppler depends on nss, which does not build for the Hurd. * gnu/packages/gtk.scm (cairo)[native-inputs]: When building for the Hurd, do not include gobject-introspection. [inputs]: Likewise, do not include libdrm, poppler. --- gnu/packages/gtk.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8e9a9dc8b2..c5ec7bcdc2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Sergiu Ivanov ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,15 +195,21 @@ (define-public cairo (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(,@(if (target-hurd?) + '() + `(("gobject-introspection" ,gobject-introspection))) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap - ("drm" ,libdrm) + ,@(if (target-hurd?) + '() + `(("drm" ,libdrm))) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler))) + ,@(if (target-hurd?) + '() + `(("poppler" ,poppler))))) (propagated-inputs `( ;; ("cogl" ,cogl) ;; ("directfb" ,directfb) -- cgit v1.2.3 From dd3f9a7a49616cd2db9a0cc2d4640aebde2664ef Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 13 Jun 2023 13:50:38 +0200 Subject: gnu: harfbuzz: Support build for the Hurd. * gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c5ec7bcdc2..5b88a9d31e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -276,11 +276,13 @@ (define-public harfbuzz ;; There are all in the Requires or Requires.private field of '.pc'. (list glib graphite2 icu4c)) (native-inputs - (list `(,glib "bin") ;for glib-mkenums - gobject-introspection - pkg-config - python-wrapper - which)) + (append (list `(,glib "bin")) ;for glib-mkenums + (if (target-hurd?) + '() + (list gobject-introspection)) + (list pkg-config + python-wrapper + which))) (arguments (list #:configure-flags #~(list "--with-graphite2" -- cgit v1.2.3 From 825a7be4316d27f8f34b0cbfa4970e1886a40e29 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 13 Jun 2023 13:52:24 +0200 Subject: gnu: pango: Support build for the Hurd. * gnu/packages/gtk.scm (pango)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5b88a9d31e..848ed91d96 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -401,12 +401,15 @@ (define-public pango (list bash-minimal zlib)) (native-inputs - (list `(,glib "bin") ;glib-mkenums, etc. - gobject-introspection ;g-ir-compiler, etc. - help2man - perl - pkg-config - python-wrapper)) + (append (list `(,glib "bin")) ;glib-mkenums, etc. + (if (target-hurd?) + '() + (list gobject-introspection)) ;g-ir-compiler, etc. + (list + help2man + perl + pkg-config + python-wrapper))) (synopsis "Text and font handling library") (description "Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text -- cgit v1.2.3