gpgme 1.4.2
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Tue, 6 Aug 2013 04:01:44 +0000 (23:01 -0500)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Tue, 6 Aug 2013 04:01:44 +0000 (23:01 -0500)
1.1.8-no-undefined.patch [deleted file]
1.4.2-without-libassuan.patch [new file with mode: 0644]
gpgme.cygport

diff --git a/1.1.8-no-undefined.patch b/1.1.8-no-undefined.patch
deleted file mode 100644 (file)
index 247f648..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/gpgme-1.1.8/src/Makefile.am        2008-12-03 07:36:07.000000000 -0600
-+++ src/gpgme-1.1.8/src/Makefile.am    2010-01-12 03:45:23.583958100 -0600
-@@ -190,7 +190,7 @@ libgpgme_la_DEPENDENCIES = $(assuan_libo
- libgpgme_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \
-       @GPG_ERROR_LIBS@ @NETLIBS@
--libgpgme_pthread_la_LDFLAGS = $(libgpgme_version_script_cmd) -version-info \
-+libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(libgpgme_version_script_cmd) -version-info \
-       @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
- libgpgme_pthread_la_DEPENDENCIES = $(assuan_libobjs) \
-       @LTLIBOBJS@ $(srcdir)/libgpgme.vers
diff --git a/1.4.2-without-libassuan.patch b/1.4.2-without-libassuan.patch
new file mode 100644 (file)
index 0000000..93fb9f8
--- /dev/null
@@ -0,0 +1,42 @@
+--- origsrc/gpgme-1.4.2/configure.ac   2013-05-28 04:08:35.000000000 -0500
++++ src/gpgme-1.4.2/configure.ac       2013-08-05 22:46:13.901736500 -0500
+@@ -984,7 +984,7 @@ if test "$have_gpg_error" = "no"; then
+ *** (at least version $NEED_GPG_ERROR_VERSION is required.)
+ ***]])
+ fi
+-if test "$have_libassuan" = "no"; then
++if test "$have_libassuan" = "no" && test "$GPGSM" != no; then
+    die=yes
+    AC_MSG_NOTICE([[
+ ***
+--- origsrc/gpgme-1.4.2/src/Makefile.am        2013-05-23 13:17:20.000000000 -0500
++++ src/gpgme-1.4.2/src/Makefile.am    2013-08-05 22:55:09.161351600 -0500
+@@ -73,7 +73,7 @@ gpgsm_components =
+ endif
+ if HAVE_ASSUAN
+-assuan_components = assuan-support.c engine-assuan.c
++assuan_components = assuan-support.c engine-assuan.c opassuan.c
+ else
+ assuan_components =
+ endif
+@@ -112,7 +112,7 @@ main_sources =                                                             \
+       sign.c passphrase.c progress.c                                  \
+       key.c keylist.c trust-item.c trustlist.c                        \
+       import.c export.c genkey.c delete.c edit.c getauditlog.c        \
+-      opassuan.c passwd.c                                             \
++      passwd.c                                                        \
+       engine.h engine-backend.h engine.c engine-gpg.c status-table.c  \
+       $(gpgsm_components) $(assuan_components) $(gpgconf_components)  \
+       $(uiserver_components)                                          \
+@@ -223,8 +223,10 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI
+       @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
+ endif
++if HAVE_ASSUAN
+ noinst_PROGRAMS = gpgme-tool
+ gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
++endif
+ install-data-local: install-def-file
index 35c6b0bdd6a312dc190aeb720c08872c77dbe1a0..0b435dabe5933652ac7dc917b27aa1d7654a01ae 100644 (file)
@@ -1,6 +1,6 @@
 NAME="gpgme"
-VERSION=1.1.8
-RELEASE=2
+VERSION=1.4.2
+RELEASE=1
 CATEGORY="Libs"
 SUMMARY="GnuPG cryptography support library"
 DESCRIPTION="GPGME (GnuPG Made Easy) is a C language library that allows to
@@ -11,7 +11,7 @@ signature verification and key management."
 HOMEPAGE="http://www.gnupg.org/related_software/gpgme/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2
          ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${VERSION}.tar.bz2.sig"
-PATCH_URI="1.1.8-no-undefined.patch"
+PATCH_URI="1.4.2-without-libassuan.patch"
 
 PKG_NAMES="libgpgme11 libgpgme-devel"
 libgpgme11_REQUIRES="gnupg"
@@ -21,4 +21,10 @@ libgpgme_devel_CONTENTS="usr/bin/*-config usr/include/ usr/lib/
 
 DISTCLEANFILES="m4/libtool.m4"
 
+CYGCONF_ARGS="
+  --with-gpg=/usr/bin/gpg
+  --without-gpgsm
+  --without-gpgconf
+  --without-g13
+"
 MAKEOPTS+=" no_undefined=-no-undefined"
This page took 0.031144 seconds and 5 git commands to generate.