Merge remote-tracking branch 'upstream/master'

Author: dscho

mingw-w64-gnutls/0001-add-missing-define.patch

@@ -0,0 +1,11 @@
+--- gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in.orig	2015-04-09 23:38:42.018400000 +0300
++++ gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in	2015-04-09 23:39:31.860400000 +0300
+@@ -67,6 +67,8 @@
+ #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
+ #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
+ 
++#define GNUTLS_INTERNAL_BUILD 1
++
+ #if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
+ # define _SYM_EXPORT __declspec(dllimport)
+ #else

mingw-w64-gnutls/0002-fix-duplicate-entries.patch

@@ -0,0 +1,36 @@
+From 7e63027a5caafa55dcca65c5b9bff3bf76c5a41c Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <[email protected]>
+Date: Thu, 9 Apr 2015 16:00:43 +0200
+Subject: [PATCH] remove duplicate entries from manpages Makefile
+
+---
+ doc/manpages/Makefile.am | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4

mingw-w64-gnutls/PKGBUILD

@@ -2,7 +2,7 @@
 
 _realname=gnutls
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=3.3.14
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
 arch=('any')
@@ -13,35 +13,45 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-libtasn1"
         "${MINGW_PACKAGE_PREFIX}-gmp"
         "${MINGW_PACKAGE_PREFIX}-zlib"
-        "${MINGW_PACKAGE_PREFIX}-nettle"
-        "${MINGW_PACKAGE_PREFIX}-p11-kit"
+        "${MINGW_PACKAGE_PREFIX}-nettle>=3.1"
+        "${MINGW_PACKAGE_PREFIX}-p11-kit>=0.23.1"
         "${MINGW_PACKAGE_PREFIX}-libgnurx"
         #"${MINGW_PACKAGE_PREFIX}-unbound"
         )
+
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_realname}-${pkgver}.tar.xz{,.sig}
+# Need remove "autogen" package before building.
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
+        0001-add-missing-define.patch
+        0002-fix-duplicate-entries.patch
         0004-fix-gtkdoc.all.patch
         0005-fix-strtok-conflict.mingw.patch)
-md5sums=('7f4465f8c564cf9cb8f5cb38b909f7ca'
+md5sums=('aa015c2666b031044edfb01b01980d84'
          'SKIP'
+         '807a79513358a9f4123f62111f1eed59'
+         '516c3b60e5c2878a0af9f243fd4dac30'
          '86cfab6e7c2ccfcfd1dad9d5024627e3'
          '77287dc835afbb8cc4e9c4aa6b7adb7b')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i ${srcdir}/0001-add-missing-define.patch
+  patch -p1 -i ${srcdir}/0002-fix-duplicate-entries.patch
   #patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
   #patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
 
-  #WANT_AUTOMAKE=latest autoreconf -fi -I m4
+  WANT_AUTOMAKE=latest autoreconf -fi -I m4
 }
 
 build() {
-  # Woraround for localtime_r functions
-  #CFLAGS+=" -DGNULIB_PORTCHECK=1"
-  #CXXFLAGS+=" -DGNULIB_PORTCHECK=1"
+  # Workaround for localtime_r functions
+  CFLAGS+=" -D_POSIX_C_SOURCE"
+  CXXFLAGS+=" -D_POSIX_C_SOURCE"
 
+  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
   mkdir -p "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
+  
   ../${_realname}-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
@@ -58,6 +68,7 @@ build() {
     --enable-local-libopts \
     --disable-guile \
     --disable-libdane \
+    --disable-tests \
     gl_cv_double_slash_root=yes
 
   make

mingw-w64-gst-plugins-bad/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=gst-plugins-bad
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
 arch=('any')
 url="http://gstreamer.freedesktop.org/"
@@ -86,12 +86,13 @@ build() {
     --enable-experimental \
     --disable-gtk-doc \
     --with-gtk=3.0
+
   make
 }
 
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   make -j1 DESTDIR="$pkgdir" install
-  find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+  
   rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a
 }

mingw-w64-libmongoose-git/PKGBUILD

@@ -0,0 +1,39 @@
+# Maintainer: Renato Silva <[email protected]>
+
+_realname='libmongoose'
+url='https://github.com/cesanta/mongoose'
+pkgdesc=' Embedded web server for C/C++ (mingw-w64)'
+license=('GPL2')
+arch=('any')
+pkgver=r1764.eef70aa
+pkgrel=1
+
+pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
+provides=(${MINGW_PACKAGE_PREFIX}-${_realname})
+conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname})
+makedepends=(${MINGW_PACKAGE_PREFIX}-gcc)
+source=(${_realname}::'git+https://github.com/cesanta/mongoose')
+sha1sums=('SKIP')
+
+pkgver() {
+    cd "${srcdir}/${_realname}"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+build() {
+    cd "${srcdir}/${_realname}"
+    # See https://github.com/cesanta/mongoose/issues/326
+    # See https://github.com/cesanta/mongoose/issues/506
+    gcc -c -DFD_SETSIZE=1024 mongoose.c -o mongoose.o
+    ar rcs libmongoose.a mongoose.o
+    gcc -shared -o libmongoose.dll mongoose.o -Wl,--out-implib,libmongoose.dll.a -lws2_32
+}
+
+package() {
+    cd "${srcdir}/${_realname}"
+    install -D -m644 mongoose.h        "${pkgdir}${MINGW_PREFIX}/include/mongoose.h"
+    install -D -m644 libmongoose.a     "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.a"
+    install -D -m644 libmongoose.dll.a "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.dll.a"
+    install -D -m755 libmongoose.dll   "${pkgdir}${MINGW_PREFIX}/bin/libmongoose.dll"
+    install -D -m644 LICENSE           "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+}