gpgme: Update to version 1.5.3

diff --git a/gpgme/gpgme.nm b/gpgme/gpgme.nm
index 317a046fd742fd805bd7edc42f71fa0a146f451e..5f5600b265d9e7db46a1e69c55127f56ed41829e 100644 (file)
--- a/gpgme/gpgme.nm
+++ b/gpgme/gpgme.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = gpgme
-version    = 1.3.0
+version    = 1.5.3
 release    = 1
 
 groups     = Applications/System

diff --git a/gpgme/patches/gpgme-1.2.0-largefile.patch b/gpgme/patches/gpgme-1.2.0-largefile.patch
deleted file mode 100644 (file)
index 98f9039..0000000
--- a/gpgme/patches/gpgme-1.2.0-largefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up gpgme-1.2.0/src/gpgme-config.in.largefile gpgme-1.2.0/src/gpgme-config.in
---- gpgme-1.2.0/src/gpgme-config.in.largefile  2010-08-11 20:11:49.000000000 +0200
-+++ gpgme-1.2.0/src/gpgme-config.in    2010-08-11 20:23:45.000000000 +0200
-@@ -42,6 +42,10 @@ cflags_pthread=""
- cflags_glib="@GLIB_CFLAGS@"
- with_glib=
- 
-+if test "0@NEED__FILE_OFFSET_BITS@" -gt "0" ; then
-+    cflags_lfs="-D_FILE_OFFSET_BITS=@NEED__FILE_OFFSET_BITS@"
-+fi
-+
- output=""
- 
- usage()
-@@ -101,6 +105,9 @@ while test $# -gt 0; do
-           exit 0
-           ;;
-         --cflags)
-+          if test "x$cflags_lfs" != "x"; then
-+              output="$output $cflags_lfs"
-+          fi
-           if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
-               output="$output -I$includedir"
-           fi

diff --git a/gpgme/patches/gpgme-1.3.0-ImplicitDSOLinking.patch b/gpgme/patches/gpgme-1.3.0-ImplicitDSOLinking.patch
deleted file mode 100644 (file)
index cd2f7a5..0000000
--- a/gpgme/patches/gpgme-1.3.0-ImplicitDSOLinking.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.am
---- gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking     2010-01-06 04:02:19.000000000 +0100
-+++ gpgme-1.3.0/src/Makefile.am        2011-02-11 18:14:54.000000000 +0100
-@@ -232,7 +232,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI
- endif
- 
- noinst_PROGRAMS = gpgme-tool
--gpgme_tool_LDADD = libgpgme.la
-+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
- 
- status-table.h : gpgme.h
-       $(srcdir)/mkstatus < $(builddir)/gpgme.h > status-table.h
-diff -up gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.in
---- gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking     2010-01-11 12:06:54.000000000 +0100
-+++ gpgme-1.3.0/src/Makefile.in        2011-02-11 18:17:10.000000000 +0100
-@@ -572,7 +572,7 @@ libgpgme_pth_la_LIBADD = $(gpgme_res) @L
- @BUILD_W32_QT_TRUE@libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
- @BUILD_W32_QT_TRUE@   @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
- 
--gpgme_tool_LDADD = libgpgme.la
-+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
- all: $(BUILT_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) all-am
- 
-diff -up gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.am
---- gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking     2008-12-03 14:39:48.000000000 +0100
-+++ gpgme-1.3.0/tests/gpgsm/Makefile.am        2011-02-11 17:36:32.000000000 +0100
-@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
- INCLUDES = -I$(top_builddir)/src
- 
- AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
--LDADD = ../../src/libgpgme.la
-+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
- 
- # We don't run t-genkey in the test suite, because it takes too long
- # and needs a working pinentry.
-diff -up gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.in
---- gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking     2010-01-11 12:06:54.000000000 +0100
-+++ gpgme-1.3.0/tests/gpgsm/Makefile.in        2011-02-11 17:36:32.000000000 +0100
-@@ -307,7 +307,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
- 
- INCLUDES = -I$(top_builddir)/src
- AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
--LDADD = ../../src/libgpgme.la
-+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
- key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
- DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
-       private-keys-v1.d/$(key_id).key random_seed
-diff -up gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.am
---- gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking  2009-01-26 15:15:26.000000000 +0100
-+++ gpgme-1.3.0/tests/opassuan/Makefile.am     2011-02-11 17:36:32.000000000 +0100
-@@ -27,7 +27,7 @@ EXTRA_DIST = 
- INCLUDES = -I$(top_builddir)/src
- 
- AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
--LDADD = ../../src/libgpgme.la
-+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
- 
- noinst_PROGRAMS = $(TESTS) t-command
- 
-diff -up gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.in
---- gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking  2010-01-11 12:06:54.000000000 +0100
-+++ gpgme-1.3.0/tests/opassuan/Makefile.in     2011-02-11 17:36:32.000000000 +0100
-@@ -258,7 +258,7 @@ noinst_HEADERS = 
- EXTRA_DIST = 
- INCLUDES = -I$(top_builddir)/src
- AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
--LDADD = ../../src/libgpgme.la
-+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
- DISTCLEANFILES = 
- all: all-am
- 

diff --git a/gpgme/patches/gpgme-1.3.0-config_extras.patch b/gpgme/patches/gpgme-1.3.0-config_extras.patch
deleted file mode 100644 (file)
index 7b9a643..0000000
--- a/gpgme/patches/gpgme-1.3.0-config_extras.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up gpgme-1.3.0/src/gpgme-config.in.config_extras gpgme-1.3.0/src/gpgme-config.in
---- gpgme-1.3.0/src/gpgme-config.in.config_extras      2009-10-23 08:44:56.000000000 -0500
-+++ gpgme-1.3.0/src/gpgme-config.in    2011-03-17 13:15:12.511565537 -0500
-@@ -20,26 +20,26 @@ LC_ALL=C
- LANG=C
- 
- # Network libraries.
--assuan_cflags="@LIBASSUAN_CFLAGS@"
--assuan_libs="@LIBASSUAN_LIBS@"
-+#assuan_cflags="@LIBASSUAN_CFLAGS@"
-+#assuan_libs="@LIBASSUAN_LIBS@"
- 
- # Configure libgpg-error.
- gpg_error_cflags="@GPG_ERROR_CFLAGS@"
--gpg_error_libs="@GPG_ERROR_LIBS@"
-+#gpg_error_libs="@GPG_ERROR_LIBS@"
- 
- # Configure thread packages.
- thread_modules=""
- 
- @HAVE_PTH_TRUE@thread_modules="$thread_modules pth"
--libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
-+#libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
- cflags_pth="@PTH_CFLAGS@"
- 
- @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
--libs_pthread="-lpthread"
-+#libs_pthread="-lpthread"
- cflags_pthread=""
- 
- # Configure glib.
--libs_glib="@GLIB_LIBS@"
-+#libs_glib="@GLIB_LIBS@"
- cflags_glib="@GLIB_CFLAGS@"
- with_glib=
-