diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-22 06:35:12 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-03-22 06:35:12 +0000 |
| commit | d0fd8d80cae022a4401411c686d2ed7758a969d4 (patch) | |
| tree | 55759a10d5a625251545b1ec8124327dc02267a9 | |
| parent | f9dffe1158c9b5dee29ea3def908cb6da2f77cd9 (diff) | |
| download | packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.gz packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.bz2 packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.tar.xz packages-d0fd8d80cae022a4401411c686d2ed7758a969d4.zip | |
user/libreoffice: fix build with Boost 1.69.0
| -rw-r--r-- | user/libreoffice/APKBUILD | 4 | ||||
| -rw-r--r-- | user/libreoffice/boost.patch | 17 |
2 files changed, 20 insertions, 1 deletions
diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD index a9e18b5f3..b46c09ed0 100644 --- a/user/libreoffice/APKBUILD +++ b/user/libreoffice/APKBUILD @@ -94,6 +94,7 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg disable-outdated-font-test.patch disable-mariadbc.patch disable-mysqlc.patch + boost.patch " ldpath="/usr/lib/$pkgname/program" @@ -483,4 +484,5 @@ bac06a1f0f6ef3e5860ec340470583b2a7ff079efa9efee9119ae1ac320b97ecbfdb7eba63975d4f 6a039ba592a23b8db1dd5c8d5dffbc9562270de691d2eb1e1c420f8632532c0fce14a0f3844dc2e6f6b6b04655c40230bd69fd81d1ae6f0bd16f0e88ce0a2783 disable-crc-test.patch 4ffc389a3c545d37d152bb52390c3abd06a32eb9fee03110c07e8b57f9b9d1be68fdc5092ad0be76f6540367a1f1d2e9e32d519021d8205847594edb811da428 disable-outdated-font-test.patch c1925fe5833410c6a4b47a1723e67ce3898fc01ebded766023855cd93f290a6788638a86a8595e112ab788628c0ea7642c41d7ff987ba9117c2e079a99a3b29f disable-mariadbc.patch -01ef207d0b3ab1ded5edadd2d05cefe65d7c2dc4285abee12d7fbb61c92b2a3e37d5cfe5bb8f5ea9a40fd2918396ec25b473a916012e04732ebbe79ee6768a21 disable-mysqlc.patch" +01ef207d0b3ab1ded5edadd2d05cefe65d7c2dc4285abee12d7fbb61c92b2a3e37d5cfe5bb8f5ea9a40fd2918396ec25b473a916012e04732ebbe79ee6768a21 disable-mysqlc.patch +0d325827209d27488d433239680b6c8fa7eee3df7c95091d8558ee928ba17454f56e13697b41afa4e38e5b9d70cd15089e6e7150feaa35cf1f0aa3993290e892 boost.patch" diff --git a/user/libreoffice/boost.patch b/user/libreoffice/boost.patch new file mode 100644 index 000000000..f72016725 --- /dev/null +++ b/user/libreoffice/boost.patch @@ -0,0 +1,17 @@ +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}; + } + + } |