From aa7587633b1d5bc53338f388cdf35babf3ffb67f Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 9 Jun 2018 11:11:28 +0100
Subject: gnu: rhythmbox: Add a unreleased patch from upstream.
* gnu/packages/gnome.scm (rhythmbox)[source]: Add patch from the upstream Git
repository, as without this, the package fails to build.
---
gnu/packages/gnome.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'gnu/packages/gnome.scm')
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index de212bfb44..3a9f11bd0f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3750,6 +3750,17 @@ (define-public rhythmbox
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
+ (patches
+ (list
+ ;; fmradio: Fix build with GStreamer master
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://gitlab.gnome.org/GNOME/rhythmbox/commit/"
+ "b182c6b9e1d09e601bac0b703cc5f8b159ebbc3a.patch"))
+ (sha256
+ (base32
+ "17j45vyyr071ka3nckj2gycgyyv1j08fyrxw89jfdq2442nzrsiy")))))
(sha256
(base32
"0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2"))))
--
cgit v1.2.3
From 4b3480d62f9d98bfe7dc7b0b148312f2000d70b5 Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 13 Jun 2018 08:43:23 +0200
Subject: gnu: cheese: Update to 3.28.0.
* gnu/packages/gnome.scm (cheese): Update to 3.28.0.
---
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 3a9f11bd0f..1d53af7515 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7140,7 +7140,7 @@ (define-public gnome-video-effects
(define-public cheese
(package
(name "cheese")
- (version "3.26.0")
+ (version "3.28.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -7148,7 +7148,7 @@ (define-public cheese
version ".tar.xz"))
(sha256
(base32
- "01f6lsp9jkhq5v2zxlghw15bca4xqavkxqkl8977r0g13p22zxcf"))))
+ "06da5qc5hdvwwd5vkbgbx8pjx1l3mvr07yrnnv3v1hfc3wp7l7jw"))))
(arguments
;; Tests require GDK.
`(#:tests? #f
--
cgit v1.2.3
From 737d1b3cd6fd583903428545cdd6bac0f5f6faab Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Tue, 19 Jun 2018 21:17:49 +0200
Subject: gnu: faba-icon-theme: Fix build.
* gnu/packages/gnome.scm (faba-icon-theme)[arguments]: Do not run
configure during the bootstrap phase.
---
gnu/packages/gnome.scm | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'gnu/packages/gnome.scm')
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1d53af7515..f66ac7446d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6486,6 +6486,12 @@ (define-public faba-icon-theme
(substitute* '("Makefile.am")
(("\\$\\(DESTDIR\\)/usr/share")
"$(datadir)"))
+ #t))
+ (add-after 'unpack 'disable-configure-during-bootstrap
+ (lambda _
+ ;; Do not run configure as part of autogen.sh because references
+ ;; to /bin are not fixed yet.
+ (setenv "NOCONFIGURE" "y")
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
--
cgit v1.2.3
From 9e1ede95df446f17df3c2164766545daeea472d3 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Tue, 19 Jun 2018 21:32:24 +0200
Subject: gnu: arc-icon-theme: Fix build.
* gnu/packages/gnome.scm (arc-icon-theme)[arguments]: Do not run
configure during the bootstrap phase.
---
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 f66ac7446d..b5d8170ae2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6541,6 +6541,14 @@ (define-public arc-icon-theme
(base32
"1ya1cqvv8q847c0rpcg6apzky87q3h04y8jz5nmi52qk6kg8si0b"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'disable-configure-during-bootstrap
+ (lambda _
+ (substitute* "autogen.sh"
+ (("^\"\\$srcdir/configure\".*") ""))
+ #t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)))
--
cgit v1.2.3
From de99ba7e7c0ba782451f1ccf60135adfce058ad5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 20 Jun 2018 01:03:47 +0200
Subject: Fix some more lonely unquotes.
* gnu/packages/gnome.scm (workrave)[inputs]: Move unquote to its
operand.
* gnu/packages/java.scm (java-asm-bootstrap)[propagated-inputs]:
Likewise.
* gnu/packages/maven.scm (maven-compat)[native-inputs]: Likewise.
(maven)[inputs]: Likewise.
* gnu/packages/networking.scm (amule)[inputs]: Likewise.
* gnu/packages/wm.scm (nitrogen)[native-inputs]: Likewise.
---
gnu/packages/gnome.scm | 2 +-
gnu/packages/java.scm | 2 +-
gnu/packages/maven.scm | 4 ++--
gnu/packages/networking.scm | 2 +-
gnu/packages/wm.scm | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'gnu/packages/gnome.scm')
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b5d8170ae2..a21adf4f56 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7287,7 +7287,7 @@ (define-public workrave
("libxtst" ,libxtst)
("dconf" ,dconf)
("libice" ,libice)))
- (inputs `(("libsm", libsm)
+ (inputs `(("libsm" ,libsm)
("python-cheetah" ,python2-cheetah)))
(native-inputs `(("glib" ,glib "bin")
("pkg-config" ,pkg-config)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b4b1eedd2e..30a9b77380 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -3583,7 +3583,7 @@ (define java-asm-bootstrap
`(("java-aqute-bndlib" ,java-aqute-bndlib-bootstrap)
("java-aqute-libg" ,java-aqute-libg-bootstrap)
,@(delete `("java-aqute-bndlib" ,java-aqute-bndlib)
- (delete `("java-aqute-libg", java-aqute-libg)
+ (delete `("java-aqute-libg" ,java-aqute-libg)
(package-inputs java-asm)))))))
(define-public java-cglib
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index 070bd7131c..0feb01f040 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -1405,7 +1405,7 @@ (define (modello-single-mode file version mode)
;; tests
("java-plexus-cipher" ,java-plexus-cipher)
("java-plexus-sec-dispatcher" ,java-plexus-sec-dispatcher)
- ("java-jsr250", java-jsr250)
+ ("java-jsr250" ,java-jsr250)
("java-cdi-api" ,java-cdi-api)
("java-junit" ,java-junit)
("maven-resolver-impl" ,maven-resolver-impl)
@@ -1463,7 +1463,7 @@ (define-public maven
("maven-settings" ,maven-settings)
("maven-settings-builder" ,maven-settings-builder)
("maven-plugin-api" ,maven-plugin-api)
- ("maven-repository-metadata", maven-repository-metadata)
+ ("maven-repository-metadata" ,maven-repository-metadata)
("maven-shared-utils" ,maven-shared-utils)
("maven-resolver-api" ,maven-resolver-api)
("maven-resolver-spi" ,maven-resolver-spi)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 5cdfec3431..b72a4734d7 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1776,7 +1776,7 @@ (define-public amule
`(("zlib" ,zlib)
("crypto++" ,crypto++)
("libpng" ,libpng)
- ("wxwidgets-gtk2", wxwidgets-gtk2)))
+ ("wxwidgets-gtk2" ,wxwidgets-gtk2)))
(home-page "http://amule.org/")
(synopsis "Peer-to-peer client for the eD2K and Kademlia networks")
(description
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 2a09521601..a076cbbb1d 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -991,7 +991,7 @@ (define-public nitrogen
("glib" ,glib)
("glibmm" ,glibmm)))
(native-inputs
- `(("pkg-config", pkg-config)))
+ `(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list
(string-append "--prefix=" %output)
--
cgit v1.2.3
From cf81ddefc810d2c9803fab294a27f4800565aa7e Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 22 Jun 2018 10:21:48 +0200
Subject: gnu: gnome-dictionary: Update to 3.26.1.
* gnu/packages/gnome.scm (gnome-dictionary): Update to 3.26.1.
[build-system]: Switch to MESON-BUILD-SYSTEM.
[arguments]; New field.
---
gnu/packages/gnome.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/gnome.scm')
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a21adf4f56..74a7cd0972 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6312,7 +6312,7 @@ (define-public gnome-todo
(define-public gnome-dictionary
(package
(name "gnome-dictionary")
- (version "3.24.0")
+ (version "3.26.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -6320,8 +6320,9 @@ (define-public gnome-dictionary
name "-" version ".tar.xz"))
(sha256
(base32
- "1wnrpg8yndacq0xnzc84d519yp7f28brzklm3a48xcgs1i50drs1"))))
- (build-system glib-or-gtk-build-system)
+ "007k2bq8iplg4psdpz074r5d4zxvn4s95qym4rw9hs6giljbrf0n"))))
+ (build-system meson-build-system)
+ (arguments '(#:glib-or-gtk? #t))
(native-inputs
`(("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
--
cgit v1.2.3
From cc00249b9bacccafa6408c319dd4cbd935f59f78 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 22 Jun 2018 16:18:14 +0200
Subject: gnu: workrave: Edit description.
* gnu/packages/gnome.scm (workrave)[description]: Edit and mark up.
---
gnu/packages/gnome.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/gnome.scm')
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 74a7cd0972..be5374a59f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7302,9 +7302,10 @@ (define-public workrave
("gobject-introspection" ,gobject-introspection)
("python2" ,python-2)))
(synopsis "Tool to help prevent repetitive strain injury (RSI)")
- (description "Workrave is a program that assists in the recovery and
-prevention of repetitive strain injury (RSI). The program frequently alerts
-you to take micro-pauses, rest breaks and restricts you to your daily limit")
+ (description
+ "Workrave is a program that assists in the recovery and prevention of
+repetitive strain injury (@dfn{RSI}). The program frequently alerts you to take
+micro-pauses and rest breaks, and restricts you to your daily limit.")
(home-page "http://www.workrave.org")
(license license:gpl3+))))
--
cgit v1.2.3
From 0e4d4d9872492064958f603673c354efc90c1caa Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Mon, 25 Jun 2018 17:27:18 -0400
Subject: gnu: epiphany: Update to 3.28.3.1 [fixes CVE-2018-{11396,12016}].
* gnu/packages/gnome.scm (epiphany): Update to 3.28.3.1.
---
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 be5374a59f..b9c1417186 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4191,7 +4191,7 @@ (define-public eolie
(define-public epiphany
(package
(name "epiphany")
- (version "3.28.2.1")
+ (version "3.28.3.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4199,7 +4199,7 @@ (define-public epiphany
name "-" version ".tar.xz"))
(sha256
(base32
- "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s"))))
+ "1xz6xl6b0iihvczyr0cs1z5ifvpai6anb4m0ng1caiph06klc1b9"))))
(build-system meson-build-system)
(arguments
--
cgit v1.2.3