From 3928fbde279f8d3399670c5861c8317a32aa8fd7 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2020 23:23:26 +0200 Subject: [PATCH] monolith: rebuild against libressl-3.1.3 --- srcpkgs/monolith/template | 6 +++++- srcpkgs/nextcloud-client/patches/qt5.15.patch | 10 ++++++++++ srcpkgs/retroshare/patches/qt5.15.patch | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/nextcloud-client/patches/qt5.15.patch create mode 100644 srcpkgs/retroshare/patches/qt5.15.patch diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template index 8dda2ca62a..172aac1208 100644 --- a/srcpkgs/monolith/template +++ b/srcpkgs/monolith/template @@ -1,7 +1,7 @@ # Template file for 'monolith' pkgname=monolith version=2.2.7 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" makedepends="libressl-devel" @@ -12,6 +12,10 @@ homepage="https://github.com/Y2Z/monolith" distfiles="https://github.com/Y2Z/monolith/archive/v${version}.tar.gz" checksum=8fa8ea66383f7278f6fcbe1ba75ffc9243b93031a88725135ca3b0eeb38c7df9 +pre_build() { + cargo update --package openssl-sys --precise 0.9.58 +} + post_install() { vlicense LICENSE } diff --git a/srcpkgs/nextcloud-client/patches/qt5.15.patch b/srcpkgs/nextcloud-client/patches/qt5.15.patch new file mode 100644 index 0000000000..60d459c5fd --- /dev/null +++ b/srcpkgs/nextcloud-client/patches/qt5.15.patch @@ -0,0 +1,10 @@ +--- src/libsync/networkjobs.cpp 2020-03-03 20:32:31.000000000 +0100 ++++ - 2020-07-05 00:46:17.255659367 +0200 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + #include "networkjobs.h" diff --git a/srcpkgs/retroshare/patches/qt5.15.patch b/srcpkgs/retroshare/patches/qt5.15.patch new file mode 100644 index 0000000000..22253642c4 --- /dev/null +++ b/srcpkgs/retroshare/patches/qt5.15.patch @@ -0,0 +1,20 @@ +--- retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100 ++++ - 2020-07-05 00:47:16.416125978 +0200 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include + +--- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100 ++++ - 2020-07-05 00:47:57.366966204 +0200 +@@ -30,6 +30,7 @@ + #include + + #include ++#include + #include + + /* Images for tag icons */