From c3264f9e100ad6aefe5216002b68f3bfdcf6be95 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:58:26 -0400 Subject: gnu: gobject-introspection: Make some cosmetic changes. * gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/glib.scm | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 43523e516d..a4fa6faefb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -429,17 +429,20 @@ dynamic loading, and an object system.") (package (name "gobject-introspection") (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -450,25 +453,23 @@ dynamic loading, and an object system.") (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths - (list (search-path-specification - (variable "GI_TYPELIB_PATH") - (files '("lib/girepository-1.0"))))) + (list + (search-path-specification + (variable "GI_TYPELIB_PATH") + (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description "GObject introspection is a middleware layer between C libraries (using @@ -476,7 +477,7 @@ GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ + (home-page "https://wiki.gnome.org/GObjectIntrospection") (license license:gpl2+))) (define intltool -- cgit v1.2.3 From 0382e6a4e633d8e95954754475d0887a661c670b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:27:48 -0400 Subject: gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>: Remove all phases. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex, glib and zlib. [propagated-inputs]: Add glib. Signed-off-by: Danny Milosavljevic --- gnu/packages/glib.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a4fa6faefb..eb2d864fa5 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -428,7 +428,7 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -437,7 +437,7 @@ dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches "gobject-introspection-cc.patch" @@ -445,25 +445,17 @@ dynamic loading, and an object system.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From c2c0244ec3d09d677026e0b62e5ce4f08f030f7e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:30:21 -0400 Subject: gnu: gobject-introspection: Update synopsis, description, home-page and license. * gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/glib.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eb2d864fa5..b9625ed8d0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -462,15 +462,19 @@ dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (synopsis "Generate interface introspection data for GObject libraries") - (description - "GObject introspection is a middleware layer between C libraries (using -GObject) and language bindings. The C library can be scanned at compile time -and generate a metadata file, in addition to the actual native C library. Then -at runtime, language bindings can read this metadata and automatically provide -bindings to call into the C library.") - (home-page "https://wiki.gnome.org/GObjectIntrospection") - (license license:gpl2+))) + (synopsis "GObject introspection tools and libraries") + (description "GObject introspection is a middleware layer between +C libraries (using GObject) and language bindings. The C library can be scanned +at compile time and generate metadata files, in addition to the actual native +C library. Then language bindings can read this metadata and automatically +provide bindings to call into the C library.") + (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection") + (license + (list + ;; For library. + license:lgpl2.0+ + ;; For tools. + license:gpl2+)))) (define intltool (package -- cgit v1.2.3 From 5b580c0a2873010a3ae02b11bdd46a736f52bc8c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Dec 2020 23:05:31 +0100 Subject: Revert "gnu: gobject-introspection: Update to 1.64.1." This reverts commit 0382e6a4e633d8e95954754475d0887a661c670b. --- gnu/packages/glib.scm | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b9625ed8d0..ce132f8fcf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -428,7 +428,7 @@ dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.64.1") + (version "1.62.0") (source (origin (method url-fetch) @@ -437,7 +437,7 @@ dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) (patches (search-patches "gobject-introspection-cc.patch" @@ -445,17 +445,25 @@ dynamic loading, and an object system.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'do-not-use-/usr/bin/env + (lambda _ + (substitute* "tools/g-ir-tool-template.in" + (("#!@PYTHON_CMD@") + (string-append "#!" (which "python3")))) + #t))))) (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ("glib" ,glib "bin") + `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (inputs - `(("python" ,python-wrapper))) + `(("bison" ,bison) + ("flex" ,flex) + ("glib" ,glib) + ("python" ,python-wrapper) + ("zlib" ,zlib))) (propagated-inputs - `(("glib" ,glib) - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 68d5529bc540748323e0b39346e88e88b921198f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Nov 2020 22:24:57 +0100 Subject: gnu: dbus: Remove replacement. * gnu/packages/glib.scm (dbus)[replacement]: Remove. [source]: Add "dbus-CVE-2020-12049.patch". (dbus/fixed): Remove. --- gnu/packages/glib.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ce132f8fcf..d1521b2508 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver @@ -91,7 +91,6 @@ (package (name "dbus") (version "1.12.16") - (replacement dbus/fixed) (source (origin (method url-fetch) (uri (string-append @@ -100,7 +99,8 @@ (sha256 (base32 "107ckxaff1cv4q6kmfdi2fb1nlsv03312a7kf6lb4biglhpjv8jl")) - (patches (search-patches "dbus-helper-search-path.patch")))) + (patches (search-patches "dbus-CVE-2020-12049.patch" + "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -168,15 +168,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with shared NFS home directories.") (license license:gpl2+))) ; or Academic Free License 2.1 -;; Replacement package to fix CVE-2020-12049. -(define dbus/fixed - (package - (inherit dbus) - (source (origin - (inherit (package-source dbus)) - (patches (append (search-patches "dbus-CVE-2020-12049.patch") - (origin-patches (package-source dbus)))))))) - (define glib (package (name "glib") -- cgit v1.2.3 From 52ef5b384786b4a2f7031ee26ef6b196bc22f912 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 8 Dec 2020 11:00:11 +0100 Subject: gnu: glib: Remove replacement with GIO appinfo patch. * gnu/packages/glib.scm (glib)[replacement]: Remove. [source]: Add "glib-appinfo-watch.patch". (glib-with-gio-patch): Remove. --- gnu/packages/glib.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d1521b2508..a37369c49a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -172,7 +172,6 @@ shared NFS home directories.") (package (name "glib") (version "2.62.6") - (replacement glib-with-gio-patch) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -181,7 +180,8 @@ shared NFS home directories.") (sha256 (base32 "174bsmbmcvaw69ff9g60q5sx0fn23rkhqcwqz17h5s7sprps4kqh")) - (patches (search-patches "glib-tests-timer.patch")) + (patches (search-patches "glib-appinfo-watch.patch" + "glib-tests-timer.patch")) (modules '((guix build utils))) (snippet '(begin @@ -379,16 +379,6 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) -(define glib-with-gio-patch - ;; GLib with a fix for . - ;; TODO: Fold into 'glib' above in the next rebuild cycle. - (package - (inherit glib) - (source (origin - (inherit (package-source glib)) - (patches (cons (search-patch "glib-appinfo-watch.patch") - (origin-patches (package-source glib)))))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. -- cgit v1.2.3 From 359f841c5d8417f0167dd985259d0f746b16ce3e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 8 Dec 2020 21:26:31 -0500 Subject: gnu: gobject-introspection: Restore a comment. * gnu/packages/glib.scm (gobject-introspection)[propagated-inputs]: Restore a comment deleted in commit c3264f9e100ad6aefe5216002b68f3bfdcf6be95. --- gnu/packages/glib.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ce132f8fcf..431111f811 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -463,7 +463,9 @@ dynamic loading, and an object system.") ("python" ,python-wrapper) ("zlib" ,zlib))) (propagated-inputs - `(("libffi" ,libffi))) + `(;; In practice, GIR users will need libffi when using + ;; gobject-introspection. + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 034cfbd2449387c15823cd9ec3e91661f9e5bf49 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Dec 2020 19:07:55 +0100 Subject: gnu: glib: Increase test timeout on armhf-linux. * gnu/packages/glib.scm (glib)[arguments]: Add phase to adjust test timeouts to account for slower systems. --- gnu/packages/glib.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/glib.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a37369c49a..3fe440515d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -227,6 +227,17 @@ shared NFS home directories.") (("gio-launch-desktop") (string-append out "/libexec/gio-launch-desktop"))) #t))) + ;; TODO: Remove the conditional in the next core-updates cycle. + ;; Needed to build glib on slower ARM nodes. + ,@(if (string-prefix? "arm" (%current-system)) + `((add-after 'unpack 'increase-test-timeout + (lambda _ + (substitute* "meson.build" + (("test_timeout = 60") + "test_timeout = 90") + (("test_timeout_slow = 120") + "test_timeout_slow = 180"))))) + '()) (add-before 'build 'pre-build (lambda* (#:key inputs outputs #:allow-other-keys) ;; For tests/gdatetime.c. -- cgit v1.2.3