From 916ae00b4f4d303936b1c1af86cb3d830a931ad6 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:00:22 -0400 Subject: [PATCH 1/9] Clang include libunwind --- ...-libunwind-add-support-for-mingw-w64.patch | 126 ++++++++++++++++++ mingw-w64-clang/PKGBUILD | 82 ++++++++---- 2 files changed, 179 insertions(+), 29 deletions(-) create mode 100644 mingw-w64-clang/0061-libunwind-add-support-for-mingw-w64.patch diff --git a/mingw-w64-clang/0061-libunwind-add-support-for-mingw-w64.patch b/mingw-w64-clang/0061-libunwind-add-support-for-mingw-w64.patch new file mode 100644 index 0000000000000..9a9a73e7ebb9f --- /dev/null +++ b/mingw-w64-clang/0061-libunwind-add-support-for-mingw-w64.patch @@ -0,0 +1,126 @@ +From 81b5dabfed88d2976faf587598361c054630ef95 Mon Sep 17 00:00:00 2001 +From: Martell Malone +Date: Tue, 21 Jul 2015 04:35:55 +0100 +Subject: [PATCH] libunwind add support for mingw-w64 + + +diff --git a/include/unwind.h b/include/unwind.h +index 31fb871..e8c63d7 100644 +--- a/include/unwind.h ++++ b/include/unwind.h +@@ -121,7 +121,7 @@ struct _Unwind_Exception { + _Unwind_Exception *exc); + uintptr_t private_1; // non-zero means forced unwind + uintptr_t private_2; // holds sp that phase1 found for phase2 to use +-#ifndef __LP64__ ++#if !defined(__LP64__) && !defined(_WIN64) + // The gcc implementation of _Unwind_Exception used attribute mode on the + // above fields which had the side effect of causing this whole struct to + // round up to 32 bytes in size. To be more explicit, we add pad fields +diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp +index 567cbda..fd0b233 100644 +--- a/src/AddressSpace.hpp ++++ b/src/AddressSpace.hpp +@@ -18,7 +18,7 @@ + #include + #include + +-#ifndef _LIBUNWIND_IS_BAREMETAL ++#if !defined(_LIBUNWIND_IS_BAREMETAL) && !defined(_WIN32) + #include + #endif + +@@ -104,7 +104,7 @@ struct UnwindInfoSections { + /// making local unwinds fast. + class __attribute__((visibility("hidden"))) LocalAddressSpace { + public: +-#ifdef __LP64__ ++#if defined(__LP64__) || defined(_WIN64) + typedef uint64_t pint_t; + typedef int64_t sint_t; + #else +@@ -156,7 +156,7 @@ public: + }; + + inline uintptr_t LocalAddressSpace::getP(pint_t addr) { +-#ifdef __LP64__ ++#if defined(__LP64__) || defined(_WIN64) + return get64(addr); + #else + return get32(addr); +@@ -434,6 +434,7 @@ inline bool LocalAddressSpace::findUnwindSections(pint_t targetAddr, + }, + &cb_data); + return static_cast(found); ++#elif defined(_WIN32) + #else + #error "_LIBUNWIND_SUPPORT_DWARF_UNWIND requires _LIBUNWIND_SUPPORT_DWARF_INDEX on this platform." + #endif +@@ -457,7 +458,9 @@ inline bool LocalAddressSpace::findOtherFDE(pint_t targetAddr, pint_t &fde) { + inline bool LocalAddressSpace::findFunctionName(pint_t addr, char *buf, + size_t bufLen, + unw_word_t *offset) { +-#ifndef _LIBUNWIND_IS_BAREMETAL ++#ifdef _WIN32 ++// FIXME: support DLLs on Windows. ++#elif !defined(_LIBUNWIND_IS_BAREMETAL) + Dl_info dyldInfo; + if (dladdr((void *)addr, &dyldInfo)) { + if (dyldInfo.dli_sname != NULL) { +diff --git a/src/UnwindLevel1-gcc-ext.c b/src/UnwindLevel1-gcc-ext.c +index 28ba092..0decf77 100644 +--- a/src/UnwindLevel1-gcc-ext.c ++++ b/src/UnwindLevel1-gcc-ext.c +@@ -29,7 +29,7 @@ + _LIBUNWIND_EXPORT _Unwind_Reason_Code + _Unwind_Resume_or_Rethrow(_Unwind_Exception *exception_object) { + #if _LIBUNWIND_ARM_EHABI +- _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%ld\n", ++ _LIBUNWIND_TRACE_API("_Unwind_Resume_or_Rethrow(ex_obj=%p), private_1=%" PRIdPTR "\n", + (void *)exception_object, + (long)exception_object->unwinder_cache.reserved1); + #else +diff --git a/src/assembly.h b/src/assembly.h +index f46a24d..4d6c3e1 100644 +--- a/src/assembly.h ++++ b/src/assembly.h +@@ -26,6 +26,8 @@ + + #if defined(__APPLE__) + #define HIDDEN_DIRECTIVE .private_extern ++#elif defined(_WIN32) ++#define HIDDEN_DIRECTIVE .globl + #else + #define HIDDEN_DIRECTIVE .hidden + #endif +diff --git a/src/config.h b/src/config.h +index c9ec087..6f14e92 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -60,6 +60,23 @@ + #define _LIBUNWIND_SUPPORT_DWARF_INDEX 0 + #endif + ++#elif defined(_WIN32) ++ // Note! the assembler files must be .S and not .s. ++ #define _LIBUNWIND_BUILD_ZERO_COST_APIS 1 ++ ++ // #define _LIBUNWIND_BUILD_SJLJ_APIS ++ // #define _LIBUNWIND_SUPPORT_FRAME_APIS ++ #define _LIBUNWIND_EXPORT ++ #define _LIBUNWIND_HIDDEN ++ #define _LIBUNWIND_LOG(msg, ...) fprintf(stderr, "libuwind: " msg, __VA_ARGS__) ++ #define _LIBUNWIND_ABORT(msg) do { fprintf(stderr, msg); abort(); } while(0) ++ #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 ++ #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 ++ // #define _LIBUNWIND_SUPPORT_DWARF_INDEX ++ #define bzero(s,n) memset(s,0,n) ++ // libcxx may have defined __USE_MINGW_ANSI_STDIO. ++ // Here we would like to get the regular versions, not the _mingw ones. ++ #undef __USE_MINGW_ANSI_STDIO + #else + #include + +-- +2.4.5 + diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 2f297a979d221..a2ef7c2fce0f2 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -11,6 +11,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-libc++abi" "${MINGW_PACKAGE_PREFIX}-libc++" "${MINGW_PACKAGE_PREFIX}-lld" + "${MINGW_PACKAGE_PREFIX}-libunwind" "${MINGW_PACKAGE_PREFIX}-llvm" #"${MINGW_PACKAGE_PREFIX}-lldb" ) @@ -39,17 +40,17 @@ source=(http://llvm.org/releases/${pkgver}/llvm-${pkgver}.src.tar.xz{,.sig} http://llvm.org/releases/${pkgver}/clang-tools-extra-${pkgver}.src.tar.xz{,.sig} http://llvm.org/releases/${pkgver}/lld-${pkgver}.src.tar.xz{,.sig} http://llvm.org/releases/${pkgver}/lldb-${pkgver}.src.tar.xz{,.sig} - 0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch - 0002-use-DESTDIR-on-windows.patch - 0003-generate-proper-library-names-mingw.patch - 0012-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch - 0013-mingw-w64-dont-have-dl-library.patch - 0014-dont-create-cl-mingw.patch - 0018-mingw-enable-static-libclang.patch - 0021-missing-include.patch - 0041-libcxx-add-support-for-mingw-w64.patch - ) - + http://llvm.org/releases/${pkgver}/libunwind-${pkgver}.src.tar.xz{,.sig} + "0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch" + "0002-use-DESTDIR-on-windows.patch" + "0003-generate-proper-library-names-mingw.patch" + "0012-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch" + "0013-mingw-w64-dont-have-dl-library.patch" + "0014-dont-create-cl-mingw.patch" + "0018-mingw-enable-static-libclang.patch" + "0021-missing-include.patch" + "0041-libcxx-add-support-for-mingw-w64.patch" + "0061-libunwind-add-support-for-mingw-w64.patch") # Some patch notes :) #0001-0009 -> llvm #0011-0019 -> clang @@ -57,7 +58,7 @@ source=(http://llvm.org/releases/${pkgver}/llvm-${pkgver}.src.tar.xz{,.sig} #0031-0039 -> lld #0041-0049 -> c++ #0051-0059 -> lldb - +#0061-0069 -> libunwind sha256sums=('555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46' 'SKIP' '04149236de03cf05232d68eb7cb9c50f03062e339b68f4f8a03b650a11536cf9' @@ -76,6 +77,8 @@ sha256sums=('555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46' 'SKIP' 'e3f68f44147df0433e7989bf6ed1c58ff28d7c68b9c47553cb9915f744785a35' 'SKIP' + 'af3eaf39ecdc3b9e89863fb62e1aa3c135cfde7e9415424e4e396d7486a9422b' + 'SKIP' '0804146b32138d55c611336cc81e1783c29a8fab0fe62f248ba1ad7acc711c4d' '76bcdcae0ef3a4d3ae7082b7fcd668e9560e63fb82068c3f889f9e89b9becf4a' '6a95ed671876a6de04799d15bf7485d628016bb4a95a6764217ad452d8eed0d8' @@ -84,9 +87,9 @@ sha256sums=('555b028e9ee0f6445ff8f949ea10e9cd8be0d084840e21fbbe1d31d51fc06e46' 'b03cfc7ebbbfb847e88ae3569d9dcafb01f179b06f1312de29fbd5b7cf906617' '0e45e76ee6d6658de52edb7b508a8bcc9f10ff0b295ff2a4e35577136a40c6a5' 'a0933775b979b4879e220358b1076d8eeb9170403d0d190b1340d179fcd3cd1e' - '5b8edbbb638c906216e20229529e8348abc50d5886d20e07af08543e1e574e94') -validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') #Hans Wennborg, Google - + '5b8edbbb638c906216e20229529e8348abc50d5886d20e07af08543e1e574e94' + 'c05162c426e90a01cef4a9d34d09e6314b966f2fea5a121223c98e51f5b6bd93') +validpgpkeys=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg, Google. noextract=(cfe-${pkgver}.src.tar.xz #libcxx-${pkgver}.src.tar.xz lldb-${pkgver}.src.tar.xz @@ -97,17 +100,16 @@ prepare() { plain "Extracting clang-${pkgver}.src.tar.xz due to symlink(s) without pre-existing target(s)" [[ -d ${srcdir}/cfe-${pkgver} ]] && rm -rf ${srcdir}/cfe-${pkgver} [[ -d ${srcdir}/cfe-${pkgver} ]] || tar -xJvf ${srcdir}/cfe-${pkgver}.src.tar.xz -C ${srcdir} || true - cd "${srcdir}/llvm-${pkgver}.src" - patch -p1 -i ${srcdir}/0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch - patch -p1 -i ${srcdir}/0002-use-DESTDIR-on-windows.patch - patch -p1 -i ${srcdir}/0003-generate-proper-library-names-mingw.patch + patch -p1 -i "${srcdir}/0001-Fix-GetHostTriple-for-mingw-w64-in-msys.patch" + patch -p1 -i "${srcdir}/0002-use-DESTDIR-on-windows.patch" + patch -p1 -i "${srcdir}/0003-generate-proper-library-names-mingw.patch" cd "${srcdir}/cfe-${pkgver}.src" - patch -p1 -i ${srcdir}/0012-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch - patch -p1 -i ${srcdir}/0013-mingw-w64-dont-have-dl-library.patch - patch -p1 -i ${srcdir}/0014-dont-create-cl-mingw.patch - patch -p1 -i ${srcdir}/0018-mingw-enable-static-libclang.patch + patch -p1 -i "${srcdir}/0012-Set-the-x86-arch-name-to-i686-for-mingw-w64.patch" + patch -p1 -i "${srcdir}/0013-mingw-w64-dont-have-dl-library.patch" + patch -p1 -i "${srcdir}/0014-dont-create-cl-mingw.patch" + patch -p1 -i "${srcdir}/0018-mingw-enable-static-libclang.patch" cd "${srcdir}/compiler-rt-${pkgver}.src" patch -p1 -i ${srcdir}/0021-missing-include.patch @@ -115,8 +117,9 @@ prepare() { cd "${srcdir}/lld-${pkgver}.src" cd "${srcdir}/libcxx-${pkgver}.src" - patch -p1 -i "${srcdir}"/0041-libcxx-add-support-for-mingw-w64.patch - + patch -p1 -i "${srcdir}/0041-libcxx-add-support-for-mingw-w64.patch" + cd "${srcdir}/libunwind-${pkgver}.src" + patch -p1 -i "${srcdir}/0061-libunwind-add-support-for-mingw-w64.patch" cd "${srcdir}/llvm-${pkgver}.src" # Fix docs installation directory @@ -131,13 +134,15 @@ prepare() { # See http://llvm.org/bugs/show_bug.cgi?id=4840 cd "${srcdir}"/llvm-${pkgver}.src - mv "${srcdir}/cfe-${pkgver}.src" tools/clang - mv "${srcdir}/clang-tools-extra-${pkgver}.src" tools/clang/tools/extra +# note you need to ignore failure if there is stuff that already exists + mv "${srcdir}/cfe-${pkgver}.src" tools/clang | true + mv "${srcdir}/clang-tools-extra-${pkgver}.src" tools/clang/tools/extra | true mv "${srcdir}/lld-${pkgver}.src" tools/lld | true - #mv "${srcdir}/lldb-${pkgver}.src" tools/lldb + #mv "${srcdir}/lldb-${pkgver}.src" tools/lldb | true mv "${srcdir}/compiler-rt-${pkgver}.src" projects/compiler-rt | true mv "${srcdir}/libcxxabi-${pkgver}.src" projects/libcxxabi | true mv "${srcdir}/libcxx-${pkgver}.src" projects/libcxx | true + mv "${srcdir}/libunwind-${pkgver}.src" projects/libunwind | true #mv "${srcdir}/testsuite-${pkgver}.src" projects/test-suite | true } @@ -185,6 +190,7 @@ build() { -DLIBCLANG_BUILD_STATIC=ON \ -DLIBCXX_ENABLE_SHARED=OFF \ -DLIBCXXABI_ENABLE_SHARED=OFF \ + -DLIBUNWIND_ENABLE_SHARED=OFF \ "${extra_config[@]}" \ ../llvm-${pkgver}.src @@ -195,7 +201,8 @@ build() { # sed -i.orig '/\(clang\|lld\|lldb\)\/cmake_install.cmake/d' tools/cmake_install.cmake sed -i.orig '/\(extra\|scan-build\|scan-view\)\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake - sed -i.orig '/\(compiler-rt\|libcxxabi\|libcxx\)\/cmake_install.cmake/d' projects/cmake_install.cmake +# sed -i.orig '/\(compiler-rt\|libcxxabi\|libcxx\)\/cmake_install.cmake/d' projects/cmake_install.cmake + sed -i.orig '/\(compiler-rt\|libcxxabi\|libcxx\|libunwind\)\/cmake_install.cmake/d' projects/cmake_install.cmake } #check() { @@ -236,6 +243,7 @@ package_compiler-rt() { package_libcxxabi() { pkgdesc="C++ Standard Library Support (mingw-w64)" url="http://libcxxabi.llvm.org/" + depends="${MINGW_PACKAGE_PREFIX}-libunwind" cd "${srcdir}/llvm-${pkgver}.src" make -C ../build-${CARCH}/projects/libcxxabi -j1 DESTDIR="${pkgdir}" install @@ -249,6 +257,14 @@ package_libcxx() { make -C ../build-${CARCH}/projects/libcxx -j1 DESTDIR="${pkgdir}" install } +package_libunwind() { + pkgdesc='A new implementation of a stack unwinder for C++ exceptions (mingw-w64)' + url='http://llvm.org' + + cd "${srcdir}/llvm-${pkgver}.src" + make -C ../build-${CARCH}/projects/libunwind -j1 DESTDIR="${pkgdir}" install +} + package_lldb() { pkgdesc="Next generation, high-performance debugger (mingw-w64)" url="http://lldb.llvm.org/" @@ -350,6 +366,10 @@ package_mingw-w64-i686-lldb(){ package_lldb } +package_mingw-w64-i686-libunwind(){ + package_libunwind +} + package_mingw-w64-i686-llvm(){ package_llvm } @@ -386,6 +406,10 @@ package_mingw-w64-x86_64-lldb(){ package_lldb } +package_mingw-w64-x86_64-libunwind(){ + package_libunwind +} + package_mingw-w64-x86_64-llvm(){ package_llvm } From abbf13ac117702997694aad41522e470513a9fe2 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:00:49 -0400 Subject: [PATCH 2/9] CMake Upgrade to 3.5.1 --- mingw-w64-cmake/PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD index 3fb298c7420d6..61639654aee07 100644 --- a/mingw-w64-cmake/PKGBUILD +++ b/mingw-w64-cmake/PKGBUILD @@ -3,7 +3,7 @@ _realname=cmake pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.4.1 +pkgver=3.5.1 pkgrel=1 pkgdesc="A cross-platform open-source make system (mingw-w64)" arch=('any') @@ -26,20 +26,20 @@ source=("https://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz "qt5-static-plugin-support.patch" "pkg-config-without-prefix.patch" "do-not-generate-import-library-for-executables.patch") -sha256sums=('d41462bdd80dc37f0d5608167b354bb3af8c068eee640be04c907154c5c113e2' +sha256sums=('93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8' '76565ffc20010b27e895af7919f35deedc7fd0b86ca8746bbc22329185ad57fa' 'aa816b734bf91941403b25bc9d9fd1797675ce2b4a7311bdb6e3ecae38964c37' - '5470eaf830aa43f37893d34af224915cc9be0c8b2d165a0115d7fd01881b9e69' + '3558259452883de78b176543de701d8a5757dbaf0d187b07e72256d97e13cabe' 'aa807e20e4a2902a8e6f3f36e1cd7d4b043d0df12f4fb0f4e6bd27d9d6842c0f' '8503536bfc6606e147c62cd7bc28f984911a04b7bf8164264c345eacbf68dc5b') prepare() { cd ${_realname}-${pkgver} - patch -Np1 -i ${srcdir}/disable-response-files-for-msys.patch - patch -Np1 -i ${srcdir}/dont-install-bundle.patch - patch -Np1 -i ${srcdir}/qt5-static-plugin-support.patch - patch -Np1 -i ${srcdir}/pkg-config-without-prefix.patch - patch -Np1 -i ${srcdir}/do-not-generate-import-library-for-executables.patch + patch -Np1 -i "${srcdir}/disable-response-files-for-msys.patch" + patch -Np1 -i "${srcdir}/dont-install-bundle.patch" +# patch -Np1 -i "${srcdir}/qt5-static-plugin-support.patch" + patch -Np1 -i "${srcdir}/pkg-config-without-prefix.patch" + patch -Np1 -i "${srcdir}/do-not-generate-import-library-for-executables.patch" } build() { From 0b4cf12670993e57008e9355cbfa30ff5eaf9d47 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:01:44 -0400 Subject: [PATCH 3/9] CUnit 2.1.3 Lightweight system for writing, administering, and running unit tests in C (mingw-w64) --- mingw-w64-cunit/PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 mingw-w64-cunit/PKGBUILD diff --git a/mingw-w64-cunit/PKGBUILD b/mingw-w64-cunit/PKGBUILD new file mode 100644 index 0000000000000..6cbd919567297 --- /dev/null +++ b/mingw-w64-cunit/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Some One + +_realname=cunit +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +_distname="CUnit" +_distver="2.1-3" +pkgver=2.1.3 +pkgrel=1 +pkgdesc="Lightweight system for writing, administering, and running unit tests in C (mingw-w64)" +arch=('any') +url='http://cunit.sourceforge.net/' +license=('LGPL2.1') +source=("https://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2") +sha256sums=('f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214') + +prepare() { + cd "$srcdir/"${_distname}-${_distver} +} + +build() { + cd "$srcdir"/${_distname}-${_distver} + rm -rf "${srcdir}"/build-${CARCH} | true + mkdir -p "${srcdir}"/build-${CARCH} + cp -Rf ${srcdir}/${_distname}-${_distver}/* "${srcdir}"/build-${CARCH} + cd "${srcdir}"/build-${CARCH} + + ./bootstrap /mingw + ./configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-debug \ + --enable-static \ + --enable-shared + sed "s|\/Users\/aks\/CUnitHome|${MINGW_PREFIX}|" -i cunit.pc + make +} + +check() { + cd "${srcdir}"/build-${CARCH} +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +} From 139a3044bc74540d7537c5527433e714a15c36f3 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:03:48 -0400 Subject: [PATCH 4/9] Upgrade to curl 7.48 and add HTTP/2 and metalink support Add HTTP/2 support through nghttp2 library and add metalink support through libmetalink. --- mingw-w64-curl/PKGBUILD | 18 ++++++++++---- mingw-w64-libmetalink/PKGBUILD | 44 ++++++++++++++++++++++++++++++++++ mingw-w64-nghttp2/PKGBUILD | 41 +++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 mingw-w64-libmetalink/PKGBUILD create mode 100644 mingw-w64-nghttp2/PKGBUILD diff --git a/mingw-w64-curl/PKGBUILD b/mingw-w64-curl/PKGBUILD index 722dea598bd5c..75ef9effc54cf 100644 --- a/mingw-w64-curl/PKGBUILD +++ b/mingw-w64-curl/PKGBUILD @@ -6,7 +6,7 @@ _variant=-openssl _realname=curl pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=7.47.1 +pkgver=7.48.0 pkgrel=1 pkgdesc="An URL retrival utility and library. (mingw-w64)" arch=('any') @@ -16,12 +16,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-c-ares" "${MINGW_PACKAGE_PREFIX}-libidn" + "${MINGW_PACKAGE_PREFIX}-libmetalink" "${MINGW_PACKAGE_PREFIX}-libssh2" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-rtmpdump" $([[ "$_variant" == "-openssl" ]] && echo \ "${MINGW_PACKAGE_PREFIX}-ca-certificates" \ - "${MINGW_PACKAGE_PREFIX}-openssl") + "${MINGW_PACKAGE_PREFIX}-openssl" \ + "${MINGW_PACKAGE_PREFIX}-nghttp2") $([[ "$_variant" == "-gnutls" ]] && echo \ "${MINGW_PACKAGE_PREFIX}-ca-certificates" \ "${MINGW_PACKAGE_PREFIX}-gnutls") @@ -30,7 +32,7 @@ options=('staticlibs') source=("${url}/download/${_realname}-${pkgver}.tar.bz2"{,.asc} "0001-curl-relocation.patch" "0004-cURL-Get-relocatable-base-from-dll.patch") -sha256sums=('ddc643ab9382e24bbe4747d43df189a0a6ce38fcb33df041b9cb0b3cd47ae98f' +sha256sums=('864e7819210b586d42c674a1fdd577ce75a78b3dda64c63565abe5aefd72c753' 'SKIP' '99327833b310a2a05197bf48d43e5a8bb89b8ec3f7315d6b1adba327d4bf8074' 'e21fb106ebda8559ba2d34633a9d7d94be541de02de01982f92d67048bb9854b') @@ -52,22 +54,24 @@ build() { extra_config+=( --disable-debug ) fi mkdir -p "${srcdir}/build-${CARCH}" - local -a _variant_config if [ "${_variant}" = "-winssl" ]; then _variant_config+=("--without-ssl") _variant_config+=("--without-gnutls") _variant_config+=("--with-winssl") + _variant_config+=('--without-nghttp2') _variant_config+=("--without-ca-bundle") - _variant_config+=("--without-ca-path") + _variant_config+=("--without-ca-path") elif [ "${_variant}" = "-gnutls" ]; then _variant_config+=("--without-ssl") _variant_config+=("--with-gnutls") + _variant_config+=('--without-nghttp2') _variant_config+=("--with-ca-bundle=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt") elif [ "${_variant}" = "-openssl" ]; then _variant_config+=("--without-gnutls") _variant_config+=("--with-ssl") _variant_config+=("--with-ca-bundle=${MINGW_PREFIX}/ssl/certs/ca-bundle.crt") + _variant_config+=('--with-nghttp2=${MINGW_PREFIX}/') fi cd "${srcdir}/build-${CARCH}" ../${_realname}-${pkgver}/configure \ @@ -79,8 +83,12 @@ build() { --enable-static \ --enable-shared \ --enable-sspi \ + --with-libmetalink=${MINGW_PREFIX} \ "${_variant_config[@]}" \ "${extra_config[@]}" +# there's a bug with zsh completion generation script and Windows. +# curl has to specified with the file extension. + sed -i "s|\/curl > \$\@|\/curl\$\{EXEEXT\} > \$\@|" scripts/Makefile make } diff --git a/mingw-w64-libmetalink/PKGBUILD b/mingw-w64-libmetalink/PKGBUILD new file mode 100644 index 0000000000000..e3d1516ca50c4 --- /dev/null +++ b/mingw-w64-libmetalink/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: J. Peter Mugaas + +_realname=libmetalink +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-expat") +pkgver=0.1.3 +pkgrel=1 +pkgdesc="Metalink library (mingw-w64)" +arch=('any') +url='https://launchpad.net/libmetalink' +license=('MIT') +source=("https://launchpad.net/${_realname}/trunk/${_realname}-${pkgver}/+download/${_realname}-${pkgver}.tar.xz") +sha256sums=('86312620c5b64c694b91f9cc355eabbd358fa92195b3e99517504076bf9fe33a') + +prepare() { + cd $srcdir/${_realname}-${pkgver} +} + +build() { + cd "$srcdir"/${_realname}-${pkgver} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-static \ + --enable-shared + + make +} + +check() { + cd "${srcdir}"/build-${CARCH} + make check +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +} diff --git a/mingw-w64-nghttp2/PKGBUILD b/mingw-w64-nghttp2/PKGBUILD new file mode 100644 index 0000000000000..1b815d978a1bf --- /dev/null +++ b/mingw-w64-nghttp2/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: J. Peter Mugaas + +_realname=nghttp2 +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.9.2 +pkgrel=1 +pkgdesc="Framing layer of HTTP/2 is implemented as a reusable C library (mingw-w64)" +arch=('any') +url='http://nghttp2.org/' +depends=("${MINGW_PACKAGE_PREFIX}-jansson" + "${MINGW_PACKAGE_PREFIX}-openssl") +license=('MIT') +source=("https://github.com/tatsuhiro-t/nghttp2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz") +sha256sums=('3d600ef8bfd151769559bc23806877b8b4eaf3d66776e6c1427b9c04cce8e853') + +prepare() { + cd $srcdir/${_realname}-${pkgver} +} + +build() { + cd "$srcdir"/${_realname}-${pkgver} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && \ + cd "${srcdir}"/build-${CARCH} + # Note, cmake system does not yet work well with this. + ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-static \ + --enable-shared \ + --enable-lib-only + make +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +} From 6af3fabe4180d615fd2a6451774cbd23463aa7d2 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:04:17 -0400 Subject: [PATCH 5/9] Add SIL Graphics Graphite2 to harfbuzz --- .../001-graphite2-1.3.8-win64.patch | 26 +++++++ .../002-graphite2-1.2.1-pkgconfig.patch | 20 +++++ mingw-w64-graphite2/PKGBUILD | 74 +++++++++++++++++++ mingw-w64-harfbuzz/PKGBUILD | 4 +- 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 mingw-w64-graphite2/001-graphite2-1.3.8-win64.patch create mode 100644 mingw-w64-graphite2/002-graphite2-1.2.1-pkgconfig.patch create mode 100644 mingw-w64-graphite2/PKGBUILD diff --git a/mingw-w64-graphite2/001-graphite2-1.3.8-win64.patch b/mingw-w64-graphite2/001-graphite2-1.3.8-win64.patch new file mode 100644 index 0000000000000..cd00c3d6e4cd3 --- /dev/null +++ b/mingw-w64-graphite2/001-graphite2-1.3.8-win64.patch @@ -0,0 +1,26 @@ +--- graphite2-1.3.8/src/inc/json.h.orig 2016-04-01 03:31:38.543833400 -0400 ++++ graphite2-1.3.8/src/inc/json.h 2016-04-01 03:38:38.112543400 -0400 +@@ -86,6 +86,10 @@ public: + json & operator << (number) throw(); + json & operator << (integer) throw(); + json & operator << (long unsigned int d) throw(); ++#ifdef _WIN32 ++ json & operator << (unsigned __int64 d) throw(); ++ json & operator << (__int64 d) throw(); ++#endif + json & operator << (boolean) throw(); + json & operator << (_null_t) throw(); + json & operator << (_context_t) throw(); +--- graphite2-1.3.8/src/json.cpp.orig 2016-04-01 03:31:38.550833700 -0400 ++++ graphite2-1.3.8/src/json.cpp 2016-04-01 03:41:05.363588200 -0400 +@@ -133,6 +133,10 @@ json & json::operator << (json::number f + } + json & json::operator << (json::integer d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } + json & json::operator << (long unsigned d) throw() { context(seq); fprintf(_stream, "%ld", d); return *this; } ++#ifdef _WIN32 ++json & json::operator << (unsigned __int64 d) throw() { context(seq); fprintf(_stream, "%I64", d); return *this; } ++json & json::operator << (__int64 d) throw() { context(seq); fprintf(_stream, "%I64", d); return *this; } ++#endif + json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ? "true" : "false", _stream); return *this; } + json & json::operator << (json::_null_t) throw() { context(seq); fputs("null",_stream); return *this; } + diff --git a/mingw-w64-graphite2/002-graphite2-1.2.1-pkgconfig.patch b/mingw-w64-graphite2/002-graphite2-1.2.1-pkgconfig.patch new file mode 100644 index 0000000000000..27eae13a2cbfa --- /dev/null +++ b/mingw-w64-graphite2/002-graphite2-1.2.1-pkgconfig.patch @@ -0,0 +1,20 @@ +--- graphite2-1.2.1/graphite2.pc.in 2013-02-27 20:32:04.000000000 +0100 ++++ graphite2-1.2.1/graphite2.pc.in 2013-05-09 22:52:58.990959979 +0200 +@@ -1,3 +1,7 @@ ++prefix=${prefix} ++exec_prefix=${prefix} ++libdir=${prefix}/lib ++includedir=${prefix}/include + + Name: Graphite2 + Description: Font rendering engine for Complex Scripts +--- graphite2-1.2.1/CMakeLists.txt 2013-02-27 20:32:04.000000000 +0100 ++++ graphite2-1.2.1/CMakeLists.txt 2013-06-06 21:11:28.241391998 +0200 +@@ -64,6 +64,7 @@ + endif (NOT (GRAPHITE2_NSEGCACHE OR GRAPHITE2_NFILEFACE)) + + set(version 3.0.1) ++set(prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}) + set(includedir ${CMAKE_INSTALL_PREFIX}/include) + diff --git a/mingw-w64-graphite2/PKGBUILD b/mingw-w64-graphite2/PKGBUILD new file mode 100644 index 0000000000000..79fa3dad5a61e --- /dev/null +++ b/mingw-w64-graphite2/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: J. Peter Mugaas + +_realname=graphite2 +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") +replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.3.8 +pkgrel=1 +pkgdesc="Font rendering capabilities for complex non-Roman writing systems (mingw-w64)" +arch=('any') +url="https://github.com/silnrsi/graphite" +license=('LGPLv2+') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +options=('strip' 'staticlibs') +source=("https://github.com/silnrsi/graphite/releases/download/${pkgver}/${_realname}-${pkgver}.tgz" + "001-graphite2-1.3.8-win64.patch" + "002-graphite2-1.2.1-pkgconfig.patch") +sha256sums=('9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2' + 'bd6e108929110fcbfd69434221974395a4839710432fe58a9aa432e95bdf4354' + '22bef0d90c0266b3b0eff01859c1e002f84c165d12242c2bfc153f8f98fb272a') + +prepare() { + cd "${srcdir}"/${_realname}-${pkgver} + patch -p1 -i "${srcdir}"/001-graphite2-1.3.8-win64.patch + patch -p1 -i "${srcdir}"/002-graphite2-1.2.1-pkgconfig.patch +# python2 fixes + sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp} +} + +check() { + cd "${srcdir}"/build-${CARCH} + # python2 fixes + sed -i "s:python:python2:g" tests/CTestTestfile.cmake + # we also want to use mingw-w64-x86_64 and mingw-w64-i686 versions of python + mkdir "${srcdir}"/${_realname}-${pkgver}/tests/backup + cp "${srcdir}"/${_realname}-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp} \ + ${srcdir}"/${_realname}-${pkgver}/tests/backup" + sed -i "s:\/usr\/bin\/python2:${MINGW_PREFIX}\/bin\/python2:" \ + "${srcdir}"/${_realname}-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp} + ctest || true + rm "${srcdir}"/${_realname}-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp} + cp "${srcdir}"/${_realname}-${pkgver}/tests/backup/* "${srcdir}"/${_realname}-${pkgver}/tests + rm -rf "${srcdir}"/${_realname}-${pkgver}/tests/backup +} + +build() { + [[ -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 \ + -DGRAPHITE2_COMPARE_RENDERER=ON \ + ../${_realname}-${pkgver} + + make +} + + +package() { + cd "${srcdir}"/build-${CARCH} + make DESTDIR=${pkgdir} install +} diff --git a/mingw-w64-harfbuzz/PKGBUILD b/mingw-w64-harfbuzz/PKGBUILD index df94ffc51395e..9dc848bc8bc49 100644 --- a/mingw-w64-harfbuzz/PKGBUILD +++ b/mingw-w64-harfbuzz/PKGBUILD @@ -17,7 +17,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" depends=("${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-glib2") + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-graphite2") options=('strip' 'staticlibs') optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support") source=("https://www.freedesktop.org/software/harfbuzz/release/${_realname}-${pkgver}.tar.bz2") @@ -39,6 +40,7 @@ build() { --enable-shared \ --enable-static \ --enable-introspection \ + --with-graphite2=yes \ --with-gobject make From 6e2c7e3822cc6752c1a3391f82e9e3355bbced03 Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:05:21 -0400 Subject: [PATCH 6/9] libpaper library library for handling paper characteristic --- mingw-w64-libpaper/PKGBUILD | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 mingw-w64-libpaper/PKGBUILD diff --git a/mingw-w64-libpaper/PKGBUILD b/mingw-w64-libpaper/PKGBUILD new file mode 100644 index 0000000000000..129bea07e4489 --- /dev/null +++ b/mingw-w64-libpaper/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: J. Peter Mugaas + +_realname=libpaper +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.1.24 +_suffix=+nmu4 +pkgrel=1 +pkgdesc="library for handling paper characteristics (mingw-w64)" +arch=('any') +url='http://packages.debian.org/unstable/source/libpaper' +license=('GPL-2') +source=("http://http.debian.net/debian/pool/main/libp/libpaper/${_realname}_${pkgver}${_suffix}.tar.gz") +sha256sums=('2491fce3f590d922d2d3070555df4425921b89c76a18e1c62e36336d6657526a') + +prepare() { + cd $srcdir/${_realname}-${pkgver}${_suffix} +} + +build() { + cd "$srcdir"/${_realname}-${pkgver}${_suffix} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + ../${_realname}-${pkgver}${_suffix}/configure \ + --prefix=${MINGW_PREFIX} \ + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-static \ + --enable-shared + + make +} + +check() { + cd "${srcdir}"/build-${CARCH} + make check +} + +package() { + cd "${srcdir}"/build-${CARCH} + make install DESTDIR="${pkgdir}" +} From 9ff4057968975da7119e388de937925a4436cefc Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:06:03 -0400 Subject: [PATCH 7/9] Fix libelf Fix libelf so that you have do not have unrecognized format errors. --- mingw-w64-libelf/PKGBUILD | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mingw-w64-libelf/PKGBUILD b/mingw-w64-libelf/PKGBUILD index c5cf9e58af0e6..17781dce3acaf 100644 --- a/mingw-w64-libelf/PKGBUILD +++ b/mingw-w64-libelf/PKGBUILD @@ -14,16 +14,20 @@ source=("http://www.mr511.de/software/${_realname}-${pkgver}.tar.gz") sha256sums=('591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d') build() { - cd ${srcdir}/${_realname}-${pkgver} - - ./configure \ + cd "$srcdir"/${_realname}-${pkgver} + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && \ + cd "${srcdir}"/build-${CARCH} + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} - + --build=${MINGW_CHOST} \ + --host=${MINGW_CHOST} \ + --target=${MINGW_CHOST} \ + --enable-extended-format=yes make -j1 all } package() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}"/build-${CARCH} make install instroot="${pkgdir}" } From e6eed579dce529a26e0d15e6dfe7876189b103ea Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 06:52:29 -0400 Subject: [PATCH 8/9] Increase pkgrel --- mingw-w64-clang/PKGBUILD | 2 +- mingw-w64-harfbuzz/PKGBUILD | 2 +- mingw-w64-libelf/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index a2ef7c2fce0f2..a0c7432b314a0 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -16,7 +16,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" #"${MINGW_PACKAGE_PREFIX}-lldb" ) pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') url="http://llvm.org" diff --git a/mingw-w64-harfbuzz/PKGBUILD b/mingw-w64-harfbuzz/PKGBUILD index 9dc848bc8bc49..17579f0ecee63 100644 --- a/mingw-w64-harfbuzz/PKGBUILD +++ b/mingw-w64-harfbuzz/PKGBUILD @@ -5,7 +5,7 @@ _realname=harfbuzz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.2.6 -pkgrel=1 +pkgrel=2 pkgdesc="OpenType text shaping engine (mingw-w64)" arch=('any') url="https://www.freedesktop.org/wiki/Software/HarfBuzz" diff --git a/mingw-w64-libelf/PKGBUILD b/mingw-w64-libelf/PKGBUILD index 17781dce3acaf..07de6d70df11c 100644 --- a/mingw-w64-libelf/PKGBUILD +++ b/mingw-w64-libelf/PKGBUILD @@ -4,7 +4,7 @@ _realname=libelf pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=0.8.13 -pkgrel=2 +pkgrel=3 pkgdesc="ELF object file access library (mingw-w64)" arch=('any') license=('LGPL') From d0f2d8dcde9caa1d1a8b98a6e2b8ec924c2fef0f Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Tue, 12 Apr 2016 09:12:01 -0400 Subject: [PATCH 9/9] Revert back to 3.4.1 Revert Back to 3.4.1 until qt5-static-plugin-support.patch can be fixed. --- mingw-w64-cmake/PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD index 61639654aee07..3fb298c7420d6 100644 --- a/mingw-w64-cmake/PKGBUILD +++ b/mingw-w64-cmake/PKGBUILD @@ -3,7 +3,7 @@ _realname=cmake pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.5.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="A cross-platform open-source make system (mingw-w64)" arch=('any') @@ -26,20 +26,20 @@ source=("https://www.cmake.org/files/v${pkgver%.*}/${_realname}-${pkgver}.tar.gz "qt5-static-plugin-support.patch" "pkg-config-without-prefix.patch" "do-not-generate-import-library-for-executables.patch") -sha256sums=('93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8' +sha256sums=('d41462bdd80dc37f0d5608167b354bb3af8c068eee640be04c907154c5c113e2' '76565ffc20010b27e895af7919f35deedc7fd0b86ca8746bbc22329185ad57fa' 'aa816b734bf91941403b25bc9d9fd1797675ce2b4a7311bdb6e3ecae38964c37' - '3558259452883de78b176543de701d8a5757dbaf0d187b07e72256d97e13cabe' + '5470eaf830aa43f37893d34af224915cc9be0c8b2d165a0115d7fd01881b9e69' 'aa807e20e4a2902a8e6f3f36e1cd7d4b043d0df12f4fb0f4e6bd27d9d6842c0f' '8503536bfc6606e147c62cd7bc28f984911a04b7bf8164264c345eacbf68dc5b') prepare() { cd ${_realname}-${pkgver} - patch -Np1 -i "${srcdir}/disable-response-files-for-msys.patch" - patch -Np1 -i "${srcdir}/dont-install-bundle.patch" -# patch -Np1 -i "${srcdir}/qt5-static-plugin-support.patch" - patch -Np1 -i "${srcdir}/pkg-config-without-prefix.patch" - patch -Np1 -i "${srcdir}/do-not-generate-import-library-for-executables.patch" + patch -Np1 -i ${srcdir}/disable-response-files-for-msys.patch + patch -Np1 -i ${srcdir}/dont-install-bundle.patch + patch -Np1 -i ${srcdir}/qt5-static-plugin-support.patch + patch -Np1 -i ${srcdir}/pkg-config-without-prefix.patch + patch -Np1 -i ${srcdir}/do-not-generate-import-library-for-executables.patch } build() {