Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

gpgme: update to 1.13.0

Browse Source
This commit is contained in:
Andrew Sun
2019-04-08 17:07:03 -04:00
parent bbc306ceea
commit d8a61fc930
4 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mingw-w64-gpgme/0005-invoke-scripts-via-sh.patch
View File

@@ -1,31 +1,31 @@
--- gpgme-1.12.0/lang/python/setup.py.in.orig 2017-12-14 10:16:43.374026000 +0300
+++ gpgme-1.12.0/lang/python/setup.py.in 2017-12-14 10:21:46.471530200 +0300
--- gpgme-1.13.0.orig/lang/python/setup.py.in 2019-04-07 20:10:01.767088400 -0400
+++ gpgme-1.13.0/lang/python/setup.py.in 2019-04-07 20:18:35.986816000 -0400
@@ -61,7 +61,7 @@
devnull = open(os.devnull, "w")
devnull = open(os.devnull, 'w')
try:
- subprocess.check_call(gpgme_config + ['--version'], stdout=devnull)
+ subprocess.check_call(['sh'] + ['-c'] + [' '.join(gpgme_config + ['--version'])], stdout=devnull)
except:
sys.exit("Could not find gpgme-config. " +
"Please install the libgpgme development package.")
sys.exit('Could not find gpgme-config. ' +
'Please install the libgpgme development package.')
@@ -69,7 +69,7 @@
def getconfig(what, config=gpgme_config):
confdata = subprocess.Popen(
- config + ["--%s" % what], stdout=subprocess.PIPE).communicate()[0]
+ ['sh'] + ['-c'] + [' '.join(config + ["--%s" % what])], stdout=subprocess.PIPE).communicate()[0]
- config + ['--%s' % what], stdout=subprocess.PIPE).communicate()[0]
+ ['sh'] + ['-c'] + [' '.join(config + ['--%s' % what])], stdout=subprocess.PIPE).communicate()[0]
return [x for x in confdata.decode('utf-8').split() if x != '']
@@ -104,7 +104,7 @@
# Adjust include and library locations in case of win32
uname_s = os.popen("uname -s").read()
-if uname_s.startswith("MINGW32"):
+if uname_s.startswith("MINGW"):
uname_s = os.popen('uname -s').read()
-if uname_s.startswith('MINGW32'):
+if uname_s.startswith('MINGW'):
mnts = [
x.split()[0:3:2] for x in os.popen("mount").read().split("\n") if x
x.split()[0:3:2] for x in os.popen('mount').read().split('\n') if x
]
@@ -184,7 +184,7 @@
@@ -34,8 +34,8 @@
- gpg_error_config + ['--version'], stdout=devnull)
+ ['sh'] + ['-c'] + [' '.join(gpg_error_config + ['--version'])], stdout=devnull)
except:
sys.exit("Could not find gpg-error-config. " +
"Please install the libgpg-error development package.")
sys.exit('Could not find gpg-error-config. ' +
'Please install the libgpg-error development package.')
--- gpgme-1.10.0/lang/python/helpers.h.orig 2017-12-14 11:28:11.673618100 +0300
+++ gpgme-1.10.0/lang/python/helpers.h 2017-12-14 11:28:19.112231900 +0300
@@ -25,7 +25,7 @@

13
mingw-w64-gpgme/PKGBUILD
View File

@@ -4,7 +4,7 @@
_realname=gpgme
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.12.0
pkgver=1.13.0
pkgrel=1
pkgdesc="A C wrapper library for GnuPG (mingw-w64)"
arch=('any')
@@ -28,20 +28,22 @@ source=("https://www.gnupg.org/ftp/gcrypt/${_realname}/${_realname}-${pkgver}.ta
0006-fix-building-docs.patch
0007-mkdefsinc-use-CPPFLAGS.patch
relocatable-cmake.patch
gpgmepp-portable-types.patch)
gpgmepp-portable-types.patch
gpgme-fix-cpp-tests.patch)
#These might be signed by any of these keys https://gnupg.org/signature_key.html
validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
'46CC730865BB5C78EBABADCF04376F3EE0856959'
'031EC2536E580D8EA286A9F22071B08A33BD3F06'
'D238EA65D64C67ED4C3073F28A861B1C7EFD60D9')
sha256sums=('b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8'
sha256sums=('d4b23e47a9e784a63e029338cce0464a82ce0ae4af852886afda410f9e39c630'
'SKIP'
'71763a209761afe6495d3d85e25bbe6ba76348450d426f8a2618a34a264e058a'
'87b9ad6ccb70643a0feb2cfdb1d15dc06f9d7996a69508d0dbcfef01b3a779e7'
'2389cc237bf860b961bf3519377e83f7678e657dcf28c33510cd155f80516d42'
'b56fe3e3da872ca84d08b4aa426e6f71b3227e2a253bc45bf6023abf1288ecc9'
'393c89dfc707a4982ab297196b00b5b7e1b8af7ee5bfc02846800c5ca3608891'
'32465eb5f99015d06a0b89c30c69a7c4208ab32c287275b729cf9bec08c4474c'
'12fbb051881b77cbc99fa46c09892c6d301bfed9a030172660f10cdf02b77ef4')
'0a98bbfeff6643aa7195b3f5c87feab9ea8b329adfb65c2339e72f4fbb98523c'
'd09070c005b72e8aed14a848553f7c7289353ff7f32e62c9013a729ba46d7117')
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
@@ -51,6 +53,7 @@ prepare() {
patch -p1 -i "${srcdir}"/0007-mkdefsinc-use-CPPFLAGS.patch
patch -p1 -i "${srcdir}"/relocatable-cmake.patch
patch -p1 -i "${srcdir}"/gpgmepp-portable-types.patch
patch -p1 -i "${srcdir}"/gpgme-fix-cpp-tests.patch
autoreconf -ivf
}

11
mingw-w64-gpgme/gpgme-fix-cpp-tests.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/lang/cpp/tests/Makefile.am 2019-04-07 21:58:14.917535900 -0400
+++ b/lang/cpp/tests/Makefile.am 2019-04-07 21:58:23.229581500 -0400
@@ -24,7 +24,7 @@
../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
@LDADD_FOR_TESTS_KLUDGE@ -lstdc++
-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
@GPG_ERROR_CFLAGS@ @GPG_ERROR_CFLAGS@ \
@LIBASSUAN_CFLAGS@ -DBUILDING_GPGMEPP \
-DTOP_SRCDIR="$(top_srcdir)"

8
mingw-w64-gpgme/gpgmepp-portable-types.patch
View File

@@ -2,16 +2,16 @@ diff --git a/configure.ac b/configure.ac
index 1813cc57..1d9ceb4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,7 +893,8 @@ AC_CONFIG_FILES(Makefile src/Makefile
tests/opassuan/Makefile
doc/Makefile
@@ -897,7 +897,8 @@
src/versioninfo.rc
src/gpgme.pc
src/gpgme-glib.pc
- src/gpgme.h)
+ src/gpgme.h
+ lang/cpp/src/data.h)
AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
AC_CONFIG_FILES(lang/cpp/tests/Makefile)
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 1e6bdc28..ccfb16b0 100644
--- a/lang/cpp/src/Makefile.am