1 |
commit: 82867bc1d919138b5d2e839f39401aeb5096a101 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 1 02:19:40 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 1 02:19:40 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82867bc1 |
7 |
|
8 |
app-crypt/gpa: move patch to devspace |
9 |
|
10 |
Sorry, I didn't realise how big this one was somehow. |
11 |
|
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
app-crypt/gpa/Manifest | 1 + |
15 |
app-crypt/gpa/files/gpa-0.10.0-autoconf.patch | 1090 ------------------------- |
16 |
app-crypt/gpa/gpa-0.10.0-r1.ebuild | 4 +- |
17 |
3 files changed, 4 insertions(+), 1091 deletions(-) |
18 |
|
19 |
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest |
20 |
index 9d3a52097963..a00d88b72524 100644 |
21 |
--- a/app-crypt/gpa/Manifest |
22 |
+++ b/app-crypt/gpa/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
+DIST gpa-0.10.0-autoconf.patch.xz 8500 BLAKE2B 0b1b99ef0096f4634b60cddf46d3eb6d70da17be1f506265f2642e742e8f7a016e2b340c6722d5976f185b20b1b2ad96661b375fcdd24595d225314bdfc97e56 SHA512 be59117bea8f254238306e6e8ef023f4485bc940387a7a3d4b47dab2962410d6bfb0a540476061beca531504ff5c56d7d8b2416d366810c73359807cdcc42207 |
25 |
DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b |
26 |
|
27 |
diff --git a/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch b/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch |
28 |
deleted file mode 100644 |
29 |
index fb7d8316427b..000000000000 |
30 |
--- a/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch |
31 |
+++ /dev/null |
32 |
@@ -1,1090 +0,0 @@ |
33 |
-Upstream: https://dev.gnupg.org/rGPAb40ff3b1f20dec3b14ca72d0af50137e38cd1808 |
34 |
- |
35 |
-From b40ff3b1f20dec3b14ca72d0af50137e38cd1808 Mon Sep 17 00:00:00 2001 |
36 |
-From: NIIBE Yutaka <gniibe@××××.org> |
37 |
-Date: Fri, 20 Nov 2020 12:02:53 +0900 |
38 |
-Subject: [PATCH] build: Update to newer autoconf constructs. |
39 |
- |
40 |
-* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER. |
41 |
-Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE. |
42 |
-Use AS_HELP_STRING instead of AC_HELP_STRING. |
43 |
-(AC_ISC_POSIX): Replace by AC_SEARCH_LIBS. |
44 |
-(AC_STDC_HEADERS): Replace by AC_HEADER_STDC. |
45 |
-(byte, ushort, ulong, u16, u32): Use AC_CHECK_TYPES. |
46 |
-* m4/check_zlib.m4: Use AS_HELP_STRING instead of AC_HELP_STRING. |
47 |
-Use AC_MSG_ERROR instead of AC_ERROR. |
48 |
-* m4/gettext.m4: Update from gnulib. |
49 |
-* m4/gpg-error.m4: Update from libgpg-error. |
50 |
-* m4/gpgme.m4: Update from gpgme. |
51 |
-* m4/libassuan.m4: Update from libassuan. |
52 |
- |
53 |
-Signed-off-by: NIIBE Yutaka <gniibe@××××.org> |
54 |
---- a/configure.ac |
55 |
-+++ b/configure.ac |
56 |
-@@ -19,7 +19,7 @@ |
57 |
- # along with this program; if not, see <http://www.gnu.org/licenses/>. |
58 |
- # |
59 |
- # (Process this file with autoconf to produce a configure script.) |
60 |
--AC_PREREQ(2.61) |
61 |
-+AC_PREREQ([2.61]) |
62 |
- min_automake_version="1.10" |
63 |
- |
64 |
- # The version number goes here. |
65 |
-@@ -58,7 +58,7 @@ NEED_GPGME_API=1 |
66 |
- NEED_GPGME_VERSION=1.9.0 |
67 |
- |
68 |
- AC_CONFIG_AUX_DIR([build-aux]) |
69 |
--AM_CONFIG_HEADER(config.h) |
70 |
-+AC_CONFIG_HEADERS([config.h]) |
71 |
- AC_CONFIG_SRCDIR(src/gpa.c) |
72 |
- AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) |
73 |
- |
74 |
-@@ -99,7 +99,7 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP", |
75 |
- |
76 |
- |
77 |
- |
78 |
--AC_GNU_SOURCE |
79 |
-+AC_USE_SYSTEM_EXTENSIONS |
80 |
- |
81 |
- AH_BOTTOM([ |
82 |
- /* We don't want the old assuan codes anymore. */ |
83 |
-@@ -159,8 +159,8 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) |
84 |
- AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) |
85 |
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) |
86 |
- AC_PROG_CC |
87 |
--AC_ISC_POSIX |
88 |
--AC_STDC_HEADERS |
89 |
-+AC_SEARCH_LIBS([strerror],[cposix]) |
90 |
-+AC_HEADER_STDC |
91 |
- AC_PROG_RANLIB |
92 |
- AC_CHECK_TOOL(WINDRES, windres, :) |
93 |
- |
94 |
-@@ -171,7 +171,7 @@ AC_CHECK_TOOL(WINDRES, windres, :) |
95 |
- card_manager=yes |
96 |
- AC_MSG_CHECKING([whether to build the card manager]) |
97 |
- AC_ARG_ENABLE(card-manager, |
98 |
-- AC_HELP_STRING([--disable-card-manager], |
99 |
-+ AS_HELP_STRING([--disable-card-manager], |
100 |
- [build without the card manager]), |
101 |
- card_manager=$enableval) |
102 |
- AC_MSG_RESULT($card_manager) |
103 |
-@@ -183,7 +183,7 @@ AM_CONDITIONAL(ENABLE_CARD_MANAGER, test "$card_manager" = yes) |
104 |
- keyserver_support=yes |
105 |
- AC_MSG_CHECKING([whether to include keyserver support]) |
106 |
- AC_ARG_ENABLE(keyserver-support, |
107 |
-- AC_HELP_STRING([--disable-keyserver-support], |
108 |
-+ AS_HELP_STRING([--disable-keyserver-support], |
109 |
- [build without keyserver support]), |
110 |
- keyserver_support=$enableval) |
111 |
- AC_MSG_RESULT($keyserver_support) |
112 |
-@@ -313,12 +313,7 @@ AC_CHECK_HEADERS([locale.h]) |
113 |
- # |
114 |
- # Checks for typedefs and structures |
115 |
- # |
116 |
-- |
117 |
--GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) |
118 |
--GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF) |
119 |
--GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) |
120 |
--GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) |
121 |
--GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) |
122 |
-+AC_CHECK_TYPES([byte, ushort, ulong, u16, u32]) |
123 |
- |
124 |
- # |
125 |
- # Check for library functions |
126 |
-@@ -476,4 +471,4 @@ echo " |
127 |
- |
128 |
- Revision: mym4_revision (mym4_revision_dec) |
129 |
- Platform: $host |
130 |
--" |
131 |
-\ No newline at end of file |
132 |
-+" |
133 |
---- a/m4/check_zlib.m4 |
134 |
-+++ b/m4/check_zlib.m4 |
135 |
-@@ -12,7 +12,7 @@ |
136 |
- |
137 |
- dnl zlib test |
138 |
- AC_DEFUN([CHECK_ZLIB], [ |
139 |
--AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib=PATH], |
140 |
-+AC_ARG_WITH(zlib, AS_HELP_STRING([--with-zlib=PATH], |
141 |
- [Look for zlib library installed in PATH/lib and headers in |
142 |
- PATH/include rather than default include and library paths. (Use an |
143 |
- absolute path)]), |
144 |
-@@ -22,7 +22,7 @@ absolute path)]), |
145 |
- |
146 |
- AC_CHECK_LIB(z, compress, |
147 |
- LIBS="$LIBS -lz", |
148 |
-- AC_ERROR([GPA requires zlib (http://gzip.org/zlib or install Debian package zlib1g-dev)])) |
149 |
-+ AC_MSG_ERROR([GPA requires zlib (https://zlib.net/ or install Debian package zlib1g-dev)])) |
150 |
- |
151 |
- AC_SUBST(LIBZ) |
152 |
- ]) |
153 |
---- a/m4/gettext.m4 |
154 |
-+++ b/m4/gettext.m4 |
155 |
-@@ -1,16 +1,16 @@ |
156 |
--# gettext.m4 serial 63 (gettext-0.18) |
157 |
--dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. |
158 |
-+# gettext.m4 serial 71 (gettext-0.20.2) |
159 |
-+dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. |
160 |
- dnl This file is free software; the Free Software Foundation |
161 |
- dnl gives unlimited permission to copy and/or distribute it, |
162 |
- dnl with or without modifications, as long as this notice is preserved. |
163 |
- dnl |
164 |
--dnl This file can can be used in projects which are not available under |
165 |
--dnl the GNU General Public License or the GNU Library General Public |
166 |
-+dnl This file can be used in projects which are not available under |
167 |
-+dnl the GNU General Public License or the GNU Lesser General Public |
168 |
- dnl License but which still want to provide support for the GNU gettext |
169 |
- dnl functionality. |
170 |
- dnl Please note that the actual code of the GNU gettext library is covered |
171 |
--dnl by the GNU Library General Public License, and the rest of the GNU |
172 |
--dnl gettext package package is covered by the GNU General Public License. |
173 |
-+dnl by the GNU Lesser General Public License, and the rest of the GNU |
174 |
-+dnl gettext package is covered by the GNU General Public License. |
175 |
- dnl They are *not* in the public domain. |
176 |
- |
177 |
- dnl Authors: |
178 |
-@@ -20,22 +20,20 @@ dnl Bruno Haible <haible@××××××××××.org>, 2000-2006, 2008-2010. |
179 |
- dnl Macro to add for using GNU gettext. |
180 |
- |
181 |
- dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). |
182 |
--dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The |
183 |
--dnl default (if it is not specified or empty) is 'no-libtool'. |
184 |
--dnl INTLSYMBOL should be 'external' for packages with no intl directory, |
185 |
--dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. |
186 |
-+dnl INTLSYMBOL must be one of 'external', 'use-libtool'. |
187 |
-+dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and |
188 |
-+dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. |
189 |
- dnl If INTLSYMBOL is 'use-libtool', then a libtool library |
190 |
- dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, |
191 |
- dnl depending on --{enable,disable}-{shared,static} and on the presence of |
192 |
--dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library |
193 |
--dnl $(top_builddir)/intl/libintl.a will be created. |
194 |
-+dnl AM-DISABLE-SHARED). |
195 |
- dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext |
196 |
- dnl implementations (in libc or libintl) without the ngettext() function |
197 |
- dnl will be ignored. If NEEDSYMBOL is specified and is |
198 |
- dnl 'need-formatstring-macros', then GNU gettext implementations that don't |
199 |
- dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. |
200 |
- dnl INTLDIR is used to find the intl libraries. If empty, |
201 |
--dnl the value `$(top_builddir)/intl/' is used. |
202 |
-+dnl the value '$(top_builddir)/intl/' is used. |
203 |
- dnl |
204 |
- dnl The result of the configuration is one of three cases: |
205 |
- dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled |
206 |
-@@ -57,19 +55,17 @@ dnl |
207 |
- AC_DEFUN([AM_GNU_GETTEXT], |
208 |
- [ |
209 |
- dnl Argument checking. |
210 |
-- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , |
211 |
-+ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], , |
212 |
- [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT |
213 |
--])])])])]) |
214 |
-+])])])]) |
215 |
- ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], |
216 |
-- [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) |
217 |
-+ [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. |
218 |
-+])]) |
219 |
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , |
220 |
- [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT |
221 |
- ])])])]) |
222 |
- define([gt_included_intl], |
223 |
-- ifelse([$1], [external], |
224 |
-- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), |
225 |
-- [yes])) |
226 |
-- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) |
227 |
-+ ifelse([$1], [external], [no], [yes])) |
228 |
- gt_NEEDS_INIT |
229 |
- AM_GNU_GETTEXT_NEED([$2]) |
230 |
- |
231 |
-@@ -91,13 +87,12 @@ AC_DEFUN([AM_GNU_GETTEXT], |
232 |
- dnl again, outside any 'if'. There are two solutions: |
233 |
- dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. |
234 |
- dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. |
235 |
-- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not |
236 |
-- dnl documented, we avoid it. |
237 |
-+ dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. |
238 |
- ifelse(gt_included_intl, yes, , [ |
239 |
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
240 |
- ]) |
241 |
- |
242 |
-- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. |
243 |
-+ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. |
244 |
- gt_INTL_MACOSX |
245 |
- |
246 |
- dnl Set USE_NLS. |
247 |
-@@ -157,12 +152,23 @@ changequote([,])dnl |
248 |
- fi |
249 |
- |
250 |
- AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], |
251 |
-- [AC_TRY_LINK([#include <libintl.h> |
252 |
--$gt_revision_test_code |
253 |
-+ [AC_LINK_IFELSE( |
254 |
-+ [AC_LANG_PROGRAM( |
255 |
-+ [[ |
256 |
-+#include <libintl.h> |
257 |
-+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
258 |
- extern int _nl_msg_cat_cntr; |
259 |
--extern int *_nl_domain_bindings;], |
260 |
-- [bindtextdomain ("", ""); |
261 |
--return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], |
262 |
-+extern int *_nl_domain_bindings; |
263 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) |
264 |
-+#else |
265 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
266 |
-+#endif |
267 |
-+$gt_revision_test_code |
268 |
-+ ]], |
269 |
-+ [[ |
270 |
-+bindtextdomain ("", ""); |
271 |
-+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
272 |
-+ ]])], |
273 |
- [eval "$gt_func_gnugettext_libc=yes"], |
274 |
- [eval "$gt_func_gnugettext_libc=no"])]) |
275 |
- |
276 |
-@@ -183,35 +189,57 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b |
277 |
- gt_save_LIBS="$LIBS" |
278 |
- LIBS="$LIBS $LIBINTL" |
279 |
- dnl Now see whether libintl exists and does not depend on libiconv. |
280 |
-- AC_TRY_LINK([#include <libintl.h> |
281 |
--$gt_revision_test_code |
282 |
-+ AC_LINK_IFELSE( |
283 |
-+ [AC_LANG_PROGRAM( |
284 |
-+ [[ |
285 |
-+#include <libintl.h> |
286 |
-+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
287 |
- extern int _nl_msg_cat_cntr; |
288 |
- extern |
289 |
- #ifdef __cplusplus |
290 |
- "C" |
291 |
- #endif |
292 |
--const char *_nl_expand_alias (const char *);], |
293 |
-- [bindtextdomain ("", ""); |
294 |
--return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
295 |
-+const char *_nl_expand_alias (const char *); |
296 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) |
297 |
-+#else |
298 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
299 |
-+#endif |
300 |
-+$gt_revision_test_code |
301 |
-+ ]], |
302 |
-+ [[ |
303 |
-+bindtextdomain ("", ""); |
304 |
-+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
305 |
-+ ]])], |
306 |
- [eval "$gt_func_gnugettext_libintl=yes"], |
307 |
- [eval "$gt_func_gnugettext_libintl=no"]) |
308 |
- dnl Now see whether libintl exists and depends on libiconv. |
309 |
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then |
310 |
- LIBS="$LIBS $LIBICONV" |
311 |
-- AC_TRY_LINK([#include <libintl.h> |
312 |
--$gt_revision_test_code |
313 |
-+ AC_LINK_IFELSE( |
314 |
-+ [AC_LANG_PROGRAM( |
315 |
-+ [[ |
316 |
-+#include <libintl.h> |
317 |
-+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
318 |
- extern int _nl_msg_cat_cntr; |
319 |
- extern |
320 |
- #ifdef __cplusplus |
321 |
- "C" |
322 |
- #endif |
323 |
--const char *_nl_expand_alias (const char *);], |
324 |
-- [bindtextdomain ("", ""); |
325 |
--return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
326 |
-- [LIBINTL="$LIBINTL $LIBICONV" |
327 |
-- LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
328 |
-- eval "$gt_func_gnugettext_libintl=yes" |
329 |
-- ]) |
330 |
-+const char *_nl_expand_alias (const char *); |
331 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) |
332 |
-+#else |
333 |
-+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
334 |
-+#endif |
335 |
-+$gt_revision_test_code |
336 |
-+ ]], |
337 |
-+ [[ |
338 |
-+bindtextdomain ("", ""); |
339 |
-+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
340 |
-+ ]])], |
341 |
-+ [LIBINTL="$LIBINTL $LIBICONV" |
342 |
-+ LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
343 |
-+ eval "$gt_func_gnugettext_libintl=yes" |
344 |
-+ ]) |
345 |
- fi |
346 |
- CPPFLAGS="$gt_save_CPPFLAGS" |
347 |
- LIBS="$gt_save_LIBS"]) |
348 |
-@@ -245,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a |
349 |
- dnl Mark actions used to generate GNU NLS library. |
350 |
- BUILD_INCLUDED_LIBINTL=yes |
351 |
- USE_INCLUDED_LIBINTL=yes |
352 |
-- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" |
353 |
-- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" |
354 |
-+ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" |
355 |
-+ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" |
356 |
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` |
357 |
- fi |
358 |
- |
359 |
-@@ -314,43 +342,14 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a |
360 |
- fi |
361 |
- |
362 |
- ifelse(gt_included_intl, yes, [ |
363 |
-- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL |
364 |
-- dnl to 'yes' because some of the testsuite requires it. |
365 |
-- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then |
366 |
-- BUILD_INCLUDED_LIBINTL=yes |
367 |
-- fi |
368 |
-+ dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' |
369 |
-+ dnl because some of the testsuite requires it. |
370 |
-+ BUILD_INCLUDED_LIBINTL=yes |
371 |
- |
372 |
- dnl Make all variables we use known to autoconf. |
373 |
- AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
374 |
- AC_SUBST([USE_INCLUDED_LIBINTL]) |
375 |
- AC_SUBST([CATOBJEXT]) |
376 |
-- |
377 |
-- dnl For backward compatibility. Some configure.ins may be using this. |
378 |
-- nls_cv_header_intl= |
379 |
-- nls_cv_header_libgt= |
380 |
-- |
381 |
-- dnl For backward compatibility. Some Makefiles may be using this. |
382 |
-- DATADIRNAME=share |
383 |
-- AC_SUBST([DATADIRNAME]) |
384 |
-- |
385 |
-- dnl For backward compatibility. Some Makefiles may be using this. |
386 |
-- INSTOBJEXT=.mo |
387 |
-- AC_SUBST([INSTOBJEXT]) |
388 |
-- |
389 |
-- dnl For backward compatibility. Some Makefiles may be using this. |
390 |
-- GENCAT=gencat |
391 |
-- AC_SUBST([GENCAT]) |
392 |
-- |
393 |
-- dnl For backward compatibility. Some Makefiles may be using this. |
394 |
-- INTLOBJS= |
395 |
-- if test "$USE_INCLUDED_LIBINTL" = yes; then |
396 |
-- INTLOBJS="\$(GETTOBJS)" |
397 |
-- fi |
398 |
-- AC_SUBST([INTLOBJS]) |
399 |
-- |
400 |
-- dnl Enable libtool support if the surrounding package wishes it. |
401 |
-- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
402 |
-- AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
403 |
- ]) |
404 |
- |
405 |
- dnl For backward compatibility. Some Makefiles may be using this. |
406 |
-@@ -381,3 +380,7 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED], |
407 |
- |
408 |
- dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
409 |
- AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
410 |
-+ |
411 |
-+ |
412 |
-+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) |
413 |
-+AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) |
414 |
---- a/m4/gpg-error.m4 |
415 |
-+++ b/m4/gpg-error.m4 |
416 |
-@@ -1,5 +1,5 @@ |
417 |
- # gpg-error.m4 - autoconf macro to detect libgpg-error. |
418 |
--# Copyright (C) 2002, 2003, 2004 g10 Code GmbH |
419 |
-+# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH |
420 |
- # |
421 |
- # This file is free software; as a special exception the author gives |
422 |
- # unlimited permission to copy and/or distribute it, with or without |
423 |
-@@ -8,58 +8,181 @@ |
424 |
- # This file is distributed in the hope that it will be useful, but |
425 |
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
426 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
427 |
-+# |
428 |
-+# Last-changed: 2020-11-17 |
429 |
-+ |
430 |
- |
431 |
- dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, |
432 |
- dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
433 |
--dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS |
434 |
-+dnl |
435 |
-+dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, |
436 |
-+dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are |
437 |
-+dnl used for programs requireing real multi thread support. |
438 |
-+dnl |
439 |
-+dnl If a prefix option is not used, the config script is first |
440 |
-+dnl searched in $SYSROOT/bin and then along $PATH. If the used |
441 |
-+dnl config script does not match the host specification the script |
442 |
-+dnl is added to the gpg_config_script_warn variable. |
443 |
- dnl |
444 |
- AC_DEFUN([AM_PATH_GPG_ERROR], |
445 |
--[ AC_ARG_WITH(gpg-error-prefix, |
446 |
-- AC_HELP_STRING([--with-gpg-error-prefix=PFX], |
447 |
-- [prefix where GPG Error is installed (optional)]), |
448 |
-- gpg_error_config_prefix="$withval", gpg_error_config_prefix="") |
449 |
-- if test x$gpg_error_config_prefix != x ; then |
450 |
-- if test x${GPG_ERROR_CONFIG+set} != xset ; then |
451 |
-- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config |
452 |
-+[ AC_REQUIRE([AC_CANONICAL_HOST]) |
453 |
-+ gpg_error_config_prefix="" |
454 |
-+ dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, |
455 |
-+ dnl since that is consistent with how our three siblings use the directory/ |
456 |
-+ dnl package name in --with-$dir_name-prefix=PFX. |
457 |
-+ AC_ARG_WITH(libgpg-error-prefix, |
458 |
-+ AS_HELP_STRING([--with-libgpg-error-prefix=PFX], |
459 |
-+ [prefix where GPG Error is installed (optional)]), |
460 |
-+ [gpg_error_config_prefix="$withval"]) |
461 |
-+ |
462 |
-+ dnl Accept --with-gpg-error-prefix and make it work the same as |
463 |
-+ dnl --with-libgpg-error-prefix above, for backwards compatibility, |
464 |
-+ dnl but do not document this old, inconsistently-named option. |
465 |
-+ AC_ARG_WITH(gpg-error-prefix,, |
466 |
-+ [gpg_error_config_prefix="$withval"]) |
467 |
-+ |
468 |
-+ if test x"${GPG_ERROR_CONFIG}" = x ; then |
469 |
-+ if test x"${gpg_error_config_prefix}" != x ; then |
470 |
-+ GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" |
471 |
-+ else |
472 |
-+ case "${SYSROOT}" in |
473 |
-+ /*) |
474 |
-+ if test -x "${SYSROOT}/bin/gpg-error-config" ; then |
475 |
-+ GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" |
476 |
-+ fi |
477 |
-+ ;; |
478 |
-+ '') |
479 |
-+ ;; |
480 |
-+ *) |
481 |
-+ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
482 |
-+ ;; |
483 |
-+ esac |
484 |
- fi |
485 |
- fi |
486 |
- |
487 |
- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) |
488 |
-- min_gpg_error_version=ifelse([$1], ,0.0,$1) |
489 |
-- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
490 |
-+ min_gpg_error_version=ifelse([$1], ,1.33,$1) |
491 |
- ok=no |
492 |
-- if test "$GPG_ERROR_CONFIG" != "no" ; then |
493 |
-+ |
494 |
-+ if test "$prefix" = NONE ; then |
495 |
-+ prefix_option_expanded=/usr/local |
496 |
-+ else |
497 |
-+ prefix_option_expanded="$prefix" |
498 |
-+ fi |
499 |
-+ if test "$exec_prefix" = NONE ; then |
500 |
-+ exec_prefix_option_expanded=$prefix_option_expanded |
501 |
-+ else |
502 |
-+ exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) |
503 |
-+ fi |
504 |
-+ libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) |
505 |
-+ |
506 |
-+ if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then |
507 |
-+ gpgrt_libdir=$libdir_option_expanded |
508 |
-+ else |
509 |
-+ if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then |
510 |
-+ if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then |
511 |
-+ if test -f $possible_libdir/pkgconfig/gpg-error.pc; then |
512 |
-+ gpgrt_libdir=$possible_libdir |
513 |
-+ fi |
514 |
-+ fi |
515 |
-+ fi |
516 |
-+ fi |
517 |
-+ |
518 |
-+ if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then |
519 |
-+ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) |
520 |
-+ if test "$GPGRT_CONFIG" = "no"; then |
521 |
-+ unset GPGRT_CONFIG |
522 |
-+ else |
523 |
-+ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" |
524 |
-+ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then |
525 |
-+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" |
526 |
-+ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) |
527 |
-+ gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` |
528 |
-+ else |
529 |
-+ unset GPGRT_CONFIG |
530 |
-+ fi |
531 |
-+ fi |
532 |
-+ else |
533 |
-+ gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
534 |
-+ fi |
535 |
-+ if test "$GPG_ERROR_CONFIG" != "no"; then |
536 |
- req_major=`echo $min_gpg_error_version | \ |
537 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
538 |
- req_minor=`echo $min_gpg_error_version | \ |
539 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
540 |
-- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` |
541 |
- major=`echo $gpg_error_config_version | \ |
542 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
543 |
- minor=`echo $gpg_error_config_version | \ |
544 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
545 |
- if test "$major" -gt "$req_major"; then |
546 |
- ok=yes |
547 |
-- else |
548 |
-+ else |
549 |
- if test "$major" -eq "$req_major"; then |
550 |
- if test "$minor" -ge "$req_minor"; then |
551 |
- ok=yes |
552 |
- fi |
553 |
- fi |
554 |
- fi |
555 |
-+ if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then |
556 |
-+ if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then |
557 |
-+ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) |
558 |
-+ if test "$GPGRT_CONFIG" = "no"; then |
559 |
-+ unset GPGRT_CONFIG |
560 |
-+ else |
561 |
-+ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" |
562 |
-+ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then |
563 |
-+ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" |
564 |
-+ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) |
565 |
-+ else |
566 |
-+ unset GPGRT_CONFIG |
567 |
-+ fi |
568 |
-+ fi |
569 |
-+ fi |
570 |
-+ fi |
571 |
- fi |
572 |
-+ AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
573 |
- if test $ok = yes; then |
574 |
-- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` |
575 |
-- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` |
576 |
-+ GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` |
577 |
-+ GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` |
578 |
-+ if test -z "$GPGRT_CONFIG"; then |
579 |
-+ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` |
580 |
-+ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` |
581 |
-+ else |
582 |
-+ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` |
583 |
-+ GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS" |
584 |
-+ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null` |
585 |
-+ GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS" |
586 |
-+ fi |
587 |
- AC_MSG_RESULT([yes ($gpg_error_config_version)]) |
588 |
- ifelse([$2], , :, [$2]) |
589 |
-+ if test -z "$GPGRT_CONFIG"; then |
590 |
-+ gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none` |
591 |
-+ else |
592 |
-+ gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none` |
593 |
-+ fi |
594 |
-+ if test x"$gpg_error_config_host" != xnone ; then |
595 |
-+ if test x"$gpg_error_config_host" != x"$host" ; then |
596 |
-+ AC_MSG_WARN([[ |
597 |
-+*** |
598 |
-+*** The config script "$GPG_ERROR_CONFIG" was |
599 |
-+*** built for $gpg_error_config_host and thus may not match the |
600 |
-+*** used host $host. |
601 |
-+*** You may want to use the configure option --with-libgpg-error-prefix |
602 |
-+*** to specify a matching config script or use \$SYSROOT. |
603 |
-+***]]) |
604 |
-+ gpg_config_script_warn="$gpg_config_script_warn libgpg-error" |
605 |
-+ fi |
606 |
-+ fi |
607 |
- else |
608 |
- GPG_ERROR_CFLAGS="" |
609 |
- GPG_ERROR_LIBS="" |
610 |
-+ GPG_ERROR_MT_CFLAGS="" |
611 |
-+ GPG_ERROR_MT_LIBS="" |
612 |
- AC_MSG_RESULT(no) |
613 |
- ifelse([$3], , :, [$3]) |
614 |
- fi |
615 |
- AC_SUBST(GPG_ERROR_CFLAGS) |
616 |
- AC_SUBST(GPG_ERROR_LIBS) |
617 |
-+ AC_SUBST(GPG_ERROR_MT_CFLAGS) |
618 |
-+ AC_SUBST(GPG_ERROR_MT_LIBS) |
619 |
- ]) |
620 |
-- |
621 |
---- a/m4/gpgme.m4 |
622 |
-+++ b/m4/gpgme.m4 |
623 |
-@@ -1,5 +1,5 @@ |
624 |
- # gpgme.m4 - autoconf macro to detect GPGME. |
625 |
--# Copyright (C) 2002, 2003, 2004 g10 Code GmbH |
626 |
-+# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH |
627 |
- # |
628 |
- # This file is free software; as a special exception the author gives |
629 |
- # unlimited permission to copy and/or distribute it, with or without |
630 |
-@@ -8,20 +8,52 @@ |
631 |
- # This file is distributed in the hope that it will be useful, but |
632 |
- # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
633 |
- # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
634 |
-+# |
635 |
-+# Last-changed: 2020-11-20 |
636 |
- |
637 |
- |
638 |
- AC_DEFUN([_AM_PATH_GPGME_CONFIG], |
639 |
- [ AC_ARG_WITH(gpgme-prefix, |
640 |
-- AC_HELP_STRING([--with-gpgme-prefix=PFX], |
641 |
-+ AS_HELP_STRING([--with-gpgme-prefix=PFX], |
642 |
- [prefix where GPGME is installed (optional)]), |
643 |
- gpgme_config_prefix="$withval", gpgme_config_prefix="") |
644 |
-- if test "x$gpgme_config_prefix" != x ; then |
645 |
-- GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" |
646 |
-+ if test x"${GPGME_CONFIG}" = x ; then |
647 |
-+ if test x"${gpgme_config_prefix}" != x ; then |
648 |
-+ GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config" |
649 |
-+ else |
650 |
-+ case "${SYSROOT}" in |
651 |
-+ /*) |
652 |
-+ if test -x "${SYSROOT}/bin/gpgme-config" ; then |
653 |
-+ GPGME_CONFIG="${SYSROOT}/bin/gpgme-config" |
654 |
-+ fi |
655 |
-+ ;; |
656 |
-+ '') |
657 |
-+ ;; |
658 |
-+ *) |
659 |
-+ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
660 |
-+ ;; |
661 |
-+ esac |
662 |
-+ fi |
663 |
-+ fi |
664 |
-+ |
665 |
-+ use_gpgrt_config="" |
666 |
-+ if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
667 |
-+ if $GPGRT_CONFIG gpgme --exists; then |
668 |
-+ GPGME_CONFIG="$GPGRT_CONFIG gpgme" |
669 |
-+ AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) |
670 |
-+ use_gpgrt_config=yes |
671 |
-+ fi |
672 |
-+ fi |
673 |
-+ if test -z "$use_gpgrt_config"; then |
674 |
-+ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) |
675 |
- fi |
676 |
-- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) |
677 |
- |
678 |
- if test "$GPGME_CONFIG" != "no" ; then |
679 |
-- gpgme_version=`$GPGME_CONFIG --version` |
680 |
-+ if test -z "$use_gpgrt_config"; then |
681 |
-+ gpgme_version=`$GPGME_CONFIG --version` |
682 |
-+ else |
683 |
-+ gpgme_version=`$GPGME_CONFIG --modversion` |
684 |
-+ fi |
685 |
- fi |
686 |
- gpgme_version_major=`echo $gpgme_version | \ |
687 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
688 |
-@@ -31,10 +63,39 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], |
689 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
690 |
- ]) |
691 |
- |
692 |
-+ |
693 |
-+AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], |
694 |
-+[ |
695 |
-+ if test -z "$use_gpgrt_config"; then |
696 |
-+ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` |
697 |
-+ else |
698 |
-+ gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none` |
699 |
-+ fi |
700 |
-+ if test x"$gpgme_config_host" != xnone ; then |
701 |
-+ if test x"$gpgme_config_host" != x"$host" ; then |
702 |
-+ AC_MSG_WARN([[ |
703 |
-+*** |
704 |
-+*** The config script "$GPGME_CONFIG" was |
705 |
-+*** built for $gpgme_config_host and thus may not match the |
706 |
-+*** used host $host. |
707 |
-+*** You may want to use the configure option --with-gpgme-prefix |
708 |
-+*** to specify a matching config script or use \$SYSROOT. |
709 |
-+***]]) |
710 |
-+ gpg_config_script_warn="$gpg_config_script_warn gpgme" |
711 |
-+ fi |
712 |
-+ fi |
713 |
-+]) |
714 |
-+ |
715 |
-+ |
716 |
- dnl AM_PATH_GPGME([MINIMUM-VERSION, |
717 |
- dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
718 |
- dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. |
719 |
- dnl |
720 |
-+dnl If a prefix option is not used, the config script is first |
721 |
-+dnl searched in $SYSROOT/bin and then along $PATH. If the used |
722 |
-+dnl config script does not match the host specification the script |
723 |
-+dnl is added to the gpg_config_script_warn variable. |
724 |
-+dnl |
725 |
- AC_DEFUN([AM_PATH_GPGME], |
726 |
- [ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl |
727 |
- tmp=ifelse([$1], ,1:0.4.2,$1) |
728 |
-@@ -57,7 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], |
729 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
730 |
- if test "$gpgme_version_major" -gt "$req_major"; then |
731 |
- ok=yes |
732 |
-- else |
733 |
-+ else |
734 |
- if test "$gpgme_version_major" -eq "$req_major"; then |
735 |
- if test "$gpgme_version_minor" -gt "$req_minor"; then |
736 |
- ok=yes |
737 |
-@@ -75,7 +136,11 @@ AC_DEFUN([AM_PATH_GPGME], |
738 |
- # If we have a recent GPGME, we should also check that the |
739 |
- # API is compatible. |
740 |
- if test "$req_gpgme_api" -gt 0 ; then |
741 |
-- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
742 |
-+ if test -z "$use_gpgrt_config"; then |
743 |
-+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
744 |
-+ else |
745 |
-+ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` |
746 |
-+ fi |
747 |
- if test "$tmp" -gt 0 ; then |
748 |
- if test "$req_gpgme_api" -ne "$tmp" ; then |
749 |
- ok=no |
750 |
-@@ -88,6 +153,7 @@ AC_DEFUN([AM_PATH_GPGME], |
751 |
- GPGME_LIBS=`$GPGME_CONFIG --libs` |
752 |
- AC_MSG_RESULT(yes) |
753 |
- ifelse([$2], , :, [$2]) |
754 |
-+ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
755 |
- else |
756 |
- GPGME_CFLAGS="" |
757 |
- GPGME_LIBS="" |
758 |
-@@ -98,75 +164,6 @@ AC_DEFUN([AM_PATH_GPGME], |
759 |
- AC_SUBST(GPGME_LIBS) |
760 |
- ]) |
761 |
- |
762 |
--dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, |
763 |
--dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
764 |
--dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. |
765 |
--dnl |
766 |
--AC_DEFUN([AM_PATH_GPGME_PTH], |
767 |
--[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl |
768 |
-- tmp=ifelse([$1], ,1:0.4.2,$1) |
769 |
-- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
770 |
-- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
771 |
-- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` |
772 |
-- else |
773 |
-- req_gpgme_api=0 |
774 |
-- min_gpgme_version="$tmp" |
775 |
-- fi |
776 |
-- |
777 |
-- AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) |
778 |
-- ok=no |
779 |
-- if test "$GPGME_CONFIG" != "no" ; then |
780 |
-- if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then |
781 |
-- req_major=`echo $min_gpgme_version | \ |
782 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
783 |
-- req_minor=`echo $min_gpgme_version | \ |
784 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
785 |
-- req_micro=`echo $min_gpgme_version | \ |
786 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
787 |
-- if test "$gpgme_version_major" -gt "$req_major"; then |
788 |
-- ok=yes |
789 |
-- else |
790 |
-- if test "$gpgme_version_major" -eq "$req_major"; then |
791 |
-- if test "$gpgme_version_minor" -gt "$req_minor"; then |
792 |
-- ok=yes |
793 |
-- else |
794 |
-- if test "$gpgme_version_minor" -eq "$req_minor"; then |
795 |
-- if test "$gpgme_version_micro" -ge "$req_micro"; then |
796 |
-- ok=yes |
797 |
-- fi |
798 |
-- fi |
799 |
-- fi |
800 |
-- fi |
801 |
-- fi |
802 |
-- fi |
803 |
-- fi |
804 |
-- if test $ok = yes; then |
805 |
-- # If we have a recent GPGME, we should also check that the |
806 |
-- # API is compatible. |
807 |
-- if test "$req_gpgme_api" -gt 0 ; then |
808 |
-- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
809 |
-- if test "$tmp" -gt 0 ; then |
810 |
-- if test "$req_gpgme_api" -ne "$tmp" ; then |
811 |
-- ok=no |
812 |
-- fi |
813 |
-- fi |
814 |
-- fi |
815 |
-- fi |
816 |
-- if test $ok = yes; then |
817 |
-- GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` |
818 |
-- GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` |
819 |
-- AC_MSG_RESULT(yes) |
820 |
-- ifelse([$2], , :, [$2]) |
821 |
-- else |
822 |
-- GPGME_PTH_CFLAGS="" |
823 |
-- GPGME_PTH_LIBS="" |
824 |
-- AC_MSG_RESULT(no) |
825 |
-- ifelse([$3], , :, [$3]) |
826 |
-- fi |
827 |
-- AC_SUBST(GPGME_PTH_CFLAGS) |
828 |
-- AC_SUBST(GPGME_PTH_LIBS) |
829 |
--]) |
830 |
-- |
831 |
- dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, |
832 |
- dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
833 |
- dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS |
834 |
-@@ -195,7 +192,7 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], |
835 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
836 |
- if test "$gpgme_version_major" -gt "$req_major"; then |
837 |
- ok=yes |
838 |
-- else |
839 |
-+ else |
840 |
- if test "$gpgme_version_major" -eq "$req_major"; then |
841 |
- if test "$gpgme_version_minor" -gt "$req_minor"; then |
842 |
- ok=yes |
843 |
-@@ -227,6 +224,7 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], |
844 |
- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` |
845 |
- AC_MSG_RESULT(yes) |
846 |
- ifelse([$2], , :, [$2]) |
847 |
-+ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
848 |
- else |
849 |
- GPGME_PTHREAD_CFLAGS="" |
850 |
- GPGME_PTHREAD_LIBS="" |
851 |
-@@ -264,7 +262,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
852 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
853 |
- if test "$gpgme_version_major" -gt "$req_major"; then |
854 |
- ok=yes |
855 |
-- else |
856 |
-+ else |
857 |
- if test "$gpgme_version_major" -eq "$req_major"; then |
858 |
- if test "$gpgme_version_minor" -gt "$req_minor"; then |
859 |
- ok=yes |
860 |
-@@ -282,7 +280,11 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
861 |
- # If we have a recent GPGME, we should also check that the |
862 |
- # API is compatible. |
863 |
- if test "$req_gpgme_api" -gt 0 ; then |
864 |
-- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
865 |
-+ if test -z "$use_gpgrt_config"; then |
866 |
-+ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
867 |
-+ else |
868 |
-+ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` |
869 |
-+ fi |
870 |
- if test "$tmp" -gt 0 ; then |
871 |
- if test "$req_gpgme_api" -ne "$tmp" ; then |
872 |
- ok=no |
873 |
-@@ -291,10 +293,23 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
874 |
- fi |
875 |
- fi |
876 |
- if test $ok = yes; then |
877 |
-- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` |
878 |
-- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` |
879 |
-+ if test -z "$use_gpgrt_config"; then |
880 |
-+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` |
881 |
-+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` |
882 |
-+ else |
883 |
-+ if $GPGRT_CONFIG gpgme-glib --exists; then |
884 |
-+ GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib" |
885 |
-+ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags` |
886 |
-+ GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs` |
887 |
-+ else |
888 |
-+ ok = no |
889 |
-+ fi |
890 |
-+ fi |
891 |
-+ fi |
892 |
-+ if test $ok = yes; then |
893 |
- AC_MSG_RESULT(yes) |
894 |
- ifelse([$2], , :, [$2]) |
895 |
-+ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
896 |
- else |
897 |
- GPGME_GLIB_CFLAGS="" |
898 |
- GPGME_GLIB_LIBS="" |
899 |
-@@ -304,4 +319,3 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
900 |
- AC_SUBST(GPGME_GLIB_CFLAGS) |
901 |
- AC_SUBST(GPGME_GLIB_LIBS) |
902 |
- ]) |
903 |
-- |
904 |
---- a/m4/libassuan.m4 |
905 |
-+++ b/m4/libassuan.m4 |
906 |
-@@ -1,5 +1,5 @@ |
907 |
- dnl Autoconf macros for libassuan |
908 |
--dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. |
909 |
-+dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc. |
910 |
- dnl |
911 |
- dnl This file is free software; as a special exception the author gives |
912 |
- dnl unlimited permission to copy and/or distribute it, with or without |
913 |
-@@ -8,23 +8,36 @@ dnl |
914 |
- dnl This file is distributed in the hope that it will be useful, but |
915 |
- dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
916 |
- dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
917 |
-+dnl SPDX-License-Identifier: FSFULLR |
918 |
-+# Last-changed: 2020-11-17 |
919 |
- |
920 |
- dnl |
921 |
- dnl Common code used for libassuan detection [internal] |
922 |
- dnl Returns ok set to yes or no. |
923 |
- dnl |
924 |
- AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
925 |
--[ AC_ARG_WITH(libassuan-prefix, |
926 |
-- AC_HELP_STRING([--with-libassuan-prefix=PFX], |
927 |
-+[ AC_REQUIRE([AC_CANONICAL_HOST]) |
928 |
-+ AC_ARG_WITH(libassuan-prefix, |
929 |
-+ AS_HELP_STRING([--with-libassuan-prefix=PFX], |
930 |
- [prefix where LIBASSUAN is installed (optional)]), |
931 |
- libassuan_config_prefix="$withval", libassuan_config_prefix="") |
932 |
- if test x$libassuan_config_prefix != x ; then |
933 |
-- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" |
934 |
- if test x${LIBASSUAN_CONFIG+set} != xset ; then |
935 |
- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config |
936 |
- fi |
937 |
- fi |
938 |
-- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) |
939 |
-+ |
940 |
-+ use_gpgrt_config="" |
941 |
-+ if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
942 |
-+ if $GPGRT_CONFIG libassuan --exists; then |
943 |
-+ LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" |
944 |
-+ AC_MSG_NOTICE([Use gpgrt-config as libassuan-config]) |
945 |
-+ use_gpgrt_config=yes |
946 |
-+ fi |
947 |
-+ fi |
948 |
-+ if test -z "$use_gpgrt_config"; then |
949 |
-+ AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) |
950 |
-+ fi |
951 |
- |
952 |
- tmp=ifelse([$1], ,1:0.9.2,$1) |
953 |
- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
954 |
-@@ -35,55 +48,60 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
955 |
- min_libassuan_version="$tmp" |
956 |
- fi |
957 |
- |
958 |
-- if test "$LIBASSUAN_CONFIG" != "no" ; then |
959 |
-- libassuan_version=`$LIBASSUAN_CONFIG --version` |
960 |
-- fi |
961 |
-- libassuan_version_major=`echo $libassuan_version | \ |
962 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
963 |
-- libassuan_version_minor=`echo $libassuan_version | \ |
964 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
965 |
-- libassuan_version_micro=`echo $libassuan_version | \ |
966 |
-- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
967 |
-- |
968 |
-- AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version) |
969 |
-+ AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) |
970 |
- ok=no |
971 |
-- if test "$LIBASSUAN_CONFIG" != "no" ; then |
972 |
-- ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then]) |
973 |
-+ if test "$LIBASSUAN_CONFIG" != "no"; then |
974 |
- req_major=`echo $min_libassuan_version | \ |
975 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
976 |
- req_minor=`echo $min_libassuan_version | \ |
977 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
978 |
- req_micro=`echo $min_libassuan_version | \ |
979 |
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
980 |
-- if test "$libassuan_version_major" -gt "$req_major"; then |
981 |
-+ |
982 |
-+ if test -z "$use_gpgrt_config"; then |
983 |
-+ libassuan_config_version=`$LIBASSUAN_CONFIG --version` |
984 |
-+ else |
985 |
-+ libassuan_config_version=`$LIBASSUAN_CONFIG --modversion` |
986 |
-+ fi |
987 |
-+ major=`echo $libassuan_config_version | \ |
988 |
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
989 |
-+ minor=`echo $libassuan_config_version | \ |
990 |
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
991 |
-+ micro=`echo $libassuan_config_version | \ |
992 |
-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
993 |
-+ |
994 |
-+ if test "$major" -gt "$req_major"; then |
995 |
- ok=yes |
996 |
-- else |
997 |
-- if test "$libassuan_version_major" -eq "$req_major"; then |
998 |
-- if test "$libassuan_version_minor" -gt "$req_minor"; then |
999 |
-+ else |
1000 |
-+ if test "$major" -eq "$req_major"; then |
1001 |
-+ if test "$minor" -gt "$req_minor"; then |
1002 |
- ok=yes |
1003 |
- else |
1004 |
-- if test "$libassuan_version_minor" -eq "$req_minor"; then |
1005 |
-- if test "$libassuan_version_micro" -ge "$req_micro"; then |
1006 |
-+ if test "$minor" -eq "$req_minor"; then |
1007 |
-+ if test "$micro" -ge "$req_micro"; then |
1008 |
- ok=yes |
1009 |
- fi |
1010 |
- fi |
1011 |
- fi |
1012 |
- fi |
1013 |
- fi |
1014 |
-- ifelse([$2], ,,[fi]) |
1015 |
- fi |
1016 |
- |
1017 |
- if test $ok = yes; then |
1018 |
-- AC_MSG_RESULT([yes ($libassuan_version)]) |
1019 |
-+ AC_MSG_RESULT([yes ($libassuan_config_version)]) |
1020 |
- else |
1021 |
- AC_MSG_RESULT(no) |
1022 |
- fi |
1023 |
- |
1024 |
- if test $ok = yes; then |
1025 |
- if test "$req_libassuan_api" -gt 0 ; then |
1026 |
-- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
1027 |
-+ if test -z "$use_gpgrt_config"; then |
1028 |
-+ tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
1029 |
-+ else |
1030 |
-+ tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0` |
1031 |
-+ fi |
1032 |
- if test "$tmp" -gt 0 ; then |
1033 |
-- AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version]) |
1034 |
-+ AC_MSG_CHECKING([LIBASSUAN API version]) |
1035 |
- if test "$req_libassuan_api" -eq "$tmp" ; then |
1036 |
- AC_MSG_RESULT(okay) |
1037 |
- else |
1038 |
-@@ -94,6 +112,27 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
1039 |
- fi |
1040 |
- fi |
1041 |
- |
1042 |
-+ if test $ok = yes; then |
1043 |
-+ if test x"$host" != x ; then |
1044 |
-+ if test -z "$use_gpgrt_config"; then |
1045 |
-+ libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` |
1046 |
-+ else |
1047 |
-+ libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none` |
1048 |
-+ fi |
1049 |
-+ if test x"$libassuan_config_host" != xnone ; then |
1050 |
-+ if test x"$libassuan_config_host" != x"$host" ; then |
1051 |
-+ AC_MSG_WARN([[ |
1052 |
-+*** |
1053 |
-+*** The config script "$LIBASSUAN_CONFIG" was |
1054 |
-+*** built for $libassuan_config_host and thus may not match the |
1055 |
-+*** used host $host. |
1056 |
-+*** You may want to use the configure option --with-libassuan-prefix |
1057 |
-+*** to specify a matching config script. |
1058 |
-+***]]) |
1059 |
-+ fi |
1060 |
-+ fi |
1061 |
-+ fi |
1062 |
-+ fi |
1063 |
- ]) |
1064 |
- |
1065 |
- dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION, |
1066 |
-@@ -120,8 +159,8 @@ dnl |
1067 |
- AC_DEFUN([AM_PATH_LIBASSUAN], |
1068 |
- [ _AM_PATH_LIBASSUAN_COMMON($1) |
1069 |
- if test $ok = yes; then |
1070 |
-- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` |
1071 |
-- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` |
1072 |
-+ LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` |
1073 |
-+ LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` |
1074 |
- ifelse([$2], , :, [$2]) |
1075 |
- else |
1076 |
- LIBASSUAN_CFLAGS="" |
1077 |
-@@ -131,45 +170,3 @@ AC_DEFUN([AM_PATH_LIBASSUAN], |
1078 |
- AC_SUBST(LIBASSUAN_CFLAGS) |
1079 |
- AC_SUBST(LIBASSUAN_LIBS) |
1080 |
- ]) |
1081 |
-- |
1082 |
-- |
1083 |
--dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION, |
1084 |
--dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
1085 |
--dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS |
1086 |
--dnl |
1087 |
--AC_DEFUN([AM_PATH_LIBASSUAN_PTH], |
1088 |
--[ _AM_PATH_LIBASSUAN_COMMON($1,pth) |
1089 |
-- if test $ok = yes; then |
1090 |
-- LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags` |
1091 |
-- LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs` |
1092 |
-- ifelse([$2], , :, [$2]) |
1093 |
-- else |
1094 |
-- LIBASSUAN_PTH_CFLAGS="" |
1095 |
-- LIBASSUAN_PTH_LIBS="" |
1096 |
-- ifelse([$3], , :, [$3]) |
1097 |
-- fi |
1098 |
-- AC_SUBST(LIBASSUAN_PTH_CFLAGS) |
1099 |
-- AC_SUBST(LIBASSUAN_PTH_LIBS) |
1100 |
--]) |
1101 |
-- |
1102 |
-- |
1103 |
--dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION, |
1104 |
--dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
1105 |
--dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS |
1106 |
--dnl and LIBASSUAN_PTHREAD_LIBS |
1107 |
--dnl |
1108 |
--AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD], |
1109 |
--[ _AM_PATH_LIBASSUAN_COMMON($1,pthread) |
1110 |
-- if test $ok = yes; then |
1111 |
-- LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags` |
1112 |
-- LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs` |
1113 |
-- ifelse([$2], , :, [$2]) |
1114 |
-- else |
1115 |
-- LIBASSUAN_PTHREAD_CFLAGS="" |
1116 |
-- LIBASSUAN_PTHREAD_LIBS="" |
1117 |
-- ifelse([$3], , :, [$3]) |
1118 |
-- fi |
1119 |
-- AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS) |
1120 |
-- AC_SUBST(LIBASSUAN_PTHREAD_LIBS) |
1121 |
--]) |
1122 |
-- |
1123 |
|
1124 |
diff --git a/app-crypt/gpa/gpa-0.10.0-r1.ebuild b/app-crypt/gpa/gpa-0.10.0-r1.ebuild |
1125 |
index f8dd22fbdcb4..ebce5a63807e 100644 |
1126 |
--- a/app-crypt/gpa/gpa-0.10.0-r1.ebuild |
1127 |
+++ b/app-crypt/gpa/gpa-0.10.0-r1.ebuild |
1128 |
@@ -8,6 +8,8 @@ inherit autotools xdg |
1129 |
DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG" |
1130 |
HOMEPAGE="http://gpa.wald.intevation.org" |
1131 |
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
1132 |
+# Backport of upstream changes to 0.10.0 |
1133 |
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autoconf.patch.xz" |
1134 |
|
1135 |
LICENSE="GPL-3" |
1136 |
SLOT="0" |
1137 |
@@ -26,7 +28,7 @@ BDEPEND="virtual/pkgconfig |
1138 |
nls? ( sys-devel/gettext )" |
1139 |
|
1140 |
PATCHES=( |
1141 |
- "${FILESDIR}"/${P}-autoconf.patch |
1142 |
+ "${WORKDIR}"/${P}-autoconf.patch |
1143 |
) |
1144 |
|
1145 |
src_prepare() { |