From bc036f4c99fe40e4229c546313ffec0552ee27fa Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 03:27:49 +0200 Subject: gnu: dconf: Adjust inputs and remove obsolete workaround. * gnu/packages/gnome.scm (dconf)[inputs]: Remove GLIB and LIBXML2. [propagated-inputs]: Add GLIB. [native-inputs]: Add LIBXML2. Remove INTLTOOL. [arguments]: Remove #:phases. --- gnu/packages/gnome.scm | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a571d922cb..f6c0a80c4a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2240,16 +2240,17 @@ and RDP protocols.") (base32 "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym")))) (build-system glib-or-gtk-build-system) + (propagated-inputs + ;; In Requires of dconf.pc. + `(("glib" ,glib))) (inputs `(("gtk+" ,gtk+) - ("glib" ,glib) - ("dbus" ,dbus) - ("libxml2" ,libxml2))) + ("dbus" ,dbus))) (native-inputs - `(("libxslt" ,libxslt) + `(("libxslt" ,libxslt) ;for xsltproc + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) - ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id @@ -2258,21 +2259,7 @@ and RDP protocols.") ;; Set the correct RUNPATH in binaries. (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") - "--disable-gtk-doc-html") ; FIXME: requires gtk-doc - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "docs/Makefile.in" - (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl") - (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl"))) - (setenv "XML_CATALOG_FILES" - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/catalog.xml")) - #t))))) + "--disable-gtk-doc-html"))) ; FIXME: requires gtk-doc (home-page "https://developer.gnome.org/dconf") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose -- cgit v1.2.3 From 03676d6f35790f5816183f7de8dd1ba60562416c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 03:32:53 +0200 Subject: gnu: dconf: Install GTK documentation. * gnu/packages/gnome.scm (dconf)[native-inputs]: Add GTK-DOC. [arguments]: Adjust #:configure-flags accordingly. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f6c0a80c4a..389ea2ce85 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2251,6 +2251,7 @@ and RDP protocols.") ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) + ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id @@ -2259,7 +2260,7 @@ and RDP protocols.") ;; Set the correct RUNPATH in binaries. (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib") - "--disable-gtk-doc-html"))) ; FIXME: requires gtk-doc + "--enable-gtk-doc"))) (home-page "https://developer.gnome.org/dconf") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose -- cgit v1.2.3 From e20e6b40613b7ab2973f7ca1621edfaff8cbdf00 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 03:40:00 +0200 Subject: gnu: dconf: Update license. * gnu/packages/gnome.scm (dconf)[license]: Change from LGPL2.1 to LGPL2.1+. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 389ea2ce85..896d7090d6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2266,7 +2266,7 @@ and RDP protocols.") (description "Dconf is a low-level configuration system. Its main purpose is to provide a backend to GSettings on platforms that don't already have configuration storage systems.") - (license license:lgpl2.1))) + (license license:lgpl2.1+))) (define-public json-glib (package -- cgit v1.2.3 From 35fa923d8befc1976e3ffc6b5fd27a33dfcdd0ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 27 Jul 2018 12:39:16 +0200 Subject: gnu: dconf: Update to 0.28.0. * gnu/packages/gnome.scm (dconf): Update to 0.28.0. [build-system]: Switch to MESON-BUILD-SYSTEM. [arguments]: Adjust accordingly. [native-inputs]: Add VALA and GLIB:BIN. --- gnu/packages/gnome.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 896d7090d6..b1a0ccdc12 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2229,7 +2229,7 @@ and RDP protocols.") (define-public dconf (package (name "dconf") - (version "0.26.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (string-append @@ -2238,8 +2238,8 @@ and RDP protocols.") name "-" version ".tar.xz")) (sha256 (base32 - "0da587hpiqy8h3pswn1102h4b905x8k6mk3ajpi7kf4kzkvv30ym")))) - (build-system glib-or-gtk-build-system) + "0hn7v6769xabqz7kvyb2hfm19h46z1whkair7ff752zmbs3b7lv1")))) + (build-system meson-build-system) (propagated-inputs ;; In Requires of dconf.pc. `(("glib" ,glib))) @@ -2251,16 +2251,15 @@ and RDP protocols.") ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) + ("glib:bin" ,glib "bin") ("gtk-doc" ,gtk-doc) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) (arguments `(#:tests? #f ; To contact dbus it needs to load /var/lib/dbus/machine-id ; or /etc/machine-id. - #:configure-flags - ;; Set the correct RUNPATH in binaries. - (list (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - "--enable-gtk-doc"))) + #:glib-or-gtk? #t + #:configure-flags '("-Denable-gtk-doc=true"))) (home-page "https://developer.gnome.org/dconf") (synopsis "Low-level GNOME configuration system") (description "Dconf is a low-level configuration system. Its main purpose -- cgit v1.2.3 From 9ec5496525c6c20a174b487a69ecd555af56b924 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 21:17:09 +0200 Subject: gnu: upower: Update to 0.99.8. * gnu/packages/gnome.scm (upower): Update to 0.99.8. [source](uri): Change to new download location*. [arguments]: Remove #:phases. * https://lists.freedesktop.org/archives/devkit-devel/2018-June/001829.html --- gnu/packages/gnome.scm | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b1a0ccdc12..3d3d77bf26 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2928,14 +2928,15 @@ faster results and to avoid unnecessary server load.") (define-public upower (package (name "upower") - (version "0.99.4") + (version "0.99.8") (source (origin (method url-fetch) - (uri (string-append "https://upower.freedesktop.org/releases/" - name "-" version ".tar.xz")) + (uri (string-append "https://gitlab.freedesktop.org/upower/upower/" + "uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/" + "upower-" version ".tar.xz")) (sha256 (base32 - "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww")) + "00lzr0vyxz5lvmgya48gdb2cdgmfdim4b34jlfdyqakk1i9sl8xv")) (patches (search-patches "upower-builddir.patch")))) (build-system glib-or-gtk-build-system) (arguments @@ -2946,17 +2947,7 @@ faster results and to avoid unnecessary server load.") #:configure-flags (list "--localstatedir=/var" (string-append "--with-udevrulesdir=" (assoc-ref %outputs "out") - "/lib/udev/rules.d")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-/bin/true - (lambda _ - (substitute* "configure" - (("/bin/true") (which "true"))))) - (add-before 'configure 'patch-integration-test - (lambda _ - (substitute* "src/linux/integration-test" - (("/usr/bin/python3") (which "python3")))))))) + "/lib/udev/rules.d")))) (native-inputs `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) -- cgit v1.2.3 From d7a503fcc676a868eac449b2cb49c4459a45144c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 30 Jul 2018 21:50:57 +0200 Subject: gnu: upower: Add explicit dependency on Glib. * gnu/packages/gnome.scm (upower)[propagated-inputs]: New field. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3d3d77bf26..947ae6ae3e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2962,6 +2962,9 @@ faster results and to avoid unnecessary server load.") `(("dbus-glib" ,dbus-glib) ("libgudev" ,libgudev) ("libusb" ,libusb))) + (propagated-inputs + ;; In Requires of upower-glib.pc. + `(("glib" ,glib))) (home-page "https://upower.freedesktop.org/") (synopsis "System daemon for managing power devices") (description -- cgit v1.2.3