1 |
commit: c3bba70d6c0670228fd4da49e64fbbd17aa1a0aa |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 10 08:30:00 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 10 08:58:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3bba70d |
7 |
|
8 |
app-office/libreoffice: Fix configure with >=media-libs/glm-0.9.9 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/657178 |
11 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
12 |
|
13 |
.../files/libreoffice-5.4.7.2-glm-0.9.9.patch | 82 ++++++++++++++++++++++ |
14 |
.../files/libreoffice-6.0.4.2-glm-0.9.9.patch | 19 +++++ |
15 |
app-office/libreoffice/libreoffice-5.4.7.2.ebuild | 2 + |
16 |
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 1 + |
17 |
4 files changed, 104 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..28982d90c36 |
22 |
--- /dev/null |
23 |
+++ b/app-office/libreoffice/files/libreoffice-5.4.7.2-glm-0.9.9.patch |
24 |
@@ -0,0 +1,82 @@ |
25 |
+From 7984347b9a2fce74cdce0c1c5b27f6e2b55a2f49 Mon Sep 17 00:00:00 2001 |
26 |
+From: Rene Engelhard <rene@××××××.org> |
27 |
+Date: Sun, 28 Jan 2018 19:48:25 +0100 |
28 |
+Subject: fix build with glm 0.9.9 |
29 |
+ |
30 |
+In file included from /usr/include/glm/gtx/norm.hpp:18:0, |
31 |
+ from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti |
32 |
+ls.hxx:16, |
33 |
+ from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende |
34 |
+rUtils.hxx:14, |
35 |
+ from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti |
36 |
+ls.cxx:11: |
37 |
+/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion |
38 |
+ 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." |
39 |
+ # 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." |
40 |
+ ^~~~~ |
41 |
+ |
42 |
+so just define it. |
43 |
+ |
44 |
+Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f |
45 |
+Reviewed-on: https://gerrit.libreoffice.org/48799 |
46 |
+Tested-by: Jenkins <ci@×××××××××××.org> |
47 |
+Tested-by: Rene Engelhard <rene@××××××.org> |
48 |
+Reviewed-by: Rene Engelhard <rene@××××××.org> |
49 |
+--- |
50 |
+ chart2/Library_chartcore.mk | 6 ++++++ |
51 |
+ chart2/Library_chartopengl.mk | 6 ++++++ |
52 |
+ vcl/Library_vcl.mk | 6 ++++++ |
53 |
+ 3 files changed, 18 insertions(+) |
54 |
+ |
55 |
+diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk |
56 |
+index f785d09..08455f9 100644 |
57 |
+--- a/chart2/Library_chartcore.mk |
58 |
++++ b/chart2/Library_chartcore.mk |
59 |
+@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\ |
60 |
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ |
61 |
+ )) |
62 |
+ |
63 |
++ifeq ($(SYSTEM_GLM),TRUE) |
64 |
++$(eval $(call gb_Library_add_defs,chartcore,\ |
65 |
++ -DGLM_ENABLE_EXPERIMENTAL \ |
66 |
++)) |
67 |
++endif |
68 |
++ |
69 |
+ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore)) |
70 |
+ |
71 |
+ $(eval $(call gb_Library_use_externals,chartcore,\ |
72 |
+diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk |
73 |
+index f999f94..8b5a22c 100644 |
74 |
+--- a/chart2/Library_chartopengl.mk |
75 |
++++ b/chart2/Library_chartopengl.mk |
76 |
+@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\ |
77 |
+ chart2/source/view/main/DummyXShape \ |
78 |
+ chart2/source/view/main/OpenGLRender \ |
79 |
+ )) |
80 |
++ |
81 |
++ifeq ($(SYSTEM_GLM),TRUE) |
82 |
++$(eval $(call gb_Library_add_defs,chartopengl,\ |
83 |
++ -DGLM_ENABLE_EXPERIMENTAL \ |
84 |
++)) |
85 |
++endif |
86 |
+ |
87 |
+ # vim: set noet sw=4 ts=4: |
88 |
+diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk |
89 |
+index 699d6ab..a2caa8e 100644 |
90 |
+--- a/vcl/Library_vcl.mk |
91 |
++++ b/vcl/Library_vcl.mk |
92 |
+@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\ |
93 |
+ -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ |
94 |
+ )) |
95 |
+ |
96 |
++ifeq ($(SYSTEM_GLM),TRUE) |
97 |
++$(eval $(call gb_Library_add_defs,vcl,\ |
98 |
++ -DGLM_ENABLE_EXPERIMENTAL \ |
99 |
++)) |
100 |
++endif |
101 |
++ |
102 |
+ $(eval $(call gb_Library_use_sdk_api,vcl)) |
103 |
+ |
104 |
+ $(eval $(call gb_Library_use_custom_headers,vcl,\ |
105 |
+-- |
106 |
+cgit v1.1 |
107 |
|
108 |
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 |
109 |
new file mode 100644 |
110 |
index 00000000000..ea667d03ceb |
111 |
--- /dev/null |
112 |
+++ b/app-office/libreoffice/files/libreoffice-6.0.4.2-glm-0.9.9.patch |
113 |
@@ -0,0 +1,19 @@ |
114 |
+Fix build with >=media-libs/glm-0.9.9 |
115 |
+https://bugs.gentoo.org/657178 |
116 |
+https://bugs.documentfoundation.org/show_bug.cgi?id=118070 |
117 |
+ |
118 |
+--- a/vcl/Executable_icontest.mk |
119 |
++++ a/vcl/Executable_icontest.mk |
120 |
+@@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\ |
121 |
+ )) |
122 |
+ endif |
123 |
+ |
124 |
++ifeq ($(SYSTEM_GLM),TRUE) |
125 |
++$(eval $(call gb_Executable_add_defs,icontest,\ |
126 |
++ -DGLM_ENABLE_EXPERIMENTAL \ |
127 |
++)) |
128 |
++endif |
129 |
++ |
130 |
+ $(eval $(call gb_Executable_use_api,icontest,\ |
131 |
+ offapi \ |
132 |
+ udkapi \ |
133 |
|
134 |
diff --git a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild |
135 |
index 8b6c7e2e1ca..7f73e8fc0a4 100644 |
136 |
--- a/app-office/libreoffice/libreoffice-5.4.7.2.ebuild |
137 |
+++ b/app-office/libreoffice/libreoffice-5.4.7.2.ebuild |
138 |
@@ -232,10 +232,12 @@ PATCHES=( |
139 |
# 6.0 branch |
140 |
"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602 |
141 |
"${FILESDIR}/${PN}-6.0.3.2-poppler-0.64.patch" # bug 653478 |
142 |
+ "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178 |
143 |
|
144 |
# TODO: upstream |
145 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
146 |
"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812 |
147 |
+ "${FILESDIR}/${PN}-6.0.4.2-glm-0.9.9.patch" # bug 657178 |
148 |
) |
149 |
|
150 |
pkg_pretend() { |
151 |
|
152 |
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
153 |
index b1c28905c33..304982e8d2d 100644 |
154 |
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
155 |
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
156 |
@@ -251,6 +251,7 @@ PATCHES=( |
157 |
# TODO: upstream |
158 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
159 |
"${FILESDIR}/${PN}-6.0.3.2-testTdf108947.patch" #bug 656600 |
160 |
+ "${FILESDIR}/${P}-glm-0.9.9.patch" # bug 657178 |
161 |
|
162 |
# gtk3-kde5 vcl plugin backported from master |
163 |
"${WORKDIR}"/${PATCHSET/.tar.xz/} |