From 3944a5b9baeea9621bf368e9ebb80b4c25a0a20c Mon Sep 17 00:00:00 2001 From: Ark74 <ark@switnet.org> Date: Fri, 13 Mar 2020 23:57:04 -0600 Subject: [PATCH] Fix finall versions and minor dependencies --- helpers/make-liborcus | 2 ++ helpers/make-libreoffice | 4 ++-- helpers/make-nspr | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/helpers/make-liborcus b/helpers/make-liborcus index 2f2ce2250..8a535edff 100644 --- a/helpers/make-liborcus +++ b/helpers/make-liborcus @@ -21,6 +21,8 @@ VERSION=2 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORT=true +DEPENDS=mdds,libixion +#,libetonyek . ./config diff --git a/helpers/make-libreoffice b/helpers/make-libreoffice index ab3515a4e..c637758a6 100644 --- a/helpers/make-libreoffice +++ b/helpers/make-libreoffice @@ -17,11 +17,11 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 EXTERNAL='deb-src http://ppa.launchpad.net/libreoffice/libreoffice-6-4/ubuntu bionic main' REPOKEY="83FBA1751378B444" BACKPORT=true -DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext,xmlsec1,qr-code-generator +DEPENDS=libcmis,mdds,libixion,liborcus,libnumbertext,xmlsec1,qr-code-generator,nss . ./config diff --git a/helpers/make-nspr b/helpers/make-nspr index 2f2ce2250..1b3874c42 100644 --- a/helpers/make-nspr +++ b/helpers/make-nspr @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2019 Luis Guzmán <ark@switnet.org> +# Copyright (C) 2020 Luis Guzmán <ark@switnet.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=1 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORT=true -- GitLab