libgpg-error: Update to 1.13
This commit is contained in:
10
mingw-w64-libgpg-error/02-fix-symbollist-on.mingw.patch
Normal file
10
mingw-w64-libgpg-error/02-fix-symbollist-on.mingw.patch
Normal file
@@ -0,0 +1,10 @@
|
||||
--- libgpg-error-1.10/src/gpg-error.def.in.orig 2012-12-21 13:48:57 +0400
|
||||
+++ libgpg-error-1.10/src/gpg-error.def.in 2012-12-21 15:37:31 +0400
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
-EXPORTS
|
||||
gpg_strerror @1
|
||||
gpg_strerror_r @2
|
||||
gpg_strsource @3
|
||||
20
mingw-w64-libgpg-error/03-fix-config-on.mingw.patch
Normal file
20
mingw-w64-libgpg-error/03-fix-config-on.mingw.patch
Normal file
@@ -0,0 +1,20 @@
|
||||
--- libgpg-error-1.11/src/gpg-error-config.in.orig 2013-04-21 11:42:47 +0400
|
||||
+++ libgpg-error-1.11/src/gpg-error-config.in 2013-04-21 11:43:51 +0400
|
||||
@@ -58,7 +58,7 @@
|
||||
exit 0
|
||||
;;
|
||||
--cflags)
|
||||
- if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
|
||||
+ if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include" -a "x$includedir" != "x/mingw/include"; then
|
||||
output="$output -I$includedir"
|
||||
fi
|
||||
# Note: -idirafter is a gcc extension. It is only used on
|
||||
@@ -70,7 +70,7 @@
|
||||
;;
|
||||
--libs)
|
||||
case "$libdir" in
|
||||
- /usr/lib|/usr/lib64|/lib|/lib64) ;;
|
||||
+ /usr/lib|/usr/lib64|/lib|/lib64|/mingw/lib|/mingw/lib64) ;;
|
||||
*)
|
||||
output="$output -L$libdir"
|
||||
;;
|
||||
43
mingw-w64-libgpg-error/04-use-winpthreads.mingw.patch
Normal file
43
mingw-w64-libgpg-error/04-use-winpthreads.mingw.patch
Normal file
@@ -0,0 +1,43 @@
|
||||
--- libgpg-error-1.13/configure.ac.orig 2014-04-15 12:25:16.000000000 +0000
|
||||
+++ libgpg-error-1.13/configure.ac 2014-05-02 23:52:02.087073700 +0000
|
||||
@@ -169,27 +169,8 @@
|
||||
|
||||
|
||||
# Check for thread library.
|
||||
-#
|
||||
-# Windows has always thread support; thus we don't bother to test for
|
||||
-# it as it may lead to false results when cross building.
|
||||
-if test "$have_w32_system" = yes; then
|
||||
- AC_DEFINE([USE_WINDOWS_THREADS], [1])
|
||||
- LIBTHREAD=
|
||||
- LTLIBTHREAD=
|
||||
- LIBMULTITHREAD=
|
||||
- LTLIBMULTITHREAD=
|
||||
- THREADLIB_CPPFLAGS=""
|
||||
- AC_SUBST([LIBTHREAD])
|
||||
- AC_SUBST([LTLIBTHREAD])
|
||||
- AC_SUBST([LIBMULTITHREAD])
|
||||
- AC_SUBST([LTLIBMULTITHREAD])
|
||||
-else
|
||||
- gl_LOCK
|
||||
- if test "$gl_threads_api" = posix; then
|
||||
AC_CHECK_SIZEOF(pthread_mutex_t,,[AC_INCLUDES_DEFAULT
|
||||
#include <pthread.h>])
|
||||
- fi
|
||||
-fi
|
||||
|
||||
|
||||
# Substitution used for gpg-error-config
|
||||
--- libgpg-error-1.13/src/gen-posix-lock-obj.c.orig 2014-01-28 22:47:12.000000000 +0000
|
||||
+++ libgpg-error-1.13/src/gen-posix-lock-obj.c 2014-05-02 23:55:32.376277000 +0000
|
||||
@@ -21,10 +21,6 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_W32_SYSTEM
|
||||
-# error This module may not be build for Windows.
|
||||
-#endif
|
||||
-
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
11
mingw-w64-libgpg-error/05-w32-gen.all.patch
Normal file
11
mingw-w64-libgpg-error/05-w32-gen.all.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- libgpg-error-1.13/src/Makefile.am.orig 2014-05-02 23:33:18.692420700 +0000
|
||||
+++ libgpg-error-1.13/src/Makefile.am 2014-05-02 23:40:08.833001900 +0000
|
||||
@@ -94,6 +94,8 @@
|
||||
libgpg_error_la_DEPENDENCIES = $(gpg_error_res) gpg-error.def
|
||||
intllibs =
|
||||
|
||||
+CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES)
|
||||
+
|
||||
else
|
||||
arch_sources = posix-lock.c posix-lock-obj.h posix-thread.c
|
||||
gpg_error_res =
|
||||
@@ -3,8 +3,8 @@
|
||||
_realname=libgpg-error
|
||||
_mingw_suff=mingw-w64-${CARCH}
|
||||
pkgname="${_mingw_suff}-${_realname}"
|
||||
pkgver=1.12
|
||||
pkgrel=2
|
||||
pkgver=1.13
|
||||
pkgrel=1
|
||||
pkgdesc="Support library for libgcrypt (mingw-w64)"
|
||||
arch=('any')
|
||||
url="http://www.gnupg.org"
|
||||
@@ -14,20 +14,34 @@ depends=("${_mingw_suff}-gcc-libs" "${_mingw_suff}-gettext")
|
||||
groups=("${_mingw_suff}")
|
||||
options=('staticlibs' 'strip')
|
||||
source=("ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${pkgver}.tar.bz2"
|
||||
"01-mingw32-fix-potomo.mingw.patch")
|
||||
md5sums=('8f0eb41a344d19ac2aa9bd101dfb9ce6'
|
||||
'4865ce481ec9aa5efc0a4979f197a686')
|
||||
01-mingw32-fix-potomo.mingw.patch
|
||||
02-fix-symbollist-on.mingw.patch
|
||||
03-fix-config-on.mingw.patch
|
||||
04-use-winpthreads.mingw.patch
|
||||
05-w32-gen.all.patch)
|
||||
md5sums=('fe0cfa7e15262ef8fdeee366109e9ff6'
|
||||
'4865ce481ec9aa5efc0a4979f197a686'
|
||||
'a69b0fd4c8e4ebda9ddeb68e565bf1b1'
|
||||
'548dd52dddbea0be326589c6ef4b9a76'
|
||||
'a77d289a29962118847295a28959b0d9'
|
||||
'88afb1d5ee7de1e8fac36922a088b7f2')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/libgpg-error-$pkgver"
|
||||
patch -p1 -i ${srcdir}/01-mingw32-fix-potomo.mingw.patch
|
||||
patch -p1 -i ${srcdir}/02-fix-symbollist-on.mingw.patch
|
||||
patch -p1 -i ${srcdir}/03-fix-config-on.mingw.patch
|
||||
patch -p1 -i ${srcdir}/04-use-winpthreads.mingw.patch
|
||||
patch -p1 -i ${srcdir}/05-w32-gen.all.patch
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/libgpg-error-$pkgver"
|
||||
sed -i "s,EXPORTS,," "src/gpg-error.def.in"
|
||||
mkdir -p $srcdir/build-${CARCH} && cd $srcdir/build-${CARCH}
|
||||
../libgpg-error-$pkgver/configure \
|
||||
../libgpg-error-$pkgver/configure \
|
||||
--prefix=${MINGW_PREFIX} \
|
||||
--build=${MINGW_CHOST} \
|
||||
--host=${MINGW_CHOST} \
|
||||
@@ -37,6 +51,6 @@ build() {
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/build-${CARCH}"
|
||||
make DESTDIR="$pkgdir" install
|
||||
cd "${srcdir}/build-${CARCH}"
|
||||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user