summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-28 20:21:52 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-30 10:58:23 +0100
commitb324a1984c21621342927fd072e7f5b1d5186855 (patch)
treec2d589b0650d5e1e9c9ca8069010a6afbfec66b6
parentapp-office/libreoffice-l10n: 6.2.2.2 version bump (diff)
downloadgentoo-b324a1984c21621342927fd072e7f5b1d5186855.tar.gz
gentoo-b324a1984c21621342927fd072e7f5b1d5186855.tar.bz2
gentoo-b324a1984c21621342927fd072e7f5b1d5186855.zip
app-office/libreoffice: Add 6.2.2.2-patchset-01, build w/ boost-1.69
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--app-office/libreoffice/Manifest1
-rw-r--r--app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch36
-rw-r--r--app-office/libreoffice/libreoffice-6.2.2.2.ebuild6
3 files changed, 41 insertions, 2 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 735ca6411ec..b514ed85f2f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -6,6 +6,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
DIST libreoffice-6.1.5.2.tar.xz 207918636 BLAKE2B bb4e57a5363e7dc6757c537ef46231ff748649ca4b79993f371e787adba8cd1f3dd988f11e8813c24eb952d00355b02b15f0b126ea2c1f9d9ce7d6c26bf71c38 SHA512 36027ad8a3940e803908561e04feebce297db2fd570b7e43bb43d8c0b7885729eeaf0a64fc5f9e642c1008ffea0b3b1b6d0008e349cd1897425dc818ac8bf140
DIST libreoffice-6.2.1.1-patchset-01.tar.xz 8404 BLAKE2B 6fd1a3e931a1d3ef040e0e79ff53299fb47a55bf36f98998ebb896738a639aca8844bf6a5bb5fcbf3a5afeae935cb3e637436dcba456df005d00d5ed5a80e0d0 SHA512 eff36e8b5af2a592572ed60d9f22f59d8611dd5f62977ad93aa957181173d479a19f5907673b0f7532bfcca728a12a20101f2282914a34e0f0a53fd53e682ef3
DIST libreoffice-6.2.1.2.tar.xz 213885668 BLAKE2B b1b15dacfded68e9ce2c183e211928d732564ef0a51a967216545d8ff39bf52e72ecbcb53672cc9d967cb4474fc10efbd97e3d9107d3f7169138c62e8221f212 SHA512 0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef
+DIST libreoffice-6.2.2.2-patchset-01.tar.xz 6952 BLAKE2B 6b6b5280c9c65b7995d49bd0a5c0667226366f498f04d747e883d21490c88fcdd5abe4348ffe37d3060d0b685d4c3c3cd5e826351b22f24b68779bc5ca9d92b3 SHA512 63cce0839f65962df425f212306ed65e3899c6da857f74d7ea335bd48712fab2faa1de7dbc28a5022021a408f02cb972c3bb7b511f6e1209f103b8d214e163ac
DIST libreoffice-6.2.2.2.tar.xz 214029032 BLAKE2B fc95d9dcb594bd18317285ecf593fb69825ecf061f7a339b48c01c858ee0340390d635a75f9be2d522f0b8883365d013b72b52f81cded509a2748ad354b9006c SHA512 f58f73fc76c57cbcbc24f63680ebc06f72cbbff9c1339c8186e70bf5f0f9ad0203ed2898ee7dd82cfb2bd0239d96a1534cec635847fe8fb50a0abe70848d2125
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
DIST libreoffice-help-6.1.5.2.tar.xz 15758000 BLAKE2B e8db833db00116e210cd6da578ab05089fd12128bfb8015600027c9afca09a1afe7a62e30a0271dffead5d176c0195eae9095d0e00450a926999efadf3f7572f SHA512 0575244ae595af7383b244fd3f1855b7d63820f9c3ebf87bc9d0758463b4b289988bbed99f0985508d34793967734fd83ae2d1a5db514479bb2fe32e0498fc9f
diff --git a/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
new file mode 100644
index 00000000000..0c4c38cf58c
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.2.2.2-boost-1.69.patch
@@ -0,0 +1,36 @@
+From 358637547c5bb7ae6ca637640c4279455414dbfa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
+Date: Fri, 15 Mar 2019 16:16:31 +0100
+Subject: Fix build with boost 1.69
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is also fixed with master with boost bump which we do not need
+here.
+
+Change-Id: I61caec10c0c6d442cef3d51c31eaff01f18b89e3
+Reviewed-on: https://gerrit.libreoffice.org/69310
+Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
+Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ sfx2/source/appl/shutdownicon.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
+index e917c3a..8a51e5c 100644
+--- a/sfx2/source/appl/shutdownicon.cxx
++++ b/sfx2/source/appl/shutdownicon.cxx
+@@ -143,7 +143,7 @@ bool LoadModule()
+ #endif // ENABLE_QUICKSTART_APPLET
+ }
+ assert(!boost::logic::indeterminate(loaded));
+- return loaded;
++ return bool(loaded);
+ }
+
+ }
+--
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
index 6dfffd2394c..abd92a269e1 100644
--- a/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.2.2.ebuild
@@ -18,7 +18,7 @@ DEV_URI="
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
+PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == *9999* ]] && inherit git-r3
inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg
@@ -247,7 +247,9 @@ fi
PATCHES=(
# master branch
"${FILESDIR}/${PN}-6.2-ldap-optional.patch"
- # "${WORKDIR}"/${PATCHSET/.tar.xz/}
+ # 6.2 stable branch
+ "${FILESDIR}/${P}-boost-1.69.patch"
+ "${WORKDIR}"/${PATCHSET/.tar.xz/}
# not upstreamable stuff
"${FILESDIR}/${PN}-5.4-system-pyuno.patch"