From f8687cb21e6af7501b1537812bccca574b9d34b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 14:09:18 +0200 Subject: gnu: dia: Update to 0.97.3-2.3cf7ec4 [fixes CVE-2019-19451]. * gnu/packages/gnome.scm (dia): Update to 0.97.3-2.3cf7ec4. [build-system]: Use Meson. [inputs]: Add graphene, libxslt, poppler, and python-2. Remove freetype, gdk-pixbuf, libart-lgpl, and pango. [native-inputs]: Add appstream-glib and docbook-xsl. Remove autoconf, automake, libtool, perl, and python-wrapper. --- gnu/packages/gnome.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a568d54044..dbaab157f5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1010,11 +1010,12 @@ useful as a tutorial and users' guide for new or less experienced users.") ;; This version from GNOME's repository includes fixes for compiling with ;; recent versions of the build tools. The latest activity on the ;; pre-GNOME version has been in 2014, while GNOME has continued applying - ;; fixes in 2016. - (let ((commit "fbc306168edab63db80b904956117cbbdc514ee4")) + ;; fixes since. + (let ((commit "3cf7ec4c2e5bca139a7f3e17f9fc9009c237fcc5") + (revision "2")) (package (name "dia") - (version (git-version "0.97.3" "1" commit)) + (version (git-version "0.97.3" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1023,24 +1024,23 @@ useful as a tutorial and users' guide for new or less experienced users.") (file-name (git-file-name name version)) (sha256 (base32 - "1b4bba0k8ph4cwgw8xjglss0p6n111bpd5app67lrq79mp0ad06l")))) - (build-system gnu-build-system) + "04r8dspa6nmicrifhi3sh46hqvyy88hzq37xx99q3q1mwsrpmwy8")))) + (build-system meson-build-system) (inputs - `(("freetype" ,freetype) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("graphene" ,graphene) ("gtk+" ,gtk+-2) - ("libart-lgpl" ,libart-lgpl) ("libxml2" ,libxml2) - ("pango" ,pango))) + ("libxslt" ,libxslt) + ("poppler" ,poppler) + ;; Without Python 2, build fails: plug-ins/python/meson.build:4:0: + ;; ERROR: Unknown method "dependency" in object. + ("python-2" ,python-2))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("intltool" ,intltool) + `(("appstream-glib" ,appstream-glib) + ("docbook-xsl" ,docbook-xsl) ("glib" ,glib "bin") - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper))) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) (home-page "https://wiki.gnome.org/Apps/Dia") (synopsis "Diagram creation for GNOME") (description "Dia can be used to draw different types of diagrams, and -- cgit v1.2.3 From 5d31933e0b8520ee831e71dcd0ede6ec3de5216e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 10 Apr 2020 13:51:07 +0100 Subject: gnu: Add python2-pyatspi. This will enable updating python2-dogtail to 0.9.11. * gnu/packages/gnome.scm (python2-pyatspi): New variable. --- gnu/packages/gnome.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dbaab157f5..fdbec60881 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8860,6 +8860,14 @@ accessibility infrastructure.") (license license:lgpl2.0) (properties '((upstream-name . "pyatspi"))))) +(define-public python2-pyatspi + (package + (inherit python-pyatspi) + (name "python2-pyatspi") + (inputs + `(("python" ,python-2) + ("python-pygobject" ,python2-pygobject))))) + (define-public orca (package (name "orca") -- cgit v1.2.3 From 06fe35cf0c27545e8d995aaf35b7b11987f4ed67 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 15 Apr 2020 18:43:55 +0100 Subject: gnu: python-pyatspi: Propagate python-pygobject. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As python-pygobject is required at runtime. * gnu/packages/gnome.scm (python-pyatspi)[inputs]: Move python-pygobject to… [propagated-inputs]: …here. (python2-pyatspi)[inputs]: Move python2-pygobject to… [propagated-inputs]: …here. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fdbec60881..94a649779e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8849,8 +8849,9 @@ from gi.repository import Atspi")) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("python" ,python) - ("python-pygobject" ,python-pygobject))) + `(("python" ,python))) + (propagated-inputs + `(("python-pygobject" ,python-pygobject))) (synopsis "Python client bindings for D-Bus AT-SPI") (home-page "https://wiki.linuxfoundation.org/accessibility\ /atk/at-spi/at-spi_on_d-bus") @@ -8865,8 +8866,9 @@ accessibility infrastructure.") (inherit python-pyatspi) (name "python2-pyatspi") (inputs - `(("python" ,python-2) - ("python-pygobject" ,python2-pygobject))))) + `(("python" ,python-2))) + (propagated-inputs + `(("python-pygobject" ,python2-pygobject))))) (define-public orca (package -- cgit v1.2.3 From bdfd5d6f51b5e9b916780ca896a3a7f76bc742ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:09:14 +0200 Subject: gnu: gnome-boxes: Update to 3.36.4. * gnu/packages/gnome.scm (gnome-boxes): Update to 3.36.4. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 94a649779e..23684aabba 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9911,7 +9911,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "3.35.91") + (version "3.36.4") (source (origin (method url-fetch) @@ -9919,8 +9919,7 @@ integrate seamlessly with the GNOME desktop.") (version-major+minor version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 - "0l96spz6pc8q4l5p9a58cc0kgvdr7pbc89hy6ixn72k5pl3s7fxj")))) + (base32 "16l0mq2ydmywcdya1795mcy8syg4zkmz9ws3pzjcqv5y4m7cjj03")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 897897bda3ef2f7366560c45b92a6f39abca148f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 28 May 2020 02:10:31 +0200 Subject: gnu: gnome: Add gnome-boxes. * gnu/packages/gnome.scm (gnome)[propagated-inputs]: Add gnome-boxes. --- 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 23684aabba..0d63579d4a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7895,7 +7895,7 @@ world.") ("evince" ,evince) ("file-roller" ,file-roller) ("gedit" ,gedit) - ; TODO: ("gnome-boxes" ,gnome-boxes) + ("gnome-boxes" ,gnome-boxes) ("gnome-calculator" ,gnome-calculator) ("gnome-calendar" ,gnome-calendar) ("gnome-characters" ,gnome-characters) -- cgit v1.2.3 From 73014984bbc4067b9ed9e8c72e89921004217693 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:01:15 +0200 Subject: gnu: piper: Update to 0.5. * gnu/packages/gnome.scm (piper): Update to 0.5. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0d63579d4a..360a4c03a3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10153,7 +10153,7 @@ your operating-system definition: (define-public piper (package (name "piper") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -10161,7 +10161,7 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "17h06j8lxpbfygq8fzycl7lml4vv7r05bsyhh3gga2hp0zms4mvg")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 81af0de99986ab28628822cbec59632edbf65570 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 29 May 2020 08:02:21 +0200 Subject: gnu: piper: Include package name in source file name. * gnu/packages/gnome.scm (piper)[source]: Set FILE-NAME. --- 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 360a4c03a3..9f7b3eeecb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10161,7 +10161,8 @@ your operating-system definition: (url "https://github.com/libratbag/piper.git") (commit version))) (sha256 - (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")))) + (base32 "00vrcsbsv2477l1ncpyzc61lhxgac84dsgr3sjs8qxw3nh1gaasv")) + (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 031315e4f0fbc4e04ffc8adee04128c23173a1f7 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 May 2020 00:56:42 +0530 Subject: gnu: glade3: Update to 3.36.0. * gnu/packages/gnome.scm (glade3): Update to 3.36.0. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f7b3eeecb..1745bf7906 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -2090,7 +2091,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") (define-public glade3 (package (name "glade") - (version "3.22.1") + (version "3.36.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2098,7 +2099,7 @@ API add-ons to make GTK+ widgets OpenGL-capable.") name "-" version ".tar.xz")) (sha256 (base32 - "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z")))) + "023gx8rj51njn8fsb6ma5kz1irjpxi4js0n8rwy22inc4ysldd8r")))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; needs X, GL, and software rendering -- cgit v1.2.3