From aff0cce9175aaf836dd78941eb17549e3bfa7188 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 4 Apr 2019 15:14:57 +0200 Subject: gnu: Move nss & co. to nss.scm. * gnu/packages/gnuzilla.scm (nspr, nss): Move to... * gnu/packages/nss.scm: ... here. New file. * gnu/packages/chromium.scm, gnu/packages/disk.scm, gnu/packages/freedesktop.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/java.scm, gnu/packages/libreoffice.scm, gnu/packages/linux.scm, gnu/packages/mate.scm, gnu/packages/openldap.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/polkit.scm, gnu/packages/qt.scm, gnu/packages/sssd.scm, gnu/packages/storage.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/xml.scm: Adjust accordingly. * gnu/local.mk (GNU_SYSTEM_MODULES): Add nss.scm. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 588b2f15c7..3b8fa514d1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo -;;; Copyright © 2017, 2018 Ludovic Courtès +;;; Copyright © 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -59,7 +59,6 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) #:use-module (gnu packages gnupg) - #:use-module (gnu packages gnuzilla) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) @@ -67,6 +66,7 @@ #:use-module (gnu packages java) #:use-module (gnu packages linux) #:use-module (gnu packages maths) + #:use-module (gnu packages nss) #:use-module (gnu packages openldap) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) -- cgit v1.2.3 From 44aaf1e00ac88a7e2e969a3f30e0092f5502b3b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 04:28:33 +0200 Subject: gnu: libmwaw: Update to 0.3.15. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.15. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3b8fa514d1..d348a7aa89 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -638,14 +638,14 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.14") + (version "0.3.15") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) + "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From cb4c99ceb91124a88a40f4cb46a04e6b64ac9b2c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:24 +0200 Subject: gnu: libpagemaker: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libpagemaker)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d348a7aa89..dd289af74e 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -554,8 +554,8 @@ Java.") (source (origin (method url-fetch) - (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "https://dev-www.libreoffice.org/src/libpagemaker/" + "libpagemaker-" version ".tar.xz")) (sha256 (base32 "17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9a4f6ceb10ae39d611f3fae1cb10c45daab57cc3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:31 +0200 Subject: gnu: libvisio: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libvisio)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index dd289af74e..df40570fcc 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -581,8 +581,8 @@ created by PageMaker version 6.x and 7.") (source (origin (method url-fetch) - (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" - name "-" version ".tar.xz")) + (uri (string-append "http://dev-www.libreoffice.org/src/libvisio/" + "libvisio-" version ".tar.xz")) (sha256 (base32 "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y")))) (build-system gnu-build-system) -- cgit v1.2.3 From 9148ed7cd2912a361d9296bebe1334f908432986 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:37 +0200 Subject: gnu: libodfgen: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libodfgen)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index df40570fcc..946f630f04 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -611,8 +611,8 @@ Microsoft Visio documents of all versions.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/libwpd/" name "/" - name "-" version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libwpd/libodfgen/" + "libodfgen-" version "/libodfgen-" version ".tar.xz")) (sha256 (base32 "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij")))) (build-system gnu-build-system) -- cgit v1.2.3 From 7b7abb07c2913d9c9a4accb7b6437afa3b30236e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Apr 2019 14:11:42 +0200 Subject: gnu: libmwaw: Don't use NAME in source URI. * gnu/packages/libreoffice.scm (libmwaw)[source]: Hard-code NAME. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 946f630f04..9f5bedd913 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -642,8 +642,8 @@ text documents, vector drawings, presentations and spreadsheets.") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-" + version "/libmwaw-" version ".tar.xz")) (sha256 (base32 "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04")))) (build-system gnu-build-system) -- cgit v1.2.3