gentoo resync : 16.06.2018

6 files changed, 128 insertions, 3 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 62c37690c586..888ea9c92de4 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,10 +3,12 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851
 AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae
+AUX libreoffice-5.4.7.2-glm-0.9.9.patch 2905 BLAKE2B 6e7aed3698ddafbdd569e8bd0ba16641062c5e33e8672386da1079b8656b392270aeb4248f7e067a156629b3442c2192e009ecf363f7b26f55a310de3c17ab91 SHA512 722b1d4e8f323da2f78f3139156766d98c5ac4b66e5d02ea71b5f9ca19e19c6495293d5d1d2d4556fcd3776e47e3534719e4249dce78c22aa61544bc6ac9b5ca
 AUX libreoffice-6.0.3.2-disable-flaky-tests-1.patch 8928 BLAKE2B e5399e0e520dfe4ac5d0a02c3bf3372ccdc7725f073aabb74c36600a7cd09eb45a9e5d5486bf700ae374723206e3a421069b298137d14a9b05e17e70f2d9d3b4 SHA512 ca100dc389ed93a5eeed35f001d9e0f6f886782bfaa3dead3105b9bce91ca9e721354b55cd67fdb40c7d2d64966c530ebc6ba6a4e3c62b0e006759c7b64f1b29
 AUX libreoffice-6.0.3.2-disable-flaky-tests-2.patch 1330 BLAKE2B bf038456e3012592e69e6448399160d146ab42a6ce641f9728a13ae9275342d2deb60bfa14b12919c712f0e8f67e2d061a789fad80711c758e80e4adcb6271fb SHA512 30ede2094102b2d6d95e5cd7d76d59a3c4c40e9bd7300681613aea78a23406e32b0bd23aae779d5f8d21102baaaab999a0915e9ef3d16b32463b55caf6867456
 AUX libreoffice-6.0.3.2-poppler-0.64.patch 2617 BLAKE2B c7e9848012b40ace6cd42e7ba114bb03f137c88b25d895be4da3c962ffd2279e524b3b32ed9b24c605ede55920b664759cf321d241e5fd974651242f5c4f19e3 SHA512 ed6941b73fa49a1b520014fb92269a01f947a93bc80b7f6c8cb1c07572ae636154a1ab38a6d6de2d3129f16fad4c224b21aa9cf52e3f95343c882013b24f8b49
 AUX libreoffice-6.0.3.2-testTdf108947.patch 638 BLAKE2B 38da9bf34a921d22002d45e650c738687706c77a67ac2748ee14efb48f47a328b1339712687b525a4f66a1ad0b36fc69c0613ef441067a206ea4df81754f4727 SHA512 a712fb653d86a74a96d568805ca48d183a7ec71f32ef34cfb98a4999cb7fead3f5cd11f5d8f8944041583d5221b0dbaeb3cdfc625a1958118e867569d0c56479
+AUX libreoffice-6.0.4.2-glm-0.9.9.patch 1017 BLAKE2B 7a85f652d6a9c01157da37a9bcc72261849f8f5b64816a8b55b149a44c50e684102a63f0d758b69ed2199259a3a934fa4c47f56ca65b66a82558a72dca991084 SHA512 aca8b606c5ef7c7333938d489faa24f86f454f22797d40ff735653ef57b70874cb4b9d22f32099a8cbc45b23c6943dc1d9dbdda9b6a08052c63ef2ac99a3f1a1
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -20,9 +22,9 @@ DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd234
 DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
-EBUILD libreoffice-5.4.7.2.ebuild 16222 BLAKE2B a118f9d518c571927f24dcfd5db2373984a0e2be9caacf50af6005677706e3bc8ae57f8771a89a57e748b2221f8b8eaa19b0901218e6ce181bb28d25d7e6af24 SHA512 21e37083c7facb66bfaf3403bf2935430f1a581b61ab4d56b7d689a1762f5d14b8178f50c3e33a0d81f33f9e0ea062241f2d3e3296dd327d53ef33f431b92047
-EBUILD libreoffice-6.0.3.2.ebuild 16881 BLAKE2B e4ccafaa0c47aaceae3be045b9f7c64406c59fbcd7b2052025222352c89540270b5ffa349ce74f9bc9dcf0475f176e1b08d8b72e393e592f4f0bbca459e4e17c SHA512 1b179f51a8e3c3b26d465550407262847f754a498431e5fa6b468d7d162067c62670f72289a242b41fc89b4369d0a9f4427043c4513241111d3a1d3a2f6bb7fa
-EBUILD libreoffice-6.0.4.2.ebuild 16824 BLAKE2B 1df7a85923f8dff14d2b5bddc351daa2b8511065c2c542cdd81b1241df430b0c2f9257514c8a5709078f8d4201c2ec5c751c9554b6ad5ab4fe9d82dceb5aee95 SHA512 0a8bd8f5d33499e1bd314dc12bb6542d14de9e8f66a0215bfcd82e4a876feff1ae0875c3949d7ffb8ceb61caf5d9d359dd803a3a7c68423420fd78598024f232
+EBUILD libreoffice-5.4.7.2.ebuild 16343 BLAKE2B dbcce05f885b808cf4417c888592e8373f71c821decf3dba25c312c23f21a237d050cadf8f235f844ee85bf58143fd450bf4686f9d9188421db6f3acad65d549 SHA512 43cf57add0881d82b0e542b6f33f325b308d7a6849cbbe87056e236428de653670df69c7525783cdc26e428065f139f5183f71ec2e9064ca19c11d3862f89c4e
+EBUILD libreoffice-6.0.3.2.ebuild 16953 BLAKE2B 9b17913bb18d607ac0141226e54199b1d48c5f88a66d9ba8a6bb40459e35c1301a57c0b111a23f12e03daba9e9e6b850e874d64e4d2a37bba809dbff24201eb8 SHA512 acd68e679413031897fe17a27b1da7c688522ca4e773174be5ab1595c588b62e0969f72fa758f1548d9adce54cca151ecd5edfee1193dcf568ec5fc4b8265a22
+EBUILD libreoffice-6.0.4.2.ebuild 16887 BLAKE2B cdcb587a6d70f4157f5101162de4954edcb41eca8b8635b00291b98416c11cf50e6828cc7e65ace6dfde71591ba0ce844e929a711d038d69bf4aa2d633e7f642 SHA512 f672faa566eaeba45eb367260074ce1049a2c4b55eec721d0455fb7e4576cc126c92c927a1694862d2cb832e883daac0901a2d3766f4167617e54dc5135fb63f
 EBUILD libreoffice-6.0.9999.ebuild 16824 BLAKE2B 1df7a85923f8dff14d2b5bddc351daa2b8511065c2c542cdd81b1241df430b0c2f9257514c8a5709078f8d4201c2ec5c751c9554b6ad5ab4fe9d82dceb5aee95 SHA512 0a8bd8f5d33499e1bd314dc12bb6542d14de9e8f66a0215bfcd82e4a876feff1ae0875c3949d7ffb8ceb61caf5d9d359dd803a3a7c68423420fd78598024f232
 EBUILD libreoffice-6.1.9999.ebuild 16605 BLAKE2B 61df63788a3b0e5d8010b8589a365b3be0fb7a78e6bbac25438c39f022f8a391e27249cf6d39aaddd2e5918f251796887cc64f6c939161374b615fb77ebf65e0 SHA512 38489e5873c89a39cf3c3c09e888eccbeaf3bfbe7d90dde996415647c20609a374775aea9efd21591ec0d963888095c50b11fb4b82c958805462e492c5e34d69
 EBUILD libreoffice-9999.ebuild 16600 BLAKE2B e497c832f22797d839d084195dc70d37dc3091b3d9d88f4688a7e1ab53e624e073f7f72baa7800fa0dc09da913242ce8f4c565df694911cd2fc0d2df363195c5 SHA512 c062f2a1b2b35285266b56039579d37b347edcd7b274ee825a28b008bf2cd3ac1be2bf7a73ed4d499803ac7901d1284f776de12b666c20630791e6f1e9711e88
diff --git a/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
new file mode 100644
index 000000000000..28982d90c369
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch
@@ -0,0 +1,82 @@
+From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sun, 28 Jan 2018 19:48:25 +0100
+Subject: fix build with glm 0.9.9
+
+In file included from /usr/include/glm/gtx/norm.hpp:18:0,
+                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
+ls.hxx:16,
+                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
+rUtils.hxx:14,
+                 from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
+ls.cxx:11:
+/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
+ is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+ # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+   ^~~~~
+
+so just define it.
+
+Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
+Reviewed-on: https://gerrit.libreoffice.org/48799
+Tested-by: Jenkins <ci@libreoffice.org>
+Tested-by: Rene Engelhard <rene@debian.org>
+Reviewed-by: Rene Engelhard <rene@debian.org>
+---
+ chart2/Library_chartcore.mk   | 6 ++++++
+ chart2/Library_chartopengl.mk | 6 ++++++
+ vcl/Library_vcl.mk            | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
+index f785d09..08455f9 100644
+--- a/chart2/Library_chartcore.mk
++++ b/chart2/Library_chartcore.mk
+@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
+     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+ ))
+ 
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartcore,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
+ 
+ $(eval $(call gb_Library_use_externals,chartcore,\
+diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
+index f999f94..8b5a22c 100644
+--- a/chart2/Library_chartopengl.mk
++++ b/chart2/Library_chartopengl.mk
+@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
+     chart2/source/view/main/DummyXShape \
+     chart2/source/view/main/OpenGLRender \
+ ))
++
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartopengl,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
+  
+ # vim: set noet sw=4 ts=4:
+diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
+index 699d6ab..a2caa8e 100644
+--- a/vcl/Library_vcl.mk
++++ b/vcl/Library_vcl.mk
+@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
+ 	-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+ ))
+ 
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,vcl,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_use_sdk_api,vcl))
+ 
+ $(eval $(call gb_Library_use_custom_headers,vcl,\
+-- 
+cgit v1.1
diff --git a/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
new file mode 100644
index 000000000000..1430fdf1a346
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch
@@ -0,0 +1,34 @@
+From 5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun, 10 Jun 2018 12:25:18 +0200
+Subject: Fix build with GLM 0.9.9.0, tdf#118070
+
+One of the test files was forgotten in 953c4add8fd76d88f49a81ae4c21a1fdcc007e57
+
+Change-Id: I0315433c688ff7edb2ba599bbef203cac9de3022
+Reviewed-on: https://gerrit.libreoffice.org/55554
+Reviewed-by: Rene Engelhard <rene@debian.org>
+Tested-by: Rene Engelhard <rene@debian.org>
+---
+ vcl/Executable_icontest.mk | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
+index ce16330..8c917b7 100644
+--- a/vcl/Executable_icontest.mk
++++ b/vcl/Executable_icontest.mk
+@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
+ ))
+ endif
+ 
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Executable_add_defs,icontest,\
++    -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Executable_use_api,icontest,\
+     offapi \
+     udkapi \
+-- 
+cgit v1.1
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
index 8b6c7e2e1ca2..a2e8ed475fac 100644
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
@@ -232,6 +232,9 @@ PATCHES=(
 	# 6.0 branch
 	"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
 	"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478
+	"${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
+	# 6.1 branch
+	"${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 837b49a029d8..04b8d2c48514 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -248,6 +248,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
 	# 6.0 branch
 	"${FILESDIR}/${P}-poppler-0.64.patch"
+	# 6.1 branch
+	"${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index b1c28905c338..aedc4d06fbf8 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -247,6 +247,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
+	# 6.1 branch
+	"${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"