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

Cmake and deps (#1931)

Browse Source 
* mbedtls: Updated to 2.4.0 (#1868)

* mingw-w64-clang 3.9.0 - rev 2 delete files created by patch (#1867)

Delete files created by patches in case we are not deleting from srource
directory.

* jemalloc: Update to 4.2.1 (#1866)

* lua sqlite3 wrapper (#1861)

* Adds a TUI in GNU debugger, GDB. (#1869)

* nghttp2 - 1.16.0 Update to latest version (#1871)

Do not use --enable-lib-only for featureproofing.

* Readline (#1872)

* readline - 7.0 - Update to latest veersion - NOTE:  Will probably break stuff - rebuild what depends upon it

Rekeyed patch for new version and ifdef'ed out chown calls if not
available

* Rebuild some packages that depend upon readline for good measure

* libssh2 - 1.8.0 - Upgrade to latest version (#1876)

* Adding library: flickcurl (#1875)

* Adding library:flickcurl

* Flickcurl: fixing dependency on gtk-doc

* Libarchive (#1878)

* libarchive : 3.2.2

Update to altest version

* libarchive: 3.2.2 - add back dependency on lz4

* Nsis (#1879)

* nsis 3.0 update to release version

* mingw-w64-nsis: 33.

Download should point to main to main site, not mirror
Use https when possible

* g-i-parser: fix race condition (#1881)

* Remove rmtree debugging patch

It is shadowing exceptions thrown from the main "try" block of
GDumpParser._execute_binary_get_tree().

There does seem to be a race condition, but it seems to be related to
subprocess.check_call() and what it does on Windows. At the point
xml.[blah].parse() is called, "dump.xml" is often absent!

* More tolerant rmtreeing

If shutil.rmtree() is failing due to some funky race condition that results
in files the walk doesn't know about being left, then don't worry about it
and continue.

This may leave uniquely named junk lying around in the build tree, but that
is by design not a problem with g-i-scanner. Just don't install the
tmp-introspectXXXXXX folder by accident.

* giscanner debugging: asserts and waits

Make absence of dump.xml or functions.txt fatal, but only after giving them
plenty of time time to appear.

Yes, this is horrible code. But it fixes broken builds almost completely on
my 64-bit Win7 with NTFS.

* Wait for XML to be parsed completely

It's possible that dump.xml might exist but be incompletely written. This
nasty sleep-till-it-parses loop covers that case.

Plus the usual logging so we can see if it's really needed ☺

* gobject-introspection: bump pkgrel

* Updated to stable release 190600_20161030 (#1880)

A fresh new stable release since January 30, 2014!

* go: update to 1.7.3 (#1882)

* Cmake and some prerequisits

mingw-w64-cmake - 3.7.0 - Update to latest version, note dependency upon
libuv
mingw-w64-jsoncpp - 1.7.1 - Update to latest version
mingw-w64-libarchive - 3.2.2 - Changed build to cmake and made patch to
enable Crypto-Next-Generation using bcrypt
mingw-w64-libuv - 1.10.0 - Update to latest version and include two
checkins for bug-fixes.
This commit is contained in:
J. Peter Mugaas
2016-11-14 00:46:45 -05:00
committed by Алексей
parent 6bc32a1189
commit b4b191b2c0
8 changed files with 182 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mingw-w64-cmake/0002-Implement-Qt5-static-plugin-support.patch
View File

@@ -33,18 +33,27 @@ diff -urN cmake-3.5.2/Source/cmGlobalGenerator.cxx cmake-3.5.2.new/Source/cmGlob
!(*ti)->GetPropertyAsBool("AUTORCC")) ||
(*ti)->IsImported()) {
continue;
diff -urN cmake-3.6.1/Source/cmQtAutoGeneratorInitializer.cxx cmake-3.6.1.new/Source/cmQtAutoGeneratorInitializer.cxx
--- cmake-3.6.1/Source/cmQtAutoGeneratorInitializer.cxx 2016-07-22 15:50:22.000000000 +0200
+++ cmake-3.6.1.new/Source/cmQtAutoGeneratorInitializer.cxx 2016-07-27 18:15:39.092290100 +0200
@@ -20,6 +20,7 @@
#include <sys/stat.h>
diff -urN cmake-3.7.0/Source/cmQtAutoGeneratorInitializer.cxx.orig cmake-3.7.0/Source/cmQtAutoGeneratorInitializer.cxx
--- cmake-3.7.0/Source/cmQtAutoGeneratorInitializer.cxx.orig 2016-11-11 09:37:14.000000000 -0500
+++ cmake-3.7.0/Source/cmQtAutoGeneratorInitializer.cxx 2016-11-13 17:42:21.268132300 -0500
@@ -25,6 +25,7 @@
#include <assert.h>
#include <cmConfigure.h>
#include <cmsys/FStream.hxx>
+#include <cmGeneratedFileStream.h>
#include <cmsys/RegularExpression.hxx>
#include <iostream>
#include <map>
@@ -39,7 +40,7 @@
static std::string GetAutogenTargetName(cmGeneratorTarget const* target)
{
std::string autogenTargetName = target->GetName();
- autogenTargetName += "_automoc";
+ autogenTargetName += "_autogen";
return autogenTargetName;
}
#if defined(_WIN32) && !defined(__CYGWIN__)
#include "cmGlobalVisualStudioGenerator.h"
@@ -88,6 +89,65 @@
@@ -127,6 +128,65 @@
fileIt != newRccFiles.end(); ++fileIt) {
const_cast<cmGeneratorTarget*>(target)->AddSource(*fileIt);
}
@@ -110,16 +119,7 @@ diff -urN cmake-3.6.1/Source/cmQtAutoGeneratorInitializer.cxx cmake-3.6.1.new/So
}
static void GetCompileDefinitionsAndDirectories(
@@ -368,7 +428,7 @@
std::string GetAutogenTargetName(cmGeneratorTarget const* target)
{
std::string autogenTargetName = target->GetName();
- autogenTargetName += "_automoc";
+ autogenTargetName += "_autogen";
return autogenTargetName;
}
@@ -690,6 +750,12 @@
@@ -717,6 +777,12 @@
if (target->GetPropertyAsBool("AUTORCC")) {
toolNames.push_back("rcc");
}
@@ -132,7 +132,7 @@ diff -urN cmake-3.6.1/Source/cmQtAutoGeneratorInitializer.cxx cmake-3.6.1.new/So
std::string tools = toolNames[0];
toolNames.erase(toolNames.begin());
@@ -858,7 +924,9 @@
@@ -880,7 +946,9 @@
if (target->GetPropertyAsBool("AUTOMOC") ||
target->GetPropertyAsBool("AUTOUIC") ||
@@ -143,18 +143,18 @@ diff -urN cmake-3.6.1/Source/cmQtAutoGeneratorInitializer.cxx cmake-3.6.1.new/So
SetupSourceFiles(target, skipMoc, mocSources, mocHeaders, skipUic);
}
makefile->AddDefinition(
diff -urN cmake-3.5.2/Source/cmTarget.cxx cmake-3.5.2.new/Source/cmTarget.cxx
--- cmake-3.5.2/Source/cmTarget.cxx 2016-04-15 14:41:22.000000000 +0100
+++ cmake-3.5.2.new/Source/cmTarget.cxx 2016-06-03 00:38:43.570074400 +0100
@@ -136,6 +136,7 @@
this->SetPropertyDefault("AUTOMOC", 0);
this->SetPropertyDefault("AUTOUIC", 0);
this->SetPropertyDefault("AUTORCC", 0);
+ this->SetPropertyDefault("AUTOSTATICPLUGINS", 0);
this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", 0);
this->SetPropertyDefault("AUTOUIC_OPTIONS", 0);
this->SetPropertyDefault("AUTORCC_OPTIONS", 0);
@@ -741,6 +742,7 @@
diff -urN cmake-3.7.0/Source/cmTarget.cxx.orig cmake-3.7.0/Source/cmTarget.cxx
--- cmake-3.7.0/Source/cmTarget.cxx.orig 2016-11-11 09:37:14.000000000 -0500
+++ cmake-3.7.0/Source/cmTarget.cxx 2016-11-13 17:56:55.700534100 -0500
@@ -120,6 +120,7 @@
this->SetPropertyDefault("AUTOMOC", CM_NULLPTR);
this->SetPropertyDefault("AUTOUIC", CM_NULLPTR);
this->SetPropertyDefault("AUTORCC", CM_NULLPTR);
+ this->SetPropertyDefault("AUTOSTATICPLUGINS", CM_NULLPTR);
this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", CM_NULLPTR);
this->SetPropertyDefault("AUTOUIC_OPTIONS", CM_NULLPTR);
this->SetPropertyDefault("AUTORCC_OPTIONS", CM_NULLPTR);
@@ -737,6 +738,7 @@
builtIns.insert("IMPORTED");
builtIns.insert("NAME");
builtIns.insert("TYPE");
@@ -162,5 +162,3 @@ diff -urN cmake-3.5.2/Source/cmTarget.cxx cmake-3.5.2.new/Source/cmTarget.cxx
}
if (builtIns.count(prop)) {
--
2.8.2

7
mingw-w64-cmake/PKGBUILD
View File

@@ -4,7 +4,7 @@
_realname=cmake
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.6.3
pkgver=3.7.0
pkgrel=1
pkgdesc="A cross-platform open-source make system (mingw-w64)"
arch=('any')
@@ -18,6 +18,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-expat"
"${MINGW_PACKAGE_PREFIX}-jsoncpp"
"${MINGW_PACKAGE_PREFIX}-libarchive"
"${MINGW_PACKAGE_PREFIX}-libuv"
"${MINGW_PACKAGE_PREFIX}-zlib")
optdepends=("${MINGW_PACKAGE_PREFIX}-qt5: CMake Qt GUI")
options=('staticlibs') # '!strip' 'debug'
@@ -27,10 +28,10 @@ source=("https://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz
"0002-Implement-Qt5-static-plugin-support.patch"
"pkg-config-without-prefix.patch"
"do-not-generate-import-library-for-executables.patch")
sha256sums=('7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe'
sha256sums=('ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31'
'ce17e87849e6d07cf69422bb39c0682640ed3a03ea07808395c235a84e22be97'
'aa816b734bf91941403b25bc9d9fd1797675ce2b4a7311bdb6e3ecae38964c37'
'd78e30b4e0e8c1fc449acff5ea910c4691edd1ca2be60141ad7d3dd9a11ce6b9'
'7251394fdbe72bc0b33cbef452b9bb958f45862049aae5fca479bc1779531bb9'
'aa807e20e4a2902a8e6f3f36e1cd7d4b043d0df12f4fb0f4e6bd27d9d6842c0f'
'8503536bfc6606e147c62cd7bc28f984911a04b7bf8164264c345eacbf68dc5b')

4
mingw-w64-jsoncpp/PKGBUILD
View File

@@ -3,7 +3,7 @@
_realname=jsoncpp
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.7.5
pkgver=1.7.7
pkgrel=1
pkgdesc="A C++ library for interacting with JSON (mingw-w64)"
arch=('any')
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
)
options=('staticlibs' '!strip' '!buildflags')
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/open-source-parsers/jsoncpp/archive/${pkgver}.tar.gz")
sha256sums=('4338c6cab8af8dee6cdfd54e6218bd0533785f552c6162bb083f8dd28bf8fbbe')
sha256sums=('087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97')
build() {
[[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}

25
mingw-w64-libarchive/0001-libarchive-3.2.2-bcrypt-fix.patch Normal file
View File

@@ -0,0 +1,25 @@
--- libarchive-3.2.2/CMakeLists.txt.orig 2016-10-31 06:44:48.210114100 -0400
+++ libarchive-3.2.2/CMakeLists.txt 2016-10-31 07:07:35.977487200 -0400
@@ -1006,6 +1006,22 @@
ENDIF(ENABLE_ICONV)
#
+# Find Bcrypt library on Windows and MSYS
+#
+IF(HAVE_BCRYPT_H)
+ IF((WIN32 AND NOT CYGWIN) OR MSYS)
+ FIND_LIBRARY(BCRYPTLIB "Bcrypt")
+ IF(NOT BCRYPTLIB)
+ UNSET(HAVE_BCRYPT_H CACHE)
+ MESSAGE(STATUS "Bcrypt Library: Not Found")
+ ELSE(NOT BCRYPTLIB)
+ LIST(APPEND ADDITIONAL_LIBS ${BCRYPTLIB})
+ MESSAGE(STATUS "Found Bcrypt ${BCRYPTLIB}")
+ ENDIF(NOT BCRYPTLIB)
+ ENDIF((WIN32 AND NOT CYGWIN) OR MSYS)
+ENDIF(HAVE_BCRYPT_H)
+
+#
# Find Libxml2
#
IF(ENABLE_LIBXML2)

59
mingw-w64-libarchive/PKGBUILD
View File

@@ -1,10 +1,8 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
_realname=libarchive
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.2.2
pkgrel=1
pkgrel=2
pkgdesc="library that can create and read several streaming archive formats (mingw-w64)"
arch=('any')
url="http://www.libarchive.org"
@@ -14,37 +12,60 @@ depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs
${MINGW_PACKAGE_PREFIX}-bzip2
${MINGW_PACKAGE_PREFIX}-expat
${MINGW_PACKAGE_PREFIX}-libiconv
${MINGW_PACKAGE_PREFIX}-lz4
${MINGW_PACKAGE_PREFIX}-lzo2
${MINGW_PACKAGE_PREFIX}-libsystre
${MINGW_PACKAGE_PREFIX}-nettle
${MINGW_PACKAGE_PREFIX}-openssl
${MINGW_PACKAGE_PREFIX}-xz
${MINGW_PACKAGE_PREFIX}-zlib)
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake")
options=('!libtool' 'strip')
source=("http://libarchive.org/downloads/${_realname}-${pkgver}.tar.gz")
sha256sums=('691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f')
source=("http://libarchive.org/downloads/${_realname}-${pkgver}.tar.gz"
0001-libarchive-3.2.2-bcrypt-fix.patch)
sha256sums=('691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f'
'd51d1154cf75e73bdd7a2d140b54b3ea35827cb0cfe384eedfc963bf174f2689')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
cd "$srcdir"/${_realname}-${pkgver}
patch -p1 -i ${srcdir}/0001-libarchive-3.2.2-bcrypt-fix.patch
}
build() {
[[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
mkdir "${srcdir}/build-${MINGW_CHOST}"
cd "${srcdir}/build-${MINGW_CHOST}"
../${_realname}-${pkgver}/configure \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--prefix=${MINGW_PREFIX} \
--with-expat \
--without-xml2
cd "$srcdir"/${_realname}-${pkgver}
[[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
declare -a extra_config
if check_option "debug" "n"; then
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-G'MSYS Makefiles' \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DBUILD_{SHARED,STATIC}_LIBS=ON \
../${_realname}-${pkgver}
make
}
#one test seems to crash
#check() {
# cd "${srcdir}"/build-${CARCH}
# make test
#}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build-${CARCH}
make install DESTDIR="${pkgdir}"
local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
# fix python command in files
for _f in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do
sed -e "s|${PREFIX_WIN}/lib|\$\{libdir\}|g" -i ${_f}
done
}

47
mingw-w64-libuv/060877d483cfcbc0ede85059617be5ad7dae127a.patch Normal file
View File

@@ -0,0 +1,47 @@
From 060877d483cfcbc0ede85059617be5ad7dae127a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 29 Sep 2016 14:47:20 -0400
Subject: [PATCH] win: fix anonymous union syntax
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Remove use of the DUMMYUNIONNAME macro from our definitions of
internal winapi anonymous unions. This macro was added to
winternl.h in Windows SDK v7.0a in combination with a conditional
definition of DUMMYUNIONNAME to either empty or `u` depending on
compiler support. libuv doesn't support any compilers that lack
anonymous unions, but does support compilers such as VS 2008 that
complain about the presence of the DUMMYUNIONNAME identifier on an
anonymous union because their winapi headers do not define the
macro publicly.
PR-URL: https://github.com/libuv/libuv/pull/1090
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
---
src/win/winapi.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/win/winapi.h b/src/win/winapi.h
index 16d9365..341fcd0 100644
--- a/src/win/winapi.h
+++ b/src/win/winapi.h
@@ -4145,7 +4145,7 @@ typedef const UNICODE_STRING *PCUNICODE_STRING;
struct {
UCHAR DataBuffer[1];
} GenericReparseBuffer;
- } DUMMYUNIONNAME;
+ };
} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
#endif
@@ -4153,7 +4153,7 @@ typedef struct _IO_STATUS_BLOCK {
union {
NTSTATUS Status;
PVOID Pointer;
- } DUMMYUNIONNAME;
+ };
ULONG_PTR Information;
} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;

12
mingw-w64-libuv/PKGBUILD
View File

@@ -4,7 +4,7 @@
_realname=libuv
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.9.1
pkgver=1.10.0
pkgrel=1
pkgdesc="Cross-platform asychronous I/O (mingw-w64)"
arch=('any')
@@ -13,11 +13,17 @@ license=("custom")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libuv/libuv/archive/v${pkgver}.tar.gz")
sha256sums=('a6ca9f0648973d1463f46b495ce546ddcbe7cce2f04b32e802a15539e46c57ad')
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/libuv/libuv/archive/v${pkgver}.tar.gz"
d9d207774ea1f734310982300e55dd64b3f5682b.patch
060877d483cfcbc0ede85059617be5ad7dae127a.patch)
sha256sums=('50f4ed57d65af4ab634e2cbdd90c49213020e15b4d77d3631feb633cbba9239f'
'b953848b470bf4939c89767ed924e6eaee0a7be685ab267e05f5ac9cc2c76a8e'
'28d76b8e2fa624fdc055cec355ba3271dc33e7cf0045aa2c9021737db652073b')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/060877d483cfcbc0ede85059617be5ad7dae127a.patch
patch -p1 -i ${srcdir}/d9d207774ea1f734310982300e55dd64b3f5682b.patch
./autogen.sh
}

23
mingw-w64-libuv/d9d207774ea1f734310982300e55dd64b3f5682b.patch Normal file
View File

@@ -0,0 +1,23 @@
From d9d207774ea1f734310982300e55dd64b3f5682b Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 3 Nov 2016 08:28:49 -0400
Subject: [PATCH] win: add missing break statement
PR-URL: https://github.com/libuv/libuv/pull/1120
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
---
src/win/process-stdio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/win/process-stdio.c b/src/win/process-stdio.c
index e3c06f5..032e309 100644
--- a/src/win/process-stdio.c
+++ b/src/win/process-stdio.c
@@ -372,6 +372,7 @@ int uv__stdio_create(uv_loop_t* loop,
case FILE_TYPE_PIPE:
CHILD_STDIO_CRT_FLAGS(buffer, i) = FOPEN | FPIPE;
+ break;
case FILE_TYPE_CHAR:
case FILE_TYPE_REMOTE: