app-office/libreoffice: Use upstream patch, add to 6.0 stable branch

Closes: https://bugs.gentoo.org/657178
Package-Manager: Portage-2.3.40, Repoman-2.3.9

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
index ea667d03cebbd1b09ea74b96caf5b2e78fcf3534..1430fdf1a346bcd5e545fb96f47a29b35747e3dd 100644 (file)
--- 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
@@ -1,9 +1,22 @@
-Fix build with >=media-libs/glm-0.9.9
-https://bugs.gentoo.org/657178
-https://bugs.documentfoundation.org/show_bug.cgi?id=118070
+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
-+++ a/vcl/Executable_icontest.mk
++++ b/vcl/Executable_icontest.mk
 @@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
  ))
  endif
@@ -17,3 +30,5 @@ https://bugs.documentfoundation.org/show_bug.cgi?id=118070
  $(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 7f73e8fc0a4c4d27293dc3ec5f04dffba0408cb1..a2e8ed475fac9f3db6faa794111a4fc998bc2aa5 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild
@@ -233,11 +233,12 @@ PATCHES=(
        "${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"
        "${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
-       "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 )
 
 pkg_pretend() {

diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 837b49a029d8626ad473951be1eb5e748e80934f..04b8d2c48514c00fe732b31c6fe037af2f0a3b45 100644 (file)
--- 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 304982e8d2decd48d27dda98ab84d462f4f938c2..aedc4d06fbf8c8d4981d103dc61f51cde55707b2 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -247,11 +247,12 @@ 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"
        "${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600
-       "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178
 
        # gtk3-kde5 vcl plugin backported from master
        "${WORKDIR}"/${PATCHSET/.tar.xz/}

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b1c28905c338f3bd04ec02c67aea3d6d6fc5e3fe..58a7a8a32407559fa46260c341618c0eb2711822 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.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}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178
 
        # TODO: upstream
        "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"