Date: Friday, April 14, 2023 @ 14:05:33
Author: jelle
Revision: 1446036
archrelease: copy trunk to community-x86_64
Added:
geany-plugins/repos/community-x86_64/PKGBUILD
(from rev 1446035, geany-plugins/trunk/PKGBUILD)
geany-plugins/repos/community-x86_64/keys/
geany-plugins/repos/community-x86_64/libgit2.patch
(from rev 1446035, geany-plugins/trunk/libgit2.patch)
geany-plugins/repos/community-x86_64/update-gpgme-m4.patch
(from rev 1446035, geany-plugins/trunk/update-gpgme-m4.patch)
Deleted:
geany-plugins/repos/community-x86_64/PKGBUILD
geany-plugins/repos/community-x86_64/keys/
geany-plugins/repos/community-x86_64/libgit2.patch
-----------------------+
PKGBUILD | 86 ++++-----
libgit2.patch | 44 ++--
update-gpgme-m4.patch | 451 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 518 insertions(+), 63 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-14 14:05:14 UTC (rev 1446035)
+++ PKGBUILD 2023-04-14 14:05:33 UTC (rev 1446036)
@@ -1,41 +0,0 @@
-# Maintainer: Alexander F. Rødseth <[email protected]>
-# Contributor: Angel 'angvp' Velasquez <[email protected]>
-# Contributor: Gerardo Exequiel Pozzi <[email protected]>
-# Contributor: Patrick Melo <[email protected]>
-
-pkgname=geany-plugins
-pkgver=1.38
-pkgrel=5
-pkgdesc='Plugins for Geany'
-arch=(x86_64)
-url='https://plugins.geany.org/'
-license=(GPL)
-depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3
webkit2gtk)
-makedepends=(cppcheck intltool)
-source=(libgit2.patch
- "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
-b2sums=('8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387'
-
'a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
- 'SKIP')
-validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz
<[email protected]>
-
-prepare() {
- cd $pkgname-$pkgver
- # https://github.com/geany/geany-plugins/issues/1164
- patch -p1 -i ../libgit2.patch
- autoreconf -fi
-}
-
-build() {
- cd $pkgname-$pkgver
- export CFLAGS+=' -w' PYTHON=/usr/bin/python
- ./configure --prefix=/usr --libexecdir=/usr/lib
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
-}
-
-# getver: plugins.geany.org/downloads.html
Copied: geany-plugins/repos/community-x86_64/PKGBUILD (from rev 1446035,
geany-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-14 14:05:33 UTC (rev 1446036)
@@ -0,0 +1,45 @@
+# Maintainer: Alexander F. Rødseth <[email protected]>
+# Contributor: Angel 'angvp' Velasquez <[email protected]>
+# Contributor: Gerardo Exequiel Pozzi <[email protected]>
+# Contributor: Patrick Melo <[email protected]>
+
+pkgname=geany-plugins
+pkgver=1.38
+pkgrel=6
+pkgdesc='Plugins for Geany'
+arch=(x86_64)
+url='https://plugins.geany.org/'
+license=(GPL)
+depends=(ctpl "geany>=$pkgver" gpgme gtkspell3 libgit2 lua51 python vte3
webkit2gtk)
+makedepends=(cppcheck intltool)
+source=(libgit2.patch
+ update-gpgme-m4.patch
+ "$url$pkgname/$pkgname-$pkgver.tar.bz2"{,.sig})
+b2sums=('8daf8357caf09eb62844b6c44fa2a819231879b6d7e69bde4039f87230419cf371d1e8b5dede2f23dbb65d5d652b0bce3e51c79164ab8e3d76b445130cd5d387'
+
'cd4ae9f197eec44214a3ab6267d94c0602319999f93b2d5a2862b609cbdc5a5c0a834289aa94e65dbe13db81bee4695c3c0b9a2d35ea3efd4e844794cc0cbe24'
+
'a2fd9e59218e4b5359b910ccff8d0a6504845081f827d2f1c798ea6401914e8e01222c784a76ab0a126f5fe07c8aa86018cef4c71bb5e2891193f6c8965a3e47'
+ 'SKIP')
+validpgpkeys=('986FA7E80256D3D16F30FB7A01380DF54FD09D02') # Frank Lanitz
<[email protected]>
+
+prepare() {
+ cd $pkgname-$pkgver
+ # https://github.com/geany/geany-plugins/issues/1164
+ patch -p1 -i ../libgit2.patch
+ patch -p1 -i ../update-gpgme-m4.patch
+
+ autoreconf -fi
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export CFLAGS+=' -w' PYTHON=/usr/bin/python
+ ./configure --prefix=/usr --libexecdir=/usr/lib
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}
+
+# getver: plugins.geany.org/downloads.html
Deleted: libgit2.patch
===================================================================
--- libgit2.patch 2023-04-14 14:05:14 UTC (rev 1446035)
+++ libgit2.patch 2023-04-14 14:05:33 UTC (rev 1446036)
@@ -1,22 +0,0 @@
-diff --git i/git-changebar/src/gcb-plugin.c w/git-changebar/src/gcb-plugin.c
-index f8ce20cd..4488b22f 100644
---- i/git-changebar/src/gcb-plugin.c
-+++ w/git-changebar/src/gcb-plugin.c
-@@ -216,7 +216,7 @@ static int
- gcb_git_buf_grow (git_buf *buf,
- size_t target_size)
- {
-- if (buf->asize == 0) {
-+ if (buf->reserved == 0) {
- if (target_size == 0) {
- target_size = buf->size;
- }
-@@ -234,7 +234,7 @@ buf_zero (git_buf *buf)
- if (buf) {
- buf->ptr = NULL;
- buf->size = 0;
-- buf->asize = 0;
-+ buf->reserved = 0;
- }
- }
-
Copied: geany-plugins/repos/community-x86_64/libgit2.patch (from rev 1446035,
geany-plugins/trunk/libgit2.patch)
===================================================================
--- libgit2.patch (rev 0)
+++ libgit2.patch 2023-04-14 14:05:33 UTC (rev 1446036)
@@ -0,0 +1,22 @@
+diff --git i/git-changebar/src/gcb-plugin.c w/git-changebar/src/gcb-plugin.c
+index f8ce20cd..4488b22f 100644
+--- i/git-changebar/src/gcb-plugin.c
++++ w/git-changebar/src/gcb-plugin.c
+@@ -216,7 +216,7 @@ static int
+ gcb_git_buf_grow (git_buf *buf,
+ size_t target_size)
+ {
+- if (buf->asize == 0) {
++ if (buf->reserved == 0) {
+ if (target_size == 0) {
+ target_size = buf->size;
+ }
+@@ -234,7 +234,7 @@ buf_zero (git_buf *buf)
+ if (buf) {
+ buf->ptr = NULL;
+ buf->size = 0;
+- buf->asize = 0;
++ buf->reserved = 0;
+ }
+ }
+
Copied: geany-plugins/repos/community-x86_64/update-gpgme-m4.patch (from rev
1446035, geany-plugins/trunk/update-gpgme-m4.patch)
===================================================================
--- update-gpgme-m4.patch (rev 0)
+++ update-gpgme-m4.patch 2023-04-14 14:05:33 UTC (rev 1446036)
@@ -0,0 +1,451 @@
+From e90e293ea5055da1ef4636c22e947e689cffb983 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <[email protected]>
+Date: Thu, 15 Dec 2022 11:45:20 +0800
+Subject: [PATCH] Update bundled gpgme.m4
+
+gpgme.m4 taken from current git master version at
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=blob;f=src/gpgme.m4;hb=2ba11f9bfb1f51a481eb1240b8cf2c8ad260c222.
+
+Fixes: #1213
+---
+ build/bundled/gpgme.m4 | 316 +++++++++++++++++++++++++++--------------
+ 1 file changed, 211 insertions(+), 105 deletions(-)
+
+diff --git a/build/bundled/gpgme.m4 b/build/bundled/gpgme.m4
+index 44bf43cb9..f2906c161 100644
+--- a/build/bundled/gpgme.m4
++++ b/build/bundled/gpgme.m4
+@@ -1,5 +1,5 @@
+ # gpgme.m4 - autoconf macro to detect GPGME.
+-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH
++# Copyright (C) 2002, 2003, 2004, 2014, 2018, 2022 g10 Code GmbH
+ #
+ # This file is free software; as a special exception the author gives
+ # unlimited permission to copy and/or distribute it, with or without
+@@ -8,20 +8,141 @@
+ # This file is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++#
++# Last-changed: 2022-11-25
++
+
++dnl
++dnl Find gpgrt-config, which uses .pc file
++dnl (minimum pkg-config functionality, supporting cross build)
++dnl
++dnl _AM_PATH_GPGRT_CONFIG
++AC_DEFUN([_AM_PATH_GPGRT_CONFIG],[dnl
++ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no, [$prefix/bin:$PATH])
++ if test "$GPGRT_CONFIG" != "no"; then
++ # Determine gpgrt_libdir
++ #
++ # Get the prefix of gpgrt-config assuming it's something like:
++ # <PREFIX>/bin/gpgrt-config
++ gpgrt_prefix=${GPGRT_CONFIG%/*/*}
++ possible_libdir1=${gpgrt_prefix}/lib
++ # Determine by using system libdir-format with CC, it's like:
++ # Normal style: /usr/lib
++ # GNU cross style: /usr/<triplet>/lib
++ # Debian style: /usr/lib/<multiarch-name>
++ # Fedora/openSUSE style: /usr/lib, /usr/lib32 or /usr/lib64
++ # It is assumed that CC is specified to the one of host on cross build.
++ if libdir_candidates=$(${CC:-cc} -print-search-dirs | \
++ sed -n -e "/^libraries/{s/libraries: =//;s/:/\\
++/g;p;}"); then
++ # From the output of -print-search-dirs, select valid pkgconfig dirs.
++ libdir_candidates=$(for dir in $libdir_candidates; do
++ if p=$(cd $dir 2>/dev/null && pwd); then
++ test -d "$p/pkgconfig" && echo $p;
++ fi
++ done)
++
++ for possible_libdir0 in $libdir_candidates; do
++ # possible_libdir0:
++ # Fallback candidate, the one of system-installed (by $CC)
++ # (/usr/<triplet>/lib, /usr/lib/<multiarch-name> or /usr/lib32)
++ # possible_libdir1:
++ # Another candidate, user-locally-installed
++ # (<gpgrt_prefix>/lib)
++ # possible_libdir2
++ # Most preferred
++ # (<gpgrt_prefix>/<triplet>/lib,
++ # <gpgrt_prefix>/lib/<multiarch-name> or <gpgrt_prefix>/lib32)
++ if test "${possible_libdir0##*/}" = "lib"; then
++ possible_prefix0=${possible_libdir0%/lib}
++ possible_prefix0_triplet=${possible_prefix0##*/}
++ if test -z "$possible_prefix0_triplet"; then
++ continue
++ fi
++ possible_libdir2=${gpgrt_prefix}/$possible_prefix0_triplet/lib
++ else
++ possible_prefix0=${possible_libdir0%%/lib*}
++
possible_libdir2=${gpgrt_prefix}${possible_libdir0#$possible_prefix0}
++ fi
++ if test -f ${possible_libdir2}/pkgconfig/gpg-error.pc; then
++ gpgrt_libdir=${possible_libdir2}
++ elif test -f ${possible_libdir1}/pkgconfig/gpg-error.pc; then
++ gpgrt_libdir=${possible_libdir1}
++ elif test -f ${possible_libdir0}/pkgconfig/gpg-error.pc; then
++ gpgrt_libdir=${possible_libdir0}
++ fi
++ if test -n "$gpgrt_libdir"; then break; fi
++ done
++ if test -z "$libdir_candidates"; then
++ # No valid pkgconfig dir in any of the system directories, fallback
++ gpgrt_libdir=${possible_libdir1}
++ fi
++ else
++ # When we cannot determine system libdir-format, use this:
++ gpgrt_libdir=${possible_libdir1}
++ fi
++ else
++ unset GPGRT_CONFIG
++ fi
+
+-AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+-[ AC_ARG_WITH(gpgme-prefix,
+- AC_HELP_STRING([--with-gpgme-prefix=PFX],
+- [prefix where GPGME is installed (optional)]),
++ if test -n "$gpgrt_libdir"; then
++ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
++ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
++ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
++ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
++ gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
++ else
++ unset GPGRT_CONFIG
++ fi
++ elif test "$GPG_ERROR_CONFIG" != "no"; then
++ gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
++ unset GPGRT_CONFIG
++ fi
++])
++
++AC_DEFUN([_AM_PATH_GPGME_CONFIG],[dnl
++AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
++ AC_ARG_WITH(gpgme-prefix,
++ AS_HELP_STRING([--with-gpgme-prefix=PFX],
++ [prefix where GPGME is installed (optional)]),
+ gpgme_config_prefix="$withval", gpgme_config_prefix="")
+- if test "x$gpgme_config_prefix" != x ; then
+- GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
++ if test x"${GPGME_CONFIG}" = x ; then
++ if test x"${gpgme_config_prefix}" != x ; then
++ GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config"
++ else
++ case "${SYSROOT}" in
++ /*)
++ if test -x "${SYSROOT}/bin/gpgme-config" ; then
++ GPGME_CONFIG="${SYSROOT}/bin/gpgme-config"
++ fi
++ ;;
++ '')
++ ;;
++ *)
++ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
++ ;;
++ esac
++ fi
++ fi
++
++ use_gpgrt_config=""
++ if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
++ if $GPGRT_CONFIG gpgme --exists; then
++ GPGME_CONFIG="$GPGRT_CONFIG gpgme"
++ AC_MSG_NOTICE([Use gpgrt-config as gpgme-config])
++ use_gpgrt_config=yes
++ fi
++ fi
++ if test -z "$use_gpgrt_config"; then
++ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+ fi
+- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
+
+ if test "$GPGME_CONFIG" != "no" ; then
+- gpgme_version=`$GPGME_CONFIG --version`
++ if test -z "$use_gpgrt_config"; then
++ gpgme_version=`$GPGME_CONFIG --version`
++ else
++ gpgme_version=`$GPGME_CONFIG --modversion`
++ fi
+ fi
+ gpgme_version_major=`echo $gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+@@ -31,10 +152,39 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG],
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ ])
+
++
++AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK],
++[
++ if test -z "$use_gpgrt_config"; then
++ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none`
++ else
++ gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo
none`
++ fi
++ if test x"$gpgme_config_host" != xnone ; then
++ if test x"$gpgme_config_host" != x"$host" ; then
++ AC_MSG_WARN([[
++***
++*** The config script "$GPGME_CONFIG" was
++*** built for $gpgme_config_host and thus may not match the
++*** used host $host.
++*** You may want to use the configure option --with-gpgme-prefix
++*** to specify a matching config script or use \$SYSROOT.
++***]])
++ gpg_config_script_warn="$gpg_config_script_warn gpgme"
++ fi
++ fi
++])
++
++
+ dnl AM_PATH_GPGME([MINIMUM-VERSION,
+ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+ dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS.
+ dnl
++dnl If a prefix option is not used, the config script is first
++dnl searched in $SYSROOT/bin and then along $PATH. If the used
++dnl config script does not match the host specification the script
++dnl is added to the gpg_config_script_warn variable.
++dnl
+ AC_DEFUN([AM_PATH_GPGME],
+ [ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+@@ -57,7 +207,7 @@ AC_DEFUN([AM_PATH_GPGME],
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+- else
++ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+@@ -75,7 +225,11 @@ AC_DEFUN([AM_PATH_GPGME],
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ if test -z "$use_gpgrt_config"; then
++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ else
++ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
++ fi
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+@@ -88,6 +242,7 @@ AC_DEFUN([AM_PATH_GPGME],
+ GPGME_LIBS=`$GPGME_CONFIG --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK
+ else
+ GPGME_CFLAGS=""
+ GPGME_LIBS=""
+@@ -98,82 +253,14 @@ AC_DEFUN([AM_PATH_GPGME],
+ AC_SUBST(GPGME_LIBS)
+ ])
+
+-dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION,
+-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+-dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS.
+-dnl
+-AC_DEFUN([AM_PATH_GPGME_PTH],
+-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+- tmp=ifelse([$1], ,1:0.4.2,$1)
+- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+- else
+- req_gpgme_api=0
+- min_gpgme_version="$tmp"
+- fi
+-
+- AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version)
+- ok=no
+- if test "$GPGME_CONFIG" != "no" ; then
+- if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then
+- req_major=`echo $min_gpgme_version | \
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+- req_minor=`echo $min_gpgme_version | \
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+- req_micro=`echo $min_gpgme_version | \
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+- if test "$gpgme_version_major" -gt "$req_major"; then
+- ok=yes
+- else
+- if test "$gpgme_version_major" -eq "$req_major"; then
+- if test "$gpgme_version_minor" -gt "$req_minor"; then
+- ok=yes
+- else
+- if test "$gpgme_version_minor" -eq "$req_minor"; then
+- if test "$gpgme_version_micro" -ge "$req_micro"; then
+- ok=yes
+- fi
+- fi
+- fi
+- fi
+- fi
+- fi
+- fi
+- if test $ok = yes; then
+- # If we have a recent GPGME, we should also check that the
+- # API is compatible.
+- if test "$req_gpgme_api" -gt 0 ; then
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
+- if test "$tmp" -gt 0 ; then
+- if test "$req_gpgme_api" -ne "$tmp" ; then
+- ok=no
+- fi
+- fi
+- fi
+- fi
+- if test $ok = yes; then
+- GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags`
+- GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs`
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+- else
+- GPGME_PTH_CFLAGS=""
+- GPGME_PTH_LIBS=""
+- AC_MSG_RESULT(no)
+- ifelse([$3], , :, [$3])
+- fi
+- AC_SUBST(GPGME_PTH_CFLAGS)
+- AC_SUBST(GPGME_PTH_LIBS)
+-])
+-
+ dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
+ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
+ dnl and GPGME_PTHREAD_LIBS.
+ dnl
+-AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
++AC_DEFUN([AM_PATH_GPGME_PTHREAD],[
++ AC_OBSOLETE([$0], [; use AM_PATH_GPGME instead to use GPGME_CFLAGS and
GPGME_LIBS])dnl
++ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
+ tmp=ifelse([$1], ,1:0.4.2,$1)
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
+@@ -186,35 +273,37 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+ AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version)
+ ok=no
+ if test "$GPGME_CONFIG" != "no" ; then
+- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then
+- req_major=`echo $min_gpgme_version | \
++ req_major=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+- req_minor=`echo $min_gpgme_version | \
++ req_minor=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+- req_micro=`echo $min_gpgme_version | \
++ req_micro=`echo $min_gpgme_version | \
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+- if test "$gpgme_version_major" -gt "$req_major"; then
++ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+- else
++ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+- if test "$gpgme_version_minor" -gt "$req_minor"; then
+- ok=yes
+- else
+- if test "$gpgme_version_minor" -eq "$req_minor"; then
+- if test "$gpgme_version_micro" -ge "$req_micro"; then
+- ok=yes
+- fi
++ if test "$gpgme_version_minor" -gt "$req_minor"; then
++ ok=yes
++ else
++ if test "$gpgme_version_minor" -eq "$req_minor"; then
++ if test "$gpgme_version_micro" -ge "$req_micro"; then
++ ok=yes
++ fi
++ fi
+ fi
+- fi
+ fi
+- fi
+ fi
+ fi
+ if test $ok = yes; then
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ if test -z "$use_gpgrt_config"; then
++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ else
++ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
++ fi
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+@@ -223,10 +312,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
+ fi
+ fi
+ if test $ok = yes; then
+- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags`
+- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
++ GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --cflags`
++ GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --libs`
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK
+ else
+ GPGME_PTHREAD_CFLAGS=""
+ GPGME_PTHREAD_LIBS=""
+@@ -264,7 +354,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+ if test "$gpgme_version_major" -gt "$req_major"; then
+ ok=yes
+- else
++ else
+ if test "$gpgme_version_major" -eq "$req_major"; then
+ if test "$gpgme_version_minor" -gt "$req_minor"; then
+ ok=yes
+@@ -282,7 +372,11 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+ # If we have a recent GPGME, we should also check that the
+ # API is compatible.
+ if test "$req_gpgme_api" -gt 0 ; then
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ if test -z "$use_gpgrt_config"; then
++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0`
++ else
++ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0`
++ fi
+ if test "$tmp" -gt 0 ; then
+ if test "$req_gpgme_api" -ne "$tmp" ; then
+ ok=no
+@@ -291,10 +385,23 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+ fi
+ fi
+ if test $ok = yes; then
+- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
+- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
++ if test -z "$use_gpgrt_config"; then
++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags`
++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
++ else
++ if $GPGRT_CONFIG gpgme-glib --exists; then
++ GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib"
++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags`
++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs`
++ else
++ ok = no
++ fi
++ fi
++ fi
++ if test $ok = yes; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK
+ else
+ GPGME_GLIB_CFLAGS=""
+ GPGME_GLIB_LIBS=""
+@@ -304,4 +411,3 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
+ AC_SUBST(GPGME_GLIB_CFLAGS)
+ AC_SUBST(GPGME_GLIB_LIBS)
+ ])
+-
