Skip to content

Commit f508d43

Browse files
dschodscho
committed
Merge remote-tracking branch 'upstream/master'
2 parents 419c787 + f080890 commit f508d43

File tree

10 files changed

+851
-103
lines changed

10 files changed

+851
-103
lines changed

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

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in.orig 2015-04-09 23:38:42.018400000 +0300
2+
+++ gnutls-3.4.0/lib/includes/gnutls/gnutls.h.in 2015-04-09 23:39:31.860400000 +0300
3+
@@ -67,6 +67,8 @@
4+
#define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
5+
#define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
6+
7+
+#define GNUTLS_INTERNAL_BUILD 1
8+
+
9+
#if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
10+
# define _SYM_EXPORT __declspec(dllimport)
11+
#else

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

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

‎mingw-w64-gnutls/PKGBUILD

+20-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
_realname=gnutls
44
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
5-
pkgver=3.3.14
5+
pkgver=3.4.0
66
pkgrel=1
77
pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
88
arch=('any')
@@ -13,35 +13,45 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
1313
"${MINGW_PACKAGE_PREFIX}-libtasn1"
1414
"${MINGW_PACKAGE_PREFIX}-gmp"
1515
"${MINGW_PACKAGE_PREFIX}-zlib"
16-
"${MINGW_PACKAGE_PREFIX}-nettle"
17-
"${MINGW_PACKAGE_PREFIX}-p11-kit"
16+
"${MINGW_PACKAGE_PREFIX}-nettle>=3.1"
17+
"${MINGW_PACKAGE_PREFIX}-p11-kit>=0.23.1"
1818
"${MINGW_PACKAGE_PREFIX}-libgnurx"
1919
#"${MINGW_PACKAGE_PREFIX}-unbound"
2020
)
21+
2122
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
22-
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${_realname}-${pkgver}.tar.xz{,.sig}
23+
# Need remove "autogen" package before building.
24+
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${_realname}-${pkgver}.tar.xz{,.sig}
25+
0001-add-missing-define.patch
26+
0002-fix-duplicate-entries.patch
2327
0004-fix-gtkdoc.all.patch
2428
0005-fix-strtok-conflict.mingw.patch)
25-
md5sums=('7f4465f8c564cf9cb8f5cb38b909f7ca'
29+
md5sums=('aa015c2666b031044edfb01b01980d84'
2630
'SKIP'
31+
'807a79513358a9f4123f62111f1eed59'
32+
'516c3b60e5c2878a0af9f243fd4dac30'
2733
'86cfab6e7c2ccfcfd1dad9d5024627e3'
2834
'77287dc835afbb8cc4e9c4aa6b7adb7b')
2935

3036
prepare() {
3137
cd "${srcdir}/${_realname}-${pkgver}"
38+
patch -p1 -i ${srcdir}/0001-add-missing-define.patch
39+
patch -p1 -i ${srcdir}/0002-fix-duplicate-entries.patch
3240
#patch -p1 -i ${srcdir}/0004-fix-gtkdoc.all.patch
3341
#patch -p1 -i ${srcdir}/0005-fix-strtok-conflict.mingw.patch
3442

35-
#WANT_AUTOMAKE=latest autoreconf -fi -I m4
43+
WANT_AUTOMAKE=latest autoreconf -fi -I m4
3644
}
3745

3846
build() {
39-
# Woraround for localtime_r functions
40-
#CFLAGS+=" -DGNULIB_PORTCHECK=1"
41-
#CXXFLAGS+=" -DGNULIB_PORTCHECK=1"
47+
# Workaround for localtime_r functions
48+
CFLAGS+=" -D_POSIX_C_SOURCE"
49+
CXXFLAGS+=" -D_POSIX_C_SOURCE"
4250

51+
[[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
4352
mkdir -p "${srcdir}/build-${MINGW_CHOST}"
4453
cd "${srcdir}/build-${MINGW_CHOST}"
54+
4555
../${_realname}-${pkgver}/configure \
4656
--prefix=${MINGW_PREFIX} \
4757
--build=${MINGW_CHOST} \
@@ -58,6 +68,7 @@ build() {
5868
--enable-local-libopts \
5969
--disable-guile \
6070
--disable-libdane \
71+
--disable-tests \
6172
gl_cv_double_slash_root=yes
6273

6374
make

‎mingw-w64-gst-plugins-bad/PKGBUILD

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
_realname=gst-plugins-bad
44
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
55
pkgver=1.4.5
6-
pkgrel=2
6+
pkgrel=3
77
pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
88
arch=('any')
99
url="http://gstreamer.freedesktop.org/"
@@ -86,12 +86,13 @@ build() {
8686
--enable-experimental \
8787
--disable-gtk-doc \
8888
--with-gtk=3.0
89+
8990
make
9091
}
9192

9293
package() {
9394
cd "${srcdir}/build-${MINGW_CHOST}"
9495
make -j1 DESTDIR="$pkgdir" install
95-
find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
96+
9697
rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a
9798
}

‎mingw-w64-libmongoose-git/PKGBUILD

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Maintainer: Renato Silva <[email protected]>
2+
3+
_realname='libmongoose'
4+
url='https://github.com/cesanta/mongoose'
5+
pkgdesc=' Embedded web server for C/C++ (mingw-w64)'
6+
license=('GPL2')
7+
arch=('any')
8+
pkgver=r1764.eef70aa
9+
pkgrel=1
10+
11+
pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
12+
provides=(${MINGW_PACKAGE_PREFIX}-${_realname})
13+
conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname})
14+
makedepends=(${MINGW_PACKAGE_PREFIX}-gcc)
15+
source=(${_realname}::'git+https://github.com/cesanta/mongoose')
16+
sha1sums=('SKIP')
17+
18+
pkgver() {
19+
cd "${srcdir}/${_realname}"
20+
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
21+
}
22+
23+
build() {
24+
cd "${srcdir}/${_realname}"
25+
# See https://github.com/cesanta/mongoose/issues/326
26+
# See https://github.com/cesanta/mongoose/issues/506
27+
gcc -c -DFD_SETSIZE=1024 mongoose.c -o mongoose.o
28+
ar rcs libmongoose.a mongoose.o
29+
gcc -shared -o libmongoose.dll mongoose.o -Wl,--out-implib,libmongoose.dll.a -lws2_32
30+
}
31+
32+
package() {
33+
cd "${srcdir}/${_realname}"
34+
install -D -m644 mongoose.h "${pkgdir}${MINGW_PREFIX}/include/mongoose.h"
35+
install -D -m644 libmongoose.a "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.a"
36+
install -D -m644 libmongoose.dll.a "${pkgdir}${MINGW_PREFIX}/lib/libmongoose.dll.a"
37+
install -D -m755 libmongoose.dll "${pkgdir}${MINGW_PREFIX}/bin/libmongoose.dll"
38+
install -D -m644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
39+
}

0 commit comments

Comments
 (0)