From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5728138334 for ; Sun, 10 Jun 2018 14:43:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE1F2E0824; Sun, 10 Jun 2018 14:43:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D3C1E0824 for ; Sun, 10 Jun 2018 14:43:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7EDF335C90 for ; Sun, 10 Jun 2018 14:43:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E7A129E for ; Sun, 10 Jun 2018 14:43:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1528641764.83ed8a066140b12e87fd7a6c5adbefa59854858e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch app-office/libreoffice/libreoffice-5.4.7.2.ebuild app-office/libreoffice/libreoffice-6.0.3.2.ebuild app-office/libreoffice/libreoffice-6.0.4.2.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild X-VCS-Directories: app-office/libreoffice/files/ app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 83ed8a066140b12e87fd7a6c5adbefa59854858e X-VCS-Branch: master Date: Sun, 10 Jun 2018 14:43:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: de16ae76-95d9-4f32-885c-3e5d8b4c78ba X-Archives-Hash: f98c27471ed76cfd83e9f4bbb3431349 commit: 83ed8a066140b12e87fd7a6c5adbefa59854858e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 10 11:47:33 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 10 14:42:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ed8a06 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 .../files/libreoffice-6.0.4.2-glm-0.9.9.patch | 23 ++++++++++++++++++---- app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 3 ++- app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 ++ app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 3 ++- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 ++ 5 files changed, 27 insertions(+), 6 deletions(-) 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 ea667d03ceb..1430fdf1a34 100644 --- 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 +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 +Tested-by: Rene Engelhard +--- + 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 7f73e8fc0a4..a2e8ed475fa 100644 --- 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 837b49a029d..04b8d2c4851 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 304982e8d2d..aedc4d06fbf 100644 --- 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 b1c28905c33..58a7a8a3240 100644 --- 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"