1 |
commit: 0578a158a4943a264c38f9fc4f68d9060b74190b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 27 19:52:46 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 19:53:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578a158 |
7 |
|
8 |
app-office/libreoffice: Fix testODFEncryptedGPG, fix test deps |
9 |
|
10 |
Thanks-to: Thomas Deutschmann <whissi <AT> gentoo.org> |
11 |
Closes: https://bugs.gentoo.org/656676 |
12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
13 |
|
14 |
.../libreoffice-6.0.3.2-testODFEncryptedGPG.patch | 89 ++++++++++++++++++++++ |
15 |
.../files/libreoffice-6.0.3.2-testTdf108947.patch | 2 +- |
16 |
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 + |
17 |
app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 1 + |
18 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 1 + |
19 |
app-office/libreoffice/libreoffice-9999.ebuild | 1 + |
20 |
6 files changed, 95 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch |
23 |
new file mode 100644 |
24 |
index 00000000000..9cde8407ab4 |
25 |
--- /dev/null |
26 |
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch |
27 |
@@ -0,0 +1,89 @@ |
28 |
+From 74d438f716d9cef165c78f950d4c53a46c37503c Mon Sep 17 00:00:00 2001 |
29 |
+From: Rene Engelhard <rene@××××××.org> |
30 |
+Date: Sun, 18 Mar 2018 22:25:36 +0100 |
31 |
+Subject: gpg4libre: fix failing gpg test due to over-long filenames |
32 |
+MIME-Version: 1.0 |
33 |
+Content-Type: text/plain; charset=UTF-8 |
34 |
+Content-Transfer-Encoding: 8bit |
35 |
+ |
36 |
+This squashes the following commits: |
37 |
+ |
38 |
+From f68929ac611fdda19c1ee413effc59d33aa5ef97 Mon Sep 17 00:00:00 2001 |
39 |
+From: Thorsten Behrens <Thorsten.Behrens@×××.de> |
40 |
+Date: Fri, 9 Mar 2018 01:38:26 +0100 |
41 |
+Subject: gpg4libre: fix failing gpg test due to over-long filenames |
42 |
+ |
43 |
+With long workdir path, gpg sometimes fails with 'gpg: can't connect |
44 |
+to the agent: File name too long' error. |
45 |
+WK recommends to create preferred socket dir under /run/user, needs |
46 |
+prepping though via gpgconf. |
47 |
+ |
48 |
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=84720 |
49 |
+ |
50 |
+From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001 |
51 |
+From: Rene Engelhard <rene@××××××.org> |
52 |
+Date: Sun, 18 Mar 2018 11:25:41 +0100 |
53 |
+Subject: properly check for gpgconf (and --create-socketdir) working |
54 |
+ |
55 |
+From d6ed1d415d36809d784af780231258ea0ee1024f Mon Sep 17 00:00:00 2001 |
56 |
+From: Rene Engelhard <rene@××××××.org> |
57 |
+Date: Sun, 18 Mar 2018 19:06:58 +0100 |
58 |
+Subject: actually add GPGCONF to config_host.mk.in |
59 |
+ |
60 |
+From 7a95ee8d0badb2cbbd137a6e18af1bada35ae933 Mon Sep 17 00:00:00 2001 |
61 |
+From: Rene Engelhard <rene@××××××.org> |
62 |
+Date: Sun, 18 Mar 2018 19:26:45 +0100 |
63 |
+Subject: actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in... |
64 |
+ |
65 |
+From 5204a5145d8232ea0650144fb4756c38303ef06e Mon Sep 17 00:00:00 2001 |
66 |
+From: Rene Engelhard <rene@××××××.org> |
67 |
+Date: Sun, 18 Mar 2018 19:28:55 +0100 |
68 |
+Subject: revert accidentially comitted local changes :( |
69 |
+ |
70 |
+From bc358d39ac985914160e8aaa23b29469470c032b Mon Sep 17 00:00:00 2001 |
71 |
+From: Rene Engelhard <rene@××××××.org> |
72 |
+Date: Sun, 18 Mar 2018 20:36:45 +0100 |
73 |
+Subject: this is sh, not make... |
74 |
+ |
75 |
+Change-Id: I7880fd7eee57cedc19b72348b45f0c1389409fe6 |
76 |
+Reviewed-on: https://gerrit.libreoffice.org/51521 |
77 |
+Tested-by: Jenkins <ci@×××××××××××.org> |
78 |
+Reviewed-by: Caolán McNamara <caolanm@××××××.com> |
79 |
+Tested-by: Caolán McNamara <caolanm@××××××.com> |
80 |
+--- |
81 |
+ xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 14 +++++++++++++- |
82 |
+ 1 file changed, 13 insertions(+), 1 deletion(-) |
83 |
+ |
84 |
+(limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk') |
85 |
+ |
86 |
+diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk |
87 |
+index c382e3b..2f3ed41 100644 |
88 |
+--- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk |
89 |
++++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk |
90 |
+@@ -52,11 +52,23 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE) |
91 |
+ $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport)) |
92 |
+ endif |
93 |
+ |
94 |
+-# reset the LD_LIBRARY_PATH for spawned GPG processes |
95 |
++# various hacks to make unit test work on Linux more often |
96 |
+ ifeq ($(OS),LINUX) |
97 |
++# reset the LD_LIBRARY_PATH for spawned GPG processes |
98 |
+ $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ |
99 |
+ EXTRA_ENV_VARS := \ |
100 |
+ LIBO_LD_PATH=$$LD_LIBRARY_PATH |
101 |
++ |
102 |
++ifneq (,$(HAVE_GPGCONF_SOCKETDIR)) |
103 |
++# create socket dir below /run/user/ instead of in workdir |
104 |
++.PHONY : gb_CppunitTest_run_gpgconf |
105 |
++gb_CppunitTest_run_gpgconf: |
106 |
++ GNUPGHOME=$(WORKDIR)/CppunitTest/xmlsecurity_signing.test.user \ |
107 |
++ $(GPGCONF) --create-socketdir |
108 |
++ |
109 |
++$(call gb_CppunitTest_get_target,xmlsecurity_signing): \ |
110 |
++ gb_CppunitTest_run_gpgconf |
111 |
++endif |
112 |
+ endif |
113 |
+ |
114 |
+ # vim: set noet sw=4 ts=4: |
115 |
+-- |
116 |
+cgit v1.1 |
117 |
|
118 |
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch |
119 |
index 5973b6ae67c..bd84b316252 100644 |
120 |
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch |
121 |
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-testTdf108947.patch |
122 |
@@ -10,4 +10,4 @@ index 457aedce0acb..4f02cf2b4040 100644 |
123 |
+ CPPUNIT_ASSERT_EQUAL(1, getPages()); |
124 |
|
125 |
//Check if Headers/Footers contain what they should in this document |
126 |
- uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>( |
127 |
\ No newline at end of file |
128 |
+ uno::Reference<text::XText> xHeaderTextRight = getProperty<uno::Reference<text::XText>>( |
129 |
|
130 |
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
131 |
index b95fd784f38..612ab4bcbaf 100644 |
132 |
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
133 |
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
134 |
@@ -226,6 +226,7 @@ DEPEND="${COMMON_DEPEND} |
135 |
) |
136 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
137 |
test? ( |
138 |
+ app-crypt/gnupg |
139 |
dev-util/cppunit |
140 |
media-fonts/dejavu |
141 |
) |
142 |
@@ -246,6 +247,7 @@ PATCHES=( |
143 |
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" |
144 |
# 6.0 branch |
145 |
"${FILESDIR}/${P}-poppler-0.64.patch" |
146 |
+ "${FILESDIR}/${PN}-6.0.3.2-testODFEncryptedGPG.patch" #bug 656676 |
147 |
|
148 |
# TODO: upstream |
149 |
"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" |
150 |
|
151 |
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
152 |
index f50cbbd0996..4d3bb3a4921 100644 |
153 |
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
154 |
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild |
155 |
@@ -236,6 +236,7 @@ DEPEND="${COMMON_DEPEND} |
156 |
) |
157 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
158 |
test? ( |
159 |
+ app-crypt/gnupg |
160 |
dev-util/cppunit |
161 |
media-fonts/dejavu |
162 |
) |
163 |
|
164 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
165 |
index f50cbbd0996..4d3bb3a4921 100644 |
166 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
167 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
168 |
@@ -236,6 +236,7 @@ DEPEND="${COMMON_DEPEND} |
169 |
) |
170 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
171 |
test? ( |
172 |
+ app-crypt/gnupg |
173 |
dev-util/cppunit |
174 |
media-fonts/dejavu |
175 |
) |
176 |
|
177 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
178 |
index 558cf0dce7d..232eaa56a6b 100644 |
179 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
180 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
181 |
@@ -235,6 +235,7 @@ DEPEND="${COMMON_DEPEND} |
182 |
) |
183 |
odk? ( >=app-doc/doxygen-1.8.4 ) |
184 |
test? ( |
185 |
+ app-crypt/gnupg |
186 |
dev-util/cppunit |
187 |
media-fonts/dejavu |
188 |
) |