From 0b5c16c07f4cc28dc2ffa80d3b6259f10762413d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 14 Jun 2018 04:30:50 +0200
Subject: Fix typo in (gnu packages gtk) header.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/gtk.scm: Fix ‘Coypright’ typo.
---
gnu/packages/gtk.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gnu/packages/gtk.scm')
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 41b908050d..90878ee1e9 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
-;;; Coypright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
--
cgit v1.2.3
From 0d0252e45768b2a638a6b018735aab30d27d22ee Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Fri, 22 Jun 2018 19:59:45 +0200
Subject: gnu: Use HTTPS for drobilla.net URIs.
* gnu/packages/audio.scm (jalv, lilv, patchage, raul, raul-devel)
(sratom, suil)[source, home-page]: Use HTTPS.
* gnu/packages/gtk.scm (ganv, ganv-devel)[source, home-page]: Likewise.
* gnu/packages/music.scm (ingen)[source, home-page]: Likewise.
* gnu/packages/rdf.scm (serd, sord)[source, home-page]: Likewise.
---
gnu/packages/audio.scm | 26 +++++++++++++-------------
gnu/packages/gtk.scm | 6 +++---
gnu/packages/music.scm | 4 ++--
gnu/packages/rdf.scm | 8 ++++----
4 files changed, 22 insertions(+), 22 deletions(-)
(limited to 'gnu/packages/gtk.scm')
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ab16707ee5..986a429a0b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1476,7 +1476,7 @@ (define-public jalv
(version "1.6.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/jalv-"
+ (uri (string-append "https://download.drobilla.net/jalv-"
version ".tar.bz2"))
(sha256
(base32
@@ -1501,7 +1501,7 @@ (define-public jalv
("jack" ,jack-1)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/jalv/")
+ (home-page "https://drobilla.net/software/jalv/")
(synopsis "Simple LV2 host for JACK")
(description
"Jalv is a simple but fully featured LV2 host for JACK. It runs LV2
@@ -1711,7 +1711,7 @@ (define-public lilv
(version "0.24.2")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/lilv-"
+ (uri (string-append "https://download.drobilla.net/lilv-"
version ".tar.bz2"))
(sha256
(base32
@@ -1737,7 +1737,7 @@ (define-public lilv
`(("lv2" ,lv2)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/lilv/")
+ (home-page "https://drobilla.net/software/lilv/")
(synopsis "Library to simplify use of LV2 plugins in applications")
(description
"Lilv is a C library to make the use of LV2 plugins as simple as possible
@@ -1966,7 +1966,7 @@ (define-public patchage
(version "1.0.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/patchage-"
+ (uri (string-append "https://download.drobilla.net/patchage-"
version
".tar.bz2"))
(sha256
@@ -1984,7 +1984,7 @@ (define-public patchage
("dbus-glib" ,dbus-glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/patchage/")
+ (home-page "https://drobilla.net/software/patchage/")
(synopsis "Modular patch bay for audio and MIDI systems")
(description
"Patchage is a modular patch bay for audio and MIDI systems based on JACK
@@ -2163,7 +2163,7 @@ (define-public raul
(version "0.8.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/raul-"
+ (uri (string-append "https://download.drobilla.net/raul-"
version ".tar.bz2"))
(sha256
(base32
@@ -2177,7 +2177,7 @@ (define-public raul
("boost" ,boost)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/raul/")
+ (home-page "https://drobilla.net/software/raul/")
(synopsis "Real-time audio utility library")
(description
"Raul (Real-time Audio Utility Library) is a C++ utility library primarily
@@ -2194,7 +2194,7 @@ (define-public raul-devel
(source (origin
(method git-fetch)
(uri (git-reference
- (url "http://git.drobilla.net/raul.git")
+ (url "https://git.drobilla.net/raul.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
@@ -2287,7 +2287,7 @@ (define-public sratom
(version "0.6.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/sratom-"
+ (uri (string-append "https://download.drobilla.net/sratom-"
version ".tar.bz2"))
(sha256
(base32
@@ -2300,7 +2300,7 @@ (define-public sratom
("sord" ,sord)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/sratom/")
+ (home-page "https://drobilla.net/software/sratom/")
(synopsis "Library for serialising LV2 atoms to/from RDF")
(description
"Sratom is a library for serialising LV2 atoms to/from RDF, particularly
@@ -2313,7 +2313,7 @@ (define-public suil
(version "0.10.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/suil-"
+ (uri (string-append "https://download.drobilla.net/suil-"
version ".tar.bz2"))
(sha256
(base32
@@ -2330,7 +2330,7 @@ (define-public suil
("qt" ,qtbase)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/suil/")
+ (home-page "https://drobilla.net/software/suil/")
(synopsis "Library for loading and wrapping LV2 plugin UIs")
(description
"Suil is a lightweight C library for loading and wrapping LV2 plugin UIs.
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 90878ee1e9..9a8293bfe9 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -284,7 +284,7 @@ (define-public ganv
(version "1.4.2")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/ganv-"
+ (uri (string-append "https://download.drobilla.net/ganv-"
version ".tar.bz2"))
(sha256
(base32
@@ -309,7 +309,7 @@ (define-public ganv
(native-inputs
`(("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/ganv/")
+ (home-page "https://drobilla.net/software/ganv/")
(synopsis "GTK+ widget for interactive graph-like environments")
(description
"Ganv is an interactive GTK+ widget for interactive “boxes and lines” or
@@ -328,7 +328,7 @@ (define-public ganv-devel
(source (origin
(method git-fetch)
(uri (git-reference
- (url "http://git.drobilla.net/ganv.git")
+ (url "https://git.drobilla.net/ganv.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7d6021da23..600f64da20 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3197,7 +3197,7 @@ (define-public ingen
(origin
(method git-fetch)
(uri (git-reference
- (url "http://git.drobilla.net/ingen.git")
+ (url "https://git.drobilla.net/ingen.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
@@ -3258,7 +3258,7 @@ (define-public ingen
(native-inputs
`(("pkg-config" ,pkg-config)
("python-pygments" ,python-pygments)))
- (home-page "http://drobilla.net/software/ingen")
+ (home-page "https://drobilla.net/software/ingen")
(synopsis "Modular audio processing system")
(description "Ingen is a modular audio processing system for JACK and
LV2 based systems. Ingen is built around LV2 technology and a strict
diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm
index 973fef72f0..1618b29b06 100644
--- a/gnu/packages/rdf.scm
+++ b/gnu/packages/rdf.scm
@@ -233,7 +233,7 @@ (define-public serd
(version "0.28.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/serd-"
+ (uri (string-append "https://download.drobilla.net/serd-"
version ".tar.bz2"))
(sha256
(base32
@@ -250,7 +250,7 @@ (define-public serd
(string-append "-Wl,-rpath="
(assoc-ref outputs "out") "/lib"))
#t)))))
- (home-page "http://drobilla.net/software/serd/")
+ (home-page "https://drobilla.net/software/serd/")
(synopsis "Library for RDF syntax supporting Turtle and NTriples")
(description
"Serd is a lightweight C library for RDF syntax which supports reading
@@ -267,7 +267,7 @@ (define-public sord
(version "0.16.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://download.drobilla.net/sord-"
+ (uri (string-append "https://download.drobilla.net/sord-"
version ".tar.bz2"))
(sha256
(base32
@@ -288,7 +288,7 @@ (define-public sord
`(("serd" ,serd)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- (home-page "http://drobilla.net/software/sord/")
+ (home-page "https://drobilla.net/software/sord/")
(synopsis "C library for storing RDF data in memory")
(description
"Sord is a lightweight C library for storing RDF data in memory.")
--
cgit v1.2.3
From 36ba88da4a18d4e93f08f7296cc20ab775828036 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 13 Jun 2018 22:06:11 +0200
Subject: gnu: gtk-doc: Update to 1.27.
* gnu/packages/gtk.scm (gtk-doc)[source]: Update to 1.27.
[arguments]<#:phases>[patch-gtk-doc-scan]: New phase.
[arguments]<#:phases>[patch-test-out]: New phase.
[propagated-inputs]: Add python-six.
---
gnu/packages/gtk.scm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/gtk.scm')
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9a8293bfe9..56f3a249de 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1416,7 +1416,7 @@ (define-public girara
(define-public gtk-doc
(package
(name "gtk-doc")
- (version "1.25")
+ (version "1.27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1424,12 +1424,30 @@ (define-public gtk-doc
name "-" version ".tar.xz"))
(sha256
(base32
- "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"))))
+ "0vwsdl61nvnmqswlz5j9m4hg7qirhazwcikcnqf9nx0c13vx6sz2"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-gtk-doc-scan
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "gtk-doc.xsl"
+ (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
+ (string-append (assoc-ref inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-"
+ ,(package-version docbook-xsl)
+ "/html/chunk.xsl")))
+ #t))
+ (add-after 'patch-gtk-doc-scan 'patch-test-out
+ (lambda _
+ ;; sanity.sh counts the number of status lines. Since our
+ ;; texlive regenerates the fonts every time and the font
+ ;; generator metafont outputs a lot of extra lines, this
+ ;; test would always fail. Disable it for now.
+ (substitute* "tests/Makefile.in"
+ (("empty.sh sanity.sh") "empty.sh"))
+ #t))
(add-before 'build 'set-HOME
(lambda _
;; FIXME: dblatex with texlive-union does not find the built
@@ -1470,6 +1488,8 @@ (define-public gtk-doc
("docbook-xsl" ,docbook-xsl)
("source-highlight" ,source-highlight)
("glib" ,glib)))
+ (propagated-inputs
+ `(("python-six" ,python-six)))
(home-page "http://www.gtk.org/gtk-doc/")
(synopsis "Documentation generator from C source code")
(description
--
cgit v1.2.3
From d86a7c647d9b51de0c3d7e420c0951cedbca49eb Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 24 Jun 2018 17:35:31 +0200
Subject: gnu: gtk-doc: Wrap executables.
* gnu/packages/gtk.scm (gtk-doc)[arguments]: Add phase "wrap-executables".
---
gnu/packages/gtk.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'gnu/packages/gtk.scm')
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 56f3a249de..bc7cda0d72 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
-;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Fabian Harfert <fhmgufs@web.de>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
@@ -1468,7 +1468,15 @@ (define-public gtk-doc
(string-append (car (find-files (assoc-ref inputs "docbook-xsl")
"^catalog.xml$"))
" \"http://docbook.sourceforge.net/release/xsl/")))
- #t)))
+ #t))
+ (add-after 'install 'wrap-executables
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each (lambda (prog)
+ (wrap-program prog
+ `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
+ (find-files (string-append out "/bin")))
+ #t))))
#:configure-flags
(list (string-append "--with-xml-catalog="
(assoc-ref %build-inputs "docbook-xml")
--
cgit v1.2.3
From 9c708566a29befd065458c7003ac5686ef7c238c Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Mon, 25 Jun 2018 21:48:11 +0200
Subject: gnu: gtk-doc: Don't propagate python-six.
* gnu/packages/gtk.scm (gtk-doc)[propagated-inputs]: Remove python-six.
[inputs]: Add python-six.
---
gnu/packages/gtk.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/gtk.scm')
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index bc7cda0d72..83db8f6b30 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1495,9 +1495,8 @@ (define-public gtk-doc
("docbook-xml" ,docbook-xml-4.3)
("docbook-xsl" ,docbook-xsl)
("source-highlight" ,source-highlight)
- ("glib" ,glib)))
- (propagated-inputs
- `(("python-six" ,python-six)))
+ ("glib" ,glib)
+ ("python-six" ,python-six)))
(home-page "http://www.gtk.org/gtk-doc/")
(synopsis "Documentation generator from C source code")
(description
--
cgit v1.2.3