From b02225b614f94f3532e4ba220e175a83a0019dae Mon Sep 17 00:00:00 2001 From: Tomasz Jeneralczyk Date: Tue, 28 Jun 2022 16:15:47 +0000 Subject: gnu: Add gdk-pixbuf-xlib. This was part of gtk-pixbuf before but was split into its own library in version 2.42.0: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/tags/2.42.0 * gnu/packages/gtk.scm (gtk-pixbuf-xlib): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4d6a690fbb..358eb365ef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -717,6 +717,34 @@ (define-public gdk-pixbuf (home-page "https://wiki.gnome.org/Projects/GdkPixbuf") (license license:lgpl2.1+))) +(define-public gdk-pixbuf-xlib + (package + (name "gdk-pixbuf-xlib") + (version "2.40.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url + "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vwnvqxap3r9zw932jwasazy9sxw49j78x2g650xkn70iili90bg")))) + (build-system meson-build-system) + (arguments + '(#:configure-flags '("-Dgtk_doc=true"))) + (native-inputs (list pkg-config gtk-doc/stable)) + (inputs (list gdk-pixbuf libx11)) + (synopsis "Deprecated Xlib integration for GdkPixbuf") + (description + "GdkPixbuf-Xlib contains the deprecated API for integrating GdkPixbuf with +Xlib data types. This library was originally shipped by gdk-pixbuf, and has +since been moved out of the original repository. No newly written code should +ever use this library.") + (home-page "https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib") + (license license:lgpl2.1+))) + ;;; A minimal variant used to prevent a cycle with Inkscape. (define-public at-spi2-core-minimal (hidden-package -- cgit v1.2.3 From 48ff4bfcd7491c12248b34a82e0b8e8a50a86308 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Jul 2022 13:46:25 +0200 Subject: gnu: gdk-pixbuf: Add removal hint for libx11. * gnu/packages/gtk.scm (gdk-pixbuf)[propagated-inputs]: Add hint to remove libx11 on core-updates. --- gnu/packages/gtk.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 358eb365ef..d23bb42fb6 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -683,6 +683,7 @@ (define-public gdk-pixbuf (list ;; Required by gdk-pixbuf-2.0.pc glib ;; Required by gdk-pixbuf-xlib-2.0.pc + ;; TODO: Remove on core-updates. libx11 ;; Used for testing and required at runtime. shared-mime-info)) -- cgit v1.2.3 From 3af9282853cef5e62c35fcc2500d7a66a433193d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 24 Jun 2022 23:08:26 +0200 Subject: gnu: harfbuzz-3: Update to 3.4.0. * gnu/packages/gtk.scm (harfbuzz-3.0): Rename to... (harfbuzz-3): ... this. Update to 3.4.0. * gnu/packages/chromium.scm (ungoogled-chromium): Adjust accordingly. --- gnu/packages/chromium.scm | 2 +- gnu/packages/gtk.scm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index e9e20ab7b9..0dc9502a56 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -886,7 +886,7 @@ (define-public ungoogled-chromium gdk-pixbuf glib gtk+ - harfbuzz-3.0 + harfbuzz-3 icu4c-71 jsoncpp lcms diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d23bb42fb6..5da2008163 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -279,10 +279,10 @@ (define-public harfbuzz "See 'COPYING' in the distribution.")) (home-page "https://www.freedesktop.org/wiki/Software/HarfBuzz/"))) -(define-public harfbuzz-3.0 +(define-public harfbuzz-3 (package (inherit harfbuzz) - (version "3.0.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/harfbuzz/harfbuzz" @@ -290,7 +290,7 @@ (define-public harfbuzz-3.0 "/harfbuzz-" version ".tar.xz")) (sha256 (base32 - "1ngk8vn06rryx3s4v5pbl91bw1j1pd4431n77rw3j5a533hhwsq3")))))) + "0lprrl8iih8ji1n17xwm5llz05a1hv4g04b7a3y229dq9myahn3i")))))) (define-public libdatrie (package -- cgit v1.2.3 From bcf6730e6841dc79017e0875a49388b626426f08 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 24 Jun 2022 23:10:49 +0200 Subject: gnu: Add harfbuzz-4. * gnu/packages/gtk.scm (harfbuzz-4): New variable. --- gnu/packages/gtk.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5da2008163..2c8381f5b2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -292,6 +292,19 @@ (define-public harfbuzz-3 (base32 "0lprrl8iih8ji1n17xwm5llz05a1hv4g04b7a3y229dq9myahn3i")))))) +(define-public harfbuzz-4 + (package + (inherit harfbuzz) + (version "4.3.0") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/harfbuzz/harfbuzz" + "/releases/download/" version + "/harfbuzz-" version ".tar.xz")) + (sha256 + (base32 + "0c5mzwgz43d37h75p4b6cgjg4v24jdd96i7gjpgxirn8qks2i5m4")))))) + (define-public libdatrie (package (name "libdatrie") -- cgit v1.2.3 From 15b4579a5a2dfa06dfc1b8d3892caed4c4f0a2ce Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 24 Jun 2022 23:10:57 +0200 Subject: gnu: Add pango-1.90. * gnu/packages/gtk.scm (pango-1.90): New variable. --- gnu/packages/gtk.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2c8381f5b2..50465c121d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -468,6 +468,29 @@ (define-public pango-1.42 (("test-layout\\$\\(EXEEXT\\)") "")) #t))))))) +(define-public pango-1.90 + (package + (inherit pango) + (name "pango") + (version "1.90.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "1zqif72jxa819bwi4jv2vgac574qas3w37f7qvn8l31rm1jgjf7i")) + (modules '((guix build utils))) + (snippet + #~(begin + (substitute* "pango/pangocairo-font.c" + (("cairo_user_font_face_set_render_color_glyph_func") + "cairo_user_font_face_set_render_glyph_func")))))) + (inputs (modify-inputs (package-inputs pango) + (prepend harfbuzz-4))))) + (define-public pangox-compat (package (name "pangox-compat") -- cgit v1.2.3 From 9819aac1d88cdbad51e4aea183495f484f7b7e13 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Jul 2022 21:55:35 -0400 Subject: gnu: gtk: Update to 4.6.6. * gnu/packages/gtk.scm (gtk): Update to 4.6.6. [phases]{patch}: Disable 'unaligned-offscreen' test. --- gnu/packages/gtk.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 50465c121d..aa7bbcc3f0 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1143,7 +1143,7 @@ (define-public gtk+ (define-public gtk (package (name "gtk") - (version "4.6.1") + (version "4.6.6") (source (origin (method url-fetch) @@ -1151,7 +1151,7 @@ (define-public gtk (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0pzcs24j67f90kjcp6apgn6rffynxksjm1m7d3an7kdv3k90hmfq")) + (base32 "0w5fb4grgmb6nhf2glq2y5xqnc9y4v3lm0s9xnbw5xv96p8y9gvv")) (patches (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")))) (build-system meson-build-system) @@ -1203,9 +1203,13 @@ (define-public gtk (substitute* (find-files "testsuite" "meson.build") (("[ \t]*'empty-text.node',") "") (("[ \t]*'testswitch.node',") "") - (("[ \t]*'widgetfactory.node',") "")) + (("[ \t]*'widgetfactory.node',") "") + ;; The unaligned-offscreen test fails for unknown reasons, also + ;; on different distributions (see: + ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889). + ((" 'unaligned-offscreen',") "")) (substitute* "testsuite/reftests/meson.build" - (("[ \t]*'label-wrap-justify.ui',") "")) )) + (("[ \t]*'label-wrap-justify.ui',") "")))) (add-before 'build 'set-cache (lambda _ (setenv "XDG_CACHE_HOME" (getcwd)))) -- cgit v1.2.3 From 3f814d187810af270d48f38505c1788ccacb23ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Jul 2022 22:50:24 -0400 Subject: gnu: gtk: Use new style inputs. * gnu/packages/gtk.scm (gtk)[native-inputs]: Use new style. [propagated-inputs]: Likewise. --- gnu/packages/gtk.scm | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa7bbcc3f0..cc25fac2aa 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1162,10 +1162,10 @@ (define-public gtk ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) #:configure-flags (list - "-Dbroadway-backend=true" ;for broadway display-backend - "-Dcloudproviders=enabled" ;for cloud-providers support - "-Dtracker=enabled" ;for filechooser search support - "-Dcolord=enabled" ;for color printing support + "-Dbroadway-backend=true" ;for broadway display-backend + "-Dcloudproviders=enabled" ;for cloud-providers support + "-Dtracker=enabled" ;for filechooser search support + "-Dcolord=enabled" ;for color printing support ,@(if (%current-target-system) ;; If true, gtkdoc-scangobj will try to execute a ;; cross-compiled binary. @@ -1256,72 +1256,72 @@ (define-public gtk (string-append out "/share/doc") (string-append doc "/share/doc")))))))) (native-inputs - `(("docbook-xml-4.3" ,docbook-xml-4.3) - ("docbook-xsl" ,docbook-xsl) - ("gettext-minimal" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) ;for building introspection data - ("graphene" ,graphene) - ("gtk-doc" ,gtk-doc) ;for building documentation - ("intltool" ,intltool) - ("libxslt" ,libxslt) ;for building man-pages - ("pkg-config" ,pkg-config) - ("python-pygobject" ,python-pygobject) - ;; These python modules are required for building documentation. - ("python-docutils" ,python-docutils) - ("python-jinja2" ,python-jinja2) - ("python-markdown" ,python-markdown) - ("python-markupsafe" ,python-markupsafe) - ("python-pygments" ,python-pygments) - ("python-toml" ,python-toml) - ("python-typogrify" ,python-typogrify) - ("sassc" ,sassc) ;for building themes - ("tzdata" ,tzdata-for-tests) - ("vala" ,vala) - ("xorg-server-for-tests" ,xorg-server-for-tests))) + (list docbook-xml-4.3 + docbook-xsl + gettext-minimal + `(,glib "bin") + gobject-introspection ;for building introspection data + graphene + gtk-doc ;for building documentation + intltool + libxslt ;for building man-pages + pkg-config + python-pygobject + ;; These python modules are required for building documentation. + python-docutils + python-jinja2 + python-markdown + python-markupsafe + python-pygments + python-toml + python-typogrify + sassc ;for building themes + tzdata-for-tests + vala + xorg-server-for-tests)) (inputs - (list colord ;for color printing support - cups ;for CUPS print-backend - ffmpeg ;for ffmpeg media-backend + (list colord ;for color printing support + cups ;for CUPS print-backend + ffmpeg ;for ffmpeg media-backend fribidi - gstreamer ;for gstreamer media-backend - gst-plugins-bad ;provides gstreamer-player - gst-plugins-base ;provides gstreamer-gl + gstreamer ;for gstreamer media-backend + gst-plugins-bad ;provides gstreamer-player + gst-plugins-base ;provides gstreamer-gl harfbuzz iso-codes json-glib - libcloudproviders ;for cloud-providers support + libcloudproviders ;for cloud-providers support libjpeg-turbo libpng librsvg libtiff python rest - tracker)) ;for filechooser search support + tracker)) ;for filechooser search support (propagated-inputs ;; Following dependencies are referenced in .pc files. - `(("cairo" ,cairo) - ("fontconfig" ,fontconfig) - ("librsvg" ,librsvg) - ("glib" ,glib) - ("graphene" ,graphene) - ("libepoxy" ,libepoxy) - ("libx11" ,libx11) ;for x11 display-backend - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxdamage" ,libxdamage) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) ;for xinerama support - ("libxkbcommon" ,libxkbcommon) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("pango" ,pango-next) - ("vulkan-headers" ,vulkan-headers) - ("vulkan-loader" ,vulkan-loader) ;for vulkan graphics API support - ("wayland" ,wayland) ;for wayland display-backend - ("wayland-protocols" ,wayland-protocols))) + (list cairo + fontconfig + librsvg + glib + graphene + libepoxy + libx11 ;for x11 display-backend + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama ;for xinerama support + libxkbcommon + libxrandr + libxrender + pango-next + vulkan-headers + vulkan-loader ;for vulkan graphics API support + wayland ;for wayland display-backend + wayland-protocols)) (native-search-paths (list (search-path-specification -- cgit v1.2.3