From a511933e080aa9136c432d0cbc5651dc08d45067 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 22 Apr 2019 20:19:56 +0000
Subject: [PATCH] extra/libreoffice-fresh to 6.2.3-1

---
 extra/libreoffice-fresh/PKGBUILD               | 18 ++++++------------
 .../libreoffice-boost-1.69.patch               | 17 -----------------
 2 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 extra/libreoffice-fresh/libreoffice-boost-1.69.patch

diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index a9ac45562..e473a3edf 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -18,9 +18,9 @@ _google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=6.2.2.2
-pkgver=6.2.2
-pkgrel=4
+_LOver=6.2.3.2
+pkgver=6.2.3
+pkgrel=1
 arch=('x86_64')
 license=('LGPL3')
 url="https://www.libreoffice.org/"
@@ -62,7 +62,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url2}/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-boost-1.69.patch
 	libreoffice-fresh.sh libreoffice-fresh.csh)
 noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -81,11 +80,11 @@ noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
            185d60944ea767075d27247c3162b3bc-unowinreg.dll
 )
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build@documentfoundation.org>
-sha256sums=('b83ad3a8aa7bebf34db9e984d518a8f2248ed685e04be8373cfa87bb04e31f69'
+sha256sums=('f1ddb94fb2bab615ec446da83e62f2bcf963bddc7b9fe600e326701926dc6daf'
             'SKIP'
-            '619f92db787dc8cb4aa81f203b3eefbd02a4affd382bf8d1b9268c846d360d92'
+            'c1b6923eb66610abeecde79fcc28c9c61353e5b1f2772a37c7aa7a018dbe1132'
             'SKIP'
-            '37e86f2675003a43379658ca5ad65e9093df5353dc0e6dc0a2d34450dbab1745'
+            '77bfeac5cefb96210a09557ad7f5c40ae399b0658f879fddb02891ac4d2add3e'
             'SKIP'
             '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
             '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
@@ -103,7 +102,6 @@ sha256sums=('b83ad3a8aa7bebf34db9e984d518a8f2248ed685e04be8373cfa87bb04e31f69'
             '49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
-            '5099c5e7818a327b661c45c0bd218835c1e70b14861b5112525da1d48beebf8c'
             'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2'
             '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6')
 
@@ -126,10 +124,6 @@ prepare() {
 	# fix not upstreamable pyuno paths - FS#54250
 	patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
 
-
-	# fix build with boost 1.69 (freebsd)
-	patch -p0 -i ../libreoffice-boost-1.69.patch
-
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in
diff --git a/extra/libreoffice-fresh/libreoffice-boost-1.69.patch b/extra/libreoffice-fresh/libreoffice-boost-1.69.patch
deleted file mode 100644
index f72016725..000000000
--- a/extra/libreoffice-fresh/libreoffice-boost-1.69.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
-
-sfx2/source/appl/shutdownicon.cxx:170:12: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
-    return loaded;
-           ^~~~~~
-
---- sfx2/source/appl/shutdownicon.cxx.orig	2018-06-19 22:27:30 UTC
-+++ sfx2/source/appl/shutdownicon.cxx
-@@ -167,7 +167,7 @@ bool LoadModule()
- #endif // ENABLE_QUICKSTART_APPLET
-     }
-     assert(!boost::logic::indeterminate(loaded));
--    return loaded;
-+    return bool{loaded};
- }
- 
- }