From 85cb90fbb21386583c5bc842bcee97c24e01a606 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Wed, 1 Jul 2020 09:17:59 +0200 Subject: [PATCH 01/72] update README with current documentation URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7910629cd3..82ee67dbf2 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This repository contains package scripts for MinGW-w64 targets to build under MS MSYS2 is an independent rewrite of MSYS providing a Unix-like environment and command-line interface for Windows making it possible to port software running on POSIX systems (such as Linux, BSD, and Unix systems) to Windows. ## Documentation -See the [MSYS2 wiki](https://github.com/msys2/msys2/wiki). +See the [MSYS2 website](https://www.msys2.org/wiki/Home). ## Using packages You have two options if you want to use these packages: @@ -44,7 +44,7 @@ You have two options if you want to use these packages: ``` ## Creating packages -See the [MSYS2 wiki](https://github.com/msys2/msys2/wiki/Creating-Packages) for instructions and advice about creating MINGW-packages. +See the [MSYS2 documentation](https://www.msys2.org/wiki/Creating-Packages) for instructions and advice about creating MINGW-packages. ## License From 4db1b7cb9196d1a199f4201ede366fa3568db8cc Mon Sep 17 00:00:00 2001 From: Biswa96 Date: Wed, 1 Jul 2020 19:16:06 +0530 Subject: [PATCH 02/72] simdjson: add package --- mingw-w64-simdjson/PKGBUILD | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mingw-w64-simdjson/PKGBUILD diff --git a/mingw-w64-simdjson/PKGBUILD b/mingw-w64-simdjson/PKGBUILD new file mode 100644 index 0000000000..32ab8dc3e7 --- /dev/null +++ b/mingw-w64-simdjson/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Alexey Pavlov + +_realname=simdjson +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.4.5 +pkgrel=1 +pkgdesc="A C++ library to see how fast we can parse JSON with complete validation (mingw-w64)" +arch=('any') +url="https://github.com/lemire/simdjson" +license=('Apache-2.0') +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") +source=("${_realname}-${pkgver}.tar.gz::https://github.com/lemire/simdjson/archive/v${pkgver}.tar.gz") +sha512sums=('97a858378d4e3d4fcf834851d3388119c343506ad0c1b9bd3e8f6f74ad342893553f5e1ef7d5c764e3b508caada94e9c8d4dd087058aff9e759753ebe14b2c1d') + +build() { + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} + mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DSIMDJSON_JUST_LIBRARY=ON \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build ./ +} + +check() { + cd ${srcdir}/build-${MINGW_CHOST} + ${MINGW_PREFIX}/bin/ctest ./ +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install + + install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md + install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE +} From 96c00d1ceb1a639411f893dd2d1d8324d1afe0e9 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 1 Jul 2020 22:22:57 +0200 Subject: [PATCH 03/72] opusfile: Update to 0.12 --- mingw-w64-opusfile/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-opusfile/PKGBUILD b/mingw-w64-opusfile/PKGBUILD index 7ce3979d07..3ac252fbe7 100644 --- a/mingw-w64-opusfile/PKGBUILD +++ b/mingw-w64-opusfile/PKGBUILD @@ -3,8 +3,8 @@ _realname=opusfile pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.11 -pkgrel=2 +pkgver=0.12 +pkgrel=1 pkgdesc="Library for opening, seeking, and decoding .opus files (mingw-w64)" arch=('any') url="https://www.opus-codec.org/" @@ -14,9 +14,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-opus") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('strip' 'staticlibs') -source=("https://ftp.mozilla.org/pub/mozilla.org/opus/${_realname}-${pkgver}.tar.gz" +source=("https://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz" 'no-openssl-wincert.patch') -sha256sums=('74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf' +sha256sums=('118d8601c12dd6a44f52423e68ca9083cc9f2bfe72da7a8c1acb22a80ae3550b' 'c87aac7f63e499cffa10a301f902766559cfc121d0c9f92796b2469d7e1c205b') prepare() { From c17ff82105648d5949d60cb5ecb6c4fad122dfc1 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquemin Date: Tue, 30 Jun 2020 21:52:34 +0200 Subject: [PATCH 04/72] Update Corrade and Magnum to 2020.06. Amended to use zip files instead of cloning from GitHub. --- ...rade-2019.10-fix-corrademain-on-i686.patch | 15 ------- mingw-w64-corrade/PKGBUILD | 23 ++++------- mingw-w64-magnum-integration/PKGBUILD | 29 +++++++++---- mingw-w64-magnum-plugins/PKGBUILD | 41 +++++++++++++++---- mingw-w64-magnum/PKGBUILD | 23 +++++++---- 5 files changed, 78 insertions(+), 53 deletions(-) delete mode 100644 mingw-w64-corrade/001-corrade-2019.10-fix-corrademain-on-i686.patch diff --git a/mingw-w64-corrade/001-corrade-2019.10-fix-corrademain-on-i686.patch b/mingw-w64-corrade/001-corrade-2019.10-fix-corrademain-on-i686.patch deleted file mode 100644 index 448a76940e..0000000000 --- a/mingw-w64-corrade/001-corrade-2019.10-fix-corrademain-on-i686.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Corrade/CorradeMain.cpp b/src/Corrade/CorradeMain.cpp -index cc47a607..e117a6e5 100644 ---- a/src/Corrade/CorradeMain.cpp -+++ b/src/Corrade/CorradeMain.cpp -@@ -28,6 +28,10 @@ - #ifdef CORRADE_TARGET_WINDOWS - #include - -+/* 32-bit MinGW doesn't have implicit __argc / __wargv for some reason: -+ https://github.com/mirror/mingw-w64/blob/f8e2c9ac594259fd2a46746943f84bd8766d7054/mingw-w64-headers/crt/stdlib.h#L178-L189 */ -+#include -+ - /* Use Array, but in a way that doesn't require the whole Utility library - to be linked */ - #define CORRADE_NO_DEBUG \ No newline at end of file diff --git a/mingw-w64-corrade/PKGBUILD b/mingw-w64-corrade/PKGBUILD index 2967e9b58c..c13eb75764 100644 --- a/mingw-w64-corrade/PKGBUILD +++ b/mingw-w64-corrade/PKGBUILD @@ -5,26 +5,21 @@ _realname=corrade pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2019.10 -pkgrel=2 +pkgver=2020.06 +pkgrel=1 pkgdesc='C++11/C++14 multiplatform utility library' arch=('any') url='https://magnum.graphics/corrade/' license=('MIT') -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'git') -# The .tar.gz / .zip download contains symlinks (.travis.yml), making tar and -# unzip on Windows grumpy because dangling symlinks are created. Could be fixed -# by manually extracting everything except symlinks, but that's hard to -# maintain. Downloading a Git tag works. -source=("${_realname}-${pkgver}"::"git+https://github.com/mosra/corrade.git#tag=v$pkgver" - "001-corrade-2019.10-fix-corrademain-on-i686.patch") -sha256sums=('SKIP' - '9b1434577f13c711e9bb703744e8042940725150481cce555bcf456ffb684675') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'unzip') +source=("${_realname}-${pkgver}.zip::https://github.com/mosra/corrade/archive/v${pkgver}.zip") +noextract=("${_realname}-${pkgver}.zip") +sha256sums=('d89a06128c334920d91fecf23cc1df48fd6be26543dc0ed81b2f819a92d70e72') prepare() { - cd "${srcdir}"/${_realname}-${pkgver} - - patch -p1 -i "${srcdir}"/001-corrade-2019.10-fix-corrademain-on-i686.patch + cd ${srcdir} + rm -rf ${_realname}-${pkgver} + unzip ../${_realname}-${pkgver}.zip } build() { diff --git a/mingw-w64-magnum-integration/PKGBUILD b/mingw-w64-magnum-integration/PKGBUILD index 35cfb503a7..74882d29a8 100644 --- a/mingw-w64-magnum-integration/PKGBUILD +++ b/mingw-w64-magnum-integration/PKGBUILD @@ -5,7 +5,8 @@ _realname=magnum-integration pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2019.10 +pkgver=2020.06 +_imgui_pkgver=1.76 pkgrel=1 pkgdesc='Integration libraries for the Magnum C++11/C++14 graphics engine' arch=('any') @@ -13,18 +14,27 @@ url='https://magnum.graphics/' license=('MIT') depends=("${MINGW_PACKAGE_PREFIX}-magnum>=$pkgver" "${MINGW_PACKAGE_PREFIX}-bullet" + "${MINGW_PACKAGE_PREFIX}-eigen3" "${MINGW_PACKAGE_PREFIX}-glm") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'git') -# The .tar.gz / .zip download contains symlinks (.travis.yml), making tar and -# unzip on Windows grumpy because dangling symlinks are created. Could be fixed -# by manually extracting everything except symlinks, but that's hard to -# maintain. Downloading a Git tag works. -source=("${_realname}-${pkgver}"::"git+https://github.com/mosra/magnum-integration.git#tag=v$pkgver") -sha256sums=('SKIP') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'unzip') +source=("${_realname}-${pkgver}.zip::https://github.com/mosra/magnum-integration/archive/v${pkgver}.zip" + "https://github.com/ocornut/imgui/archive/v${_imgui_pkgver}.tar.gz") +noextract=("${_realname}-${pkgver}.zip") +sha256sums=('8e5d7ffc9df300eb9fac9cff24e74d40f9a13f5e952bd3185fb002d4d6ac38ed' + 'e482dda81330d38c87bd81597cacaa89f05e20ed2c4c4a93a64322e97565f6dc') + +prepare() { + cd ${srcdir} + rm -rf ${_realname}-${pkgver} + unzip ../${_realname}-${pkgver}.zip +} build() { mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + # Bundle ImGui + ln -sf $srcdir/imgui-${_imgui_pkgver}/ "$srcdir/${_realname}-${pkgver}/src/MagnumExternal/ImGui" + declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -37,7 +47,10 @@ build() { -G'Ninja' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DWITH_BULLET=ON \ + -DWITH_DART=OFF \ + -DWITH_EIGEN=ON \ -DWITH_GLM=ON \ + -DWITH_IMGUI=ON \ "${extra_config[@]}" \ ../${_realname}-${pkgver} ninja diff --git a/mingw-w64-magnum-plugins/PKGBUILD b/mingw-w64-magnum-plugins/PKGBUILD index 5b0f65055c..c6ede386c3 100644 --- a/mingw-w64-magnum-plugins/PKGBUILD +++ b/mingw-w64-magnum-plugins/PKGBUILD @@ -5,7 +5,9 @@ _realname=magnum-plugins pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2019.10 +pkgver=2020.06 +_basis_pkgver=2f43afcc97d0a5dafdb73b4e24e123cf9687a418 +_meshopt_pkgver=97c52415c6d29f297a76482ddde22f739292446d pkgrel=1 pkgdesc='Plugins for the Magnum C++11/C++14 graphics engine' arch=('any') @@ -14,21 +16,37 @@ license=('MIT') depends=("${MINGW_PACKAGE_PREFIX}-magnum>=$pkgver" "${MINGW_PACKAGE_PREFIX}-assimp" "${MINGW_PACKAGE_PREFIX}-devil" + "${MINGW_PACKAGE_PREFIX}-faad2" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-harfbuzz" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" "${MINGW_PACKAGE_PREFIX}-libpng") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'git') -# The .tar.gz / .zip download contains symlinks (.travis.yml), making tar and -# unzip on Windows grumpy because dangling symlinks are created. Could be fixed -# by manually extracting everything except symlinks, but that's hard to -# maintain. Downloading a Git tag works. -source=("${_realname}-${pkgver}"::"git+https://github.com/mosra/magnum-plugins.git#tag=v$pkgver") -sha256sums=('SKIP') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'unzip') +source=("${_realname}-${pkgver}.zip::https://github.com/mosra/magnum-plugins/archive/v${pkgver}.zip" + # A commit that's before the UASTC support (which is not implemented + # yet, because latest versions crash even on trivial tests) + "https://github.com/BinomialLLC/basis_universal/archive/2f43afcc97d0a5dafdb73b4e24e123cf9687a418.tar.gz" + "https://github.com/zeux/meshoptimizer/archive/97c52415c6d29f297a76482ddde22f739292446d.tar.gz") +noextract=("${_realname}-${pkgver}.zip") +sha256sums=('8e1e98674ef3f0276f68abbdfecef1d72ae95b5a812b78c1ff45dba10fc72e3f' + 'f983ab5bfc5c32474914a87d9ca572c7fb970bf96f7bc68385c08772f633639f' + '57bd3ff2ae1c20a2319979013e36a4472372af20580d323a1ce15f0385d5ed75') + +prepare() { + cd ${srcdir} + rm -rf ${_realname}-${pkgver} + unzip ../${_realname}-${pkgver}.zip +} build() { mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + # Bundle Basis Universal + ln -sf $srcdir/basis_universal-${_basis_pkgver}/ "$srcdir/${_realname}-${pkgver}/src/external/basis-universal" + + # Bundle meshoptimizer + ln -sf $srcdir/meshoptimizer-${_meshopt_pkgver}/ "$srcdir/${_realname}-${pkgver}/src/external/meshoptimizer" + declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -41,19 +59,26 @@ build() { -G'Ninja' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=ON \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ + -DWITH_DRMP3AUDIOIMPORTER=ON \ -DWITH_DRWAVAUDIOIMPORTER=ON \ -DWITH_FREETYPEFONT=ON \ + -DWITH_FAAD2AUDIOIMPORTER=ON \ -DWITH_HARFBUZZFONT=ON \ + -DWITH_ICOIMPORTER=ON \ -DWITH_JPEGIMAGECONVERTER=ON \ -DWITH_JPEGIMPORTER=ON \ -DWITH_MINIEXRIMAGECONVERTER=ON \ + -DWITH_MESHOPTIMIZERSCENECONVERTER=ON \ -DWITH_PNGIMAGECONVERTER=ON \ -DWITH_PNGIMPORTER=ON \ -DWITH_OPENGEXIMPORTER=ON \ + -DWITH_PRIMITIVEIMPORTER=ON \ -DWITH_STANFORDIMPORTER=ON \ + -DWITH_STANFORDSCENECONVERTER=ON \ -DWITH_STBIMAGECONVERTER=ON \ -DWITH_STBIMAGEIMPORTER=ON \ -DWITH_STBTRUETYPEFONT=ON \ diff --git a/mingw-w64-magnum/PKGBUILD b/mingw-w64-magnum/PKGBUILD index 6dbd66cc3b..edd2b36978 100644 --- a/mingw-w64-magnum/PKGBUILD +++ b/mingw-w64-magnum/PKGBUILD @@ -5,7 +5,7 @@ _realname=magnum pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2019.10 +pkgver=2020.06 pkgrel=1 pkgdesc='C++11/C++14 graphics middleware for games and data visualization' arch=('any') @@ -19,13 +19,17 @@ depends=("${MINGW_PACKAGE_PREFIX}-corrade>=$pkgver" makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'git') optdepends=("${MINGW_PACKAGE_PREFIX}-magnum-plugins: import and export features" "${MINGW_PACKAGE_PREFIX}-magnum-integration: integrations with third-party math and physics libraries") -# The .tar.gz / .zip download contains symlinks (.travis.yml), making tar and -# unzip on Windows grumpy because dangling symlinks are created. Could be fixed -# by manually extracting everything except symlinks, but that's hard to -# maintain. Downloading a Git tag works. -source=("${_realname}-${pkgver}"::"git+https://github.com/mosra/magnum.git#tag=v$pkgver") -sha256sums=('SKIP') - +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'unzip') +source=("${_realname}-${pkgver}.zip::https://github.com/mosra/magnum/archive/v${pkgver}.zip") +noextract=("${_realname}-${pkgver}.zip") +sha256sums=('78c52bc403cec27b98d8d87186622ca57f8d70ffd64342fe4094c720b7d3b0e3') + +prepare() { + cd ${srcdir} + rm -rf ${_realname}-${pkgver} + unzip ../${_realname}-${pkgver}.zip +} + build() { mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} @@ -45,6 +49,7 @@ build() { -DWITH_ANYIMAGECONVERTER=ON \ -DWITH_ANYIMAGEIMPORTER=ON \ -DWITH_ANYSCENEIMPORTER=ON \ + -DWITH_ANYSCENECONVERTER=ON \ -DWITH_AUDIO=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_WGLCONTEXT=ON \ @@ -52,6 +57,7 @@ build() { -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_FONTCONVERTER=ON \ -DWITH_GL_INFO=ON \ -DWITH_GLFWAPPLICATION=ON \ @@ -61,6 +67,7 @@ build() { -DWITH_VK=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WINDOWLESSWGLAPPLICATION=ON \ + -DVulkan_LIBRARY=${MINGW_PREFIX}/lib/libvulkan.dll.a \ "${extra_config[@]}" \ ../${_realname}-${pkgver} ninja From 39b673bba083458f3f3c3dad38e52cedb25a0250 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 17:31:31 +0200 Subject: [PATCH 05/72] mlpack: fix patch checksum --- mingw-w64-mlpack/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mlpack/PKGBUILD b/mingw-w64-mlpack/PKGBUILD index ca97a39854..8837c5a3eb 100644 --- a/mingw-w64-mlpack/PKGBUILD +++ b/mingw-w64-mlpack/PKGBUILD @@ -4,7 +4,7 @@ _realname=mlpack pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.1.1 -pkgrel=1 +pkgrel=2 pkgdesc='An intuitive, fast, scalable C++ machine learning library (mingw-w64)' arch=('any') url='https://mlpack.org/' @@ -21,7 +21,7 @@ source=("https://github.com/mlpack/mlpack/archive/${_realname}-${pkgver}.tar.gz" "0001-mingw-w64-cmake.patch" "0002-gcc9-openmp.patch") sha256sums=('161ece5386cea73d69263ecf83a7a1dc5b44527a3d4c174fee231d80ab3e135f' - '303c9c1d6fd12bf24accf63b951d98a8a6bcb3bb5a16df971e91d91accc2f581' + 'd9261f225fb089cd3717d0daf791e2c9ff705da44effd70bb3cbf76318693b91' 'c251d698e3262cab1dc18f6c045429ab70bd10632d40b745159f33a6fadda1cc') _src="mlpack-mlpack-${pkgver}" From 108b40b63694ee011b7ae39d270a6cda529fabf3 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 18:07:38 +0200 Subject: [PATCH 06/72] lapack: fix the build use two patches merged upstream --- .../367-lapacke-missing-symbols.patch | 138 ++ .../370-fix-xgesvd-build-error.patch | 1112 +++++++++++++++++ mingw-w64-lapack/PKGBUILD | 19 +- 3 files changed, 1266 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-lapack/367-lapacke-missing-symbols.patch create mode 100644 mingw-w64-lapack/370-fix-xgesvd-build-error.patch diff --git a/mingw-w64-lapack/367-lapacke-missing-symbols.patch b/mingw-w64-lapack/367-lapacke-missing-symbols.patch new file mode 100644 index 0000000000..9c0fb4e56e --- /dev/null +++ b/mingw-w64-lapack/367-lapacke-missing-symbols.patch @@ -0,0 +1,138 @@ +From 87536aa3c8bb0af00f66088fb6ac05d87509e011 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= +Date: Sat, 23 Nov 2019 12:22:20 +0100 +Subject: [PATCH] Restore missing prototypes for deprecated LAPACK functions + +Some LAPACK functions prototypes were inadvertedly dropped in 3.9.0. As a +consequence, LAPACKE has several unresolved symbols. + +Closes #365 +--- + LAPACKE/include/lapack.h | 100 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 100 insertions(+) + +diff --git a/LAPACKE/include/lapack.h b/LAPACKE/include/lapack.h +index 3f425325f..5c131d844 100644 +--- a/LAPACKE/include/lapack.h ++++ b/LAPACKE/include/lapack.h +@@ -1842,6 +1842,28 @@ void LAPACK_zgeqlf( + lapack_complex_double* work, lapack_int const* lwork, + lapack_int* info ); + ++#define LAPACK_sgeqpf LAPACK_GLOBAL(sgeqpf,SGEQPF) ++void LAPACK_sgeqpf( lapack_int* m, lapack_int* n, float* a, lapack_int* lda, ++ lapack_int* jpvt, float* tau, float* work, ++ lapack_int *info ); ++ ++#define LAPACK_dgeqpf LAPACK_GLOBAL(dgeqpf,DGEQPF) ++void LAPACK_dgeqpf( lapack_int* m, lapack_int* n, double* a, lapack_int* lda, ++ lapack_int* jpvt, double* tau, double* work, ++ lapack_int *info ); ++ ++#define LAPACK_cgeqpf LAPACK_GLOBAL(cgeqpf,CGEQPF) ++void LAPACK_cgeqpf( lapack_int* m, lapack_int* n, lapack_complex_float* a, ++ lapack_int* lda, lapack_int* jpvt, ++ lapack_complex_float* tau, lapack_complex_float* work, ++ float* rwork, lapack_int *info ); ++ ++#define LAPACK_zgeqpf LAPACK_GLOBAL(zgeqpf,ZGEQPF) ++void LAPACK_zgeqpf( lapack_int* m, lapack_int* n, lapack_complex_double* a, ++ lapack_int* lda, lapack_int* jpvt, ++ lapack_complex_double* tau, lapack_complex_double* work, ++ double* rwork, lapack_int *info ); ++ + #define LAPACK_cgeqp3 LAPACK_GLOBAL(cgeqp3,CGEQP3) + void LAPACK_cgeqp3( + lapack_int const* m, lapack_int const* n, +@@ -3617,6 +3639,47 @@ void LAPACK_zggrqf( + lapack_complex_double* work, lapack_int const* lwork, + lapack_int* info ); + ++#define LAPACK_sggsvd LAPACK_GLOBAL(sggsvd,SGGSVD) ++lapack_int LAPACKE_sggsvd( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int n, lapack_int p, ++ lapack_int* k, lapack_int* l, float* a, ++ lapack_int lda, float* b, lapack_int ldb, ++ float* alpha, float* beta, float* u, lapack_int ldu, ++ float* v, lapack_int ldv, float* q, lapack_int ldq, ++ lapack_int* iwork ); ++ ++#define LAPACK_dggsvd LAPACK_GLOBAL(dggsvd,DGGSVD) ++lapack_int LAPACKE_dggsvd( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int n, lapack_int p, ++ lapack_int* k, lapack_int* l, double* a, ++ lapack_int lda, double* b, lapack_int ldb, ++ double* alpha, double* beta, double* u, ++ lapack_int ldu, double* v, lapack_int ldv, double* q, ++ lapack_int ldq, lapack_int* iwork ); ++ ++#define LAPACK_cggsvd LAPACK_GLOBAL(cggsvd,CGGSVD) ++lapack_int LAPACKE_cggsvd( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int n, lapack_int p, ++ lapack_int* k, lapack_int* l, ++ lapack_complex_float* a, lapack_int lda, ++ lapack_complex_float* b, lapack_int ldb, ++ float* alpha, float* beta, lapack_complex_float* u, ++ lapack_int ldu, lapack_complex_float* v, ++ lapack_int ldv, lapack_complex_float* q, ++ lapack_int ldq, lapack_int* iwork ); ++ ++#define LAPACK_zggsvd LAPACK_GLOBAL(zggsvd,ZGGSVD) ++lapack_int LAPACKE_zggsvd( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int n, lapack_int p, ++ lapack_int* k, lapack_int* l, ++ lapack_complex_double* a, lapack_int lda, ++ lapack_complex_double* b, lapack_int ldb, ++ double* alpha, double* beta, ++ lapack_complex_double* u, lapack_int ldu, ++ lapack_complex_double* v, lapack_int ldv, ++ lapack_complex_double* q, lapack_int ldq, ++ lapack_int* iwork ); ++ + #define LAPACK_cggsvd3 LAPACK_GLOBAL(cggsvd3,CGGSVD3) + void LAPACK_cggsvd3( + char const* jobu, char const* jobv, char const* jobq, +@@ -3679,6 +3742,43 @@ void LAPACK_zggsvd3( + lapack_int* iwork, + lapack_int* info ); + ++#define LAPACK_sggsvp LAPACK_GLOBAL(sggsvp,SGGSVP) ++lapack_int LAPACKE_sggsvp( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int p, lapack_int n, float* a, ++ lapack_int lda, float* b, lapack_int ldb, float tola, ++ float tolb, lapack_int* k, lapack_int* l, float* u, ++ lapack_int ldu, float* v, lapack_int ldv, float* q, ++ lapack_int ldq ); ++ ++#define LAPACK_dggsvp LAPACK_GLOBAL(dggsvp,DGGSVP) ++lapack_int LAPACKE_dggsvp( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int p, lapack_int n, double* a, ++ lapack_int lda, double* b, lapack_int ldb, ++ double tola, double tolb, lapack_int* k, ++ lapack_int* l, double* u, lapack_int ldu, double* v, ++ lapack_int ldv, double* q, lapack_int ldq ); ++ ++#define LAPACK_cggsvp LAPACK_GLOBAL(cggsvp,CGGSVP) ++lapack_int LAPACKE_cggsvp( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int p, lapack_int n, ++ lapack_complex_float* a, lapack_int lda, ++ lapack_complex_float* b, lapack_int ldb, float tola, ++ float tolb, lapack_int* k, lapack_int* l, ++ lapack_complex_float* u, lapack_int ldu, ++ lapack_complex_float* v, lapack_int ldv, ++ lapack_complex_float* q, lapack_int ldq ); ++ ++#define LAPACK_zggsvp LAPACK_GLOBAL(zggsvp,ZGGSVP) ++lapack_int LAPACKE_zggsvp( int matrix_layout, char jobu, char jobv, char jobq, ++ lapack_int m, lapack_int p, lapack_int n, ++ lapack_complex_double* a, lapack_int lda, ++ lapack_complex_double* b, lapack_int ldb, ++ double tola, double tolb, lapack_int* k, ++ lapack_int* l, lapack_complex_double* u, ++ lapack_int ldu, lapack_complex_double* v, ++ lapack_int ldv, lapack_complex_double* q, ++ lapack_int ldq ); ++ + #define LAPACK_cggsvp3 LAPACK_GLOBAL(cggsvp3,CGGSVP3) + void LAPACK_cggsvp3( + char const* jobu, char const* jobv, char const* jobq, diff --git a/mingw-w64-lapack/370-fix-xgesvd-build-error.patch b/mingw-w64-lapack/370-fix-xgesvd-build-error.patch new file mode 100644 index 0000000000..0c99749d6f --- /dev/null +++ b/mingw-w64-lapack/370-fix-xgesvd-build-error.patch @@ -0,0 +1,1112 @@ +From 489a2884c22e8593ec47bfe7c84ab451b0c0d3d9 Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Mon, 25 Nov 2019 19:41:16 +0100 +Subject: [PATCH 1/2] Fix MinGW build error + +With MinGW the build fails for some LAPACKE xgesvd routines with: +lapacke_cgesvdq.c:74:5: error: aggregate value used where an integer was expected +Seems the C2INT macro is useful there. +--- + LAPACKE/src/lapacke_cgesvdq.c | 2 +- + LAPACKE/src/lapacke_zgesvdq.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/LAPACKE/src/lapacke_cgesvdq.c b/LAPACKE/src/lapacke_cgesvdq.c +index 801569453..6ecd06962 100644 +--- a/LAPACKE/src/lapacke_cgesvdq.c ++++ b/LAPACKE/src/lapacke_cgesvdq.c +@@ -71,7 +71,7 @@ lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp, + goto exit_level_0; + } + liwork = (lapack_int)iwork_query; +- lcwork = (lapack_int)cwork_query; ++ lcwork = LAPACK_C2INT(cwork_query); + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_zgesvdq.c b/LAPACKE/src/lapacke_zgesvdq.c +index 7c205dab3..1674138fc 100644 +--- a/LAPACKE/src/lapacke_zgesvdq.c ++++ b/LAPACKE/src/lapacke_zgesvdq.c +@@ -71,7 +71,7 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp, + goto exit_level_0; + } + liwork = (lapack_int)iwork_query; +- lcwork = (lapack_int)cwork_query; ++ lcwork = LAPACK_C2INT(cwork_query); + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); + +From 74cecfb96ac5e541aaac88082851c6598f1cc0fd Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Mon, 25 Nov 2019 20:21:50 +0100 +Subject: [PATCH 2/2] Remove unnecessary lapack_int cast + +--- + LAPACKE/src/lapacke_cgelsd.c | 2 +- + LAPACKE/src/lapacke_cgesvdq.c | 2 +- + LAPACKE/src/lapacke_cggesx.c | 2 +- + LAPACKE/src/lapacke_chbevd.c | 2 +- + LAPACKE/src/lapacke_chbevd_2stage.c | 2 +- + LAPACKE/src/lapacke_chbgvd.c | 2 +- + LAPACKE/src/lapacke_cheevd.c | 2 +- + LAPACKE/src/lapacke_cheevd_2stage.c | 2 +- + LAPACKE/src/lapacke_cheevr.c | 2 +- + LAPACKE/src/lapacke_cheevr_2stage.c | 2 +- + LAPACKE/src/lapacke_chegvd.c | 2 +- + LAPACKE/src/lapacke_chpevd.c | 2 +- + LAPACKE/src/lapacke_chpgvd.c | 2 +- + LAPACKE/src/lapacke_cstedc.c | 2 +- + LAPACKE/src/lapacke_cstegr.c | 2 +- + LAPACKE/src/lapacke_cstemr.c | 2 +- + LAPACKE/src/lapacke_ctgsen.c | 2 +- + LAPACKE/src/lapacke_dgeesx.c | 2 +- + LAPACKE/src/lapacke_dgelsd.c | 2 +- + LAPACKE/src/lapacke_dgesvdq.c | 2 +- + LAPACKE/src/lapacke_dggesx.c | 2 +- + LAPACKE/src/lapacke_dsbevd.c | 2 +- + LAPACKE/src/lapacke_dsbevd_2stage.c | 2 +- + LAPACKE/src/lapacke_dsbgvd.c | 2 +- + LAPACKE/src/lapacke_dspevd.c | 2 +- + LAPACKE/src/lapacke_dspgvd.c | 2 +- + LAPACKE/src/lapacke_dstedc.c | 2 +- + LAPACKE/src/lapacke_dstegr.c | 2 +- + LAPACKE/src/lapacke_dstemr.c | 2 +- + LAPACKE/src/lapacke_dstevd.c | 2 +- + LAPACKE/src/lapacke_dstevr.c | 2 +- + LAPACKE/src/lapacke_dsyevd.c | 2 +- + LAPACKE/src/lapacke_dsyevd_2stage.c | 2 +- + LAPACKE/src/lapacke_dsyevr.c | 2 +- + LAPACKE/src/lapacke_dsyevr_2stage.c | 2 +- + LAPACKE/src/lapacke_dsygvd.c | 2 +- + LAPACKE/src/lapacke_dtgsen.c | 2 +- + LAPACKE/src/lapacke_dtrsen.c | 2 +- + LAPACKE/src/lapacke_sgeesx.c | 2 +- + LAPACKE/src/lapacke_sgelsd.c | 2 +- + LAPACKE/src/lapacke_sgesvdq.c | 2 +- + LAPACKE/src/lapacke_sggesx.c | 2 +- + LAPACKE/src/lapacke_ssbevd.c | 2 +- + LAPACKE/src/lapacke_ssbevd_2stage.c | 2 +- + LAPACKE/src/lapacke_ssbgvd.c | 2 +- + LAPACKE/src/lapacke_sspevd.c | 2 +- + LAPACKE/src/lapacke_sspgvd.c | 2 +- + LAPACKE/src/lapacke_sstedc.c | 2 +- + LAPACKE/src/lapacke_sstegr.c | 2 +- + LAPACKE/src/lapacke_sstemr.c | 2 +- + LAPACKE/src/lapacke_sstevd.c | 2 +- + LAPACKE/src/lapacke_sstevr.c | 2 +- + LAPACKE/src/lapacke_ssyevd.c | 2 +- + LAPACKE/src/lapacke_ssyevd_2stage.c | 2 +- + LAPACKE/src/lapacke_ssyevr.c | 2 +- + LAPACKE/src/lapacke_ssyevr_2stage.c | 2 +- + LAPACKE/src/lapacke_ssygvd.c | 2 +- + LAPACKE/src/lapacke_stgsen.c | 2 +- + LAPACKE/src/lapacke_strsen.c | 2 +- + LAPACKE/src/lapacke_zgelsd.c | 2 +- + LAPACKE/src/lapacke_zgesvdq.c | 2 +- + LAPACKE/src/lapacke_zggesx.c | 2 +- + LAPACKE/src/lapacke_zhbevd.c | 2 +- + LAPACKE/src/lapacke_zhbevd_2stage.c | 2 +- + LAPACKE/src/lapacke_zhbgvd.c | 2 +- + LAPACKE/src/lapacke_zheevd.c | 2 +- + LAPACKE/src/lapacke_zheevd_2stage.c | 2 +- + LAPACKE/src/lapacke_zheevr.c | 2 +- + LAPACKE/src/lapacke_zheevr_2stage.c | 2 +- + LAPACKE/src/lapacke_zhegvd.c | 2 +- + LAPACKE/src/lapacke_zhpevd.c | 2 +- + LAPACKE/src/lapacke_zhpgvd.c | 2 +- + LAPACKE/src/lapacke_zstedc.c | 2 +- + LAPACKE/src/lapacke_zstegr.c | 2 +- + LAPACKE/src/lapacke_zstemr.c | 2 +- + LAPACKE/src/lapacke_ztgsen.c | 2 +- + 76 files changed, 76 insertions(+), 76 deletions(-) + +diff --git a/LAPACKE/src/lapacke_cgelsd.c b/LAPACKE/src/lapacke_cgelsd.c +index 2ee891977..9d022dae6 100644 +--- a/LAPACKE/src/lapacke_cgelsd.c ++++ b/LAPACKE/src/lapacke_cgelsd.c +@@ -75,7 +75,7 @@ lapack_int LAPACKE_cgelsd( int matrix_layout, lapack_int m, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cgesvdq.c b/LAPACKE/src/lapacke_cgesvdq.c +index 6ecd06962..91458136c 100644 +--- a/LAPACKE/src/lapacke_cgesvdq.c ++++ b/LAPACKE/src/lapacke_cgesvdq.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_cgesvdq( int matrix_layout, char joba, char jobp, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lcwork = LAPACK_C2INT(cwork_query); + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cggesx.c b/LAPACKE/src/lapacke_cggesx.c +index fc939a314..9581691c6 100644 +--- a/LAPACKE/src/lapacke_cggesx.c ++++ b/LAPACKE/src/lapacke_cggesx.c +@@ -91,7 +91,7 @@ lapack_int LAPACKE_cggesx( int matrix_layout, char jobvsl, char jobvsr, + if( info != 0 ) { + goto exit_level_2; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_chbevd.c b/LAPACKE/src/lapacke_chbevd.c +index 024cf2585..b4af255a9 100644 +--- a/LAPACKE/src/lapacke_chbevd.c ++++ b/LAPACKE/src/lapacke_chbevd.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_chbevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_chbevd_2stage.c b/LAPACKE/src/lapacke_chbevd_2stage.c +index 63f7d8ccb..e8e9a6830 100644 +--- a/LAPACKE/src/lapacke_chbevd_2stage.c ++++ b/LAPACKE/src/lapacke_chbevd_2stage.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_chbevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_chbgvd.c b/LAPACKE/src/lapacke_chbgvd.c +index d44f6c622..5a7331d87 100644 +--- a/LAPACKE/src/lapacke_chbgvd.c ++++ b/LAPACKE/src/lapacke_chbgvd.c +@@ -71,7 +71,7 @@ lapack_int LAPACKE_chbgvd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cheevd.c b/LAPACKE/src/lapacke_cheevd.c +index 3531f3eab..75fa47915 100644 +--- a/LAPACKE/src/lapacke_cheevd.c ++++ b/LAPACKE/src/lapacke_cheevd.c +@@ -65,7 +65,7 @@ lapack_int LAPACKE_cheevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cheevd_2stage.c b/LAPACKE/src/lapacke_cheevd_2stage.c +index f5ec6d757..cb4d34a09 100644 +--- a/LAPACKE/src/lapacke_cheevd_2stage.c ++++ b/LAPACKE/src/lapacke_cheevd_2stage.c +@@ -65,7 +65,7 @@ lapack_int LAPACKE_cheevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cheevr.c b/LAPACKE/src/lapacke_cheevr.c +index 6fe261624..f277e7f70 100644 +--- a/LAPACKE/src/lapacke_cheevr.c ++++ b/LAPACKE/src/lapacke_cheevr.c +@@ -83,7 +83,7 @@ lapack_int LAPACKE_cheevr( int matrix_layout, char jobz, char range, char uplo, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cheevr_2stage.c b/LAPACKE/src/lapacke_cheevr_2stage.c +index 5b3f5c77a..a09eac1bd 100644 +--- a/LAPACKE/src/lapacke_cheevr_2stage.c ++++ b/LAPACKE/src/lapacke_cheevr_2stage.c +@@ -83,7 +83,7 @@ lapack_int LAPACKE_cheevr_2stage( int matrix_layout, char jobz, char range, char + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_chegvd.c b/LAPACKE/src/lapacke_chegvd.c +index 2959cb0dc..98c901982 100644 +--- a/LAPACKE/src/lapacke_chegvd.c ++++ b/LAPACKE/src/lapacke_chegvd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_chegvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_chpevd.c b/LAPACKE/src/lapacke_chpevd.c +index 47c7bbe23..fbdb73802 100644 +--- a/LAPACKE/src/lapacke_chpevd.c ++++ b/LAPACKE/src/lapacke_chpevd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_chpevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_chpgvd.c b/LAPACKE/src/lapacke_chpgvd.c +index 568882ec9..587d1509a 100644 +--- a/LAPACKE/src/lapacke_chpgvd.c ++++ b/LAPACKE/src/lapacke_chpgvd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_chpgvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cstedc.c b/LAPACKE/src/lapacke_cstedc.c +index 5be3cec70..3c0be27d5 100644 +--- a/LAPACKE/src/lapacke_cstedc.c ++++ b/LAPACKE/src/lapacke_cstedc.c +@@ -73,7 +73,7 @@ lapack_int LAPACKE_cstedc( int matrix_layout, char compz, lapack_int n, float* d + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_cstegr.c b/LAPACKE/src/lapacke_cstegr.c +index 986702e62..86a0cd72d 100644 +--- a/LAPACKE/src/lapacke_cstegr.c ++++ b/LAPACKE/src/lapacke_cstegr.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_cstegr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_cstemr.c b/LAPACKE/src/lapacke_cstemr.c +index 9b9b84e49..51e63c675 100644 +--- a/LAPACKE/src/lapacke_cstemr.c ++++ b/LAPACKE/src/lapacke_cstemr.c +@@ -75,7 +75,7 @@ lapack_int LAPACKE_cstemr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ctgsen.c b/LAPACKE/src/lapacke_ctgsen.c +index e2f38c87b..6bfcdc996 100644 +--- a/LAPACKE/src/lapacke_ctgsen.c ++++ b/LAPACKE/src/lapacke_ctgsen.c +@@ -84,7 +84,7 @@ lapack_int LAPACKE_ctgsen( int matrix_layout, lapack_int ijob, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = LAPACK_C2INT( work_query ); + /* Allocate memory for work arrays */ + if( ijob != 0 ) { +diff --git a/LAPACKE/src/lapacke_dgeesx.c b/LAPACKE/src/lapacke_dgeesx.c +index 27647954b..193d65737 100644 +--- a/LAPACKE/src/lapacke_dgeesx.c ++++ b/LAPACKE/src/lapacke_dgeesx.c +@@ -76,7 +76,7 @@ lapack_int LAPACKE_dgeesx( int matrix_layout, char jobvs, char sort, + if( info != 0 ) { + goto exit_level_1; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) { +diff --git a/LAPACKE/src/lapacke_dgelsd.c b/LAPACKE/src/lapacke_dgelsd.c +index 6750597bb..790119596 100644 +--- a/LAPACKE/src/lapacke_dgelsd.c ++++ b/LAPACKE/src/lapacke_dgelsd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_dgelsd( int matrix_layout, lapack_int m, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dgesvdq.c b/LAPACKE/src/lapacke_dgesvdq.c +index b0f923297..7bf831f8b 100644 +--- a/LAPACKE/src/lapacke_dgesvdq.c ++++ b/LAPACKE/src/lapacke_dgesvdq.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_dgesvdq( int matrix_layout, char joba, char jobp, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_dggesx.c b/LAPACKE/src/lapacke_dggesx.c +index 36addda74..91eb7bf8c 100644 +--- a/LAPACKE/src/lapacke_dggesx.c ++++ b/LAPACKE/src/lapacke_dggesx.c +@@ -82,7 +82,7 @@ lapack_int LAPACKE_dggesx( int matrix_layout, char jobvsl, char jobvsr, + if( info != 0 ) { + goto exit_level_1; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsbevd.c b/LAPACKE/src/lapacke_dsbevd.c +index 4ecd1b522..3a9abbbe1 100644 +--- a/LAPACKE/src/lapacke_dsbevd.c ++++ b/LAPACKE/src/lapacke_dsbevd.c +@@ -62,7 +62,7 @@ lapack_int LAPACKE_dsbevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsbevd_2stage.c b/LAPACKE/src/lapacke_dsbevd_2stage.c +index b0ccc0b1e..4d42b6208 100644 +--- a/LAPACKE/src/lapacke_dsbevd_2stage.c ++++ b/LAPACKE/src/lapacke_dsbevd_2stage.c +@@ -62,7 +62,7 @@ lapack_int LAPACKE_dsbevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsbgvd.c b/LAPACKE/src/lapacke_dsbgvd.c +index 36f912ee5..cab2a64bb 100644 +--- a/LAPACKE/src/lapacke_dsbgvd.c ++++ b/LAPACKE/src/lapacke_dsbgvd.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_dsbgvd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dspevd.c b/LAPACKE/src/lapacke_dspevd.c +index 3b6b25d5e..c7d93b6b3 100644 +--- a/LAPACKE/src/lapacke_dspevd.c ++++ b/LAPACKE/src/lapacke_dspevd.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_dspevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dspgvd.c b/LAPACKE/src/lapacke_dspgvd.c +index 8ca478ed1..b49ce95ec 100644 +--- a/LAPACKE/src/lapacke_dspgvd.c ++++ b/LAPACKE/src/lapacke_dspgvd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_dspgvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dstedc.c b/LAPACKE/src/lapacke_dstedc.c +index 4f88a04c4..16e308450 100644 +--- a/LAPACKE/src/lapacke_dstedc.c ++++ b/LAPACKE/src/lapacke_dstedc.c +@@ -69,7 +69,7 @@ lapack_int LAPACKE_dstedc( int matrix_layout, char compz, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dstegr.c b/LAPACKE/src/lapacke_dstegr.c +index 9191f0a9f..7e4f9d694 100644 +--- a/LAPACKE/src/lapacke_dstegr.c ++++ b/LAPACKE/src/lapacke_dstegr.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_dstegr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dstemr.c b/LAPACKE/src/lapacke_dstemr.c +index 8dc2bd237..1a3b0ac7b 100644 +--- a/LAPACKE/src/lapacke_dstemr.c ++++ b/LAPACKE/src/lapacke_dstemr.c +@@ -75,7 +75,7 @@ lapack_int LAPACKE_dstemr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dstevd.c b/LAPACKE/src/lapacke_dstevd.c +index e824a164b..251a2ae2e 100644 +--- a/LAPACKE/src/lapacke_dstevd.c ++++ b/LAPACKE/src/lapacke_dstevd.c +@@ -64,7 +64,7 @@ lapack_int LAPACKE_dstevd( int matrix_layout, char jobz, lapack_int n, double* d + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dstevr.c b/LAPACKE/src/lapacke_dstevr.c +index fd53e0ac0..d49e0ff1c 100644 +--- a/LAPACKE/src/lapacke_dstevr.c ++++ b/LAPACKE/src/lapacke_dstevr.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_dstevr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsyevd.c b/LAPACKE/src/lapacke_dsyevd.c +index 8989f9cfa..d6772ea01 100644 +--- a/LAPACKE/src/lapacke_dsyevd.c ++++ b/LAPACKE/src/lapacke_dsyevd.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_dsyevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsyevd_2stage.c b/LAPACKE/src/lapacke_dsyevd_2stage.c +index 996306574..e866451a5 100644 +--- a/LAPACKE/src/lapacke_dsyevd_2stage.c ++++ b/LAPACKE/src/lapacke_dsyevd_2stage.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_dsyevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsyevr.c b/LAPACKE/src/lapacke_dsyevr.c +index bae72f6c3..290ae0bd4 100644 +--- a/LAPACKE/src/lapacke_dsyevr.c ++++ b/LAPACKE/src/lapacke_dsyevr.c +@@ -78,7 +78,7 @@ lapack_int LAPACKE_dsyevr( int matrix_layout, char jobz, char range, char uplo, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsyevr_2stage.c b/LAPACKE/src/lapacke_dsyevr_2stage.c +index dad20209e..7ee7dbc0b 100644 +--- a/LAPACKE/src/lapacke_dsyevr_2stage.c ++++ b/LAPACKE/src/lapacke_dsyevr_2stage.c +@@ -78,7 +78,7 @@ lapack_int LAPACKE_dsyevr_2stage( int matrix_layout, char jobz, char range, char + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dsygvd.c b/LAPACKE/src/lapacke_dsygvd.c +index 907ad50bd..51f333359 100644 +--- a/LAPACKE/src/lapacke_dsygvd.c ++++ b/LAPACKE/src/lapacke_dsygvd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_dsygvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_dtgsen.c b/LAPACKE/src/lapacke_dtgsen.c +index 2cb7fce4b..baa63abe7 100644 +--- a/LAPACKE/src/lapacke_dtgsen.c ++++ b/LAPACKE/src/lapacke_dtgsen.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_dtgsen( int matrix_layout, lapack_int ijob, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( ijob != 0 ) { +diff --git a/LAPACKE/src/lapacke_dtrsen.c b/LAPACKE/src/lapacke_dtrsen.c +index 521bc2701..67932fd98 100644 +--- a/LAPACKE/src/lapacke_dtrsen.c ++++ b/LAPACKE/src/lapacke_dtrsen.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_dtrsen( int matrix_layout, char job, char compq, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) { +diff --git a/LAPACKE/src/lapacke_sgeesx.c b/LAPACKE/src/lapacke_sgeesx.c +index 91cfc4fa5..0bc14b33e 100644 +--- a/LAPACKE/src/lapacke_sgeesx.c ++++ b/LAPACKE/src/lapacke_sgeesx.c +@@ -76,7 +76,7 @@ lapack_int LAPACKE_sgeesx( int matrix_layout, char jobvs, char sort, + if( info != 0 ) { + goto exit_level_1; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( LAPACKE_lsame( sense, 'b' ) || LAPACKE_lsame( sense, 'v' ) ) { +diff --git a/LAPACKE/src/lapacke_sgelsd.c b/LAPACKE/src/lapacke_sgelsd.c +index fc42b1eec..9d00ded10 100644 +--- a/LAPACKE/src/lapacke_sgelsd.c ++++ b/LAPACKE/src/lapacke_sgelsd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_sgelsd( int matrix_layout, lapack_int m, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sgesvdq.c b/LAPACKE/src/lapacke_sgesvdq.c +index 8330a6d0d..5ff543d10 100644 +--- a/LAPACKE/src/lapacke_sgesvdq.c ++++ b/LAPACKE/src/lapacke_sgesvdq.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_sgesvdq( int matrix_layout, char joba, char jobp, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_sggesx.c b/LAPACKE/src/lapacke_sggesx.c +index f0acb70a4..d552a2010 100644 +--- a/LAPACKE/src/lapacke_sggesx.c ++++ b/LAPACKE/src/lapacke_sggesx.c +@@ -82,7 +82,7 @@ lapack_int LAPACKE_sggesx( int matrix_layout, char jobvsl, char jobvsr, + if( info != 0 ) { + goto exit_level_1; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssbevd.c b/LAPACKE/src/lapacke_ssbevd.c +index 3acdeb95d..b41e5b156 100644 +--- a/LAPACKE/src/lapacke_ssbevd.c ++++ b/LAPACKE/src/lapacke_ssbevd.c +@@ -62,7 +62,7 @@ lapack_int LAPACKE_ssbevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssbevd_2stage.c b/LAPACKE/src/lapacke_ssbevd_2stage.c +index 2eda9cde9..a76d92c71 100644 +--- a/LAPACKE/src/lapacke_ssbevd_2stage.c ++++ b/LAPACKE/src/lapacke_ssbevd_2stage.c +@@ -62,7 +62,7 @@ lapack_int LAPACKE_ssbevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssbgvd.c b/LAPACKE/src/lapacke_ssbgvd.c +index a6c036846..b40ccb9e5 100644 +--- a/LAPACKE/src/lapacke_ssbgvd.c ++++ b/LAPACKE/src/lapacke_ssbgvd.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_ssbgvd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sspevd.c b/LAPACKE/src/lapacke_sspevd.c +index bd06a8ba6..9b518751b 100644 +--- a/LAPACKE/src/lapacke_sspevd.c ++++ b/LAPACKE/src/lapacke_sspevd.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_sspevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sspgvd.c b/LAPACKE/src/lapacke_sspgvd.c +index 749abb0b1..e80e24647 100644 +--- a/LAPACKE/src/lapacke_sspgvd.c ++++ b/LAPACKE/src/lapacke_sspgvd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_sspgvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sstedc.c b/LAPACKE/src/lapacke_sstedc.c +index 157874668..f902e8c30 100644 +--- a/LAPACKE/src/lapacke_sstedc.c ++++ b/LAPACKE/src/lapacke_sstedc.c +@@ -69,7 +69,7 @@ lapack_int LAPACKE_sstedc( int matrix_layout, char compz, lapack_int n, float* d + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sstegr.c b/LAPACKE/src/lapacke_sstegr.c +index c6a73b2b4..c02372ba2 100644 +--- a/LAPACKE/src/lapacke_sstegr.c ++++ b/LAPACKE/src/lapacke_sstegr.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_sstegr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sstemr.c b/LAPACKE/src/lapacke_sstemr.c +index 4229819ab..65dcc9170 100644 +--- a/LAPACKE/src/lapacke_sstemr.c ++++ b/LAPACKE/src/lapacke_sstemr.c +@@ -74,7 +74,7 @@ lapack_int LAPACKE_sstemr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sstevd.c b/LAPACKE/src/lapacke_sstevd.c +index 9f9e2e79e..c5db5d79d 100644 +--- a/LAPACKE/src/lapacke_sstevd.c ++++ b/LAPACKE/src/lapacke_sstevd.c +@@ -64,7 +64,7 @@ lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_sstevr.c b/LAPACKE/src/lapacke_sstevr.c +index f45c49087..4043e3090 100644 +--- a/LAPACKE/src/lapacke_sstevr.c ++++ b/LAPACKE/src/lapacke_sstevr.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssyevd.c b/LAPACKE/src/lapacke_ssyevd.c +index cc28b6467..f5924bd94 100644 +--- a/LAPACKE/src/lapacke_ssyevd.c ++++ b/LAPACKE/src/lapacke_ssyevd.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssyevd_2stage.c b/LAPACKE/src/lapacke_ssyevd_2stage.c +index 4251d4b08..40ef1bcc2 100644 +--- a/LAPACKE/src/lapacke_ssyevd_2stage.c ++++ b/LAPACKE/src/lapacke_ssyevd_2stage.c +@@ -61,7 +61,7 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssyevr.c b/LAPACKE/src/lapacke_ssyevr.c +index d7e050143..3274f6bab 100644 +--- a/LAPACKE/src/lapacke_ssyevr.c ++++ b/LAPACKE/src/lapacke_ssyevr.c +@@ -78,7 +78,7 @@ lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssyevr_2stage.c b/LAPACKE/src/lapacke_ssyevr_2stage.c +index cbc3014e9..8958be31d 100644 +--- a/LAPACKE/src/lapacke_ssyevr_2stage.c ++++ b/LAPACKE/src/lapacke_ssyevr_2stage.c +@@ -78,7 +78,7 @@ lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ssygvd.c b/LAPACKE/src/lapacke_ssygvd.c +index 2a1c62aef..5afe8d2de 100644 +--- a/LAPACKE/src/lapacke_ssygvd.c ++++ b/LAPACKE/src/lapacke_ssygvd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_stgsen.c b/LAPACKE/src/lapacke_stgsen.c +index 5464fd22b..d0250eb63 100644 +--- a/LAPACKE/src/lapacke_stgsen.c ++++ b/LAPACKE/src/lapacke_stgsen.c +@@ -81,7 +81,7 @@ lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( ijob != 0 ) { +diff --git a/LAPACKE/src/lapacke_strsen.c b/LAPACKE/src/lapacke_strsen.c +index efba91af8..0ec3ee907 100644 +--- a/LAPACKE/src/lapacke_strsen.c ++++ b/LAPACKE/src/lapacke_strsen.c +@@ -69,7 +69,7 @@ lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) { +diff --git a/LAPACKE/src/lapacke_zgelsd.c b/LAPACKE/src/lapacke_zgelsd.c +index 6d111c69f..eca145090 100644 +--- a/LAPACKE/src/lapacke_zgelsd.c ++++ b/LAPACKE/src/lapacke_zgelsd.c +@@ -75,7 +75,7 @@ lapack_int LAPACKE_zgelsd( int matrix_layout, lapack_int m, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zgesvdq.c b/LAPACKE/src/lapacke_zgesvdq.c +index 1674138fc..f58a5c4e9 100644 +--- a/LAPACKE/src/lapacke_zgesvdq.c ++++ b/LAPACKE/src/lapacke_zgesvdq.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_zgesvdq( int matrix_layout, char joba, char jobp, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lcwork = LAPACK_C2INT(cwork_query); + lrwork = (lapack_int)rwork_query; + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zggesx.c b/LAPACKE/src/lapacke_zggesx.c +index 6b4d27045..53e086753 100644 +--- a/LAPACKE/src/lapacke_zggesx.c ++++ b/LAPACKE/src/lapacke_zggesx.c +@@ -91,7 +91,7 @@ lapack_int LAPACKE_zggesx( int matrix_layout, char jobvsl, char jobvsr, + if( info != 0 ) { + goto exit_level_2; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_zhbevd.c b/LAPACKE/src/lapacke_zhbevd.c +index 95c6d3a54..ac9467496 100644 +--- a/LAPACKE/src/lapacke_zhbevd.c ++++ b/LAPACKE/src/lapacke_zhbevd.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_zhbevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zhbevd_2stage.c b/LAPACKE/src/lapacke_zhbevd_2stage.c +index eca867b28..9b6005b2d 100644 +--- a/LAPACKE/src/lapacke_zhbevd_2stage.c ++++ b/LAPACKE/src/lapacke_zhbevd_2stage.c +@@ -67,7 +67,7 @@ lapack_int LAPACKE_zhbevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zhbgvd.c b/LAPACKE/src/lapacke_zhbgvd.c +index 91bfc0a73..76c3bac3a 100644 +--- a/LAPACKE/src/lapacke_zhbgvd.c ++++ b/LAPACKE/src/lapacke_zhbgvd.c +@@ -71,7 +71,7 @@ lapack_int LAPACKE_zhbgvd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zheevd.c b/LAPACKE/src/lapacke_zheevd.c +index bc2f9d358..1305ebfb3 100644 +--- a/LAPACKE/src/lapacke_zheevd.c ++++ b/LAPACKE/src/lapacke_zheevd.c +@@ -65,7 +65,7 @@ lapack_int LAPACKE_zheevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zheevd_2stage.c b/LAPACKE/src/lapacke_zheevd_2stage.c +index 8e110df8b..63f139435 100644 +--- a/LAPACKE/src/lapacke_zheevd_2stage.c ++++ b/LAPACKE/src/lapacke_zheevd_2stage.c +@@ -65,7 +65,7 @@ lapack_int LAPACKE_zheevd_2stage( int matrix_layout, char jobz, char uplo, lapac + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zheevr.c b/LAPACKE/src/lapacke_zheevr.c +index 52e7a5bee..0d26dc2f9 100644 +--- a/LAPACKE/src/lapacke_zheevr.c ++++ b/LAPACKE/src/lapacke_zheevr.c +@@ -83,7 +83,7 @@ lapack_int LAPACKE_zheevr( int matrix_layout, char jobz, char range, char uplo, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zheevr_2stage.c b/LAPACKE/src/lapacke_zheevr_2stage.c +index faf949aef..6fa69c44b 100644 +--- a/LAPACKE/src/lapacke_zheevr_2stage.c ++++ b/LAPACKE/src/lapacke_zheevr_2stage.c +@@ -83,7 +83,7 @@ lapack_int LAPACKE_zheevr_2stage( int matrix_layout, char jobz, char range, char + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zhegvd.c b/LAPACKE/src/lapacke_zhegvd.c +index 81c3d29b4..1242a0eda 100644 +--- a/LAPACKE/src/lapacke_zhegvd.c ++++ b/LAPACKE/src/lapacke_zhegvd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_zhegvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zhpevd.c b/LAPACKE/src/lapacke_zhpevd.c +index 948bb9c10..a470ca3bb 100644 +--- a/LAPACKE/src/lapacke_zhpevd.c ++++ b/LAPACKE/src/lapacke_zhpevd.c +@@ -66,7 +66,7 @@ lapack_int LAPACKE_zhpevd( int matrix_layout, char jobz, char uplo, lapack_int n + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zhpgvd.c b/LAPACKE/src/lapacke_zhpgvd.c +index be18d3313..91fa26443 100644 +--- a/LAPACKE/src/lapacke_zhpgvd.c ++++ b/LAPACKE/src/lapacke_zhpgvd.c +@@ -70,7 +70,7 @@ lapack_int LAPACKE_zhpgvd( int matrix_layout, lapack_int itype, char jobz, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zstedc.c b/LAPACKE/src/lapacke_zstedc.c +index 1bd7274c1..665c4414f 100644 +--- a/LAPACKE/src/lapacke_zstedc.c ++++ b/LAPACKE/src/lapacke_zstedc.c +@@ -74,7 +74,7 @@ lapack_int LAPACKE_zstedc( int matrix_layout, char compz, lapack_int n, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lrwork = (lapack_int)rwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ +diff --git a/LAPACKE/src/lapacke_zstegr.c b/LAPACKE/src/lapacke_zstegr.c +index 2a65dcc4d..07b5ce81d 100644 +--- a/LAPACKE/src/lapacke_zstegr.c ++++ b/LAPACKE/src/lapacke_zstegr.c +@@ -82,7 +82,7 @@ lapack_int LAPACKE_zstegr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_zstemr.c b/LAPACKE/src/lapacke_zstemr.c +index c1144488e..d1d1d5692 100644 +--- a/LAPACKE/src/lapacke_zstemr.c ++++ b/LAPACKE/src/lapacke_zstemr.c +@@ -75,7 +75,7 @@ lapack_int LAPACKE_zstemr( int matrix_layout, char jobz, char range, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = (lapack_int)work_query; + /* Allocate memory for work arrays */ + iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); +diff --git a/LAPACKE/src/lapacke_ztgsen.c b/LAPACKE/src/lapacke_ztgsen.c +index 60f48ba8f..f6f58becd 100644 +--- a/LAPACKE/src/lapacke_ztgsen.c ++++ b/LAPACKE/src/lapacke_ztgsen.c +@@ -84,7 +84,7 @@ lapack_int LAPACKE_ztgsen( int matrix_layout, lapack_int ijob, + if( info != 0 ) { + goto exit_level_0; + } +- liwork = (lapack_int)iwork_query; ++ liwork = iwork_query; + lwork = LAPACK_Z2INT( work_query ); + /* Allocate memory for work arrays */ + if( ijob != 0 ) { diff --git a/mingw-w64-lapack/PKGBUILD b/mingw-w64-lapack/PKGBUILD index 8e7b0428f2..017e6211e1 100644 --- a/mingw-w64-lapack/PKGBUILD +++ b/mingw-w64-lapack/PKGBUILD @@ -4,7 +4,7 @@ _realname=lapack pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.9.0 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="Linear Algebra PACKage (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran") @@ -12,8 +12,21 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc-fortra options=('strip' 'staticlibs') license=('LGPL') url="https://www.netlib.org/lapack" -source=(${_realname}-${pkgver}.tar.gz::https://github.com/Reference-LAPACK/lapack/archive/v${pkgver}.tar.gz) -sha256sums=('106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573') +source=(${_realname}-${pkgver}.tar.gz::https://github.com/Reference-LAPACK/lapack/archive/v${pkgver}.tar.gz + '370-fix-xgesvd-build-error.patch' + '367-lapacke-missing-symbols.patch') +sha256sums=('106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573' + 'f758f505ea709c4b7dec0ca9870454feabf3e95222a427794c2225207181717c' + '327d62ee39eeb967ce48b4ed0b95e78c6210f688b5c3f944810aafe68d2dadfa') + +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" + + # https://github.com/Reference-LAPACK/lapack/pull/370 + patch -Np1 -i "${srcdir}"/370-fix-xgesvd-build-error.patch + # https://github.com/Reference-LAPACK/lapack/pull/367 + patch -Np1 -i "${srcdir}"/367-lapacke-missing-symbols.patch +} build() { declare -a _btype From 00a39316aba8654bed30c7be760ef6caca7b3173 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 18:49:40 +0200 Subject: [PATCH 07/72] cairo: fix the build --- mingw-w64-cairo/0028-link-libssp.patch | 11 +++++++++++ mingw-w64-cairo/PKGBUILD | 9 ++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-cairo/0028-link-libssp.patch diff --git a/mingw-w64-cairo/0028-link-libssp.patch b/mingw-w64-cairo/0028-link-libssp.patch new file mode 100644 index 0000000000..51b717d067 --- /dev/null +++ b/mingw-w64-cairo/0028-link-libssp.patch @@ -0,0 +1,11 @@ +--- cairo-1.16.0/build/configure.ac.features.orig 2020-07-02 18:38:47.679950700 +0200 ++++ cairo-1.16.0/build/configure.ac.features 2020-07-02 18:36:28.530150600 +0200 +@@ -160,6 +160,8 @@ + CAIRO_LIBS="$CAIRO_LIBS $CAIRO_NONPKGCONFIG_LIBS" + ])dnl + ++CAIRO_LIBS="$CAIRO_LIBS -lssp" ++ + m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE], + [dnl + AC_CONFIG_FILES([$3:$4], diff --git a/mingw-w64-cairo/PKGBUILD b/mingw-w64-cairo/PKGBUILD index efb10a4ada..1297fb2f16 100644 --- a/mingw-w64-cairo/PKGBUILD +++ b/mingw-w64-cairo/PKGBUILD @@ -5,7 +5,7 @@ _realname=cairo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library (mingw-w64)" arch=('any') url="https://cairographics.org/" @@ -33,17 +33,20 @@ source=("https://cairographics.org/releases/cairo-${pkgver}.tar.xz" #"https://cairographics.org/snapshots/cairo-${pkgver}.tar.xz" 0009-standalone-headers.mingw.patch 0026-create-argb-fonts.all.patch - 0027-win32-print-fix-unbounded-surface-assertion.patch) + 0027-win32-print-fix-unbounded-surface-assertion.patch + 0028-link-libssp.patch) sha256sums=('5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331' '234de8c5d4c28b03c19e638a353e8defb2de0367a634c002b0ea7d2877bd0756' '6db6c44fbdb4926d09afa978fe80430186c4b7b7d255059602b1f94c6a079975' - '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781') + '7e244c20eec8c7b287dbee1d34de178d9b0c419dc4c2b11c90eaf626c92bf781' + '02fc331315b973e3bcfcf9e8d2647dcd719d1eee96466abaa3959ef153fdc5fb') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i ${srcdir}/0009-standalone-headers.mingw.patch patch -p1 -i ${srcdir}/0026-create-argb-fonts.all.patch patch -p1 -i ${srcdir}/0027-win32-print-fix-unbounded-surface-assertion.patch + patch -p1 -i ${srcdir}/0028-link-libssp.patch NOCONFIGURE=1 ./autogen.sh } From 498f15a99becf4f184386b43b2bbaa8d206f2b3b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 20:15:45 +0200 Subject: [PATCH 08/72] aom: bump pkgrel pkgbase was changed --- mingw-w64-aom/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-aom/PKGBUILD b/mingw-w64-aom/PKGBUILD index cd20f08a6c..a8e4809aad 100644 --- a/mingw-w64-aom/PKGBUILD +++ b/mingw-w64-aom/PKGBUILD @@ -4,7 +4,7 @@ _realname=aom pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='AV1 codec library(mingw-w64)' arch=('any') url="https://aomedia.org/" From ea82dae5b34976ec6e3d12c845563b345138ed8d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 2 Jul 2020 20:37:08 +0200 Subject: [PATCH 09/72] gnucobol: add validpgpkeys --- mingw-w64-gnucobol/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-gnucobol/PKGBUILD b/mingw-w64-gnucobol/PKGBUILD index dda242081b..b51fa290a2 100644 --- a/mingw-w64-gnucobol/PKGBUILD +++ b/mingw-w64-gnucobol/PKGBUILD @@ -34,6 +34,7 @@ sha256sums=('C2E41C2BA520681A67C570D7246D25C31F7F55C8A145AAEC3F6273A500A93A76' '3FBFDAF61EB6EC125258DE62B404C97BF6DCCF39BD3B9152510F794B5383CA33' 'EEDFC170CFD6606527DD701C3CF6BBA2029C33CE694F697F8B7EE527B4ED7F1C' '225F7F6E17FC125AF6348028FDB86278C990BEAB07D230A158D9B9373CD58506') +validpgpkeys=('B9459D0CA8A740B323235CDF13E96B53C005604E') prepare() { cd "${_realname}-${pkgver_real}" From 72da8bf4276d57cc8b4bc1e8f6955a183577c5e4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 6 Jul 2020 22:52:43 +0200 Subject: [PATCH 10/72] aom: switch to new release tarball --- mingw-w64-aom/PKGBUILD | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mingw-w64-aom/PKGBUILD b/mingw-w64-aom/PKGBUILD index a8e4809aad..4335769d6f 100644 --- a/mingw-w64-aom/PKGBUILD +++ b/mingw-w64-aom/PKGBUILD @@ -4,7 +4,7 @@ _realname=aom pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='AV1 codec library(mingw-w64)' arch=('any') url="https://aomedia.org/" @@ -12,18 +12,24 @@ license=('BSD') replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") -makedepends=("perl" "git" +makedepends=("perl" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python") -source=("git+https://aomedia.googlesource.com/aom#tag=v${pkgver}" +source=("https://storage.googleapis.com/aom-releases/libaom-${pkgver}.tar.gz"{,.asc} "fix-lib-dest.patch") -sha256sums=('SKIP' +sha256sums=('7be566ad19209f076a4b22b54f6638651ea7131c06c33eda1152552da23f4597' + 'SKIP' '3a202005676f91b2b5ee5d7c10792f1930b204f36a96d7d5b893ef81d375b19d') +validpgpkeys=('B002F08B74A148DAA01F7123A48E86DB0B830498') +noextract=("libaom-${pkgver}.tar.gz") prepare() { + # Extract into a subdirectory + (mkdir "${srcdir}/${_realname}" && cd "${srcdir}/${_realname}" && bsdtar -xf "${srcdir}/libaom-${pkgver}.tar.gz") + cd "${srcdir}/${_realname}" patch -Np1 -i "${srcdir}"/fix-lib-dest.patch From 28c8c0c3f7d9c0d5047a20ee1a72b8cef9270519 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 7 Jul 2020 15:54:48 +0200 Subject: [PATCH 11/72] sip5: write bash tool wrappers instead of batch This also bumps pkgrel of pyqt so the wrappers are rebuilt and removes an unused patch (the build is now handled by sip5) Fixes #6617 --- mingw-w64-pyqt5/001-mingw-python.patch | 109 ------------------------- mingw-w64-pyqt5/PKGBUILD | 10 +-- mingw-w64-sip5/002-wrappers.patch | 32 ++++++++ mingw-w64-sip5/PKGBUILD | 17 ++-- 4 files changed, 45 insertions(+), 123 deletions(-) delete mode 100644 mingw-w64-pyqt5/001-mingw-python.patch create mode 100644 mingw-w64-sip5/002-wrappers.patch diff --git a/mingw-w64-pyqt5/001-mingw-python.patch b/mingw-w64-pyqt5/001-mingw-python.patch deleted file mode 100644 index e2f7c0dc75..0000000000 --- a/mingw-w64-pyqt5/001-mingw-python.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- PyQt5_gpl-5.9/configure.py.orig 2017-08-22 15:11:51.878439200 +0200 -+++ PyQt5_gpl-5.9/configure.py 2017-08-22 15:15:44.292242200 +0200 -@@ -25,6 +25,7 @@ - import shutil - import stat - import sys -+from sysconfig import _POSIX_BUILD - - - # Initialise the constants. -@@ -414,7 +415,7 @@ - self.module_dir = sysconfig.get_python_lib(plat_specific=1) - self.debug = hasattr(sys, 'gettotalrefcount') - -- if sys.platform == 'win32': -+ if sys.platform == 'win32' and not _POSIX_BUILD: - bin_dir = sys.exec_prefix - - try: -@@ -443,6 +444,13 @@ - self.data_dir = sys.prefix + '/share' - self.lib_dir = sys.prefix + '/lib' - -+ if _POSIX_BUILD and "MSYSTEM" in os.environ: -+ self.inc_dir = os.popen(' '.join(['cygpath', '--unix', self.inc_dir])).readline().strip() -+ self.module_dir = os.popen(' '.join(['cygpath', '--unix', self.module_dir])).readline().strip() -+ self.bin_dir = os.popen(' '.join(['cygpath', '--unix', self.bin_dir])).readline().strip() -+ self.data_dir = os.popen(' '.join(['cygpath', '--unix', self.data_dir])).readline().strip() -+ self.lib_dir = os.popen(' '.join(['cygpath', '--unix', self.lib_dir])).readline().strip() -+ - # The name of the interpreter used by the pyuic5 wrapper. - if sys.platform == 'darwin': - # The installation of MacOS's python is a mess that changes from -@@ -638,7 +646,7 @@ - py_major = self.py_version >> 16 - py_minor = (self.py_version >> 8) & 0x0ff - -- if sys.platform == 'win32': -+ if sys.platform == 'win32' and not _POSIX_BUILD: - debug_suffix = self.get_win32_debug_suffix() - - # See if we are using the limited API. -@@ -756,6 +764,9 @@ - - self.designer_plugin_dir = qt_config.QT_INSTALL_PLUGINS + '/designer' - self.qml_plugin_dir = qt_config.QT_INSTALL_PLUGINS + '/PyQt5' -+ if "MSYSTEM" in os.environ: -+ self.designer_plugin_dir = os.popen(' '.join(['cygpath', '--unix', self.designer_plugin_dir])).readline().strip() -+ self.qml_plugin_dir = os.popen(' '.join(['cygpath', '--unix', self.qml_plugin_dir])).readline().strip() - - if self.sysroot == '': - self.sysroot = qt_config.QT_SYSROOT -@@ -764,6 +775,8 @@ - # in the default location. - self.qsci_api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci') - self.qsci_api = os.path.isdir(self.qsci_api_dir) -+ if "MSYSTEM" in os.environ: -+ self.qsci_api_dir = os.popen(' '.join(['cygpath', '--unix', self.qsci_api_dir])).readline().strip() - - # Save the default qmake spec. and finalise the value we want to use. - self.qmake_spec_default = qt_config.QMAKE_SPEC -@@ -771,7 +784,9 @@ - # On Windows for Qt versions prior to v5.9.0 we need to be explicit - # about the qmake spec. - if self.qt_version < 0x050900 and self.py_platform == 'win32': -- if self.py_version >= 0x030500: -+ if _POSIX_BUILD: -+ self.qmake_spec = "win32-g++" -+ elif self.py_version >= 0x030500: - self.qmake_spec = 'win32-msvc2015' - elif self.py_version >= 0x030300: - self.qmake_spec = 'win32-msvc2010' -@@ -952,6 +967,15 @@ - if opts.vendlibdir is not None: - self.vend_lib_dir = opts.vendlibdir - -+ if _POSIX_BUILD and "MSYSTEM" in os.environ: -+ self.pyqt_bin_dir = os.popen(' '.join(['cygpath', '--unix', self.pyqt_bin_dir])).readline().strip() -+ self.designer_plugin_dir = os.popen(' '.join(['cygpath', '--unix', self.designer_plugin_dir])).readline().strip() -+ self.pyqt_module_dir = os.popen(' '.join(['cygpath', '--unix', self.pyqt_module_dir])).readline().strip() -+ self.qsci_api_dir = os.popen(' '.join(['cygpath', '--unix', self.qsci_api_dir])).readline().strip() -+ self.pyqt_sip_dir = os.popen(' '.join(['cygpath', '--unix', self.pyqt_sip_dir])).readline().strip() -+ self.vend_inc_dir = os.popen(' '.join(['cygpath', '--unix', self.vend_inc_dir])).readline().strip() -+ self.vend_lib_dir = os.popen(' '.join(['cygpath', '--unix', self.vend_lib_dir])).readline().strip() -+ - # Handle any conflicts. - if not self.qt_shared: - if not self.static: -@@ -1015,7 +1015,7 @@ - # it where it is. - if not self.static: - pro_lines.extend(['win32 {', -- ' LIBS += ' + self.get_pylib_link_arguments(name=False), -+ ' LIBS += ' + self.get_pylib_link_arguments(name=True), - '}']) - - @staticmethod -@@ -2312,7 +2336,10 @@ - - # Create the output file, first making sure it doesn't exist. - remove_file(out_file) -- run_command(test + ' ' + out_file, verbose) -+ if "MSYSTEM" in os.environ: -+ run_command('sh -c "' + test + ' ' + out_file + '"', True) -+ else: -+ run_command(test + ' ' + out_file, True) - - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (test, out_file)) diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index 9841d11997..fbe47f5329 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -9,7 +9,7 @@ conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-common") pkgver=5.15.0 -pkgrel=1 +pkgrel=2 pkgdesc="Qt5 bindings for Python (mingw-w64)" arch=('any') license=('GPL') @@ -24,16 +24,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-sip5" "${MINGW_PACKAGE_PREFIX}-pyqt-builder") options=('strip' 'staticlibs') -source=(https://pypi.python.org/packages/source/P/PyQt5/PyQt5-${pkgver}.tar.gz - 001-mingw-python.patch) -sha256sums=('c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9' - '9acd5672557000861d31944e74874e58dd126cf07e21bab8fad4f55f866b03ed') +source=(https://pypi.python.org/packages/source/P/PyQt5/PyQt5-${pkgver}.tar.gz) +sha256sums=('c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9') prepare() { cd "${srcdir}"/PyQt5-${pkgver} - #Apply patches - patch -p1 -i "${srcdir}"/001-mingw-python.patch } build() { diff --git a/mingw-w64-sip5/002-wrappers.patch b/mingw-w64-sip5/002-wrappers.patch new file mode 100644 index 0000000000..a868a68d42 --- /dev/null +++ b/mingw-w64-sip5/002-wrappers.patch @@ -0,0 +1,32 @@ +--- sip-5.3.0/sipbuild/builder.py.orig 2020-07-07 09:23:59.242531000 +0200 ++++ sip-5.3.0/sipbuild/builder.py 2020-07-07 09:25:02.079143700 +0200 +@@ -380,7 +380,7 @@ + # Remove any callable name. + module = module.split(':')[0] + +- if project.py_platform == 'win32': ++ if project.py_platform == 'win32' and "MSYSTEM" not in os.environ: + script += '.bat' + + project.progress("Generating the {} script".format(script)) +@@ -390,14 +390,18 @@ + + script_f = project.open_for_writing(script_path) + +- if project.py_platform == 'win32': ++ exe = sys.executable ++ if "MSYSTEM" in os.environ: ++ exe = os.popen(' '.join(['cygpath', '--unix', exe])).readline().strip() ++ ++ if project.py_platform == 'win32' and "MSYSTEM" not in os.environ: + script_f.write( + '@{} -m {} %1 %2 %3 %4 %5 %6 %7 %8 %9\n'.format( + sys.executable, module)) + else: + script_f.write('#!/bin/sh\n') + script_f.write( +- 'exec %s -m %s ${1+"$@"}\n' % (sys.executable, ++ 'exec %s -m %s ${1+"$@"}\n' % (exe, + module)) + + script_f.close() diff --git a/mingw-w64-sip5/PKGBUILD b/mingw-w64-sip5/PKGBUILD index ba77bc7338..d4ed45e41a 100644 --- a/mingw-w64-sip5/PKGBUILD +++ b/mingw-w64-sip5/PKGBUILD @@ -7,19 +7,21 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}5") conflicts=("${MINGW_PACKAGE_PREFIX}-sip") replaces=("${MINGW_PACKAGE_PREFIX}-sip") pkgver=5.3.0 -pkgrel=5 +pkgrel=6 pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries (mingw-w64)" arch=('any') license=('custom:"sip"') url="https://riverbankcomputing.com/software/sip" -depemds=("${MINGW_PACKAGE_PREFIX}-python-setuptools" - "${MINGW_PACKAGE_PREFIX}-python-toml") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-python") +depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-toml" + "${MINGW_PACKAGE_PREFIX}-python") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=(https://pypi.python.org/packages/source/s/sip/sip-${pkgver}.tar.gz - 001-mingw-python.patch) + 001-mingw-python.patch + 002-wrappers.patch) sha256sums=('03a44e20b252ef03ca2891e9439d238af3fd8245f65cdcff238a843d4f455b80' - '3cbe4be5e37c580d657e7f532a1c3f9ff465513ccd6ce495cba505255bf465ca') + '3cbe4be5e37c580d657e7f532a1c3f9ff465513ccd6ce495cba505255bf465ca' + '2e46495e5df4eed5384a01db93e75f82e37549a4776ca03d07dfef7801d01d78') install=${_realname}5-${CARCH}.install prepare() { @@ -27,6 +29,7 @@ prepare() { # Apply patches patch -p1 -i "${srcdir}"/001-mingw-python.patch + patch -p1 -i "${srcdir}"/002-wrappers.patch cd "${srcdir}" rm -rf python-build-${MINGW_CHOST} | true From d82fcb13ee0cc9a040360b34c83b6d3adb188974 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 16 Jun 2020 19:43:22 +0200 Subject: [PATCH 12/72] Add cargo-c and rav1e --- mingw-w64-cargo-c/PKGBUILD | 63 +++++++++++ mingw-w64-cargo-c/fix-append_to_destdir.patch | 101 ++++++++++++++++++ mingw-w64-rav1e/PKGBUILD | 68 ++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 mingw-w64-cargo-c/PKGBUILD create mode 100644 mingw-w64-cargo-c/fix-append_to_destdir.patch create mode 100644 mingw-w64-rav1e/PKGBUILD diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD new file mode 100644 index 0000000000..cb8548dc31 --- /dev/null +++ b/mingw-w64-cargo-c/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: Christoph Reiter + +_realname=cargo-c +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.6.8 +pkgrel=1 +pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)' +arch=('any') +url='https://github.com/lu-zero/cargo-c/' +license=('MIT') +depends=( + "${MINGW_PACKAGE_PREFIX}-curl" + "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-zlib") +makedepends=( + "${MINGW_PACKAGE_PREFIX}-rust") +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/lu-zero/cargo-c/archive/v${pkgver}.tar.gz" + "${_realname}-${pkgver}.Cargo.lock"::"https://github.com/lu-zero/cargo-c/releases/download/v${pkgver}/Cargo.lock" + "fix-append_to_destdir.patch") +sha256sums=('ca8cb5e08b0ba5b6eccea1481854829e1b411ebb9885be891a897c27b5a76cba' + 'f956c171676375ecdf5069d32896c8c8047001b207f377d1ba6442be449a3688' + '474ca4a7504d563f76455c13cedeb04cef0b665fa5d9c596ddd141393fb7079c') + +prepare() { + cp "${srcdir}/${_realname}-${pkgver}.Cargo.lock" "${_realname}-${pkgver}/Cargo.lock" + cd "${srcdir}/${_realname}-${pkgver}" + + # https://github.com/lu-zero/cargo-c/pull/90 + patch -Np1 -i "${srcdir}"/fix-append_to_destdir.patch + + cargo fetch \ + --locked +} + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo build \ + --release \ + --frozen \ + --offline +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo test \ + --release \ + --frozen +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo install \ + --frozen \ + --offline \ + --no-track \ + --path . \ + --root "${pkgdir}${MINGW_PREFIX}" + + install -D -m644 "LICENSE" -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" +} diff --git a/mingw-w64-cargo-c/fix-append_to_destdir.patch b/mingw-w64-cargo-c/fix-append_to_destdir.patch new file mode 100644 index 0000000000..85e9dceabf --- /dev/null +++ b/mingw-w64-cargo-c/fix-append_to_destdir.patch @@ -0,0 +1,101 @@ +From 1dbe81185a889c39feb9380dd2e517214cb8728b Mon Sep 17 00:00:00 2001 +From: Christoph Reiter +Date: Wed, 8 Jul 2020 08:18:26 +0200 +Subject: [PATCH] append_to_destdir: handle Windows paths properly + +It currently uses is_absolute() to strip one leading component which doesn't +work for paths like "C:/foo", "C:foo" and "/foo" which are either not absolute +or have multiple components that need to be stripped. + +The goal is to join two paths and removing any components from the second +one that would result in the first one being replaced/changed. + +push()/join() alters the first path if it starts with a RootDir, Prefix, or both, so +we push everything from the second path except for those. + +Fixes #89 +--- + src/cinstall.rs | 65 ++++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 56 insertions(+), 9 deletions(-) + +diff --git a/src/cinstall.rs b/src/cinstall.rs +index d7c1b9f..9212b2c 100644 +--- a/src/cinstall.rs ++++ b/src/cinstall.rs +@@ -1,4 +1,4 @@ +-use std::path::{Path, PathBuf}; ++use std::path::{Component, Path, PathBuf}; + + use cargo::core::Workspace; + use cargo::util::command_prelude::opt; +@@ -52,15 +52,62 @@ the --release flag will use the `release` profile instead. + } + + fn append_to_destdir(destdir: &PathBuf, path: &PathBuf) -> PathBuf { +- let path = if path.is_absolute() { +- let mut components = path.components(); +- let _ = components.next(); +- components.as_path() +- } else { +- path.as_path() +- }; ++ let mut joined = destdir.clone(); ++ for component in path.components() { ++ match component { ++ Component::Prefix(_) | Component::RootDir => {} ++ _ => joined.push(component), ++ }; ++ } ++ joined ++} ++ ++#[cfg(test)] ++mod tests { ++ use std::path::PathBuf; ++ ++ #[test] ++ fn append_to_destdir() { ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r"/foo"), &PathBuf::from(r"/bar/./..")), ++ PathBuf::from(r"/foo/bar/./..") ++ ); ++ ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r"foo"), &PathBuf::from(r"bar")), ++ PathBuf::from(r"foo/bar") ++ ); ++ ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r""), &PathBuf::from(r"")), ++ PathBuf::from(r"") ++ ); ++ ++ if cfg!(windows) { ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r"X:\foo"), &PathBuf::from(r"Y:\bar")), ++ PathBuf::from(r"X:\foo\bar") ++ ); + +- destdir.join(path) ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r"A:\foo"), &PathBuf::from(r"B:bar")), ++ PathBuf::from(r"A:\foo\bar") ++ ); ++ ++ assert_eq!( ++ super::append_to_destdir(&PathBuf::from(r"\foo"), &PathBuf::from(r"\bar")), ++ PathBuf::from(r"\foo\bar") ++ ); ++ ++ assert_eq!( ++ super::append_to_destdir( ++ &PathBuf::from(r"C:\dest"), ++ &PathBuf::from(r"\\server\share\foo\bar") ++ ), ++ PathBuf::from(r"C:\\dest\\foo\\bar") ++ ); ++ } ++ } + } + + fn copy, Q: AsRef>(from: P, to: Q) -> anyhow::Result { diff --git a/mingw-w64-rav1e/PKGBUILD b/mingw-w64-rav1e/PKGBUILD new file mode 100644 index 0000000000..da85b197c9 --- /dev/null +++ b/mingw-w64-rav1e/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Christoph Reiter + +_realname=rav1e +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.3.3 +pkgrel=1 +pkgdesc='An AV1 encoder focused on speed and safety (mingw-w64)' +arch=('any') +url=https://github.com/xiph/rav1e/ +license=(BSD) +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +makedepends=( + "${MINGW_PACKAGE_PREFIX}-nasm" + "${MINGW_PACKAGE_PREFIX}-rust" + "${MINGW_PACKAGE_PREFIX}-cargo-c" +) +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/xiph/rav1e/archive/v${pkgver}.tar.gz") +sha256sums=('a091f3387055e472b6e028aa013cf0f37fb5acce9f4db2605d929bbffb448d01') + +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo fetch \ + --locked +} + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo build \ + --release \ + --frozen \ + --offline + + cargo cbuild \ + --release \ + --frozen \ + --library-type=cdylib +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo test \ + --release \ + --frozen +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + + cargo install \ + --frozen \ + --offline \ + --no-track \ + --path . \ + --root "${pkgdir}${MINGW_PREFIX}" + + MSYS2_ARG_CONV_EXCL="--prefix=;" \ + cargo cinstall \ + --release \ + --frozen \ + --library-type=cdylib \ + --prefix="${MINGW_PREFIX}" \ + --destdir="${pkgdir}" + + install -Dm644 LICENSE PATENTS -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/" +} From 18c7497660d3a6745684dc34c92cb39b58c4ebe9 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 9 Jul 2020 14:50:30 +0300 Subject: [PATCH 13/72] libicsneo: Rebuild --- mingw-w64-libicsneo/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw-w64-libicsneo/PKGBUILD b/mingw-w64-libicsneo/PKGBUILD index 861586c84c..c6c05c5157 100644 --- a/mingw-w64-libicsneo/PKGBUILD +++ b/mingw-w64-libicsneo/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) pkgver=0.1.2 -pkgrel=1 +pkgrel=2 arch=('any') pkgdesc="The Intrepid Control Systems Open Cross-Platform Device Communication API (mingw-w64)" license=("custom") @@ -15,7 +15,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-doxygen" - "${MINGW_PACKAGE_PREFIX}-python3-sphinx") + "${MINGW_PACKAGE_PREFIX}-python-sphinx") options=('strip' '!debug' 'staticlibs') source=(${_realname}-${pkgver}.tar.gz::https://github.com/intrepidcs/libicsneo/archive/v${pkgver}.tar.gz 001-mingw-build.patch @@ -41,6 +41,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G "MSYS Makefiles" \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ . From e861b62eb9aeafaf74003aef592d5202fbbf3692 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 9 Jul 2020 14:50:54 +0300 Subject: [PATCH 14/72] libavif: Fix install shared library --- mingw-w64-libavif/001-install-shared-lib.patch | 10 ++++++++++ mingw-w64-libavif/PKGBUILD | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-libavif/001-install-shared-lib.patch diff --git a/mingw-w64-libavif/001-install-shared-lib.patch b/mingw-w64-libavif/001-install-shared-lib.patch new file mode 100644 index 0000000000..40bed4a0e1 --- /dev/null +++ b/mingw-w64-libavif/001-install-shared-lib.patch @@ -0,0 +1,10 @@ +--- libavif-0.7.3/CMakeLists.txt.orig 2020-07-09 13:06:19.099513700 +0300 ++++ libavif-0.7.3/CMakeLists.txt 2020-07-09 13:05:23.866661100 +0300 +@@ -395,6 +395,7 @@ + EXPORT ${PROJECT_NAME}-config + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) + + if (BUILD_SHARED_LIBS) diff --git a/mingw-w64-libavif/PKGBUILD b/mingw-w64-libavif/PKGBUILD index e22bac5053..866065de8e 100644 --- a/mingw-w64-libavif/PKGBUILD +++ b/mingw-w64-libavif/PKGBUILD @@ -16,8 +16,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-aom" makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-nasm") -source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz") -sha512sums=('b8928755ee39964fd9d9575fdb393ffee0ac3597c1d6f6048e049e6c328d1e82febdb32bfa0b22e16a2fb73ff6cd1ad4af7f63fc9baccea22716d941385c028d') +source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz" + 001-install-shared-lib.patch) +sha512sums=('b8928755ee39964fd9d9575fdb393ffee0ac3597c1d6f6048e049e6c328d1e82febdb32bfa0b22e16a2fb73ff6cd1ad4af7f63fc9baccea22716d941385c028d' + 'fbe294261a40b0c426a1ae27985939f7482aa16bce412a0a8f7876ecb78813ddf1c42fe87e50f637cd23bf5edef82da547df77f9e1274086c77465f893142a29') + +prepare() { + cd ${_realname}-${pkgver} + patch -p1 -i ${srcdir}/001-install-shared-lib.patch +} build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} From 0b000df449fbb5441f245d9817b25b2a20438653 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 9 Jul 2020 15:56:18 +0300 Subject: [PATCH 15/72] qt-creator: Update to 4.12.4 --- mingw-w64-qt-creator/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-qt-creator/PKGBUILD b/mingw-w64-qt-creator/PKGBUILD index 09c2082d84..dc54ea9d05 100644 --- a/mingw-w64-qt-creator/PKGBUILD +++ b/mingw-w64-qt-creator/PKGBUILD @@ -5,7 +5,7 @@ _realname=qt-creator pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" __pre= -_base_ver=4.12.3 +_base_ver=4.12.4 pkgver=${_base_ver}${_pre} pkgrel=1 pkgdesc='Cross-platform IDE (mingw-w64)' @@ -37,7 +37,7 @@ source=(#https://download.qt.io/development_releases/qtcreator/${_base_ver%.*}/$ qt-creator-4.3.0-qbs-CONFIG-add-qbs_enable_project_file_updates.patch qt-creator-4.6.2-fix-clang-detect.patch) noextract=(${_pkgfqn}.tar.gz) -sha256sums=('262d3e9f0c5a8d0f85b568a9ebbcc38a46feedc8fdd9284c22b89548de19f9d3' +sha256sums=('26c484412bf3ac6ce6f97e1147fcdd29d7ddc396826acf6d4a90afd03610708b' 'b4eba129997fef75b811d0ba3ef573db23ba13e43f9dbdb0c27164ee551ba08d' '96c14f54577bf6cadf5c12018745666a9e99cd8d6a876c29a28b13599a8cb368' 'e95ab2c936ff3e4fd09e044ff119829d72037a40de4bc6c93e90c52eb14a75fc' From 24151313bb2877be0a6bf26d3daa8e1f6b9747df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Sat, 20 Jun 2020 00:30:04 +0200 Subject: [PATCH 16/72] Few more patches for LLVM packages --- ...-to-system-libraries-list-if-enabled.patch | 27 +++ .../0106-fix-libunwind-extension.patch | 62 ++++++ ...orting-of-symbols-containing-periods.patch | 67 ++++++ ...ty_routine-to-_Unwind_Personality_Fn.patch | 193 ++++++++++++++++++ mingw-w64-clang/PKGBUILD | 22 +- 5 files changed, 369 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-clang/0013-Add-Z3-to-system-libraries-list-if-enabled.patch create mode 100644 mingw-w64-clang/0106-fix-libunwind-extension.patch create mode 100644 mingw-w64-clang/0301-Fix-def-file-exporting-of-symbols-containing-periods.patch create mode 100644 mingw-w64-clang/0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch diff --git a/mingw-w64-clang/0013-Add-Z3-to-system-libraries-list-if-enabled.patch b/mingw-w64-clang/0013-Add-Z3-to-system-libraries-list-if-enabled.patch new file mode 100644 index 0000000000..91657ce4a1 --- /dev/null +++ b/mingw-w64-clang/0013-Add-Z3-to-system-libraries-list-if-enabled.patch @@ -0,0 +1,27 @@ +From 0d70f66ac52ab7da9468b155378ae0c61d391eb2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= +Date: Tue, 16 Jun 2020 20:31:57 +0200 +Subject: [PATCH] Add Z3 to system libraries list if enabled + +--- + lib/Support/CMakeLists.txt | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt +index 25918746..ef12af68 100644 +--- a/lib/Support/CMakeLists.txt ++++ b/lib/Support/CMakeLists.txt +@@ -49,9 +49,7 @@ endif() + + # Link Z3 if the user wants to build it. + if(LLVM_WITH_Z3) +- set(Z3_LINK_FILES ${Z3_LIBRARIES}) +-else() +- set(Z3_LINK_FILES "") ++ set(system_libs ${system_libs} z3) + endif() + + add_llvm_component_library(LLVMSupport +-- +2.27.0.windows.1 + diff --git a/mingw-w64-clang/0106-fix-libunwind-extension.patch b/mingw-w64-clang/0106-fix-libunwind-extension.patch new file mode 100644 index 0000000000..130fa674a5 --- /dev/null +++ b/mingw-w64-clang/0106-fix-libunwind-extension.patch @@ -0,0 +1,62 @@ +From ab4d02cf265982d4c03123d2f52b9d5ee8df575d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= +Date: Fri, 29 May 2020 15:09:44 +0300 +Subject: [PATCH] [clang] [MinGW] Fix libunwind extension + +Differential Revision: https://reviews.llvm.org/D79995 +--- + lib/Driver/ToolChains/CommonArgs.cpp | 9 ++++++++- + test/Driver/compiler-rt-unwind.c | 23 ++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + +diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp +index 33c43222b5f9..b2c984912154 100644 +--- a/lib/Driver/ToolChains/CommonArgs.cpp ++++ b/lib/Driver/ToolChains/CommonArgs.cpp +@@ -1235,7 +1235,14 @@ static void AddUnwindLibrary(const ToolChain &TC, const Driver &D, + case ToolChain::UNW_CompilerRT: + if (LGT == LibGccType::StaticLibGcc) + CmdArgs.push_back("-l:libunwind.a"); +- else ++ else if (TC.getTriple().isOSCygMing()) { ++ if (LGT == LibGccType::SharedLibGcc) ++ CmdArgs.push_back("-l:libunwind.dll.a"); ++ else ++ // Let the linker choose between libunwind.dll.a and libunwind.a ++ // depending on what's available, and depending on the -static flag ++ CmdArgs.push_back("-lunwind"); ++ } else + CmdArgs.push_back("-l:libunwind.so"); + break; + } +diff --git a/test/Driver/compiler-rt-unwind.c b/test/Driver/compiler-rt-unwind.c +index 652a48c6ad78..e21916d41f93 100644 +--- a/test/Driver/compiler-rt-unwind.c ++++ b/test/Driver/compiler-rt-unwind.c +@@ -48,3 +48,26 @@ + // RUN: --gcc-toolchain="" \ + // RUN: FileCheck --input-file=%t.err --check-prefix=RTLIB-GCC-UNWINDLIB-COMPILER_RT %s + // RTLIB-GCC-UNWINDLIB-COMPILER_RT: "{{[.|\\\n]*}}--rtlib=libgcc requires --unwindlib=libgcc" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \ ++// RUN: -shared-libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT %s ++// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" ++// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT: "{{.*}}l:libunwind.dll.a" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \ ++// RUN: -static-libgcc \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT %s ++// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" ++// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT: "{{.*}}l:libunwind.a" ++// ++// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ ++// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \ ++// RUN: --gcc-toolchain="" \ ++// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s ++// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins-x86_64.a" ++// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}lunwind" diff --git a/mingw-w64-clang/0301-Fix-def-file-exporting-of-symbols-containing-periods.patch b/mingw-w64-clang/0301-Fix-def-file-exporting-of-symbols-containing-periods.patch new file mode 100644 index 0000000000..8ea457728e --- /dev/null +++ b/mingw-w64-clang/0301-Fix-def-file-exporting-of-symbols-containing-periods.patch @@ -0,0 +1,67 @@ +From ed0a57f753a312bc0433480ef0bfad338e56b19e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Fri, 8 May 2020 11:01:09 +0300 +Subject: [PATCH] [LLD] [COFF] Fix def file exporting of symbols containing + periods + +This fixes an accidental breakage of exporting symbols using def +files, when the symbol name contains a period, since commit +0ca06f7950e5, mixing up a symbol name containing a period with +the case of exporting a symbol as a forward to another dll. + +Differential Revision: https://reviews.llvm.org/D79619 +--- + COFF/Driver.cpp | 3 ++- + test/COFF/export-tricky-names.s | 29 +++++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletion(-) + create mode 100644 lld/test/COFF/export-tricky-names.s + +diff --git a/COFF/Driver.cpp b/COFF/Driver.cpp +index 5d99a4cd17cf..07132345f135 100644 +--- a/COFF/Driver.cpp ++++ b/COFF/Driver.cpp +@@ -848,7 +848,8 @@ static void parseModuleDefs(StringRef path) { + // and set as "ExtName = Name". If Name has the form "OtherDll.Func", + // it shouldn't be a normal exported function but a forward to another + // DLL instead. This is supported by both MS and GNU linkers. +- if (e1.ExtName != e1.Name && StringRef(e1.Name).contains('.')) { ++ if (!e1.ExtName.empty() && e1.ExtName != e1.Name && ++ StringRef(e1.Name).contains('.')) { + e2.name = saver.save(e1.ExtName); + e2.forwardTo = saver.save(e1.Name); + config->exports.push_back(e2); +diff --git a/test/COFF/export-tricky-names.s b/test/COFF/export-tricky-names.s +new file mode 100644 +index 000000000000..bd39d68c637d +--- /dev/null ++++ b/test/COFF/export-tricky-names.s +@@ -0,0 +1,29 @@ ++# REQUIRES: x86 ++ ++# RUN: echo -e "EXPORTS\n foo.bar" > %t.def ++ ++# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc -defsym drectve=0 %s -o %t.obj ++# RUN: lld-link -entry:dllmain -dll -def:%t.def %t.obj -out:%t.1.dll ++# RUN: llvm-readobj --coff-exports %t.1.dll | FileCheck %s ++ ++# RUN: lld-link -entry:dllmain -dll %t.obj -out:%t.2.dll -export:foo.bar ++# RUN: llvm-readobj --coff-exports %t.2.dll | FileCheck %s ++ ++# RUN: llvm-mc -filetype=obj -triple=x86_64-windows-msvc -defsym drectve=1 %s -o %t.drectve.obj ++# RUN: lld-link -entry:dllmain -dll %t.drectve.obj -out:%t.3.dll ++# RUN: llvm-readobj --coff-exports %t.3.dll | FileCheck %s ++ ++# CHECK: Name: foo.bar ++ ++ .text ++ .globl dllmain ++ .globl foo.bar ++dllmain: ++ ret ++foo.bar: ++ ret ++ ++.if drectve==1 ++ .section .drectve ++ .ascii "-export:foo.bar" ++.endif diff --git a/mingw-w64-clang/0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch b/mingw-w64-clang/0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch new file mode 100644 index 0000000000..95563c7951 --- /dev/null +++ b/mingw-w64-clang/0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch @@ -0,0 +1,193 @@ +From 14798b44658c8b30b44afae20d0f391e88eb5bec Mon Sep 17 00:00:00 2001 +From: Saleem Abdulrasool +Date: Mon, 10 Feb 2020 08:52:31 -0800 +Subject: [PATCH] unwind: rename `__personality_routine` to + `_Unwind_Personality_Fn` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch renames `__personality_routine` to `_Unwind_Personality_Fn` +in `unwind.h`. Both `unwind.h` from clang and GCC headers use this name +instead of `__personality_routine`. With this patch one is also able to +build libc++abi with libunwind support on Windows. + +Patch by Markus Böck! +--- + include/unwind.h | 21 ++++++++------------- + src/Unwind-EHABI.cpp | 8 ++++---- + src/Unwind-seh.cpp | 6 +++--- + src/Unwind-sjlj.c | 4 ++-- + src/UnwindLevel1-gcc-ext.c | 2 +- + src/UnwindLevel1.c | 12 ++++++------ + 6 files changed, 24 insertions(+), 29 deletions(-) + +diff --git a/include/unwind.h b/include/unwind.h +index b6cc70498b37..1d3444cd83b4 100644 +--- a/include/unwind.h ++++ b/include/unwind.h +@@ -111,10 +111,9 @@ typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn) + _Unwind_Exception* exceptionObject, + struct _Unwind_Context* context); + +-typedef _Unwind_Reason_Code (*__personality_routine) +- (_Unwind_State state, +- _Unwind_Exception* exceptionObject, +- struct _Unwind_Context* context); ++typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)( ++ _Unwind_State state, _Unwind_Exception *exceptionObject, ++ struct _Unwind_Context *context); + #else + struct _Unwind_Context; // opaque + struct _Unwind_Exception; // forward declaration +@@ -150,12 +149,9 @@ typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn) + struct _Unwind_Context* context, + void* stop_parameter ); + +-typedef _Unwind_Reason_Code (*__personality_routine) +- (int version, +- _Unwind_Action actions, +- uint64_t exceptionClass, +- _Unwind_Exception* exceptionObject, +- struct _Unwind_Context* context); ++typedef _Unwind_Reason_Code (*_Unwind_Personality_Fn)( ++ int version, _Unwind_Action actions, uint64_t exceptionClass, ++ _Unwind_Exception *exceptionObject, struct _Unwind_Context *context); + #endif + + #ifdef __cplusplus +@@ -387,10 +383,9 @@ typedef struct _DISPATCHER_CONTEXT DISPATCHER_CONTEXT; + #endif + // This is the common wrapper for GCC-style personality functions with SEH. + extern EXCEPTION_DISPOSITION _GCC_specific_handler(EXCEPTION_RECORD *exc, +- void *frame, +- CONTEXT *ctx, ++ void *frame, CONTEXT *ctx, + DISPATCHER_CONTEXT *disp, +- __personality_routine pers); ++ _Unwind_Personality_Fn pers); + #endif + + #ifdef __cplusplus +diff --git a/src/Unwind-EHABI.cpp b/src/Unwind-EHABI.cpp +index a23ba2cc7e0e..a8a64cbfd7e5 100644 +--- a/src/Unwind-EHABI.cpp ++++ b/src/Unwind-EHABI.cpp +@@ -481,8 +481,8 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except + // If there is a personality routine, ask it if it will want to stop at + // this frame. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(long)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(long)(frameInfo.handler); + _LIBUNWIND_TRACE_UNWINDING( + "unwind_phase1(ex_ojb=%p): calling personality function %p", + static_cast(exception_object), +@@ -597,8 +597,8 @@ static _Unwind_Reason_Code unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor + + // If there is a personality routine, tell it we are unwinding. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(long)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(long)(frameInfo.handler); + struct _Unwind_Context *context = (struct _Unwind_Context *)(cursor); + // EHABI #7.2 + exception_object->pr_cache.fnstart = frameInfo.start_ip; +diff --git a/src/Unwind-seh.cpp b/src/Unwind-seh.cpp +index 7647f2e0db0b..403ab2d77110 100644 +--- a/src/Unwind-seh.cpp ++++ b/src/Unwind-seh.cpp +@@ -69,7 +69,7 @@ static void __unw_seh_set_disp_ctx(unw_cursor_t *cursor, + /// b) Initiate a collided unwind to halt unwinding. + _LIBUNWIND_EXPORT EXCEPTION_DISPOSITION + _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx, +- DISPATCHER_CONTEXT *disp, __personality_routine pers) { ++ DISPATCHER_CONTEXT *disp, _Unwind_Personality_Fn pers) { + unw_cursor_t cursor; + _Unwind_Exception *exc; + _Unwind_Action action; +@@ -290,8 +290,8 @@ unwind_phase2_forced(unw_context_t *uc, + + // If there is a personality routine, tell it we are unwinding. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(intptr_t)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(intptr_t)(frameInfo.handler); + _LIBUNWIND_TRACE_UNWINDING( + "unwind_phase2_forced(ex_ojb=%p): calling personality function %p", + (void *)exception_object, (void *)(uintptr_t)p); +diff --git a/src/Unwind-sjlj.c b/src/Unwind-sjlj.c +index b8bb7c83bdff..85a4cc3c69d6 100644 +--- a/src/Unwind-sjlj.c ++++ b/src/Unwind-sjlj.c +@@ -39,7 +39,7 @@ struct _Unwind_FunctionContext { + uint32_t resumeParameters[4]; + + // set by calling function before registering +- __personality_routine personality; // arm offset=24 ++ _Unwind_Personality_Fn personality; // arm offset=24 + uintptr_t lsda; // arm offset=28 + + // variable length array, contains registers to restore +@@ -268,7 +268,7 @@ unwind_phase2_forced(struct _Unwind_Exception *exception_object, + + // if there is a personality routine, tell it we are unwinding + if (c->personality != NULL) { +- __personality_routine p = (__personality_routine) c->personality; ++ _Unwind_Personality_Fn p = (_Unwind_Personality_Fn)c->personality; + _LIBUNWIND_TRACE_UNWINDING("unwind_phase2_forced(ex_ojb=%p): " + "calling personality function %p", + (void *)exception_object, (void *)p); +diff --git a/src/UnwindLevel1-gcc-ext.c b/src/UnwindLevel1-gcc-ext.c +index 008df815665e..310b836d129e 100644 +--- a/src/UnwindLevel1-gcc-ext.c ++++ b/src/UnwindLevel1-gcc-ext.c +@@ -149,7 +149,7 @@ _Unwind_Backtrace(_Unwind_Trace_Fn callback, void *ref) { + + struct _Unwind_Context *context = (struct _Unwind_Context *)&cursor; + // Get and call the personality function to unwind the frame. +- __personality_routine handler = (__personality_routine) frameInfo.handler; ++ _Unwind_Personality_Fn handler = (_Unwind_Personality_Fn)frameInfo.handler; + if (handler == NULL) { + return _URC_END_OF_STACK; + } +diff --git a/src/UnwindLevel1.c b/src/UnwindLevel1.c +index bcb1a7fbec2a..3e75b5f13cd6 100644 +--- a/src/UnwindLevel1.c ++++ b/src/UnwindLevel1.c +@@ -90,8 +90,8 @@ unwind_phase1(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except + // If there is a personality routine, ask it if it will want to stop at + // this frame. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(uintptr_t)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(uintptr_t)(frameInfo.handler); + _LIBUNWIND_TRACE_UNWINDING( + "unwind_phase1(ex_ojb=%p): calling personality function %p", + (void *)exception_object, (void *)(uintptr_t)p); +@@ -188,8 +188,8 @@ unwind_phase2(unw_context_t *uc, unw_cursor_t *cursor, _Unwind_Exception *except + + // If there is a personality routine, tell it we are unwinding. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(uintptr_t)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(uintptr_t)(frameInfo.handler); + _Unwind_Action action = _UA_CLEANUP_PHASE; + if (sp == exception_object->private_2) { + // Tell personality this was the frame it marked in phase 1. +@@ -294,8 +294,8 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor, + + // If there is a personality routine, tell it we are unwinding. + if (frameInfo.handler != 0) { +- __personality_routine p = +- (__personality_routine)(intptr_t)(frameInfo.handler); ++ _Unwind_Personality_Fn p = ++ (_Unwind_Personality_Fn)(intptr_t)(frameInfo.handler); + _LIBUNWIND_TRACE_UNWINDING( + "unwind_phase2_forced(ex_ojb=%p): calling personality function %p", + (void *)exception_object, (void *)(uintptr_t)p); diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index d25aabf0c3..ae14c88606 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -77,12 +77,16 @@ source=(${_url}/llvm-${pkgver}.src.tar.xz{,.sig} "0009-empty-target-prefix-only-msvc.patch" "0010-mbig-obj-for-all.patch" "0012-fix-testplugin-linking.patch" + "0013-Add-Z3-to-system-libraries-list-if-enabled.patch" "0101-Allow-build-static-clang-library-for-mingw.patch" "0102-fix-libclang-name-for-mingw.patch" "0104-link-pthread-with-mingw.patch" "0105-build-libclang-cpp-fix.patch" + "0106-fix-libunwind-extension.patch" + "0301-Fix-def-file-exporting-of-symbols-containing-periods.patch" "0502-Add-missing-declarations-for-linking-to-psapi.patch" "0503-lldb-find-mingw-python.patch" + "0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch" "0504-fix-lldb-library-name-mingw.patch" "0801-Don-t-build-LLVMPolly-on-WIN32.patch" "0901-openmp-kpm-lock.patch" @@ -132,12 +136,16 @@ sha256sums=('df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf' '33400d16d5f6671a8fd60345c3ae44b9777a7d600061957889d14305eb2ad709' '1c9efccd40a0e7834c3aa9d819aa25cfdd2cec389d1bd3e8a89bc9ff670a0129' 'c486e1d45f6fb2a24823d776d2b47d6930530d423df73cc635f863265210c294' + 'a2f0e8090a9450abe51e43ba9e9c8ff4b2a4024ba394deea4b8aff547e30fc33' 'b2e5fd29bf666998d495a321690c97fe239bb998abcf0739418ac0ea725fecd6' '01b029f2a21bd998ce374a90d41d214c891dfbb611dfbd9ca147517cd2c228ea' '53646dd01af2862473e9719c5223366486268891ccbff86413943a432a8342e9' 'a60f7328d84628a56a9f626e4dc26ffd0c35292c79eeba62ac3d4f25aef2fe5c' + 'ab28a1f6afe2cbd3849da9db12346a3ecdcfa6ca3bd546963c3ac6b874b7b33b' + 'b0958bfb21d011e60f93f943dc616a362b4fbe2ebd4c38955cdc97389a88b5ab' '6ee9d0bd6abe0a3642bb3078fc285b56f945ba6443a9d305d3f54f1c63f0672a' 'd1021748be52cfd447cbfff5f1bfcbb540f7d9e80af7c1bb3f2cc4c0c3a79eab' + '12939edc95f503ad03a19355c34a617af645b9731e32b8de7c70054241f1aa96' 'bed7ae642486a8fd0db5afb0b9afcd8a87605de318ad891bf4c9378a2eb09dc2' 'bc394e597f8939b6f6630bd88c990f951738aaadacded2f3be71c658e9608fe7' 'db8dc554f7780609ee4eb4bc9e3817d4a9409b622f6471c8db06c92705805ead' @@ -179,7 +187,8 @@ prepare() { "0008-enable-emutls-for-mingw.patch" \ "0009-empty-target-prefix-only-msvc.patch" \ "0010-mbig-obj-for-all.patch" \ - "0012-fix-testplugin-linking.patch" + "0012-fix-testplugin-linking.patch" \ + "0013-Add-Z3-to-system-libraries-list-if-enabled.patch" # https://bugs.llvm.org/show_bug.cgi?id=25493 apply_patch_with_msg \ @@ -193,7 +202,12 @@ prepare() { "0101-Allow-build-static-clang-library-for-mingw.patch" \ "0102-fix-libclang-name-for-mingw.patch" \ "0104-link-pthread-with-mingw.patch" \ - "0105-build-libclang-cpp-fix.patch" + "0105-build-libclang-cpp-fix.patch" \ + "0106-fix-libunwind-extension.patch" + + cd "${srcdir}/lld-${pkgver}.src" + apply_patch_with_msg \ + "0301-Fix-def-file-exporting-of-symbols-containing-periods.patch" cd "${srcdir}/lldb-${pkgver}.src" apply_patch_with_msg \ @@ -201,6 +215,10 @@ prepare() { "0503-lldb-find-mingw-python.patch" \ "0504-fix-lldb-library-name-mingw.patch" + cd "${srcdir}/libunwind-${pkgver}.src" + apply_patch_with_msg \ + "0600-unwind-rename-__personality_routine-to-_Unwind_Personality_Fn.patch" \ + cd "${srcdir}/polly-${pkgver}.src" # With LLVM_LINK_LLVM_DYLIB=ON it's build before LLVM and fails with undefined references to LLVM functions apply_patch_with_msg \ From 3d643b8e7f7535173996923c311116d3a0b81e0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Wed, 24 Jun 2020 13:24:21 +0200 Subject: [PATCH 17/72] Do not move projects into LLVM tree --- mingw-w64-clang/PKGBUILD | 61 ++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index ae14c88606..18c2a06485 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -233,20 +233,20 @@ prepare() { # At the present, clang must reside inside the LLVM source code tree to build # See https://bugs.llvm.org/show_bug.cgi?id=4840 - cd "${srcdir}"/llvm-${pkgver}.src - rm -rf tools/clang tools/clang/tools/extra tools/lld tools/lldb tools/polly projects/compiler-rt projects/libcxx \ - projects/libcxxabi projects/libunwind projects/openmp projects/test-suite | true - mv "${srcdir}/clang-${pkgver}.src" tools/clang - mv "${srcdir}/clang-tools-extra-${pkgver}.src" tools/clang/tools/extra - mv "${srcdir}/lld-${pkgver}.src" tools/lld - mv "${srcdir}/lldb-${pkgver}.src" tools/lldb - mv "${srcdir}/polly-${pkgver}.src" tools/polly - mv "${srcdir}/compiler-rt-${pkgver}.src" projects/compiler-rt - mv "${srcdir}/libcxxabi-${pkgver}.src" projects/libcxxabi - mv "${srcdir}/libcxx-${pkgver}.src" projects/libcxx - mv "${srcdir}/libunwind-${pkgver}.src" projects/libunwind - mv "${srcdir}/openmp-${pkgver}.src" projects/openmp - #mv "${srcdir}/testsuite-${pkgver}.src" projects/test-suite + cd "${srcdir}" + rm -rf clang clang-tools-extra lld lldb polly compiler-rt libcxx \ + libcxxabi libunwind openmp test-suite | true + mv "${srcdir}/clang-${pkgver}.src" clang + mv "${srcdir}/clang-tools-extra-${pkgver}.src" clang-tools-extra + mv "${srcdir}/lld-${pkgver}.src" lld + mv "${srcdir}/lldb-${pkgver}.src" lldb + mv "${srcdir}/polly-${pkgver}.src" polly + mv "${srcdir}/compiler-rt-${pkgver}.src" compiler-rt + mv "${srcdir}/libcxxabi-${pkgver}.src" libcxxabi + mv "${srcdir}/libcxx-${pkgver}.src" libcxx + mv "${srcdir}/libunwind-${pkgver}.src" libunwind + mv "${srcdir}/openmp-${pkgver}.src" openmp + #mv "${srcdir}/testsuite-${pkgver}.src" test-suite } build() { @@ -277,7 +277,7 @@ build() { export CC='clang' export CXX='clang++' fi - + export ASM_COMPILER="${MINGW_PREFIX}/bin/uasm.exe" if [ "${CARCH}" == "x86_64" ]; then export ASM_COMPILER_FLAGS=-win64 @@ -288,7 +288,6 @@ build() { -G"$_generator" \ -DCLANG_ANALYZER_BUILD_Z3=ON \ -DCMAKE_ASM_MASM_COMPILER="${ASM_COMPILER}" \ - -DCMAKE_C_FLAGS="${CFLAGS}" \ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib \ @@ -312,6 +311,7 @@ build() { -DLLVM_BUILD_STATIC=OFF \ -DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_FFI=ON \ + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld;lldb;openmp;polly" \ -DLLVM_ENABLE_SPHINX=ON \ -DLLVM_ENABLE_THREADS=ON \ -DLLVM_INCLUDE_EXAMPLES=OFF \ @@ -332,9 +332,7 @@ build() { # sed -i.orig '/\(clang\|lld\|lldb\|polly\)\/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\|openmp\|libunwind\)\/cmake_install.cmake/d' projects/cmake_install.cmake - # fix the bad command line parameters, use unix style } #check() { @@ -352,7 +350,7 @@ package_clang() { "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-z3") - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/clang" ${_make_cmd} -C ../build-${CARCH}/tools/clang DESTDIR="${pkgdir}" install # Install static libraries @@ -366,7 +364,7 @@ package_clang-analyzer() { depends=("${MINGW_PACKAGE_PREFIX}-clang=${pkgver}-${pkgrel}" "${MINGW_PACKAGE_PREFIX}-python") - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/clang" ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-build -j1 DESTDIR="${pkgdir}" install ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-view -j1 DESTDIR="${pkgdir}" install @@ -386,7 +384,7 @@ package_clang-tools-extra() { pkgdesc="Extra tools built using Clang's tooling APIs (mingw-w64)" url="https://clang.llvm.org/" - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/clang-tools-extra" ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/extra -j1 DESTDIR="${pkgdir}" install } @@ -395,7 +393,7 @@ package_compiler-rt() { url="https://compiler-rt.llvm.org/" depends=("${MINGW_PACKAGE_PREFIX}-llvm=${pkgver}-${pkgrel}") - cd "${srcdir}"/llvm-${pkgver}.src + cd "${srcdir}"/compiler-rt ${_make_cmd} -C ../build-${CARCH}/projects/compiler-rt DESTDIR="${pkgdir}" install } @@ -403,7 +401,7 @@ package_libcxx() { pkgdesc="C++ Standard Library (mingw-w64)" url="https://libcxx.llvm.org/" - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/libcxx" ${_make_cmd} -C ../build-${CARCH}/projects/libcxx -j1 DESTDIR="${pkgdir}" install } @@ -411,7 +409,7 @@ package_openmp() { pkgdesc="OpenMP library (mingw-w64)" url="https://openmp.llvm.org/" - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/openmp" ${_make_cmd} -C ../build-${CARCH}/projects/openmp DESTDIR="${pkgdir}" install } @@ -421,7 +419,7 @@ package_libcxxabi() { # Don't depend on libunwind until it actually works as installing it breaks some packages #depends="${MINGW_PACKAGE_PREFIX}-libunwind" - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/libcxxabi" ${_make_cmd} -C ../build-${CARCH}/projects/libcxxabi -j1 DESTDIR="${pkgdir}" install } @@ -429,7 +427,7 @@ package_libunwind() { pkgdesc='A new implementation of a stack unwinder for C++ exceptions (mingw-w64)' url='https://llvm.org/' - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/libunwind" ${_make_cmd} -C ../build-${CARCH}/projects/libunwind -j1 DESTDIR="${pkgdir}" install mkdir -p "${pkgdir}${MINGW_PREFIX}/bin" @@ -440,7 +438,7 @@ package_lld() { pkgdesc="Linker tools for LLVM (mingw-w64)" url="https://lld.llvm.org/" - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/lld" ${_make_cmd} -C ../build-${CARCH}/tools/lld -j1 DESTDIR="${pkgdir}" install } @@ -453,7 +451,7 @@ package_lldb() { "${MINGW_PACKAGE_PREFIX}-readline" "${MINGW_PACKAGE_PREFIX}-swig") - cd "${srcdir}/llvm-${pkgver}.src" + cd "${srcdir}/lldb" ${_make_cmd} -C ../build-${CARCH}/tools/lldb DESTDIR="${pkgdir}" install @@ -462,7 +460,7 @@ package_lldb() { ${MINGW_PREFIX}/bin/python -m compileall "${pkgdir}${MINGW_PREFIX}/lib/python${_pyver}/site-packages/lldb" ${MINGW_PREFIX}/bin/python -O -m compileall "${pkgdir}${MINGW_PREFIX}/lib/python${_pyver}/site-packages/lldb" - install -Dm644 tools/lldb/LICENSE.TXT "${pkgdir}${MINGW_PREFIX}/share/licenses/lldb/LICENSE" + install -Dm644 LICENSE.TXT "${pkgdir}${MINGW_PREFIX}/share/licenses/lldb/LICENSE" } package_llvm() { @@ -475,9 +473,6 @@ package_llvm() { ${_make_cmd} -C ../build-${CARCH} DESTDIR="${pkgdir}" install - # TODO: why CMake haven't included it? - cp ../build-${CARCH}/lib/libLLVM.dll.a "${pkgdir}/${MINGW_PREFIX}/lib/" - install -Dm644 LICENSE.TXT "${pkgdir}${MINGW_PREFIX}/share/licenses/llvm/LICENSE" # Install CMake stuff @@ -497,7 +492,7 @@ package_polly() { url="https://polly.llvm.org/" depends=("${MINGW_PACKAGE_PREFIX}-llvm=${pkgver}-${pkgrel}") - cd "${srcdir}"/llvm-${pkgver}.src + cd "${srcdir}"/polly ${_make_cmd} -C ../build-${CARCH}/tools/polly DESTDIR="${pkgdir}" install # fox cmake files. local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) From dd2f427a23190f54158adc1bb27a3e60a1080872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Tue, 7 Jul 2020 18:58:55 +0200 Subject: [PATCH 18/72] Add missing Lua dependency for LLDB --- mingw-w64-clang/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 18c2a06485..533bef9d7c 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -447,6 +447,7 @@ package_lldb() { url="https://lldb.llvm.org/" depends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-llvm" + "${MINGW_PACKAGE_PREFIX}-lua" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-readline" "${MINGW_PACKAGE_PREFIX}-swig") From bf1a765c236e19c0a59cc2c73d72c2ed80167cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Tue, 7 Jul 2020 20:40:04 +0200 Subject: [PATCH 19/72] Build shared and static libc++ --- mingw-w64-clang/PKGBUILD | 86 ++++++++++++++++++++++++++++++++-------- 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 533bef9d7c..79b559850d 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -288,22 +288,13 @@ build() { -G"$_generator" \ -DCLANG_ANALYZER_BUILD_Z3=ON \ -DCMAKE_ASM_MASM_COMPILER="${ASM_COMPILER}" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib \ -DFFI_INCLUDE_DIR="${FFI_INCLUDE_DIR}" \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \ -DLIBCLANG_BUILD_STATIC=ON \ - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF \ - -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF \ - -DLIBCXX_ENABLE_SHARED=OFF \ - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON \ - -DLIBCXX_HAS_WIN32_THREAD_API=ON \ - -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF \ - -DLIBCXXABI_ENABLE_SHARED=OFF \ -DLIBOMP_ASMFLAGS="${ASM_COMPILER_FLAGS}" \ -DLIBOMP_FORTRAN_MODULES=ON \ - -DLIBUNWIND_ENABLE_SHARED=ON \ -DLLDB_ENABLE_LIBEDIT=OFF \ -DLLDB_RELOCATABLE_PYTHON=ON \ -DLLDB_USE_SYSTEM_SIX=ON \ @@ -311,7 +302,7 @@ build() { -DLLVM_BUILD_STATIC=OFF \ -DLLVM_ENABLE_ASSERTIONS=OFF \ -DLLVM_ENABLE_FFI=ON \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld;lldb;openmp;polly" \ + -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld;lldb;openmp;polly" \ -DLLVM_ENABLE_SPHINX=ON \ -DLLVM_ENABLE_THREADS=ON \ -DLLVM_INCLUDE_EXAMPLES=OFF \ @@ -333,6 +324,66 @@ build() { sed -i.orig '/\(clang\|lld\|lldb\|polly\)\/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\|openmp\|libunwind\)\/cmake_install.cmake/d' projects/cmake_install.cmake + + # Use newly built compiler because GCC/binutils doesn't play nicely + export CC="${srcdir}/build-${CARCH}/bin/clang" + export CXX="${srcdir}/build-${CARCH}/bin/clang++" + # Force win32 threads for libc++abi + export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_HAS_THREAD_API_WIN32" + COMMON_CMAKE_ARGS=(-DCMAKE_AR=${srcdir}/build-${CARCH}/bin/llvm-ar + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} + -DCMAKE_RANLIB=${srcdir}/build-${CARCH}/bin/llvm-ranlib + -DCMAKE_SYSTEM_IGNORE_PATH=/usr/lib + -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=ON + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON + -DLIBCXX_HAS_WIN32_THREAD_API=ON + -DLIBCXX_USE_COMPILER_RT=ON + -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF + -DLIBCXXABI_ENABLE_SHARED=OFF + -DLIBCXXABI_ENABLE_STATIC=ON + -DLIBCXXABI_USE_COMPILER_RT=ON + -DLIBCXXABI_USE_LLVM_UNWINDER=ON + -DLIBUNWIND_ENABLE_SHARED=ON + -DLIBUNWIND_USE_COMPILER_RT=ON + -DLLVM_ENABLE_LLD=ON + -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi;libunwind" + -DPYTHON_EXECUTABLE=${MINGW_PREFIX}/bin/python.exe) + + cd "${srcdir}" + + [[ -d build-libcxx-shared-${CARCH} ]] && rm -rf build-libcxx-shared-${CARCH} + mkdir build-libcxx-shared-${CARCH} && cd build-libcxx-shared-${CARCH} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"$_generator" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -D_LIBCPP_BUILDING_LIBRARY -U_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS" \ + -DLIBCXX_ENABLE_SHARED=ON \ + -DLIBCXX_ENABLE_STATIC=OFF \ + -DLIBUNWIND_ENABLE_STATIC=OFF \ + "${COMMON_CMAKE_ARGS[@]}" \ + ${extra_config[@]} \ + ../llvm-${pkgver}.src + + ${_make_cmd} cxx + + cd "${srcdir}" + + [[ -d build-libcxx-static-${CARCH} ]] && rm -rf build-libcxx-static-${CARCH} + mkdir build-libcxx-static-${CARCH} && cd build-libcxx-static-${CARCH} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"$_generator" \ + -DCMAKE_CXX_FLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" \ + -DLIBCXX_ENABLE_SHARED=OFF \ + -DLIBCXX_ENABLE_STATIC=ON \ + -DLIBUNWIND_ENABLE_STATIC=ON \ + "${COMMON_CMAKE_ARGS[@]}" \ + ${extra_config[@]} \ + ../llvm-${pkgver}.src + + ${_make_cmd} unwind cxxabi cxx } #check() { @@ -400,9 +451,13 @@ package_compiler-rt() { package_libcxx() { pkgdesc="C++ Standard Library (mingw-w64)" url="https://libcxx.llvm.org/" + depends="${MINGW_PACKAGE_PREFIX}-libunwind" cd "${srcdir}/libcxx" - ${_make_cmd} -C ../build-${CARCH}/projects/libcxx -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-libcxx-shared-${CARCH}/projects/libcxx DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-libcxx-static-${CARCH}/projects/libcxx DESTDIR="${pkgdir}" install + + install -Dm644 "${srcdir}/build-libcxx-static-${CARCH}/lib/libc++experimental.a" "${pkgdir}${MINGW_PREFIX}/lib/libc++experimental.a" } package_openmp() { @@ -416,11 +471,10 @@ package_openmp() { package_libcxxabi() { pkgdesc="C++ Standard Library Support (mingw-w64)" url="https://libcxxabi.llvm.org/" - # Don't depend on libunwind until it actually works as installing it breaks some packages - #depends="${MINGW_PACKAGE_PREFIX}-libunwind" + depends="${MINGW_PACKAGE_PREFIX}-libunwind" cd "${srcdir}/libcxxabi" - ${_make_cmd} -C ../build-${CARCH}/projects/libcxxabi -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-libcxx-static-${CARCH}/projects/libcxxabi DESTDIR="${pkgdir}" install } package_libunwind() { @@ -428,10 +482,10 @@ package_libunwind() { url='https://llvm.org/' cd "${srcdir}/libunwind" - ${_make_cmd} -C ../build-${CARCH}/projects/libunwind -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-libcxx-static-${CARCH}/projects/libunwind DESTDIR="${pkgdir}" install mkdir -p "${pkgdir}${MINGW_PREFIX}/bin" - install "${srcdir}/build-${CARCH}/lib/libunwind.dll" "${pkgdir}${MINGW_PREFIX}/bin/libunwind.dll" + install "${srcdir}/build-libcxx-static-${CARCH}/lib/libunwind.dll" "${pkgdir}${MINGW_PREFIX}/bin/libunwind.dll" } package_lld() { From 403ff23a3f355f80653c26c5903b4f9a8e427d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 9 Jul 2020 00:07:42 +0200 Subject: [PATCH 20/72] drop -j1 from install --- mingw-w64-clang/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 79b559850d..073956d05f 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -416,8 +416,8 @@ package_clang-analyzer() { "${MINGW_PACKAGE_PREFIX}-python") cd "${srcdir}/clang" - ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-build -j1 DESTDIR="${pkgdir}" install - ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-view -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-build DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/scan-view DESTDIR="${pkgdir}" install # Use Python 2 sed -i \ @@ -436,7 +436,7 @@ package_clang-tools-extra() { url="https://clang.llvm.org/" cd "${srcdir}/clang-tools-extra" - ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/extra -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-${CARCH}/tools/clang/tools/extra DESTDIR="${pkgdir}" install } package_compiler-rt() { @@ -493,7 +493,7 @@ package_lld() { url="https://lld.llvm.org/" cd "${srcdir}/lld" - ${_make_cmd} -C ../build-${CARCH}/tools/lld -j1 DESTDIR="${pkgdir}" install + ${_make_cmd} -C ../build-${CARCH}/tools/lld DESTDIR="${pkgdir}" install } package_lldb() { From ced57b2b3743a7bb96ad4824bae78fd48efb271f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Thu, 9 Jul 2020 15:37:29 +0200 Subject: [PATCH 21/72] Bump pkgrel --- mingw-w64-clang/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 073956d05f..4c1e08da56 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -32,7 +32,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-openmp" "${MINGW_PACKAGE_PREFIX}-polly") pkgver=10.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') url="https://llvm.org/" From 2d12f08eae1155743a1fe1c3f1165a078bd5c07d Mon Sep 17 00:00:00 2001 From: Marcelo Duarte Date: Thu, 9 Jul 2020 13:19:22 -0300 Subject: [PATCH 22/72] python-cx_Freeze: Update to 6.2 --- mingw-w64-python-cx_Freeze/PKGBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mingw-w64-python-cx_Freeze/PKGBUILD b/mingw-w64-python-cx_Freeze/PKGBUILD index b79a6c3dc3..da66502225 100644 --- a/mingw-w64-python-cx_Freeze/PKGBUILD +++ b/mingw-w64-python-cx_Freeze/PKGBUILD @@ -8,18 +8,17 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-cx_Freeze") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=6.1 -pkgrel=3 +pkgver=6.2 +pkgrel=1 pkgdesc="Python package for freezing scripts into executables (mingw-w64)" arch=('any') license=('PSF') -url="https://cx-freeze.sourceforge.io/" -depends=("${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-python-six") +url="https://github.com/marcelotduarte/cx_Freeze/" +depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") options=('staticlibs' 'strip' '!debug') -source=(cx_Freeze-${pkgver}.tar.gz::https://github.com/anthony-tuininga/cx_Freeze/archive/${pkgver}.tar.gz) -sha256sums=('97ebaa6226737cba0a6a5d2a715c50a871181ce01b23800358d159c15ebcc96a') +source=(cx_Freeze-${pkgver}.tar.gz::https://github.com/marcelotduarte/cx_Freeze/archive/${pkgver}.tar.gz) +sha256sums=('4109a7a62015ccefc7ef58fc4fb487d970bf1a7ea94a13069460e60f5d504c73') prepare() { rm -Rf python-cx_Freeze-${CARCH} From 834edbf5ea2c1ae3a313b59594b0dad97b96f767 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Thu, 9 Jul 2020 19:15:29 +0200 Subject: [PATCH 23/72] gtk3: add patch from GIMP project (ported for gtk3) This prevents transparent top-level windows from intercepting mouse events as often the case with screen capturing software, see https://bugzilla.gnome.org/show_bug.cgi?id=780979 Applies the same patch that was added for gtk2 in 023eb8614b8f320563ecb625da334cd1392d430d --- mingw-w64-gtk3/0006_fix_mouse_events.patch | 49 ++++++++++++++++++++++ mingw-w64-gtk3/PKGBUILD | 6 ++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 mingw-w64-gtk3/0006_fix_mouse_events.patch diff --git a/mingw-w64-gtk3/0006_fix_mouse_events.patch b/mingw-w64-gtk3/0006_fix_mouse_events.patch new file mode 100644 index 0000000000..19fa57a580 --- /dev/null +++ b/mingw-w64-gtk3/0006_fix_mouse_events.patch @@ -0,0 +1,49 @@ +From 8972d6e0b2c6d6afa5a1128641127fe66d0f159b Mon Sep 17 00:00:00 2001 +From: Patrick Storz +Date: Thu, 9 Jul 2020 18:13:02 +0200 +Subject: [PATCH] Add patch from GIMP project + +This prevents transparent top-level windows from intercepting mouse +events as often the case with screen capturing software, see +https://bugzilla.gnome.org/show_bug.cgi?id=780979 +--- + gdk/win32/gdkdevice-win32.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c +index 190372de2d..3d89290b25 100644 +--- a/gdk/win32/gdkdevice-win32.c ++++ b/gdk/win32/gdkdevice-win32.c +@@ -214,6 +214,10 @@ _gdk_device_win32_window_at_position (GdkDevice *device, + * WindowFromPoint() can find our windows, we follow similar logic + * here, and ignore invisible and disabled windows. + */ ++ UINT cwp_flags = CWP_SKIPDISABLED | ++ CWP_SKIPINVISIBLE | ++ CWP_SKIPTRANSPARENT; ++ + hwnd = GetDesktopWindow (); + do { + window = gdk_win32_handle_table_lookup (hwnd); +@@ -224,8 +228,7 @@ _gdk_device_win32_window_at_position (GdkDevice *device, + break; + + screen_to_client (hwnd, screen_pt, &client_pt); +- hwndc = ChildWindowFromPointEx (hwnd, client_pt, CWP_SKIPDISABLED | +- CWP_SKIPINVISIBLE); ++ hwndc = ChildWindowFromPointEx (hwnd, client_pt, cwp_flags); + + /* Verify that we're really inside the client area of the window */ + if (hwndc != hwnd) +@@ -236,6 +239,8 @@ _gdk_device_win32_window_at_position (GdkDevice *device, + hwndc = hwnd; + } + ++ /* Only ignore top-level transparent windows */ ++ cwp_flags &= ~CWP_SKIPTRANSPARENT; + } while (hwndc != hwnd && (hwnd = hwndc, 1)); + + } +-- +2.25.1.windows.1 + diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index 4192ff4043..d213f75907 100644 --- a/mingw-w64-gtk3/PKGBUILD +++ b/mingw-w64-gtk3/PKGBUILD @@ -4,7 +4,7 @@ _realname=gtk3 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.24.20 -pkgrel=2 +pkgrel=3 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)" arch=('any') url="https://www.gtk.org/" @@ -32,6 +32,7 @@ source=("https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-${pkgver}.tar "0003-gtkwindow-Don-t-force-enable-CSD-under-Windows.patch" "0004-Disable-low-level-keyboard-hook.patch" "0005-fix-build.patch" + "0006_fix_mouse_events.patch" "gtk-query-immodules-3.0.hook.in" "gtk-update-icon-cache.hook.in" "gtk-update-icon-cache.script.in") @@ -40,6 +41,7 @@ sha256sums=('2dac69f716e8d04ba7a95091589e2baaec95dcace932cb15839163db479b1df3' 'b84a7f38f0af80680bee143d431f2a7bae53899efb337de0f67a1b4d9b59fa02' 'e553083298495f9581ae1454b1046a22b83e81862311b30de984057eec859708' '233a1238913034a538b6ab495d06f2f2045fc72b749e337d99b932f7eaddec42' + 'ae048aa0674124217e26e7a3041e2aa34cea89b1e36534c97448d841687a035d' 'adbe57eb726d882bba7a031ab8fb1788e7cd03cbf713823fd0f99d3cb380b97c' '56a566739c4f153f3c924b2bfe5ec7aaca469e15c023810cd7c5f57036d1a258' 'b6306c6e117e879a60febc8e398a5a181325255a2e2c785c77222664b683f9dd') @@ -56,6 +58,8 @@ prepare() { patch -p1 -i "${srcdir}"/0004-Disable-low-level-keyboard-hook.patch patch -p1 -i "${srcdir}"/0005-fix-build.patch + + patch -p1 -i "${srcdir}"/0006_fix_mouse_events.patch } build() { From fb06715e4df4d97d7a3a4dc1cc54c8f5e006a49c Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Thu, 9 Jul 2020 14:25:34 -0400 Subject: [PATCH 24/72] Fix missing ngspice pkg-config file. * Add make pkg-config to build dependencies. * Make sure ngspice.pc file gets added to package. * Bump package release version. --- mingw-w64-ngspice/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mingw-w64-ngspice/PKGBUILD b/mingw-w64-ngspice/PKGBUILD index 07d1315da5..c7ad23a341 100644 --- a/mingw-w64-ngspice/PKGBUILD +++ b/mingw-w64-ngspice/PKGBUILD @@ -11,12 +11,12 @@ _realname=ngspice pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=32 -pkgrel=1 +pkgrel=2 pkgdesc="Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Cider1b1, and Xspice (mingw-w64)" url='https://ngspice.sourceforge.io/' license=('BSD') arch=('any') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-git) depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") @@ -61,6 +61,10 @@ package() { make install DESTDIR="${pkgdir}" install -D -m644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + # pkg-conf file has to be copied manually. Generated pkg-config file is the same for + # static and shared builds. + install -D -m644 "${srcdir}/build-shared-${CARCH}/ngspice.pc" "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/ngspice.pc" + # library files have to be copied manually cd "${srcdir}/build-shared-${CARCH}" install -D -m755 src/.libs/libngspice-0.dll "${pkgdir}${MINGW_PREFIX}/bin" From ed4993cddebbe2cbb9573a7d28a6708fde61fbe7 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Fri, 10 Jul 2020 08:07:44 +0800 Subject: [PATCH 25/72] asciidoc: update to 9.0.1, replaces asciidoc-py3-git --- .../0002-use-python2-in-cmd.patch | 11 ------ .../0001-W32-confdir.mingw.patch | 0 .../PKGBUILD | 38 +++++++------------ 3 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 mingw-w64-asciidoc-py3-git/0002-use-python2-in-cmd.patch rename {mingw-w64-asciidoc-py3-git => mingw-w64-asciidoc}/0001-W32-confdir.mingw.patch (100%) rename {mingw-w64-asciidoc-py3-git => mingw-w64-asciidoc}/PKGBUILD (54%) diff --git a/mingw-w64-asciidoc-py3-git/0002-use-python2-in-cmd.patch b/mingw-w64-asciidoc-py3-git/0002-use-python2-in-cmd.patch deleted file mode 100644 index 6c4399f005..0000000000 --- a/mingw-w64-asciidoc-py3-git/0002-use-python2-in-cmd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- asciidoc-py3/a2x.py.orig 2019-06-07 22:23:57.665795800 +0300 -+++ asciidoc-py3/a2x.py 2019-06-07 22:24:02.876093800 +0300 -@@ -203,7 +203,7 @@ - if not mo: - mo = re.match(r'^\s*(?P[^ ]+)', cmd) - if mo.group('arg0').endswith('.py'): -- cmd = 'python ' + cmd -+ cmd = 'python3 ' + cmd - # Remove redundant quoting -- this is not just cosmetic, - # quoting seems to dramatically decrease the allowed command - # length in Windows XP. diff --git a/mingw-w64-asciidoc-py3-git/0001-W32-confdir.mingw.patch b/mingw-w64-asciidoc/0001-W32-confdir.mingw.patch similarity index 100% rename from mingw-w64-asciidoc-py3-git/0001-W32-confdir.mingw.patch rename to mingw-w64-asciidoc/0001-W32-confdir.mingw.patch diff --git a/mingw-w64-asciidoc-py3-git/PKGBUILD b/mingw-w64-asciidoc/PKGBUILD similarity index 54% rename from mingw-w64-asciidoc-py3-git/PKGBUILD rename to mingw-w64-asciidoc/PKGBUILD index 95827b4930..c1f72613d1 100644 --- a/mingw-w64-asciidoc-py3-git/PKGBUILD +++ b/mingw-w64-asciidoc/PKGBUILD @@ -1,46 +1,37 @@ # Maintainer: Alexey Pavlov -_realname=asciidoc-py3 -pkgbase=mingw-w64-${_realname}-git -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -conflicts=("${MINGW_PACKAGE_PREFIX}-asciidoc") -provides=("${MINGW_PACKAGE_PREFIX}-asciidoc") -_ver_base=8.6.10 -pkgver=8.6.10.r1390 +_realname=asciidoc +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +conflicts=("${MINGW_PACKAGE_PREFIX}-asciidoc-py3-git") +provides=("${MINGW_PACKAGE_PREFIX}-asciidoc-py3-git") +pkgver=9.0.1 pkgrel=1 pkgdesc="AsciiDoc is a text document format for writing notes, documentation, articles, books, ebooks, slideshows, web pages, man pages and blogs (mingw-w64)" arch=('any') url="https://github.com/asciidoc/asciidoc-py3" license=("GPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -depends=("${MINGW_PACKAGE_PREFIX}-python3" +depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-libxslt" "${MINGW_PACKAGE_PREFIX}-docbook-xsl") options=('staticlibs' 'strip') -source=(git+https://github.com/asciidoc/asciidoc-py3.git - 0001-W32-confdir.mingw.patch - 0002-use-python2-in-cmd.patch) -sha256sums=('SKIP' - 'e44d1f3a98ef7e06102323843054d7443d833f421bfba55382b961fa9e4691b2' - '0f783905233b45ab5e2450b4a4dfd621dfaab41fb5d69ea9d581c838dab22cc5') - -pkgver() { - cd ${_realname} - printf "%s.r%s" "${_ver_base}" "$(git rev-list --count HEAD)" -} +source=(https://github.com/asciidoc/asciidoc-py3/releases/download/${pkgver}/asciidoc-${pkgver}.tar.gz + 0001-W32-confdir.mingw.patch) +sha256sums=('26ba534b9cc00596febc1b2386fca65d03be0dfbb73f7e1279eeb87637e851c7' + 'e44d1f3a98ef7e06102323843054d7443d833f421bfba55382b961fa9e4691b2') prepare() { - cd "${srcdir}/${_realname}" + cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/0001-W32-confdir.mingw.patch - patch -p1 -i ${srcdir}/0002-use-python2-in-cmd.patch autoreconf -fiv } build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} - cp -rf ${_realname} build-${MINGW_CHOST} + cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} cd "${srcdir}/build-${MINGW_CHOST}" - ../${_realname}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -53,6 +44,5 @@ package() { cd "${srcdir}/build-${MINGW_CHOST}" make DESTDIR="${pkgdir}" install - install -Dm644 COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING install -Dm644 COPYRIGHT ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYRIGHT } From f434b9ae30522e7110eb682b9f35e456426d312f Mon Sep 17 00:00:00 2001 From: pal1000 Date: Fri, 10 Jul 2020 23:00:54 +0300 Subject: [PATCH 26/72] Update mingw-w64-mesa to 20.1.3 --- mingw-w64-mesa/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD index eef068398f..4ea64d31d0 100644 --- a/mingw-w64-mesa/PKGBUILD +++ b/mingw-w64-mesa/PKGBUILD @@ -3,7 +3,7 @@ _realname=mesa pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=20.1.2 +pkgver=20.1.3 pkgrel=1 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)" arch=('any') @@ -19,7 +19,7 @@ license=('MIT') options=('staticlibs' 'strip') source=(https://mesa.freedesktop.org/archive/${_realname}-${pkgver}.tar.xz{,.sig} llvmwrapgen.sh) -sha256sums=('283dff72814c8a80ce1ff8271e3f055895d26f4da3f4362acc49193e635780cb' +sha256sums=('9872b8d46bee822177ffbe4292addff7bdb84cefc1fe776b8e6b2881a8362bf1' 'SKIP' '3ad048a4c395adf6d24f2e9325d6a125822b323d494149e00d5cc435d16075e4') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov From 4cebcf512381e2df0defe1f4177c673954f0b59c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 11 Jul 2020 09:24:22 +0200 Subject: [PATCH 27/72] rav1e: set pkgbase --- mingw-w64-rav1e/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-rav1e/PKGBUILD b/mingw-w64-rav1e/PKGBUILD index da85b197c9..cc43d71b99 100644 --- a/mingw-w64-rav1e/PKGBUILD +++ b/mingw-w64-rav1e/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Christoph Reiter _realname=rav1e +pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.3.3 -pkgrel=1 +pkgrel=2 pkgdesc='An AV1 encoder focused on speed and safety (mingw-w64)' arch=('any') url=https://github.com/xiph/rav1e/ From 5e1aef4a205dcc774749c3c96b94ae7cee8b64f0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 11 Jul 2020 09:26:01 +0200 Subject: [PATCH 28/72] cargo-c: set pkgbase --- mingw-w64-cargo-c/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD index cb8548dc31..44cae4d069 100644 --- a/mingw-w64-cargo-c/PKGBUILD +++ b/mingw-w64-cargo-c/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Christoph Reiter _realname=cargo-c +pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6.8 -pkgrel=1 +pkgrel=2 pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)' arch=('any') url='https://github.com/lu-zero/cargo-c/' From 2c896f7dd8d0d89726df4365f796052e1aa6ceec Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 11 Jul 2020 14:15:12 +0530 Subject: [PATCH 29/72] spirv-headers: add package --- mingw-w64-spirv-headers/PKGBUILD | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 mingw-w64-spirv-headers/PKGBUILD diff --git a/mingw-w64-spirv-headers/PKGBUILD b/mingw-w64-spirv-headers/PKGBUILD new file mode 100644 index 0000000000..b8e30e59f9 --- /dev/null +++ b/mingw-w64-spirv-headers/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Christoph Reiter + +_realname=spirv-headers +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=1.5.3 +pkgrel=1 +pkgdesc='Machine-readable files for the SPIR-V Registry (mingw-w64)' +arch=('any') +url='https://www.khronos.org/registry/spir-v/' +license=('MIT') +groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/SPIRV-Headers/archive/${pkgver}.tar.gz") +sha512sums=('f678cd66c61bfdff4650cf3e14ab9dfd2fe11566f0ac7c50148be412f4d217c55b71541e92a31d8b5ea51748048539ad7b2645f7d54abc146045fd4a8c06b5b1') + +build() { + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} + mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G "MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build ./ +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install + + install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md + install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE +} From ad088f41722145072715f58b81faecb7d685ad9a Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 14 Jul 2020 10:52:46 +0300 Subject: [PATCH 30/72] wxPython: Rebuild for GCC 10 --- mingw-w64-wxPython/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-wxPython/PKGBUILD b/mingw-w64-wxPython/PKGBUILD index 4193a3b283..e3b5e39a99 100644 --- a/mingw-w64-wxPython/PKGBUILD +++ b/mingw-w64-wxPython/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.0.2.0 _editraver=0.7.20 -pkgrel=9 +pkgrel=10 pkgdesc="A wxWidgets GUI toolkit for Python (mingw-w64)" arch=('any') license=("custom:wxWindows") From 56c0932ff798b5b5d5afd08dedf4d3aba1b58af8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 14 Jul 2020 21:38:11 +0200 Subject: [PATCH 31/72] gobject-introspection: fix g_ir_scanner var in .pc file We create an .exe launcher for it so the variable in the .pc file no longer matched. This is a problem because meson 0.55.0 has started to use the variable to look up g-ir-scanner and fails. Fixes #6677 --- mingw-w64-gobject-introspection/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mingw-w64-gobject-introspection/PKGBUILD b/mingw-w64-gobject-introspection/PKGBUILD index 3ec80ac1bf..a413ed8c0f 100644 --- a/mingw-w64-gobject-introspection/PKGBUILD +++ b/mingw-w64-gobject-introspection/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-runtime") pkgver=1.64.1 -pkgrel=2 +pkgrel=3 arch=('any') url="https://live.gnome.org/GObjectIntrospection" license=("LGPL") @@ -84,6 +84,8 @@ package_gobject-introspection() { for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do sed -s "s|${_PRE_WIN}/lib/libffi|\${prefix}/lib/libffi|g" -i "${pcfile}" sed -s "s|${_PRE_WIN}|${MINGW_PREFIX}|g" -i "${pcfile}" + # we create an .exe launcher for g-ir-scanner, so adjust here too + sed -s "s|/g-ir-scanner|/g-ir-scanner.exe|g" -i "${pcfile}" done rm "${pkgdir}${MINGW_PREFIX}/bin/libgirepository"*.dll From c674ddf1414423d1d8373f5e925d0fa330287b21 Mon Sep 17 00:00:00 2001 From: "Julio C. Galindo" Date: Thu, 16 Jul 2020 00:52:41 -0400 Subject: [PATCH 32/72] Update to v1.7.4 (pkgver + sha256sums) --- mingw-w64-nana/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-nana/PKGBUILD b/mingw-w64-nana/PKGBUILD index 566f22f0e9..8709099893 100644 --- a/mingw-w64-nana/PKGBUILD +++ b/mingw-w64-nana/PKGBUILD @@ -3,7 +3,7 @@ _realname=nana pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="An opensource cross-platform GUI library written in modern C++11 for static linking (mingw-w64)" arch=('any') @@ -12,7 +12,7 @@ license=("Custom:Boost Software License") depends=("${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") source=("${_realname}-v${pkgver}.tar.gz"::"https://github.com/cnjinhao/${_realname}/archive/v${pkgver}.tar.gz") -sha256sums=('fb2480477dc48fbbbbe4a12a07b67d775c32516c5c2e8bb5b6a95361d3b07585') +sha256sums=('56F7B1ED006C750FCCF8EF15AB1E83F96751F2DFDCB68D93E5F712A6C9B58BCB') build() { cd ${srcdir}/${_realname}-${pkgver} From 2a1cf378ed4241582604d2282e05806e3c27d349 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 16 Jul 2020 12:48:28 +0300 Subject: [PATCH 33/72] mpdecimal: Update to 2.5.0 --- mingw-w64-mpdecimal/PKGBUILD | 17 +- .../mpdecimal-2.5.0-msys-mingw.patch | 289 ++++++++++++++++ mingw-w64-mpdecimal/msys2-mingw-fixes.patch | 324 ------------------ 3 files changed, 296 insertions(+), 334 deletions(-) create mode 100644 mingw-w64-mpdecimal/mpdecimal-2.5.0-msys-mingw.patch delete mode 100644 mingw-w64-mpdecimal/msys2-mingw-fixes.patch diff --git a/mingw-w64-mpdecimal/PKGBUILD b/mingw-w64-mpdecimal/PKGBUILD index 0110bebda0..e0df453988 100644 --- a/mingw-w64-mpdecimal/PKGBUILD +++ b/mingw-w64-mpdecimal/PKGBUILD @@ -3,7 +3,7 @@ _realname=mpdecimal pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.4.2 +pkgver=2.5.0 pkgrel=1 pkgdesc="Package for correctly-rounded arbitrary precision decimal floating point arithmetic (mingw-w64)" arch=('any') @@ -12,28 +12,25 @@ license=('custom') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") checkdepends=("wget") source=("http://www.bytereef.org/software/${_realname}/releases/${_realname}-$pkgver.tar.gz" - "msys2-mingw-fixes.patch") -sha256sums=('83c628b90f009470981cf084c5418329c88b19835d8af3691b930afccb7d79c7' - '9a49bfe1e67cb51f77c8d211130f7bc7d1150a26385550bcae111f29d5e0d46f') + "mpdecimal-2.5.0-msys-mingw.patch") +sha256sums=('15417edc8e12a57d1d9d75fa7e3f22b158a3b98f44db9d694cfd2acde8dfa0ca' + 'b8e451931843d55e7ed51efcde183649ab29bc2ba177a6e709b22c05e3a72fde') prepare() { cd $srcdir/${_realname}-${pkgver} - patch -Nbp1 -i ${srcdir}/msys2-mingw-fixes.patch + patch -Nbp1 -i ${srcdir}/mpdecimal-2.5.0-msys-mingw.patch autoreconf -fiv } build() { - cd "$srcdir"/${_realname}-${pkgver} [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} cp -R "$srcdir/${_realname}-${pkgver}" "${srcdir}"/build-${CARCH} - mkdir -p "${srcdir}"/build-${CARCH} && cd "${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 + --target=${MINGW_CHOST} make } diff --git a/mingw-w64-mpdecimal/mpdecimal-2.5.0-msys-mingw.patch b/mingw-w64-mpdecimal/mpdecimal-2.5.0-msys-mingw.patch new file mode 100644 index 0000000000..fcae7179a3 --- /dev/null +++ b/mingw-w64-mpdecimal/mpdecimal-2.5.0-msys-mingw.patch @@ -0,0 +1,289 @@ +diff -Naur mpdecimal-2.5.0-orig/configure.ac mpdecimal-2.5.0/configure.ac +--- mpdecimal-2.5.0-orig/configure.ac 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/configure.ac 2020-07-16 10:01:48.795325300 +0300 +@@ -12,6 +12,8 @@ + AC_MSG_RESULT($ac_sys_system) + + LIBSTATIC=libmpdec.a ++IS_WINDOWS=no ++LIBIMPORT= + case $ac_sys_system in + darwin*|Darwin*) + LIBNAME="libmpdec.dylib" +@@ -19,6 +21,22 @@ + LIBSHARED="libmpdec.2.5.0.dylib" + CONFIGURE_LDFLAGS="-dynamiclib -install_name @rpath/$LIBSONAME -compatibility_version 2.5 -current_version 2.5.0" + ;; ++ mingw*|MINGW*) ++ LIBNAME= ++ LIBIMPORT="libmpdec.dll.a" ++ LIBSONAME= ++ LIBSHARED="libmpdec-2.dll" ++ CONFIGURE_LDFLAGS="-shared -Wl,--out-implib,$LIBIMPORT" ++ IS_WINDOWS=yes ++ ;; ++ msys*|MSYS*) ++ LIBNAME= ++ LIBIMPORT="libmpdec.dll.a" ++ LIBSONAME= ++ LIBSHARED="msys-mpdec-2.dll" ++ CONFIGURE_LDFLAGS="-shared -Wl,--out-implib,$LIBIMPORT" ++ IS_WINDOWS=yes ++ ;; + *) + LIBNAME="libmpdec.so" + LIBSONAME="libmpdec.so.2" +@@ -31,9 +49,12 @@ + AC_SUBST(LIBNAME) + AC_SUBST(LIBSONAME) + AC_SUBST(LIBSHARED) ++AC_SUBST(LIBIMPORT) ++AC_SUBST(IS_WINDOWS) + + + LIBSTATIC_CXX=libmpdec++.a ++LIBIMPORT_CXX= + case $ac_sys_system in + darwin*|Darwin*) + LIBNAME_CXX="libmpdec++.dylib" +@@ -41,6 +62,20 @@ + LIBSHARED_CXX="libmpdec++.2.5.0.dylib" + CONFIGURE_LDXXFLAGS="-dynamiclib -install_name @rpath/$LIBSONAME_CXX -undefined dynamic_lookup -compatibility_version 2.5 -current_version 2.5.0" + ;; ++ mingw*|MINGW*) ++ LIBNAME_CXX= ++ LIBIMPORT_CXX="libmpdec++.dll.a" ++ LIBSONAME_CXX= ++ LIBSHARED_CXX="libmpdec++-2.dll" ++ CONFIGURE_LDXXFLAGS="-shared -Wl,--out-implib,$LIBIMPORT_CXX" ++ ;; ++ msys*|MSYS*) ++ LIBNAME_CXX= ++ LIBIMPORT_CXX="libmpdec++.dll.a" ++ LIBSONAME_CXX= ++ LIBSHARED_CXX="msys-mpdec++-2.dll" ++ CONFIGURE_LDXXFLAGS="-shared -Wl,--out-implib,$LIBIMPORT_CXX" ++ ;; + *) + LIBNAME_CXX="libmpdec++.so" + LIBSONAME_CXX="libmpdec++.so.2" +@@ -53,6 +88,7 @@ + AC_SUBST(LIBNAME_CXX) + AC_SUBST(LIBSONAME_CXX) + AC_SUBST(LIBSHARED_CXX) ++AC_SUBST(LIBIMPORT_CXX) + + # Apparently purely informational for this particular build: + AC_CANONICAL_HOST +diff -Naur mpdecimal-2.5.0-orig/libmpdec/Makefile.in mpdecimal-2.5.0/libmpdec/Makefile.in +--- mpdecimal-2.5.0-orig/libmpdec/Makefile.in 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/libmpdec/Makefile.in 2020-07-16 10:01:17.712406300 +0300 +@@ -8,6 +8,8 @@ + LIBNAME = @LIBNAME@ + LIBSONAME = @LIBSONAME@ + LIBSHARED = @LIBSHARED@ ++LIBIMPORT = @LIBIMPORT@ ++IS_WINDOWS= @IS_WINDOWS@ + + CC = @CC@ + LD = @LD@ +@@ -54,8 +56,10 @@ + + $(LIBSHARED): Makefile $(SHARED_OBJS) + $(LD) $(MPD_LDFLAGS) -o $(LIBSHARED) $(SHARED_OBJS) -lm ++ifeq ($(IS_WINDOWS),no) + ln -sf $(LIBSHARED) $(LIBNAME) + ln -sf $(LIBSHARED) $(LIBSONAME) ++endif + + + basearith.o:\ +diff -Naur mpdecimal-2.5.0-orig/libmpdec++/Makefile.in mpdecimal-2.5.0/libmpdec++/Makefile.in +--- mpdecimal-2.5.0-orig/libmpdec++/Makefile.in 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/libmpdec++/Makefile.in 2020-07-16 10:01:36.106553800 +0300 +@@ -8,11 +8,14 @@ + LIBNAME = @LIBNAME@ + LIBSONAME = @LIBSONAME@ + LIBSHARED = @LIBSHARED@ ++LIBIMPORT = @LIBIMPORT@ ++IS_WINDOWS= @IS_WINDOWS@ + + LIBSTATIC_CXX = @LIBSTATIC_CXX@ + LIBNAME_CXX = @LIBNAME_CXX@ + LIBSONAME_CXX = @LIBSONAME_CXX@ + LIBSHARED_CXX = @LIBSHARED_CXX@ ++LIBIMPORT_CXX = @LIBIMPORT_CXX@ + + CXX = @CXX@ + LDXX = @LDXX@ +@@ -53,8 +56,12 @@ + + $(LIBSHARED_CXX): Makefile $(SHARED_OBJS) ++ifeq ($(IS_WINDOWS),yes) ++ $(LDXX) $(MPD_LDXXFLAGS) -o $(LIBSHARED_CXX) $(SHARED_OBJS) ../libmpdec/$(LIBIMPORT) -lm ++else + $(LDXX) $(MPD_LDXXFLAGS) -o $(LIBSHARED_CXX) $(SHARED_OBJS) -lm + ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) + ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) ++endif + + + decimal.o:\ +diff -Naur mpdecimal-2.5.0-orig/Makefile.in mpdecimal-2.5.0/Makefile.in +--- mpdecimal-2.5.0-orig/Makefile.in 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/Makefile.in 2020-07-16 10:01:03.688124100 +0300 +@@ -14,15 +14,19 @@ + LIBNAME = @LIBNAME@ + LIBSONAME = @LIBSONAME@ + LIBSHARED = @LIBSHARED@ ++LIBIMPORT = @LIBIMPORT@ ++IS_WINDOWS= @IS_WINDOWS@ + + LIBSTATIC_CXX = @LIBSTATIC_CXX@ + LIBNAME_CXX = @LIBNAME_CXX@ + LIBSONAME_CXX = @LIBSONAME_CXX@ + LIBSHARED_CXX = @LIBSHARED_CXX@ ++LIBIMPORT_CXX = @LIBIMPORT_CXX@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + includedir = @includedir@ ++bindir = @bindir@ + libdir = @libdir@ + datarootdir = @datarootdir@ + docdir = @docdir@ +@@ -65,8 +68,14 @@ + $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) + $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir) ++ifeq ($(IS_WINDOWS),yes) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) ++ $(INSTALL) -m 655 libmpdec/$(LIBIMPORT) $(DESTDIR)$(libdir) ++ $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(bindir) ++else + $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) $(LIBNAME) ++endif + $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) + cp -R doc/libmpdec $(DESTDIR)$(docdir) + +@@ -75,8 +83,14 @@ + $(INSTALL) -m 644 libmpdec++/decimal.hh $(DESTDIR)$(includedir) + $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) + $(INSTALL) -m 644 libmpdec++/$(LIBSTATIC_CXX) $(DESTDIR)$(libdir) ++ifeq ($(IS_WINDOWS),yes) ++ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) ++ $(INSTALL) -m 644 libmpdec++/$(LIBIMPORT_CXX) $(DESTDIR)$(libdir) ++ $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(bindir) ++else + $(INSTALL) -m 755 libmpdec++/$(LIBSHARED_CXX) $(DESTDIR)$(libdir) + cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED_CXX) $(LIBSONAME_CXX) && ln -sf $(LIBSHARED_CXX) $(LIBNAME_CXX) ++endif + cp -R doc/libmpdec++ $(DESTDIR)$(docdir) + + +diff -Naur mpdecimal-2.5.0-orig/tests/Makefile.in mpdecimal-2.5.0/tests/Makefile.in +--- mpdecimal-2.5.0-orig/tests/Makefile.in 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests/Makefile.in 2020-07-16 09:18:19.812162800 +0300 +@@ -6,6 +6,9 @@ + CC = @CC@ + AR = @AR@ + ++# Windows demands some special build rules. ++IS_WINDOWS = @IS_WINDOWS@ ++ + CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@ + CFLAGS ?= $(CONFIGURE_CFLAGS) + +@@ -41,6 +44,9 @@ + clean: FORCE + rm -f *.o *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock + rm -f runtest runtest_shared runtest_alloc runtest_alloc_shared ++ifeq ($(IS_WINDOWS),yes) ++ rm -f *.dll *.exe ++endif + + distclean: FORCE + $(MAKE) clean +diff -Naur mpdecimal-2.5.0-orig/tests/runshort.sh mpdecimal-2.5.0/tests/runshort.sh +--- mpdecimal-2.5.0-orig/tests/runshort.sh 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests/runshort.sh 2020-07-16 10:07:26.285336100 +0300 +@@ -30,6 +30,13 @@ + + printf "Running additional tests ...\n\n" + ++case "$(uname -s)" in ++ CYGWIN*|MINGW*|MSYS*) ++ cp -f ../libmpdec/*.dll . ++ cp -f ../libmpdec++/*.dll . ++ ;; ++esac ++ + if ! ./runtest additional.decTest + then + printf "\nFAIL\n\n\n" +diff -Naur mpdecimal-2.5.0-orig/tests/runshort_alloc.sh mpdecimal-2.5.0/tests/runshort_alloc.sh +--- mpdecimal-2.5.0-orig/tests/runshort_alloc.sh 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests/runshort_alloc.sh 2020-07-16 10:07:24.025648400 +0300 +@@ -22,6 +22,13 @@ + + printf "Running official tests with allocation failures ...\n\n" + ++case "$(uname -s)" in ++ CYGWIN*|MINGW*|MSYS*) ++ cp -f ../libmpdec/*.dll . ++ cp -f ../libmpdec++/*.dll . ++ ;; ++esac ++ + if ! ./runtest_alloc official.decTest + then + printf "\nFAIL\n\n\n" +diff -Naur mpdecimal-2.5.0-orig/tests/runtest.c mpdecimal-2.5.0/tests/runtest.c +--- mpdecimal-2.5.0-orig/tests/runtest.c 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests/runtest.c 2020-07-16 09:18:19.834286900 +0300 +@@ -46,6 +46,10 @@ + + #include "malloc_fail.h" + ++#if defined(__MINGW32__) ++#define random rand ++#define srandom srand ++#endif + + #define MAXLINE 400000 + #define MAXTOKEN 32 +diff -Naur mpdecimal-2.5.0-orig/tests++/runshort.sh mpdecimal-2.5.0/tests++/runshort.sh +--- mpdecimal-2.5.0-orig/tests++/runshort.sh 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests++/runshort.sh 2020-07-16 10:07:44.750505500 +0300 +@@ -22,6 +22,13 @@ + + printf "Running official tests ...\n\n" + ++case "$(uname -s)" in ++ CYGWIN*|MINGW*|MSYS*) ++ cp -f ../libmpdec/*.dll . ++ cp -f ../libmpdec++/*.dll . ++ ;; ++esac ++ + if ! ./runtest official.topTest --threaded; then + printf "\nFAIL\n\n\n" + exit 1 +diff -Naur mpdecimal-2.5.0-orig/tests++/runshort_alloc.sh mpdecimal-2.5.0/tests++/runshort_alloc.sh +--- mpdecimal-2.5.0-orig/tests++/runshort_alloc.sh 2020-06-27 22:41:49.000000000 +0300 ++++ mpdecimal-2.5.0/tests++/runshort_alloc.sh 2020-07-16 10:07:37.918615300 +0300 +@@ -22,6 +22,13 @@ + + printf "Running official tests with allocation failures ...\n\n" + ++case "$(uname -s)" in ++ CYGWIN*|MINGW*|MSYS*) ++ cp -f ../libmpdec/*.dll . ++ cp -f ../libmpdec++/*.dll . ++ ;; ++esac ++ + if ! ./runtest_alloc official.topTest --threaded; then + printf "\nFAIL\n\n\n" + exit 1 diff --git a/mingw-w64-mpdecimal/msys2-mingw-fixes.patch b/mingw-w64-mpdecimal/msys2-mingw-fixes.patch deleted file mode 100644 index 72e7a1cc9e..0000000000 --- a/mingw-w64-mpdecimal/msys2-mingw-fixes.patch +++ /dev/null @@ -1,324 +0,0 @@ ---- mpdecimal-2.4.2/configure.ac.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/configure.ac 2017-02-14 09:04:56.759794200 -0500 -@@ -5,19 +5,51 @@ - AC_CONFIG_FILES([Makefile libmpdec/Makefile tests/Makefile libmpdec/mpdecimal.h]) - AC_ARG_VAR(MACHINE, [force configuration: x64, uint128, ansi64, ppro, ansi32, ansi-legacy]) - --LIBSTATIC=libmpdec.a --LIBSONAME=libmpdec.so.2 --LIBSHARED=libmpdec.so.2.4.2 --AC_SUBST(LIBSTATIC) --AC_SUBST(LIBSONAME) --AC_SUBST(LIBSHARED) -- -- --# Apparently purely informational for this particular build: - AC_CANONICAL_HOST - AC_SUBST(build) - AC_SUBST(host) - -+case $host in -+ *-*-mingw*) -+ LIBSTATIC=libmpdec.a -+ LIBSOALIAS= -+ LIBSONAME=libmpdec-${PACKAGE_VERSION}.dll -+ LIBSHARED=libmpdec-2.dll -+ LIBIMPORT=libmpdec.dll.a -+ IS_WINDOWS=yes -+ ;; -+ *-*-cygwin*) -+ LIBSTATIC=libmpdec.a -+ LIBSOALIAS= -+ LIBSONAME=cygmpdec-2.dll -+ LIBSHARED=cygmpdec-${PACKAGE_VERSION}.dll -+ LIBIMPORT=libmpdec.dll.a -+ IS_WINDOWS=yes -+ ;; -+ *-*-msys*) -+ LIBSTATIC=libmpdec.a -+ LIBSOALIAS= -+ LIBSONAME=msys-mpdec-2.dll -+ LIBSHARED=msys-mpdec-${PACKAGE_VERSION}.dll -+ LIBIMPORT=libmpdec.dll.a -+ IS_WINDOWS=yes -+ ;; -+ *) -+ LIBSTATIC=libmpdec.a -+ LIBSOALIAS=libmpdec.so -+ LIBSONAME=libmpdec.so.2 -+ LIBSHARED=libmpdec.so.2.4.2 -+ LIBIMPORT= -+ IS_WINDOWS=no -+ ;; -+esac -+AC_SUBST(LIBSTATIC) -+AC_SUBST(LIBSOALIAS) -+AC_SUBST(LIBSONAME) -+AC_SUBST(LIBSHARED) -+AC_SUBST(LIBIMPORT) -+AC_SUBST(IS_WINDOWS) -+ - # Language and compiler: - AC_LANG_C - saved_cflags=$CFLAGS -@@ -88,6 +120,10 @@ - AC_PROG_INSTALL - AC_SUBST(INSTALL) - -+# ln -s program -+AC_PROG_LN_S -+AC_SUBST(LN_S) -+ - # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: - # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html - AC_MSG_CHECKING(for glibc _FORTIFY_SOURCE/memmove bug) ---- mpdecimal-2.4.2/libmpdec/Makefile.in.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/libmpdec/Makefile.in 2017-02-14 09:58:38.908029100 -0500 -@@ -7,6 +7,13 @@ - LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ -+#In Unix-like systems, used to denote a so without a version number -+LIBSOALIAS= @LIBSOALIAS@ -+#LIBIMPORT may be empty. It's only for systems where you link -+# to a separate import file, rather than directly to the shared -+# file. -+LIBIMPORT = @LIBIMPORT@ -+IS_WINDOWS= @IS_WINDOWS@ - - CC = @CC@ - LD = @LD@ -@@ -17,6 +24,8 @@ - MPD_PREC = @MPD_PREC@ - MPD_DPREC = @MPD_DPREC@ - -+LN_S = @LN_S@ -+ - CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@ - MPD_CFLAGS = $(strip $(CONFIGURE_CFLAGS) $(CFLAGS)) - -@@ -37,7 +46,11 @@ - ifeq ($(shell uname), Darwin) - MPD_SOFLAGS=-dynamiclib -Wl,-install_name,$(LIBSONAME) - else -- MPD_SOFLAGS=-shared -Wl,-soname,$(LIBSONAME) -+ ifneq ($(LIBIMPORT),) -+ MPD_SOFLAGS=-shared -Wl,-soname,$(LIBSONAME),--out-implib,$(LIBIMPORT) -+ else -+ MPD_SOFLAGS=-shared -Wl,-soname,$(LIBSONAME) -+ endif - endif - - -@@ -60,8 +73,10 @@ - - $(LIBSHARED): Makefile $(SHARED_OBJS) - $(LD) $(MPD_LDFLAGS) $(MPD_SOFLAGS) -o $(LIBSHARED) $(SHARED_OBJS) -lm -- ln -sf $(LIBSHARED) libmpdec.so -- ln -sf $(LIBSHARED) $(LIBSONAME) -+ifneq ($(LIBSOALIAS),) -+ $(LN_S) $(LIBSHARED) $(LIBSOALIAS) -+endif -+ $(LN_S) $(LIBSHARED) $(LIBSONAME) - - - basearith.o:\ -@@ -220,7 +235,7 @@ - LD_LIBRARY_PATH=. ./bench_shared $(MPD_PREC) 1000 - LD_LIBRARY_PATH=. ./bench_shared $(MPD_DPREC) 1000 - rm -f *.o *.gch .objs/*.o .objs/*.gch bench bench_shared -- rm -f $(LIBSTATIC) $(LIBSHARED) $(LIBSONAME) libmpdec.so -+ rm -f $(LIBSTATIC) $(LIBSHARED) $(LIBSONAME) $(LIBSOALIAS) - - profile_use: bench bench_shared - ./bench $(MPD_PREC) 1000 -@@ -234,8 +249,12 @@ - - clean: FORCE - rm -f *.o *.so *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock -- rm -f bench bench_shared $(LIBSTATIC) $(LIBSHARED) $(LIBSONAME) libmpdec.so -+ rm -f bench bench_shared $(LIBSTATIC) $(LIBSHARED) $(LIBSONAME) $(LIBSOALIAS) - cd .objs && rm -f *.o *.so *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock -+ifeq ($(IS_WINDOWS),yes) -+ rm -f *.dll *.exe -+ cd .objs && rm -rf *.dll *.exe -+endif - - distclean: clean - rm -f config.h config.log config.status Makefile mpdecimal.h ---- mpdecimal-2.4.2/Makefile.in.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/Makefile.in 2017-02-14 09:58:38.913529400 -0500 -@@ -8,12 +8,23 @@ - LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ -+#In Unix-like systems, used to denote a so without a version number -+LIBSOALIAS= @LIBSOALIAS@ -+#LIBIMPORT may be empty. It's only for systems where you link -+# to a separate import file, rather than directly to the shared -+# file. -+LIBIMPORT = @LIBIMPORT@ - INSTALL = @INSTALL@ -+LN_S = @LN_S@ -+EXEEXT = @EXEEXT@ -+# Windows demands some special build rules. -+IS_WINDOWS = @IS_WINDOWS@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ - libdir = @libdir@ -+bindir = @bindir@ - datarootdir = @datarootdir@ - docdir = @docdir@ - -@@ -35,9 +46,23 @@ - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifneq ($(LIBIMPORT),) -+ $(INSTALL) -m 644 libmpdec/$(LIBIMPORT) $(DESTDIR)$(libdir) -+endif - $(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir) -+ifeq ($(IS_WINDOWS),yes) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(bindir) -+ifneq ($(LIBSOALIAS),) -+ cd $(DESTDIR)$(bindir) && $(LN_S) $(LIBSHARED) $(LIBSOALIAS) -+endif -+else - $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) -- cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) libmpdec.so -+ cd $(DESTDIR)$(libdir) && $(LN_S) $(LIBSHARED) $(LIBSONAME) -+ifneq ($(LIBSOALIAS),) -+ cd $(DESTDIR)$(libdir) && $(LN_S) $(LIBSHARED) $(LIBSOALIAS) -+endif -+endif - $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) - cp -R doc/* $(DESTDIR)$(docdir) - ---- mpdecimal-2.4.2/tests/Makefile.in.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/tests/Makefile.in 2017-02-14 09:58:38.919030700 -0500 -@@ -11,6 +11,9 @@ - MPD_WARN = @MPD_WARN@ - MPD_CONFIG = @MPD_CONFIG@ - -+# Windows demands some special build rules. -+IS_WINDOWS = @IS_WINDOWS@ -+ - CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@ - CFLAGS ?= $(CONFIGURE_CFLAGS) - -@@ -46,6 +49,9 @@ - clean: FORCE - rm -f *.o *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock - rm -f runtest runtest_shared runtest_alloc runtest_alloc_shared -+ifeq ($(IS_WINDOWS),yes) -+ rm -f *.dll *.exe -+endif - - distclean: FORCE - $(MAKE) clean ---- mpdecimal-2.4.2/tests/runshort.sh.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/tests/runshort.sh 2017-02-14 09:58:38.924030500 -0500 -@@ -30,9 +30,21 @@ - - printf "Running official tests ...\n\n" - -+case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ cp ../libmpdec/*.dll . -+ ;; -+esac -+ - if ! LD_LIBRARY_PATH=../libmpdec ./runtest_shared official.decTest - then - printf "\nFAIL\n\n\n" -+ case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+ esac -+ - exit 1 - fi - -@@ -41,8 +53,19 @@ - if ! LD_LIBRARY_PATH=../libmpdec ./runtest_shared additional.decTest - then - printf "\nFAIL\n\n\n" -+ -+ case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+ esac -+ - exit 1 - fi - -- -+case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+esac - ---- mpdecimal-2.4.2/tests/runshort_alloc.sh.orig 2016-02-27 16:55:00.000000000 -0500 -+++ mpdecimal-2.4.2/tests/runshort_alloc.sh 2017-02-14 09:58:38.933031900 -0500 -@@ -30,9 +30,21 @@ - - printf "Running official tests with allocation failures ...\n\n" - -+case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ cp ../libmpdec/*.dll . -+ ;; -+esac -+ - if ! LD_LIBRARY_PATH=../libmpdec ./runtest_alloc_shared official.decTest - then - printf "\nFAIL\n\n\n" -+ case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+ esac -+ - exit 1 - fi - -@@ -41,8 +53,18 @@ - if ! LD_LIBRARY_PATH=../libmpdec ./runtest_alloc_shared additional.decTest - then - printf "\nFAIL\n\n\n" -+ case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+ esac -+ - exit 1 - fi - -- -+case "$(uname -s)" in -+ CYGWIN*|MINGW*|MSYS*) -+ rm -f *.dll -+ ;; -+esac - - ---- mpdecimal-2.4.2/tests/runtest.c.orig 2017-02-14 18:41:32.763666600 -0500 -+++ mpdecimal-2.4.2/tests/runtest.c 2017-02-14 19:38:26.102943000 -0500 -@@ -46,6 +46,10 @@ - #include "mptest.h" - #include "malloc_fail.h" - -+#if defined(__MINGW32__) -+#define random rand -+#define srandom srand -+#endif - - #define MAXLINE 400000 - #define MAXTOKEN 32 From 22fdbd77ceded2cd3d30e5c4495ce2c0a8dbacec Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 16 Jul 2020 12:48:56 +0300 Subject: [PATCH 34/72] python: Update to 3.8.4 --- .../0560-mingw-use-posix-getpath.patch | 15 ++++++++------- mingw-w64-python/PKGBUILD | 8 ++++---- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mingw-w64-python/0560-mingw-use-posix-getpath.patch b/mingw-w64-python/0560-mingw-use-posix-getpath.patch index b108e3e37a..863ec1874a 100644 --- a/mingw-w64-python/0560-mingw-use-posix-getpath.patch +++ b/mingw-w64-python/0560-mingw-use-posix-getpath.patch @@ -386,15 +386,16 @@ diff -Naur Python-3.8.0-orig/Modules/posixmodule.c Python-3.8.0/Modules/posixmod Py_DECREF(list); list = path_error(path); goto exit; -diff -Naur Python-3.8.0-orig/Python/dynload_win.c Python-3.8.0/Python/dynload_win.c ---- Python-3.8.0-orig/Python/dynload_win.c 2019-10-22 10:01:24.710185500 +0300 -+++ Python-3.8.0/Python/dynload_win.c 2019-10-22 10:02:45.644127700 +0300 -@@ -180,7 +180,7 @@ +diff -Naur Python-3.8.4-orig/Python/dynload_win.c Python-3.8.4/Python/dynload_win.c +--- Python-3.8.4-orig/Python/dynload_win.c 2019-10-22 10:01:24.710185500 +0300 ++++ Python-3.8.4/Python/dynload_win.c 2019-10-22 10:02:45.644127700 +0300 +@@ -180,7 +180,9 @@ char funcname[258], *import_python; const wchar_t *wpathname; --#ifndef _DEBUG -+#if !defined(_DEBUG) && defined(_MSC_VER) ++#if defined(_MSC_VER) _Py_CheckPython3(); - #endif ++#endif + wpathname = _PyUnicode_AsUnicode(pathname); + if (wpathname == NULL) diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index 1881256d7e..cc028d7c86 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -17,8 +17,8 @@ _realname=python pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") _pybasever=3.8 -pkgver=${_pybasever}.3 -pkgrel=2 +pkgver=${_pybasever}.4 +pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python2<2.7.16-7") @@ -475,7 +475,7 @@ package() { } -sha256sums=('dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864' +sha256sums=('5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37' '0ee1acf745d38d41fd098487b9595705fd8f6666d7b154d54ddba32d14f1253b' '0d27f52bc514dbf2b730f62fa6c18c797a2f4cbad8698d95b15e2774d68e483d' 'd2d73d9fb9db48fecb3a6856e4606f444eaac7637fd4f65e192701e53ac422eb' @@ -515,7 +515,7 @@ sha256sums=('dfab5ec723c218082fe3d5d7ae17ecbdebffa9a1aea4d64aa3a2ecdd2e795864' '840cbf8fafa2cc230dd8a9f667dbad80d54ad573f929f9970252722b9183688b' 'fbae2e8121a027713ce9cf2197b4d702f512e65d028a2a71d4229a4c70f8410d' '95cf0d30ad7f0f171da79187f1564b8b2796e9d76551cfb442c26ae4d9f1aafe' - '23a3566e06b43ccf292bebe0a464421d41c5a30deb9f80d0964dd01ff483e5ed' + '6b37b7d4ecd269abcf92ada988d4be48e0fee1473d6a2cc7d6562812c579095d' '4bb617a956b783edfb1a4246580172c4f9eb2728ff14730618854a3be7840dad' '65aff7e831f3bb4b37ed5d4db5dfa75ab6bd582d132dd197e658ccb699dbfac7' 'f2a7b6dce11311e3d318d5729258935a520dcb7ce4dc879ecb1738a2f8bfe434' From d8b6e668640c6f4b5630dd306576e32cef7fe111 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 16 Jul 2020 12:49:19 +0300 Subject: [PATCH 35/72] cython: Update to 0.29.21 --- mingw-w64-cython/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-cython/PKGBUILD b/mingw-w64-cython/PKGBUILD index 7cdb983948..91492a3f7f 100644 --- a/mingw-w64-cython/PKGBUILD +++ b/mingw-w64-cython/PKGBUILD @@ -4,7 +4,7 @@ _realname=cython pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-cython") -pkgver=0.29.20 +pkgver=0.29.21 pkgrel=1 pkgdesc="C-Extensions for Python (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") install=${_realname}-${CARCH}.install source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cython/cython/archive/${pkgver}.tar.gz") -sha256sums=('88e92dc9cdc28460a5e3c6dccb78e81bd994e96cf5e86a9061b0382f4864fd50') +sha256sums=('e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079') prepare() { cd "${srcdir}" From 44f6b7b1397a5751d9bd3a341580d3f20a072f9a Mon Sep 17 00:00:00 2001 From: Tim Stahlhut Date: Thu, 16 Jul 2020 09:43:46 -0400 Subject: [PATCH 36/72] gcc: Set bugurl to "https://github.com/msys2/MINGW-packages/issues" "gcc --help" displays this URL in last line of help. Prior value was "https://sourceforge.net/projects/msys2" --- mingw-w64-gcc/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index adf14efb37..c8523a28c6 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -213,7 +213,7 @@ build() { --with-system-zlib \ --with-{gmp,mpfr,mpc,isl}=${MINGW_PREFIX} \ --with-pkgversion="Rev${pkgrel}, Built by MSYS2 project" \ - --with-bugurl="https://sourceforge.net/projects/msys2" \ + --with-bugurl="https://github.com/msys2/MINGW-packages/issues" \ --with-gnu-as --with-gnu-ld \ ${_conf} From 73f046da02df0e9ff0af53f7e359b009c62ea75e Mon Sep 17 00:00:00 2001 From: Tim Stahlhut Date: Thu, 16 Jul 2020 18:19:51 -0400 Subject: [PATCH 37/72] gcc: Bump pkgrel --- mingw-w64-gcc/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index c8523a28c6..f49fd9b193 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -21,7 +21,7 @@ pkgver=10.1.0 #_majorver=${pkgver:0:1} #_sourcedir=${_realname}-${_majorver}-${_snapshot} _sourcedir=${_realname}-${pkgver} -pkgrel=3 +pkgrel=4 pkgdesc="GCC for the MinGW-w64" arch=('any') url="https://gcc.gnu.org" From eb3ba5d8f746c602a14f37f0c284df0b897ac6bf Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Jul 2020 14:01:45 +0300 Subject: [PATCH 38/72] libwebsockets: Update to 4.0.20 --- mingw-w64-libwebsockets/002-fix-casts.patch | 11 ----------- mingw-w64-libwebsockets/PKGBUILD | 17 +++++++++-------- 2 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 mingw-w64-libwebsockets/002-fix-casts.patch diff --git a/mingw-w64-libwebsockets/002-fix-casts.patch b/mingw-w64-libwebsockets/002-fix-casts.patch deleted file mode 100644 index dfbeca1198..0000000000 --- a/mingw-w64-libwebsockets/002-fix-casts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libwebsockets-4.0.1/lib/core-net/output.c.orig 2020-04-12 10:16:02.179670900 +0300 -+++ libwebsockets-4.0.1/lib/core-net/output.c 2020-04-12 10:16:05.007733000 +0300 -@@ -366,7 +366,7 @@ - } else - #endif - if (wsi->role_ops->file_handle) -- n = write((int)(long long)wsi->desc.filefd, buf, len); -+ n = write((int)(intptr_t)wsi->desc.filefd, buf, len); - else - n = send(wsi->desc.sockfd, (char *)buf, len, MSG_NOSIGNAL); - // lwsl_info("%s: sent len %d result %d", __func__, len, n); diff --git a/mingw-w64-libwebsockets/PKGBUILD b/mingw-w64-libwebsockets/PKGBUILD index 305258b1fd..cafef9c66d 100644 --- a/mingw-w64-libwebsockets/PKGBUILD +++ b/mingw-w64-libwebsockets/PKGBUILD @@ -3,7 +3,7 @@ _realname=libwebsockets pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.0.13 +pkgver=4.0.20 pkgrel=1 arch=('any') pkgdesc="C library for websocket clients and servers (mingw-w64)" @@ -12,17 +12,14 @@ license=('LGPL2.1') depends=("${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-openssl") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") source=("${_realname}-${pkgver}.tar.gz::https://github.com/warmcat/${_realname}/archive/v${pkgver}.tar.gz" - 001-posix-layout.patch - 002-fix-casts.patch) + 001-posix-layout.patch) options=(!strip !buildflags staticlibs) -sha256sums=('fb73e26868daeb819e0c1f73a8f50eb2fa0b5c1fc1811a87a2b7dc77479ae291' - '9bdfdffc74e348692b20b08881ec682ee7aa7ba65b370199dd52f99331013cdc' - '11702eaeb099d91dd12646528a00d648f676eed03f2ab30964d76e5097b4b331') +sha256sums=('a26d243f2642a9b810e7d91f1e66b149d1da978decdca58ce1c9218c454f397e' + '9bdfdffc74e348692b20b08881ec682ee7aa7ba65b370199dd52f99331013cdc') prepare() { cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-posix-layout.patch - patch -p1 -i ${srcdir}/002-fix-casts.patch } build() { @@ -47,5 +44,9 @@ package() { make DESTDIR=${pkgdir} -j1 install install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" - sed -s "s|$(cygpath -m ${MINGW_PREFIX})|${MINGW_PREFIX}|g" -i "${pkgdir}${MINGW_PREFIX}/lib/cmake/${_realname}/LibwebsocketsTargets-release.cmake" + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/${_realname}/*.cmake; do + sed -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} + sed -e "s|${MINGW_PREFIX}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} + done } From b4bd23d744eacea296d0726c21bff033d47cba6a Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 17 Jul 2020 14:02:12 +0300 Subject: [PATCH 39/72] openblas: Fix cmake files --- mingw-w64-openblas/PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw-w64-openblas/PKGBUILD b/mingw-w64-openblas/PKGBUILD index e40bc2f20e..93d0f89981 100644 --- a/mingw-w64-openblas/PKGBUILD +++ b/mingw-w64-openblas/PKGBUILD @@ -5,7 +5,7 @@ _realname=OpenBLAS pkgbase=mingw-w64-openblas pkgname="${MINGW_PACKAGE_PREFIX}-openblas" pkgver=0.3.10 -pkgrel=1 +pkgrel=2 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64)" arch=('any') url="https://www.openblas.net/" @@ -107,6 +107,12 @@ package() { exit 1 fi + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + for _f in "${pkgdir}${MINGW_PREFIX}"/lib/cmake/openblas/*.cmake; do + sed -e "s|${PREFIX_WIN}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} + sed -e "s|${MINGW_PREFIX}|\$\{_IMPORT_PREFIX\}|g" -i ${_f} + done + # Install License install -Dm0644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE install -Dm0644 ${srcdir}/${_realname}-${pkgver}/lapack-netlib/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE-lapack From 70fc1e77c5145e7aeaee5d2c8e252a552abafabe Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Fri, 17 Jul 2020 20:16:47 +0530 Subject: [PATCH 40/72] spirv-tools: update to 2020.3 * use source tarball instead of git repository * add spirv-headers as a make depdency * remove explicity set compiler flags * use cmake command to build and install --- mingw-w64-spirv-tools/PKGBUILD | 39 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/mingw-w64-spirv-tools/PKGBUILD b/mingw-w64-spirv-tools/PKGBUILD index ce80bf09b6..77c672b329 100644 --- a/mingw-w64-spirv-tools/PKGBUILD +++ b/mingw-w64-spirv-tools/PKGBUILD @@ -3,7 +3,7 @@ _realname=spirv-tools pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2020.2 +pkgver=2020.3 pkgrel=1 pkgdesc="API and commands for processing SPIR-V modules (mingw-w64)" arch=('any') @@ -13,16 +13,14 @@ groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-python" - "git") -source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}" - "git+https://github.com/KhronosGroup/SPIRV-Headers.git" + "${MINGW_PACKAGE_PREFIX}-spirv-headers") +source=("${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.3.tar.gz" 001-cmake-files-location.patch) -sha256sums=('SKIP' - 'SKIP' - 'b76834f15d7af8c268897fac1584e94199c976a57dafb2c4390e0fce28934776') +sha512sums=('8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f' + '8cbad8289e5f29c621cf225756e69a7784eba005998a041ae3d81cb017582956ec2d07d163ea7a3de38f3f7bd34900509511a8104d2a2d196da23d87c8e35a58') prepare() { - cd SPIRV-Tools + cd SPIRV-Tools-${pkgver} patch -p1 -i ${srcdir}/001-cmake-files-location.patch } @@ -37,19 +35,18 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - CFLAGS+=" -Wno-switch" - CXXFLAGS+=" -Wno-switch" - msg2 "Building shared library" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G'MSYS Makefiles' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ + -DSPIRV_WERROR=OFF \ -DBUILD_SHARED_LIBS=ON \ - -DSPIRV-Headers_SOURCE_DIR=${srcdir}/SPIRV-Headers \ - ../SPIRV-Tools - make + -DSPIRV-Headers_SOURCE_DIR=${MINGW_PREFIX} \ + ../SPIRV-Tools-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build ./ msg2 "Building static library" [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static @@ -59,21 +56,23 @@ build() { -G'MSYS Makefiles' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ + -DSPIRV_WERROR=OFF \ -DBUILD_SHARED_LIBS=OFF \ - -DSPIRV-Headers_SOURCE_DIR=${srcdir}/SPIRV-Headers \ - ../SPIRV-Tools - make + -DSPIRV-Headers_SOURCE_DIR=${MINGW_PREFIX} \ + ../SPIRV-Tools-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build ./ } package() { cd "${srcdir}"/build-${CARCH}-shared - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install cd "${srcdir}"/build-${CARCH}-static - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install install -dm755 "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}" - install -m644 ${srcdir}/SPIRV-Tools/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/" + install -m644 ${srcdir}/SPIRV-Tools-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/" local _WIN_PREFIX=$(cygpath -am ${MINGW_PREFIX}) for _f in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do From 3429e55c9c52757497e4bc981f1ada2a4f8a5ee9 Mon Sep 17 00:00:00 2001 From: ofry Date: Fri, 17 Jul 2020 20:57:03 +0300 Subject: [PATCH 41/72] Fix innoextract windows package. Signed-off-by: ofry --- mingw-w64-innoextract/0001-fix-segfault-windows.patch | 9 +++++++++ mingw-w64-innoextract/PKGBUILD | 11 ++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-innoextract/0001-fix-segfault-windows.patch diff --git a/mingw-w64-innoextract/0001-fix-segfault-windows.patch b/mingw-w64-innoextract/0001-fix-segfault-windows.patch new file mode 100644 index 0000000000..0130c0aedf --- /dev/null +++ b/mingw-w64-innoextract/0001-fix-segfault-windows.patch @@ -0,0 +1,9 @@ +diff --git a/src/util/windows.cpp b/src/util/windows.cpp +index 9a978d7..1bebe9c 100644 +--- a/src/util/windows.cpp ++++ b/src/util/windows.cpp +@@ -523,3 +523,3 @@ int main() { + // Tell boost::filesystem to interpret our path strings as UTF-8 +- boost::filesystem::path::imbue(std::locale(std::locale(), &util::codecvt)); ++ boost::filesystem::path::imbue(std::locale(std::locale(), new std::codecvt_utf8_utf16())); + diff --git a/mingw-w64-innoextract/PKGBUILD b/mingw-w64-innoextract/PKGBUILD index 0a33d31a17..77e90e1b38 100644 --- a/mingw-w64-innoextract/PKGBUILD +++ b/mingw-w64-innoextract/PKGBUILD @@ -4,7 +4,7 @@ _realname=innoextract pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to extract installers created by Inno Setup (mingw-w64)" arch=('any') url="https://constexpr.org/innoextract/" @@ -18,11 +18,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-xz" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' '!strip') -source=("https://constexpr.org/innoextract/files/${_realname}-${pkgver}.tar.gz") -sha256sums=('5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269') +source=("https://constexpr.org/innoextract/files/${_realname}-${pkgver}.tar.gz" + 0001-fix-segfault-windows.patch +) +sha256sums=('5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269' + 'SKIP' +) prepare() { cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -l -i "${srcdir}"/0001-fix-segfault-windows.patch } build() { From f0dc9ac74ea8a5d83caf4279f2742ce501de2a23 Mon Sep 17 00:00:00 2001 From: ofry Date: Fri, 17 Jul 2020 22:09:41 +0300 Subject: [PATCH 42/72] Add sha256 sum of the patch. Signed-off-by: ofry --- mingw-w64-innoextract/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-innoextract/PKGBUILD b/mingw-w64-innoextract/PKGBUILD index 77e90e1b38..124171fbe8 100644 --- a/mingw-w64-innoextract/PKGBUILD +++ b/mingw-w64-innoextract/PKGBUILD @@ -22,7 +22,7 @@ source=("https://constexpr.org/innoextract/files/${_realname}-${pkgver}.tar.gz" 0001-fix-segfault-windows.patch ) sha256sums=('5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269' - 'SKIP' + 'BFBDF47059B1EFDD74F7847679B0ED9B61E00E8A6236BA518C050B43C4D09D2A' ) prepare() { From cadf4afc4a9f6f3b3d24ddfe857d8f4f2cb19525 Mon Sep 17 00:00:00 2001 From: HP Date: Sat, 18 Jul 2020 23:03:58 +0800 Subject: [PATCH 43/72] update git-lfs to 2.11.0 --- mingw-w64-git-lfs/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mingw-w64-git-lfs/PKGBUILD b/mingw-w64-git-lfs/PKGBUILD index c8879e8850..a1bc7d805a 100644 --- a/mingw-w64-git-lfs/PKGBUILD +++ b/mingw-w64-git-lfs/PKGBUILD @@ -3,7 +3,7 @@ _realname=git-lfs pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.9.2 +pkgver=2.11.0 pkgsrc=${_realname}-${pkgver} pkgrel=1 arch=("any") @@ -17,15 +17,15 @@ makedepends=("unzip" "${MINGW_PACKAGE_PREFIX}-go" #"${MINGW_PACKAGE_PREFIX}-ruby" ) -source=(${pkgsrc}.zip::"https://github.com/github/git-lfs/archive/v${pkgver}.zip") +source=(${pkgsrc}.tar.gz::"https://github.com/github/git-lfs/archive/v${pkgver}.tar.gz") # Extract sources ourselves (avoid bsdtar failure in pull #2406) -noextract=(${pkgsrc}.zip) -sha256sums=('c5e2573225594ce84524391e80f1fc2a332307199fc64a5beac80a1920ace573') +noextract=(${pkgsrc}.tar.gz) +sha256sums=('8183c4cbef8cf9c2e86b0c0a9822451e2df272f89ceb357c498bfdf0ff1b36c7') prepare() { # Extract sources ourselves (avoid bsdtar failure in pull #2406) [[ -d ${srcdir}/${pkgsrc} ]] && rm -rf ${srcdir}/${pkgsrc} - unzip ${srcdir}/${pkgsrc}.zip -d ${srcdir} + tar -xf ${srcdir}/${pkgsrc}.tar.gz -C ${srcdir} # apply patches cd "${srcdir}/${pkgsrc}" From 919179b1ba0389848e66accc9cbd571dab62ccc3 Mon Sep 17 00:00:00 2001 From: Fei Li Date: Sat, 18 Jul 2020 00:38:05 +0800 Subject: [PATCH 44/72] libproxy: Add new patch --- .../008-fix-buffer-overflow.patch | 81 +++++++++++++++++++ mingw-w64-libproxy/PKGBUILD | 9 ++- 2 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-libproxy/008-fix-buffer-overflow.patch diff --git a/mingw-w64-libproxy/008-fix-buffer-overflow.patch b/mingw-w64-libproxy/008-fix-buffer-overflow.patch new file mode 100644 index 0000000000..36aec47e3f --- /dev/null +++ b/mingw-w64-libproxy/008-fix-buffer-overflow.patch @@ -0,0 +1,81 @@ +diff --git a/libproxy/url.cpp b/libproxy/url.cpp +index b61a9bc..230d0ee 100644 +--- a/libproxy/url.cpp ++++ b/libproxy/url.cpp +@@ -52,7 +52,7 @@ using namespace std; + #define PAC_MIME_TYPE_FB "text/plain" + + // This is the maximum pac size (to avoid memory attacks) +-#define PAC_MAX_SIZE 102400 ++#define PAC_MAX_SIZE 0x800000 + // This is the default block size to use when receiving via HTTP + #define PAC_HTTP_BLOCK_SIZE 512 + +@@ -476,15 +476,13 @@ char* url::get_pac() { + } + + // Get content +- unsigned int recvd = 0; +- buffer = new char[PAC_MAX_SIZE]; +- memset(buffer, 0, PAC_MAX_SIZE); ++ std::vector dynamic_buffer; + do { + unsigned int chunk_length; + + if (chunked) { + // Discard the empty line if we received a previous chunk +- if (recvd > 0) recvline(sock); ++ if (!dynamic_buffer.empty()) recvline(sock); + + // Get the chunk-length line as an integer + if (sscanf(recvline(sock).c_str(), "%x", &chunk_length) != 1 || chunk_length == 0) break; +@@ -496,21 +494,41 @@ char* url::get_pac() { + + if (content_length >= PAC_MAX_SIZE) break; + +- while (content_length == 0 || recvd != content_length) { +- int r = recv(sock, buffer + recvd, +- content_length == 0 ? PAC_HTTP_BLOCK_SIZE +- : content_length - recvd, 0); ++ while (content_length == 0 || dynamic_buffer.size() != content_length) { ++ // Calculate length to recv ++ unsigned int length_to_read = PAC_HTTP_BLOCK_SIZE; ++ if (content_length > 0) ++ length_to_read = content_length - dynamic_buffer.size(); ++ ++ // Prepare buffer ++ dynamic_buffer.resize(dynamic_buffer.size() + length_to_read); ++ ++ int r = recv(sock, dynamic_buffer.data() + dynamic_buffer.size() - length_to_read, length_to_read, 0); ++ ++ // Shrink buffer to fit ++ if (r >= 0) ++ dynamic_buffer.resize(dynamic_buffer.size() - length_to_read + r); ++ ++ // PAC size too large, discard ++ if (dynamic_buffer.size() >= PAC_MAX_SIZE) { ++ chunked = false; ++ dynamic_buffer.clear(); ++ break; ++ } ++ + if (r <= 0) { + chunked = false; + break; + } +- recvd += r; + } + } while (chunked); + +- if (content_length != 0 && string(buffer).size() != content_length) { +- delete[] buffer; +- buffer = NULL; ++ if (content_length == 0 || content_length == dynamic_buffer.size()) { ++ buffer = new char[dynamic_buffer.size() + 1]; ++ if (!dynamic_buffer.empty()) { ++ memcpy(buffer, dynamic_buffer.data(), dynamic_buffer.size()); ++ } ++ buffer[dynamic_buffer.size()] = '\0'; + } + } + diff --git a/mingw-w64-libproxy/PKGBUILD b/mingw-w64-libproxy/PKGBUILD index 1c49246ff7..293742f487 100644 --- a/mingw-w64-libproxy/PKGBUILD +++ b/mingw-w64-libproxy/PKGBUILD @@ -4,7 +4,7 @@ _realname=libproxy pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.4.15 -pkgrel=3 +pkgrel=4 pkgdesc="A library that provides automatic proxy configuration management (mingw-w64)" arch=('any') url="https://libproxy.github.io/libproxy/" @@ -21,14 +21,16 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/libproxy/libproxy/arc 004-allow-bindings.patch 005-modules.patch 006-python-site-package-dir.patch - 007-python37-support.patch) + 007-python37-support.patch + 008-fix-buffer-overflow.patch) sha256sums=('18f58b0a0043b6881774187427ead158d310127fc46a1c668ad6d207fb28b4e0' 'f20ce4f17c1a858b3eac84a14226c5e368ea581b0b5ab3428f6e1f9d22d44124' '88e5988413ee2f24a893c4a64f43a7574a395ae63139d05e66a8eb1d14f14902' '0c3182da531c117f80e05871af73d1c2c5d3828ee828f91bba212c9252747ddc' 'c2e2193a6cafcd45dddc1993ea1e61a85c7d9e7b99a5f0e05a0754c52f5ac0dd' '035efcd364e736f8987ea99d11250b3e2987ba31cefbd434003faf0b3da789b6' - '30146d1bedf41fc0010f7efc67348cf154b585493ee8e4fea76d7d95bda4e395') + '30146d1bedf41fc0010f7efc67348cf154b585493ee8e4fea76d7d95bda4e395' + '5d3d9b7c321745d7daadd5e359d724906423d3e9b3087aeaa369af1e7b30491b') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -38,6 +40,7 @@ prepare() { patch -p1 -i ${srcdir}/005-modules.patch patch -p1 -i ${srcdir}/006-python-site-package-dir.patch patch -p1 -i ${srcdir}/007-python37-support.patch + patch -p1 -i ${srcdir}/008-fix-buffer-overflow.patch # https://github.com/libproxy/libproxy/pull/126 } build() { From 6b018d702432a6bf713687fa36118d4bbc574a6e Mon Sep 17 00:00:00 2001 From: ofry Date: Sun, 19 Jul 2020 01:10:54 +0300 Subject: [PATCH 45/72] Added the comment to the patch. Signed-off-by: ofry --- mingw-w64-innoextract/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-innoextract/PKGBUILD b/mingw-w64-innoextract/PKGBUILD index 124171fbe8..c513a7f337 100644 --- a/mingw-w64-innoextract/PKGBUILD +++ b/mingw-w64-innoextract/PKGBUILD @@ -27,7 +27,7 @@ sha256sums=('5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269' prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -l -i "${srcdir}"/0001-fix-segfault-windows.patch + patch -p1 -l -i "${srcdir}"/0001-fix-segfault-windows.patch # see https://github.com/dscharrer/innoextract/pull/114 for details } build() { From e0f20a35841aa40fc035d6023deb1228ed8b69cb Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 19 Jul 2020 19:46:36 +0200 Subject: [PATCH 46/72] libavif: Update to 0.8.0 Fixes #6694 --- mingw-w64-libavif/001-install-shared-lib.patch | 10 ---------- mingw-w64-libavif/002-pixbuf-install-repfix.patch | 11 +++++++++++ mingw-w64-libavif/PKGBUILD | 14 +++++++++----- 3 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 mingw-w64-libavif/001-install-shared-lib.patch create mode 100644 mingw-w64-libavif/002-pixbuf-install-repfix.patch diff --git a/mingw-w64-libavif/001-install-shared-lib.patch b/mingw-w64-libavif/001-install-shared-lib.patch deleted file mode 100644 index 40bed4a0e1..0000000000 --- a/mingw-w64-libavif/001-install-shared-lib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libavif-0.7.3/CMakeLists.txt.orig 2020-07-09 13:06:19.099513700 +0300 -+++ libavif-0.7.3/CMakeLists.txt 2020-07-09 13:05:23.866661100 +0300 -@@ -395,6 +395,7 @@ - EXPORT ${PROJECT_NAME}-config - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - - if (BUILD_SHARED_LIBS) diff --git a/mingw-w64-libavif/002-pixbuf-install-repfix.patch b/mingw-w64-libavif/002-pixbuf-install-repfix.patch new file mode 100644 index 0000000000..8695154978 --- /dev/null +++ b/mingw-w64-libavif/002-pixbuf-install-repfix.patch @@ -0,0 +1,11 @@ +--- libavif-0.8.0/contrib/gdk-pixbuf/CMakeLists.txt.orig 2020-07-14 21:50:45.000000000 +0200 ++++ libavif-0.8.0/contrib/gdk-pixbuf/CMakeLists.txt 2020-07-19 19:42:18.291269000 +0200 +@@ -17,7 +17,7 @@ + target_link_libraries(pixbufloader-avif PUBLIC ${GDK_PIXBUF_LIBRARIES} avif) + target_include_directories(pixbufloader-avif PUBLIC ${GDK_PIXBUF_INCLUDE_DIRS}) + +- pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir) ++ set(GDK_PIXBUF_MODULEDIR "${CMAKE_INSTALL_PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders") + install(TARGETS pixbufloader-avif DESTINATION ${GDK_PIXBUF_MODULEDIR}) + else() + message(WARNING "gdk-pixbuf loader: disabled due to missing gdk-pixbuf-2.0") diff --git a/mingw-w64-libavif/PKGBUILD b/mingw-w64-libavif/PKGBUILD index 866065de8e..4015623677 100644 --- a/mingw-w64-libavif/PKGBUILD +++ b/mingw-w64-libavif/PKGBUILD @@ -3,7 +3,7 @@ _realname=libavif pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.7.3 +pkgver=0.8.0 pkgrel=1 pkgdesc="Library for encoding and decoding .avif files (mingw-w64)" arch=('any') @@ -15,15 +15,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-aom" "${MINGW_PACKAGE_PREFIX}-libpng") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" "${MINGW_PACKAGE_PREFIX}-nasm") source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz" - 001-install-shared-lib.patch) -sha512sums=('b8928755ee39964fd9d9575fdb393ffee0ac3597c1d6f6048e049e6c328d1e82febdb32bfa0b22e16a2fb73ff6cd1ad4af7f63fc9baccea22716d941385c028d' - 'fbe294261a40b0c426a1ae27985939f7482aa16bce412a0a8f7876ecb78813ddf1c42fe87e50f637cd23bf5edef82da547df77f9e1274086c77465f893142a29') + 002-pixbuf-install-repfix.patch) +sha512sums=('362f3c3f8005ad0bce3026282722b26685ba09986def1f410aef25a8fb2b2035b91d1465a26cc1e9ad1cee0ee88b4110e7c92eddbe09a9e39c6ed05ab04d2b9e' + '60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2') prepare() { cd ${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-install-shared-lib.patch + + # https://gitlab.kitware.com/cmake/cmake/-/issues/19632 + patch -p1 -i ${srcdir}/002-pixbuf-install-repfix.patch } build() { @@ -38,6 +41,7 @@ build() { -DAVIF_BUILD_APPS=ON \ -DAVIF_CODEC_AOM=ON \ -DAVIF_CODEC_DAV1D=ON \ + -DAVIF_BUILD_GDK_PIXBUF=ON \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/cmake --build . From 0c547592e09baea58d373c15798b160d5ef8b20a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 19 Jul 2020 22:50:43 +0200 Subject: [PATCH 47/72] libavif: apply patch for crash in new gdk-pixbuf support As suggested here: https://github.com/msys2/MINGW-packages/issues/6694#issuecomment-660703416 --- mingw-w64-libavif/003-fix-pixbuf-crash.patch | 23 ++++++++++++++++++++ mingw-w64-libavif/PKGBUILD | 11 +++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-libavif/003-fix-pixbuf-crash.patch diff --git a/mingw-w64-libavif/003-fix-pixbuf-crash.patch b/mingw-w64-libavif/003-fix-pixbuf-crash.patch new file mode 100644 index 0000000000..22c180b925 --- /dev/null +++ b/mingw-w64-libavif/003-fix-pixbuf-crash.patch @@ -0,0 +1,23 @@ +From 9759bc7346802faa8ec96bb38456d8b8170580aa Mon Sep 17 00:00:00 2001 +From: Emmanuel Gil Peyrot +Date: Fri, 17 Jul 2020 21:41:48 +0200 +Subject: [PATCH] Fix a crash in the gdk-pixbuf loader when error is NULL + +--- + contrib/gdk-pixbuf/loader.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/contrib/gdk-pixbuf/loader.c b/contrib/gdk-pixbuf/loader.c +index b197b20..24a25a1 100644 +--- a/contrib/gdk-pixbuf/loader.c ++++ b/contrib/gdk-pixbuf/loader.c +@@ -182,7 +182,8 @@ static gboolean load_increment(gpointer data, const guchar * buf, guint size, GE + { + struct avif_context * context = (struct avif_context *) data; + g_byte_array_append(context->data, buf, size); +- *error = NULL; ++ if (error) ++ *error = NULL; + return TRUE; + } + diff --git a/mingw-w64-libavif/PKGBUILD b/mingw-w64-libavif/PKGBUILD index 4015623677..0623fbcce0 100644 --- a/mingw-w64-libavif/PKGBUILD +++ b/mingw-w64-libavif/PKGBUILD @@ -4,7 +4,7 @@ _realname=libavif pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Library for encoding and decoding .avif files (mingw-w64)" arch=('any') url="https://github.com/AOMediaCodec/libavif" @@ -18,15 +18,20 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" "${MINGW_PACKAGE_PREFIX}-nasm") source=("${_realname}-${pkgver}.tar.gz::https://github.com/AOMediaCodec/libavif/archive/v${pkgver}.tar.gz" - 002-pixbuf-install-repfix.patch) + 002-pixbuf-install-repfix.patch + 003-fix-pixbuf-crash.patch) sha512sums=('362f3c3f8005ad0bce3026282722b26685ba09986def1f410aef25a8fb2b2035b91d1465a26cc1e9ad1cee0ee88b4110e7c92eddbe09a9e39c6ed05ab04d2b9e' - '60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2') + '60f8bad03460695a094a6ffabbe33f839239fef2bae99d9be7f3a3f9cfde14b694d0c68dce6cc987e9c865a0d97638e951d55abcbab4cc554719803e5d0bb2d2' + 'fe973d8eff01ba7bdb255b16f44a1713be678c37d017b0f6c8d707c451e5c93d20e3782ca9e2f95f99453c2eec9da4d6bd9bea190b076de0ac268e57459108d1') prepare() { cd ${_realname}-${pkgver} # https://gitlab.kitware.com/cmake/cmake/-/issues/19632 patch -p1 -i ${srcdir}/002-pixbuf-install-repfix.patch + + # https://github.com/AOMediaCodec/libavif/pull/236 + patch -p1 -i ${srcdir}/003-fix-pixbuf-crash.patch } build() { From 0851c9ec483f735bbcf1f29498192005adb26023 Mon Sep 17 00:00:00 2001 From: eine Date: Mon, 20 Jul 2020 14:28:42 +0200 Subject: [PATCH 48/72] gtkwave: update to 3.3.105 --- mingw-w64-gtkwave/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-gtkwave/PKGBUILD b/mingw-w64-gtkwave/PKGBUILD index bf615ccb31..f3c10bb9ea 100644 --- a/mingw-w64-gtkwave/PKGBUILD +++ b/mingw-w64-gtkwave/PKGBUILD @@ -3,13 +3,13 @@ _realname=gtkwave pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=3.3.104 +pkgver=3.3.105 pkgrel=1 pkgdesc='GTKWaveGTKWave is a fully featured GTK+ based wave viewer for Unix, Win32, and Mac OSX' arch=('any') url='https://gtkwave.sourceforge.io/' license=('GPL') -depends=("${MINGW_PACKAGE_PREFIX}-gtk2" +depends=("${MINGW_PACKAGE_PREFIX}-gtk2" "${MINGW_PACKAGE_PREFIX}-tk" "${MINGW_PACKAGE_PREFIX}-tklib" "${MINGW_PACKAGE_PREFIX}-tcl" @@ -20,7 +20,7 @@ makedepends=('perlxml' "${MINGW_PACKAGE_PREFIX}-gcc") install=gtkwave-${CARCH}.install source=("https://gtkwave.sourceforge.io/${_realname}-${pkgver}.tar.gz") -sha256sums=('d20dd1a9307b908439c68122a9f81d3ff434a6bfa5439f0cb01398fec650894f') +sha256sums=('cf9757055ee3a1c5550cad66da1996e33145f8e13752e1c6ed2299ffb431612f') prepare() { cd "${srcdir}/${_realname}-${pkgver}" From 0162dfa49f1779976dd428e153ef401da626ab8d Mon Sep 17 00:00:00 2001 From: eine Date: Mon, 20 Jul 2020 14:32:47 +0200 Subject: [PATCH 49/72] ci: bump msys2/setup-msys2 to v2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e0681aac6..7b8283b165 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: with: fetch-depth: 0 - - uses: msys2/setup-msys2@v1 + - uses: msys2/setup-msys2@v2 with: msystem: ${{ matrix.msystem }} install: git base-devel mingw-w64-${{ matrix.arch }}-toolchain From aefb9aed21207f9ed60fefc517bd41d8716111fc Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 21 Jul 2020 16:36:39 +0300 Subject: [PATCH 50/72] python: Update to 3.8.5 --- mingw-w64-python/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-python/PKGBUILD b/mingw-w64-python/PKGBUILD index cc028d7c86..279a57eff3 100644 --- a/mingw-w64-python/PKGBUILD +++ b/mingw-w64-python/PKGBUILD @@ -17,7 +17,7 @@ _realname=python pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") _pybasever=3.8 -pkgver=${_pybasever}.4 +pkgver=${_pybasever}.5 pkgrel=1 provides=("${MINGW_PACKAGE_PREFIX}-python3=${pkgver}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3" @@ -475,7 +475,7 @@ package() { } -sha256sums=('5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37' +sha256sums=('e3003ed57db17e617acb382b0cade29a248c6026b1bd8aad1f976e9af66a83b0' '0ee1acf745d38d41fd098487b9595705fd8f6666d7b154d54ddba32d14f1253b' '0d27f52bc514dbf2b730f62fa6c18c797a2f4cbad8698d95b15e2774d68e483d' 'd2d73d9fb9db48fecb3a6856e4606f444eaac7637fd4f65e192701e53ac422eb' From a993e9fd33aeb2bcf21214cc154a91136c898490 Mon Sep 17 00:00:00 2001 From: eine Date: Wed, 22 Jul 2020 01:03:08 +0200 Subject: [PATCH 51/72] ci(gha): remove redundant keys --- .github/workflows/main.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b8283b165..a9a77b66ec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,18 +9,15 @@ jobs: runs-on: windows-latest strategy: matrix: - include: - - msystem: MINGW64 - msystem_lower: mingw64 - arch: x86_64 - - msystem: MINGW32 - msystem_lower: mingw32 - arch: i686 + include: [ + { msystem: MINGW64, arch: x86_64 }, + { msystem: MINGW32, arch: i686 } + ] defaults: run: shell: msys2 {0} - steps: + - uses: actions/checkout@v2 with: fetch-depth: 0 @@ -32,4 +29,4 @@ jobs: update: true - name: CI-Build - run: MINGW_INSTALLS=${{ matrix.msystem_lower }} ./ci-build.sh + run: MINGW_INSTALLS=${{ matrix.msystem }} ./ci-build.sh From 5a1297f7125069414c1027264391c2139ef39a1c Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 22 Jul 2020 23:37:27 +0530 Subject: [PATCH 52/72] simdjson: update to 0.4.7 add debug option with extra_config variable --- mingw-w64-simdjson/PKGBUILD | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/mingw-w64-simdjson/PKGBUILD b/mingw-w64-simdjson/PKGBUILD index 32ab8dc3e7..c2026ee49d 100644 --- a/mingw-w64-simdjson/PKGBUILD +++ b/mingw-w64-simdjson/PKGBUILD @@ -3,7 +3,7 @@ _realname=simdjson pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.4.5 +pkgver=0.4.7 pkgrel=1 pkgdesc="A C++ library to see how fast we can parse JSON with complete validation (mingw-w64)" arch=('any') @@ -13,17 +13,24 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja") source=("${_realname}-${pkgver}.tar.gz::https://github.com/lemire/simdjson/archive/v${pkgver}.tar.gz") -sha512sums=('97a858378d4e3d4fcf834851d3388119c343506ad0c1b9bd3e8f6f74ad342893553f5e1ef7d5c764e3b508caada94e9c8d4dd087058aff9e759753ebe14b2c1d') +sha512sums=('023e8b75652cb29c41eb1e01ebc6c484b28ff5f6736c885fb5d8c639b1047660fd0eb24d131dabc035fc7fc824e15fe49b177bc3613e329f1d8cd956173a490f') build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + 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 Ninja \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + "${extra_config[@]}" \ -DSIMDJSON_JUST_LIBRARY=ON \ ../${_realname}-${pkgver} From 1b8e4f8ec7837d7b2f5480e6d9f623bdb3c804f7 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 23 Jul 2020 10:40:23 +0300 Subject: [PATCH 53/72] Update mingw-w64-mesa to 20.1.4 --- mingw-w64-mesa/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD index 4ea64d31d0..600a96d354 100644 --- a/mingw-w64-mesa/PKGBUILD +++ b/mingw-w64-mesa/PKGBUILD @@ -3,7 +3,7 @@ _realname=mesa pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=20.1.3 +pkgver=20.1.4 pkgrel=1 pkgdesc="Open-source implementation of the OpenGL specification (mingw-w64)" arch=('any') @@ -19,7 +19,7 @@ license=('MIT') options=('staticlibs' 'strip') source=(https://mesa.freedesktop.org/archive/${_realname}-${pkgver}.tar.xz{,.sig} llvmwrapgen.sh) -sha256sums=('9872b8d46bee822177ffbe4292addff7bdb84cefc1fe776b8e6b2881a8362bf1' +sha256sums=('6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe' 'SKIP' '3ad048a4c395adf6d24f2e9325d6a125822b323d494149e00d5cc435d16075e4') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov From b0b7b9de7719d6600c4c3bae62d04a7cf2f7ca8a Mon Sep 17 00:00:00 2001 From: Andrew Sun Date: Thu, 23 Jul 2020 11:04:21 -0400 Subject: [PATCH 54/72] libidn: update to 1.36 --- .../0004-nfkc.c-Fixed-invalid-var-types.patch | 13 +++++-------- mingw-w64-libidn/PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/mingw-w64-libidn/0004-nfkc.c-Fixed-invalid-var-types.patch b/mingw-w64-libidn/0004-nfkc.c-Fixed-invalid-var-types.patch index 791744a601..fb695e2d48 100644 --- a/mingw-w64-libidn/0004-nfkc.c-Fixed-invalid-var-types.patch +++ b/mingw-w64-libidn/0004-nfkc.c-Fixed-invalid-var-types.patch @@ -1,13 +1,11 @@ --- a/lib/nfkc.c +++ b/lib/nfkc.c -@@ -462,13 +462,13 @@ g_utf8_to_ucs4_fast (const gchar * str, gssize len, gsize * items_written) +@@ -462,12 +462,12 @@ **/ static gchar * g_ucs4_to_utf8 (const gunichar * str, -- glong len, -- glong * items_read, glong * items_written) -+ gssize len, -+ gsize * items_read, gsize * items_written) +- glong len, glong * items_read, glong * items_written) ++ gssize len, gsize * items_read, gsize * items_written) { - gint result_length; + gsize result_length; @@ -18,9 +16,9 @@ result_length = 0; for (i = 0; len < 0 || i < len; i++) -@@ -1035,8 +1035,7 @@ char * +@@ -1040,8 +1040,7 @@ stringprep_ucs4_to_utf8 (const uint32_t * str, ssize_t len, - size_t * items_read, size_t * items_written) + size_t *items_read, size_t *items_written) { - return g_ucs4_to_utf8 (str, len, (glong *) items_read, - (glong *) items_written); @@ -28,4 +26,3 @@ } /** - diff --git a/mingw-w64-libidn/PKGBUILD b/mingw-w64-libidn/PKGBUILD index f5ce22e06b..6ea43aea89 100644 --- a/mingw-w64-libidn/PKGBUILD +++ b/mingw-w64-libidn/PKGBUILD @@ -3,7 +3,7 @@ _realname=libidn pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.35 +pkgver=1.36 pkgrel=1 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications (mingw-w64)" arch=('any') @@ -16,10 +16,10 @@ source=("https://ftp.gnu.org/gnu/libidn/${_realname}-${pkgver}.tar.gz" 0002-fix-gdoc.all.patch 0003-nfkc.c-Fix-Win64-crash.patch 0004-nfkc.c-Fixed-invalid-var-types.patch) -sha256sums=('f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e' +sha256sums=('14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038' '02d9b9e6e3f966cff2d4d763c0de9219da6c8cf444248011caa8eb2fb3067a24' '6293c730a98af32a337149a95d848f3c4619df8dc367e0bf0251a509b09f5963' - '2a2c45dc6f595705a226687c8954390baf926e135168e1919baeadef5e5478cc') + '8ae6ad9513fc11bd79cb1ab73f187cb8297bdabd21a2aef3b6526ca17810eda9') prepare() { From d34539fc0bba559cf0638bb6f1b95abbdee31df7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 24 Jul 2020 19:13:23 +0200 Subject: [PATCH 55/72] gcc: set validpgpkeys --- mingw-w64-gcc/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index f49fd9b193..0fa554d3ee 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -84,6 +84,7 @@ sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2' 'c7359f4c7015bc1fb02bc13449fa9826669273bd1f0663ba898decb67e8487fc' '441d63d95622ffcc2fa5dd688aecad20d2ab16d7d275c567865a754e1d3d4b7a' '5240a9e731b45c17a164066c7eb193c1fbee9fd8d9a2a5afa2edbcde9510da47') +validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') # Helper macros to help make tasks easier # apply_patch_with_msg() { From 93c6d6f64a09b5df70a0c3e092b8c28705291faa Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 24 Jul 2020 21:39:36 +0300 Subject: [PATCH 56/72] Update mingw-w64 to latest from git --- mingw-w64-crt-git/PKGBUILD | 2 +- mingw-w64-headers-git/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD index 430dc4137a..82a42d7c7e 100644 --- a/mingw-w64-crt-git/PKGBUILD +++ b/mingw-w64-crt-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=crt pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn") -pkgver=8.0.0.5941.736c7a24 +pkgver=8.0.0.5966.f5da805f pkgrel=1 pkgdesc='MinGW-w64 CRT for Windows' arch=('any') diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD index 280d14be55..632972e6e7 100644 --- a/mingw-w64-headers-git/PKGBUILD +++ b/mingw-w64-headers-git/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn") pkgdesc="MinGW-w64 headers for Windows" -pkgver=8.0.0.5941.736c7a24 +pkgver=8.0.0.5966.f5da805f pkgrel=1 arch=('any') url="https://mingw-w64.sourceforge.io/" From 89157e00d3f2011dfd5ed553acfd026b347be5f3 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 24 Jul 2020 21:40:00 +0300 Subject: [PATCH 57/72] gcc: Update to 10.2.0 --- mingw-w64-gcc/0130-libstdc++-in-out.patch | 73 +++++++++++++---------- mingw-w64-gcc/PKGBUILD | 8 +-- 2 files changed, 47 insertions(+), 34 deletions(-) diff --git a/mingw-w64-gcc/0130-libstdc++-in-out.patch b/mingw-w64-gcc/0130-libstdc++-in-out.patch index ba00be5993..8789318c04 100644 --- a/mingw-w64-gcc/0130-libstdc++-in-out.patch +++ b/mingw-w64-gcc/0130-libstdc++-in-out.patch @@ -837,9 +837,9 @@ diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algo.h gcc-10.1.0/li diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h gcc-10.1.0/libstdc++-v3/include/bits/ranges_algobase.h --- gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h 2020-05-07 13:50:02.000000000 +0300 +++ gcc-10.1.0/libstdc++-v3/include/bits/ranges_algobase.h 2020-05-08 17:16:30.310826200 +0300 -@@ -220,29 +220,29 @@ - constexpr bool __move_iterator_p = __detail::__is_move_iterator<_Iter>; - if constexpr (__move_iterator_p) +@@ -220,34 +220,34 @@ + using __detail::__is_normal_iterator; + if constexpr (__is_move_iterator<_Iter> && same_as<_Iter, _Sent>) { - auto [__in, __out] + auto [___in, ___out] @@ -849,58 +849,71 @@ diff -Naur gcc-10.1.0-orig/libstdc++-v3/include/bits/ranges_algobase.h gcc-10.1. - return {move_iterator{std::move(__in)}, std::move(__out)}; + return {move_iterator{std::move(___in)}, std::move(___out)}; } - else if constexpr (__reverse_p) + else if constexpr (__is_reverse_iterator<_Iter> && same_as<_Iter, _Sent> + && __is_reverse_iterator<_Out>) { - auto [__in,__out] + auto [___in,___out] - = ranges::__copy_or_move_backward<_IsMove>(__last.base(), - __first.base(), - __result.base()); + = ranges::__copy_or_move_backward<_IsMove>(std::move(__last).base(), + std::move(__first).base(), + std::move(__result).base()); - return {reverse_iterator{std::move(__in)}, - reverse_iterator{std::move(__out)}}; + return {reverse_iterator{std::move(___in)}, + reverse_iterator{std::move(___out)}}; } - else if constexpr (__normal_iterator_p) + else if constexpr (__is_normal_iterator<_Iter> && same_as<_Iter, _Sent>) { - auto [__in,__out] + auto [___in,___out] - = ranges::__copy_or_move<_IsMove>(std::__niter_base(__first), - std::__niter_base(__last), - std::__niter_base(__result)); -- return {std::__niter_wrap(__first, std::move(__in)), -- std::__niter_wrap(__result, std::move(__out))}; -+ return {std::__niter_wrap(__first, std::move(___in)), -+ std::__niter_wrap(__result, std::move(___out))}; + = ranges::__copy_or_move<_IsMove>(__first.base(), __last.base(), + __result); +- return {decltype(__first){__in}, std::move(__out)}; ++ return {decltype(__first){___in}, std::move(___out)}; + } + else if constexpr (__is_normal_iterator<_Out>) + { +- auto [__in,__out] ++ auto [___in,___out] + = ranges::__copy_or_move<_IsMove>(__first, __last, __result.base()); +- return {std::move(__in), decltype(__result){__out}}; ++ return {std::move(___in), decltype(__result){___out}}; } else if constexpr (sized_sentinel_for<_Sent, _Iter>) { -@@ -361,22 +361,22 @@ - && __detail::__is_reverse_iterator<_Out>); - if constexpr (__reverse_p) +@@ -363,28 +363,28 @@ + if constexpr (__is_reverse_iterator<_Iter> && same_as<_Iter, _Sent> + && __is_reverse_iterator<_Out>) { - auto [__in,__out] + auto [___in,___out] - = ranges::__copy_or_move<_IsMove>(__last.base(), - __first.base(), - __result.base()); + = ranges::__copy_or_move<_IsMove>(std::move(__last).base(), + std::move(__first).base(), + std::move(__result).base()); - return {reverse_iterator{std::move(__in)}, - reverse_iterator{std::move(__out)}}; + return {reverse_iterator{std::move(___in)}, + reverse_iterator{std::move(___out)}}; } - else if constexpr (__normal_iterator_p) + else if constexpr (__is_normal_iterator<_Iter> && same_as<_Iter, _Sent>) { - auto [__in,__out] + auto [___in,___out] - = ranges::__copy_or_move_backward<_IsMove> - (std::__niter_base(__first), - std::__niter_base(__last), - std::__niter_base(__result)); -- return {std::__niter_wrap(__first, std::move(__in)), -- std::__niter_wrap(__result, std::move(__out))}; -+ return {std::__niter_wrap(__first, std::move(___in)), -+ std::__niter_wrap(__result, std::move(___out))}; + = ranges::__copy_or_move_backward<_IsMove>(__first.base(), + __last.base(), + std::move(__result)); +- return {decltype(__first){__in}, std::move(__out)}; ++ return {decltype(__first){___in}, std::move(___out)}; + } + else if constexpr (__is_normal_iterator<_Out>) + { +- auto [__in,__out] ++ auto [___in,___out] + = ranges::__copy_or_move_backward<_IsMove>(std::move(__first), + std::move(__last), + __result.base()); +- return {std::move(__in), decltype(__result){__out}}; ++ return {std::move(___in), decltype(__result){___out}}; } else if constexpr (sized_sentinel_for<_Sent, _Iter>) { diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index 0fa554d3ee..20332e1660 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -17,11 +17,11 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" $([[ "$_enable_objc" == "yes" ]] && echo "${MINGW_PACKAGE_PREFIX}-${_realname}-objc") ) #_snapshot=20181214 -pkgver=10.1.0 +pkgver=10.2.0 #_majorver=${pkgver:0:1} #_sourcedir=${_realname}-${_majorver}-${_snapshot} _sourcedir=${_realname}-${pkgver} -pkgrel=4 +pkgrel=1 pkgdesc="GCC for the MinGW-w64" arch=('any') url="https://gcc.gnu.org" @@ -64,7 +64,7 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver%%+*}/${_realname}-${p 0021-gcc-config-i386-mingw32.h-Ensure-lmsvcrt-precede-lke.patch 0130-libstdc++-in-out.patch 0140-gcc-8.2.0-diagnostic-color.patch) -sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2' +sha256sums=('b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c' 'SKIP' 'bce81824fc89e5e62cca350de4c17a27e27a18a1a1ad5ca3492aec1fc5af3234' '1247e81571c908548b4d9aaa3df1ad8fd73aad7b81e7eafea12d53bbada70e94' @@ -82,7 +82,7 @@ sha256sums=('b6898a23844b656f1b68691c5c012036c2e694ac4b53a8918d4712ad876e7ea2' '4233a8d893787413b316de3ac320fd65c46844d463b98c0a98fdc17100cca505' '276ecc392c777d4b17d771a987e80dca50ff25d8f65671d5de139be73997064b' 'c7359f4c7015bc1fb02bc13449fa9826669273bd1f0663ba898decb67e8487fc' - '441d63d95622ffcc2fa5dd688aecad20d2ab16d7d275c567865a754e1d3d4b7a' + '055289699c4222ef0b8125abdc8c9ceeff0712876c86e6d552a056fbacc14284' '5240a9e731b45c17a164066c7eb193c1fbee9fd8d9a2a5afa2edbcde9510da47') validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') From cf96f760f1aa4b5ed8d84f9fd82f465e5c059e74 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 24 Jul 2020 20:54:10 +0200 Subject: [PATCH 58/72] ldns: set validpgpkeys --- mingw-w64-ldns/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-ldns/PKGBUILD b/mingw-w64-ldns/PKGBUILD index 4e31c4b2a4..1e5d277952 100644 --- a/mingw-w64-ldns/PKGBUILD +++ b/mingw-w64-ldns/PKGBUILD @@ -20,6 +20,7 @@ source=("https://www.nlnetlabs.nl/downloads/${_realname}/${_realname}-${pkgver}. sha256sums=('c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc' 'SKIP' '29728dac1131c0605e2742d40c7d6165d3c90558bab1b699b08408d38b669a33') +validpgpkeys=('DC34EE5DB2417BCC151E5100E5F8F8212F77A498') prepare() { cd ${srcdir}/${_realname}-${pkgver} From 29ba2a1da62cf88c82e10434fe42dc7607a2e07a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 24 Jul 2020 21:02:37 +0200 Subject: [PATCH 59/72] mesa: Update validpgpkeys --- mingw-w64-mesa/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD index 600a96d354..df5ee43cf8 100644 --- a/mingw-w64-mesa/PKGBUILD +++ b/mingw-w64-mesa/PKGBUILD @@ -27,6 +27,7 @@ validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez " validpgpkeys+=('A5CC9FEC93F2F837CB044912336909B6B25FADFA') # Juan A. Suarez Romero validpgpkeys+=('71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker +validpgpkeys+=('57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom noextract=(${_realname}-${pkgver}.tar.xz) From 66b2c09b24d1e1a5b1a8329522a6c4f359036cb4 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Fri, 24 Jul 2020 23:31:58 +0300 Subject: [PATCH 60/72] libtool: Rebuild for GCC 10.2 --- mingw-w64-libtool/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-libtool/PKGBUILD b/mingw-w64-libtool/PKGBUILD index 95ac8ade00..356afef3b2 100644 --- a/mingw-w64-libtool/PKGBUILD +++ b/mingw-w64-libtool/PKGBUILD @@ -5,7 +5,7 @@ _realname=libtool pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.4.6 -pkgrel=17 +pkgrel=18 pkgdesc="A system independent dlopen wrapper for GNU libtool (mingw-w64)" arch=('any') url="https://www.gnu.org/software/libtool" From b80a628228cd2c719ef480395076cf4ea58ccd01 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 25 Jul 2020 06:48:30 +0900 Subject: [PATCH 61/72] arrow: Update to 1.0.0 --- mingw-w64-arrow/PKGBUILD | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mingw-w64-arrow/PKGBUILD b/mingw-w64-arrow/PKGBUILD index 6799a88be3..cbaa24dff1 100644 --- a/mingw-w64-arrow/PKGBUILD +++ b/mingw-w64-arrow/PKGBUILD @@ -3,7 +3,7 @@ _realname=arrow pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.17.1 +pkgver=1.0.0 pkgrel=1 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)" arch=("any") @@ -17,23 +17,28 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-gflags" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-grpc" + "${MINGW_PACKAGE_PREFIX}-libutf8proc" "${MINGW_PACKAGE_PREFIX}-lz4" "${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-protobuf" "${MINGW_PACKAGE_PREFIX}-python3-numpy" "${MINGW_PACKAGE_PREFIX}-rapidjson" + "${MINGW_PACKAGE_PREFIX}-re2" "${MINGW_PACKAGE_PREFIX}-snappy" "${MINGW_PACKAGE_PREFIX}-thrift" "${MINGW_PACKAGE_PREFIX}-uriparser" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-zstd") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-clang" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gtk-doc" - "${MINGW_PACKAGE_PREFIX}-meson") + "${MINGW_PACKAGE_PREFIX}-llvm" + "${MINGW_PACKAGE_PREFIX}-meson" + "${MINGW_PACKAGE_PREFIX}-polly") options=("staticlibs" "strip" "!buildflags") source=(https://github.com/apache/arrow/archive/apache-arrow-${pkgver}.tar.gz) -sha256sums=('ecb6da20f9288c0ca31f9b457ffdd460198765a8af27c1cac4b1382a8d130f86') +sha256sums=('08fbd4c633c08939850d619ca0224c75d7a0526467c721c0838b8aa7efccb270') cmake_build_type=release meson_build_type=debugoptimized @@ -57,6 +62,7 @@ build() { ../${source_dir}/cpp \ -DARROW_BUILD_UTILITIES=ON \ -DARROW_FLIGHT=ON \ + -DARROW_GANDIVA=ON \ -DARROW_PACKAGE_PREFIX=${MINGW_PREFIX} \ -DARROW_PARQUET=ON \ -DARROW_PYTHON=ON \ From 915f794d9d051397c5e92820e074ccea2665a38c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Jul 2020 11:56:32 +0200 Subject: [PATCH 62/72] ldns: work around asctime_r by setting _POSIX_C_SOURCE Fixes #6714 --- mingw-w64-ldns/PKGBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mingw-w64-ldns/PKGBUILD b/mingw-w64-ldns/PKGBUILD index 1e5d277952..1347f837ba 100644 --- a/mingw-w64-ldns/PKGBUILD +++ b/mingw-w64-ldns/PKGBUILD @@ -4,7 +4,7 @@ _realname=ldns pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.7.0 -pkgrel=4 +pkgrel=5 pkgdesc="Fast DNS library supporting recent RFCs (mingw-w64)" arch=('any') url='https://www.nlnetlabs.nl/projects/ldns/' @@ -35,6 +35,10 @@ build() { #mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" + # for asctime_r(): https://github.com/msys2/MINGW-packages/issues/6714 + CFLAGS+=" -D_POSIX_C_SOURCE" + CXXFLAGS+=" -D_POSIX_C_SOURCE" + PYTHON=${MINGW_PREFIX}/bin/python3 \ ./configure \ --prefix=${MINGW_PREFIX} \ From 16cbb66e401531859e725a5d9950c959d82cf7c8 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Jul 2020 12:05:41 +0200 Subject: [PATCH 63/72] armadillo: add missing dep on hdf5 See #6715 --- mingw-w64-armadillo/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-armadillo/PKGBUILD b/mingw-w64-armadillo/PKGBUILD index 4d3e18d4b2..3963ca620f 100644 --- a/mingw-w64-armadillo/PKGBUILD +++ b/mingw-w64-armadillo/PKGBUILD @@ -4,13 +4,14 @@ _realname=armadillo pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=9.900.1 -pkgrel=1 +pkgrel=2 pkgdesc="C++ linear algebra library (mingw-w64)" arch=('any') url="https://arma.sourceforge.io/" license=(MPL2) depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-arpack" + "${MINGW_PACKAGE_PREFIX}-hdf5" "${MINGW_PACKAGE_PREFIX}-openblas") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") From 771d185c378c25f2bd49dcbe5f3afca0fd7498af Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Jul 2020 12:56:12 +0200 Subject: [PATCH 64/72] cargo-c: add missing dep on cargo-c --- mingw-w64-cargo-c/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD index 44cae4d069..0454670f93 100644 --- a/mingw-w64-cargo-c/PKGBUILD +++ b/mingw-w64-cargo-c/PKGBUILD @@ -4,7 +4,7 @@ _realname=cargo-c pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6.8 -pkgrel=2 +pkgrel=3 pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)' arch=('any') url='https://github.com/lu-zero/cargo-c/' @@ -12,6 +12,7 @@ license=('MIT') depends=( "${MINGW_PACKAGE_PREFIX}-curl" "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-libgit2" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=( "${MINGW_PACKAGE_PREFIX}-rust") From 2cb0d3bbab91821cbd12f07ac8d1a021ce8e6168 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Jul 2020 13:10:14 +0200 Subject: [PATCH 65/72] cargo-c: Update to 0.6.9 --- mingw-w64-cargo-c/PKGBUILD | 15 +-- mingw-w64-cargo-c/fix-append_to_destdir.patch | 101 ------------------ 2 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 mingw-w64-cargo-c/fix-append_to_destdir.patch diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD index 0454670f93..271af8c544 100644 --- a/mingw-w64-cargo-c/PKGBUILD +++ b/mingw-w64-cargo-c/PKGBUILD @@ -3,8 +3,8 @@ _realname=cargo-c pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.6.8 -pkgrel=3 +pkgver=0.6.9 +pkgrel=1 pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)' arch=('any') url='https://github.com/lu-zero/cargo-c/' @@ -17,19 +17,14 @@ depends=( makedepends=( "${MINGW_PACKAGE_PREFIX}-rust") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/lu-zero/cargo-c/archive/v${pkgver}.tar.gz" - "${_realname}-${pkgver}.Cargo.lock"::"https://github.com/lu-zero/cargo-c/releases/download/v${pkgver}/Cargo.lock" - "fix-append_to_destdir.patch") -sha256sums=('ca8cb5e08b0ba5b6eccea1481854829e1b411ebb9885be891a897c27b5a76cba' - 'f956c171676375ecdf5069d32896c8c8047001b207f377d1ba6442be449a3688' - '474ca4a7504d563f76455c13cedeb04cef0b665fa5d9c596ddd141393fb7079c') + "${_realname}-${pkgver}.Cargo.lock"::"https://github.com/lu-zero/cargo-c/releases/download/v${pkgver}/Cargo.lock") +sha256sums=('d88bad2ada3432b15d2a871a5071f2bd7554beec5ecc4807c91599533de76cb4' + 'a12f2a572848fa18c502dc33f114307959554fe3311ee1dd7da0a2787e444912') prepare() { cp "${srcdir}/${_realname}-${pkgver}.Cargo.lock" "${_realname}-${pkgver}/Cargo.lock" cd "${srcdir}/${_realname}-${pkgver}" - # https://github.com/lu-zero/cargo-c/pull/90 - patch -Np1 -i "${srcdir}"/fix-append_to_destdir.patch - cargo fetch \ --locked } diff --git a/mingw-w64-cargo-c/fix-append_to_destdir.patch b/mingw-w64-cargo-c/fix-append_to_destdir.patch deleted file mode 100644 index 85e9dceabf..0000000000 --- a/mingw-w64-cargo-c/fix-append_to_destdir.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 1dbe81185a889c39feb9380dd2e517214cb8728b Mon Sep 17 00:00:00 2001 -From: Christoph Reiter -Date: Wed, 8 Jul 2020 08:18:26 +0200 -Subject: [PATCH] append_to_destdir: handle Windows paths properly - -It currently uses is_absolute() to strip one leading component which doesn't -work for paths like "C:/foo", "C:foo" and "/foo" which are either not absolute -or have multiple components that need to be stripped. - -The goal is to join two paths and removing any components from the second -one that would result in the first one being replaced/changed. - -push()/join() alters the first path if it starts with a RootDir, Prefix, or both, so -we push everything from the second path except for those. - -Fixes #89 ---- - src/cinstall.rs | 65 ++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 56 insertions(+), 9 deletions(-) - -diff --git a/src/cinstall.rs b/src/cinstall.rs -index d7c1b9f..9212b2c 100644 ---- a/src/cinstall.rs -+++ b/src/cinstall.rs -@@ -1,4 +1,4 @@ --use std::path::{Path, PathBuf}; -+use std::path::{Component, Path, PathBuf}; - - use cargo::core::Workspace; - use cargo::util::command_prelude::opt; -@@ -52,15 +52,62 @@ the --release flag will use the `release` profile instead. - } - - fn append_to_destdir(destdir: &PathBuf, path: &PathBuf) -> PathBuf { -- let path = if path.is_absolute() { -- let mut components = path.components(); -- let _ = components.next(); -- components.as_path() -- } else { -- path.as_path() -- }; -+ let mut joined = destdir.clone(); -+ for component in path.components() { -+ match component { -+ Component::Prefix(_) | Component::RootDir => {} -+ _ => joined.push(component), -+ }; -+ } -+ joined -+} -+ -+#[cfg(test)] -+mod tests { -+ use std::path::PathBuf; -+ -+ #[test] -+ fn append_to_destdir() { -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r"/foo"), &PathBuf::from(r"/bar/./..")), -+ PathBuf::from(r"/foo/bar/./..") -+ ); -+ -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r"foo"), &PathBuf::from(r"bar")), -+ PathBuf::from(r"foo/bar") -+ ); -+ -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r""), &PathBuf::from(r"")), -+ PathBuf::from(r"") -+ ); -+ -+ if cfg!(windows) { -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r"X:\foo"), &PathBuf::from(r"Y:\bar")), -+ PathBuf::from(r"X:\foo\bar") -+ ); - -- destdir.join(path) -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r"A:\foo"), &PathBuf::from(r"B:bar")), -+ PathBuf::from(r"A:\foo\bar") -+ ); -+ -+ assert_eq!( -+ super::append_to_destdir(&PathBuf::from(r"\foo"), &PathBuf::from(r"\bar")), -+ PathBuf::from(r"\foo\bar") -+ ); -+ -+ assert_eq!( -+ super::append_to_destdir( -+ &PathBuf::from(r"C:\dest"), -+ &PathBuf::from(r"\\server\share\foo\bar") -+ ), -+ PathBuf::from(r"C:\\dest\\foo\\bar") -+ ); -+ } -+ } - } - - fn copy, Q: AsRef>(from: P, to: Q) -> anyhow::Result { From 6ee605d53bc61ca986a616b71c617c68b6c4ab87 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 25 Jul 2020 13:12:04 +0200 Subject: [PATCH 66/72] azure-pipelines: remove GHA is more or less the same now --- README.md | 2 -- azure-pipelines.yml | 59 --------------------------------------------- 2 files changed, 61 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/README.md b/README.md index 82ee67dbf2..cb6e87fca2 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,6 @@ --> -

# MINGW-packages diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index df8a6f818e..0000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,59 +0,0 @@ -trigger: - branches: - include: - - '*' - -pr: - branches: - include: - - '*' - -jobs: - - job: MINGW - timeoutInMinutes: 360 - pool: - vmImage: vs2017-win2016 - strategy: - maxParallel: 5 - matrix: - i686: - MINGW_UPPER: MINGW32 - MINGW_LOWER: mingw32 - MINGW_ARCH: i686 - x86_64: - MINGW_UPPER: MINGW64 - MINGW_LOWER: mingw64 - MINGW_ARCH: x86_64 - steps: - - powershell: | - (New-Object Net.WebClient).DownloadFile("https://github.com/msys2/msys2-installer/releases/download/2020-05-22/msys2-base-x86_64-20200522.sfx.exe", "sfx.exe") - displayName: Download MSYS2 - - script: | - sfx.exe -y -o%CD:~0,2%\ - %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" - %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu" - displayName: Extract/Install/Update MSYS2 - - script: | - %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain" - %CD:~0,2%\msys64\usr\bin\bash -lc "pacman --noconfirm -Scc" - displayName: Install Toolchain - - script: | - set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem - %CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf - %CD:~0,2%\msys64\usr\bin\bash -lc "bash ci-build.sh" - displayName: CI-Build - env: - MSYSTEM: $(MINGW_UPPER) - CHERE_INVOKING: yes - MINGW_INSTALLS: $(MINGW_LOWER) - BUILD_URL: dummy - DEPLOY_PROVIDER: bintray - BINTRAY_ACCOUNT: Alexpux - PACMAN_REPOSITORY_NAME: ci.mingw - - task: PublishBuildArtifacts@1 - displayName: Publish packages - continueOnError: true - condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false)) - inputs: - pathtoPublish: $(Build.SourcesDirectory)/artifacts - artifactName: mingw-$(MINGW_ARCH) From 30362f3338cc7fe57816d089f08988f9c9293608 Mon Sep 17 00:00:00 2001 From: ofry Date: Sun, 26 Jul 2020 05:28:57 +0300 Subject: [PATCH 67/72] pkgrel=2: Add Windows draft configs in mk/sys directory. Signed-off-by: ofry --- .../0004-add-windows-draft-configs.patch | 79 +++++++++++++++++++ mingw-w64-bmake/PKGBUILD | 5 +- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 mingw-w64-bmake/0004-add-windows-draft-configs.patch diff --git a/mingw-w64-bmake/0004-add-windows-draft-configs.patch b/mingw-w64-bmake/0004-add-windows-draft-configs.patch new file mode 100644 index 0000000000..5e699a6428 --- /dev/null +++ b/mingw-w64-bmake/0004-add-windows-draft-configs.patch @@ -0,0 +1,79 @@ +diff --git a/mk/FILES b/mk/FILES +index a6bf9a2..fa50e79 100644 +--- a/mk/FILES ++++ b/mk/FILES +@@ -51,2 +51,5 @@ sys/IRIX.mk + sys/Linux.mk ++sys/MINGW32.mk ++sys/MINGW64.mk ++sys/MSYS.mk + sys/NetBSD.mk +diff --git a/mk/sys/MINGW32.mk b/mk/sys/MINGW32.mk +index 10da919..5ba0424 100644 +--- a/mk/sys/MINGW32.mk ++++ b/mk/sys/MINGW32.mk +@@ -1,2 +1,2 @@ +-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ ++# $Id: MINGW32.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ + # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ +@@ -16,3 +16,7 @@ NEED_SOLINKS=yes + +-.LIBS: .a ++.LIBS: .a .dll ++ ++SHLIBEXT = .dll ++HOST_LIBEXT = .dll ++DSHLIBEXT = .dll + +@@ -21,2 +25,5 @@ ARFLAGS= rl + RANLIB= ranlib ++LD_shared= -Bshareable ++LD_so= dll.${SHLIB_FULLVERSION} ++LD_solink= dll + +diff --git a/mk/sys/MINGW64.mk b/mk/sys/MINGW64.mk +index 10da919..f7a1fe7 100644 +--- a/mk/sys/MINGW64.mk ++++ b/mk/sys/MINGW64.mk +@@ -1,2 +1,2 @@ +-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ ++# $Id: MINGW64.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ + # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ +@@ -16,3 +16,7 @@ NEED_SOLINKS=yes + +-.LIBS: .a ++.LIBS: .a .dll ++ ++SHLIBEXT = .dll ++HOST_LIBEXT = .dll ++DSHLIBEXT = .dll + +@@ -21,2 +25,5 @@ ARFLAGS= rl + RANLIB= ranlib ++LD_shared= -Bshareable ++LD_so= dll.${SHLIB_FULLVERSION} ++LD_solink= dll + +diff --git a/mk/sys/MSYS.mk b/mk/sys/MSYS.mk +index 10da919..2454fd1 100644 +--- a/mk/sys/MSYS.mk ++++ b/mk/sys/MSYS.mk +@@ -1,2 +1,2 @@ +-# $Id: Linux.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ ++# $Id: MSYS.mk,v 1.9 2017/05/05 18:02:16 sjg Exp $ + # $NetBSD: sys.mk,v 1.19.2.1 1994/07/26 19:58:31 cgd Exp $ +@@ -16,3 +16,7 @@ NEED_SOLINKS=yes + +-.LIBS: .a ++.LIBS: .a .dll ++ ++SHLIBEXT = .dll ++HOST_LIBEXT = .dll ++DSHLIBEXT = .dll + +@@ -21,2 +25,5 @@ ARFLAGS= rl + RANLIB= ranlib ++LD_shared= -Bshareable ++LD_so= dll.${SHLIB_FULLVERSION} ++LD_solink= dll + diff --git a/mingw-w64-bmake/PKGBUILD b/mingw-w64-bmake/PKGBUILD index bb2c340f28..a84b20d97e 100644 --- a/mingw-w64-bmake/PKGBUILD +++ b/mingw-w64-bmake/PKGBUILD @@ -8,7 +8,7 @@ _realname=bmake pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=20181221 -pkgrel=1 +pkgrel=2 pkgdesc='Portable version of the NetBSD make build tool' arch=('any') url='http://www.crufty.net/help/sjg/bmake.html' @@ -26,12 +26,14 @@ source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz" 0001-first-version-mingw-patch.patch 0002-enable-debug-output-on-test.patch 0003-print-pwd-on-fail-install.patch + 0004-add-windows-draft-configs.patch ) # checksum source: http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz.sha1 sha1sums=('ce7db05c68e2fbad41d1dd92ec110406093293bd' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' ) prepare() { @@ -39,6 +41,7 @@ prepare() { patch -p1 -l -i "${srcdir}"/0001-first-version-mingw-patch.patch patch -p1 -l -i "${srcdir}"/0002-enable-debug-output-on-test.patch patch -p1 -l -i "${srcdir}"/0003-print-pwd-on-fail-install.patch + patch -p1 -l -i "${srcdir}"/0004-add-windows-draft-configs.patch } build() { From 9cad0e4e56f583b59d5fc0e9ad6f4b5c8fb3d720 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 26 Jul 2020 12:19:24 +0200 Subject: [PATCH 68/72] appveyor: remove It's slow and currently broken because it hasn't been updated in the last month. --- README.md | 2 -- appveyor.yml | 37 ------------------------------------- 2 files changed, 39 deletions(-) delete mode 100644 appveyor.yml diff --git a/README.md b/README.md index cb6e87fca2..bf63bedda5 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,6 @@ --> 'main' workflow Status -

# MINGW-packages diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index c1eb36ab0a..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,37 +0,0 @@ -clone_folder: C:\M - -environment: - PATH: C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files\Git\cmd - DEPLOY_PROVIDER: bintray - BINTRAY_ACCOUNT: alexpux - BINTRAY_REPOSITORY: msys2 - PACMAN_REPOSITORY_NAME: ci.mingw - BUILD_URL: https://ci.appveyor.com/project/$(APPVEYOR_ACCOUNT_NAME)/$(APPVEYOR_PROJECT_NAME)/build/$(APPVEYOR_BUILD_VERSION) - matrix: - - MINGW_INSTALLS: mingw32 - - MINGW_INSTALLS: mingw64 - -matrix: - fast_finish: true - -build_script: - - rmdir /s /Q C:\OpenSSL-Win32 C:\OpenSSL-Win64 - - C:\msys64\usr\bin\pacman --noconfirm --ask 20 --sync --refresh --refresh --sysupgrade --sysupgrade - - C:\msys64\usr\bin\bash --login -c "$(cygpath ${APPVEYOR_BUILD_FOLDER})/ci-build.sh" - -test: off - -artifacts: - - path: artifacts\* - -deploy: - - provider: BinTray - username: $(BINTRAY_ACCOUNT) - subject: $(BINTRAY_ACCOUNT) - repo: $(BINTRAY_REPOSITORY) - package: $(PACMAN_REPOSITORY_NAME) - version: latest - publish: true - override: true - api_key: - secure: B2XBLbsX8EQOpWyyaHskipMoF2+Tbt6hc/afbVm82f01CBKruspjwhee4K4C7/xf From c7442921aa0e4a44fb787abc4d696495ae24020e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 26 Jul 2020 17:32:48 +0200 Subject: [PATCH 69/72] rav1e: switch to cargo-c capi command to work around permission issues with the cinstall one. Fixes #6718 --- mingw-w64-rav1e/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-rav1e/PKGBUILD b/mingw-w64-rav1e/PKGBUILD index cc43d71b99..cf3f0a8283 100644 --- a/mingw-w64-rav1e/PKGBUILD +++ b/mingw-w64-rav1e/PKGBUILD @@ -4,7 +4,7 @@ _realname=rav1e pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.3.3 -pkgrel=2 +pkgrel=3 pkgdesc='An AV1 encoder focused on speed and safety (mingw-w64)' arch=('any') url=https://github.com/xiph/rav1e/ @@ -33,7 +33,7 @@ build() { --frozen \ --offline - cargo cbuild \ + cargo capi build \ --release \ --frozen \ --library-type=cdylib @@ -58,7 +58,7 @@ package() { --root "${pkgdir}${MINGW_PREFIX}" MSYS2_ARG_CONV_EXCL="--prefix=;" \ - cargo cinstall \ + cargo capi install \ --release \ --frozen \ --library-type=cdylib \ From feeb9c28b064d4e587498f0140424c5253076b8d Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sun, 26 Jul 2020 23:47:15 +0530 Subject: [PATCH 70/72] vulkan: update to 1.2.148 --- mingw-w64-vulkan-headers/PKGBUILD | 20 +++++++++++----- mingw-w64-vulkan-loader/PKGBUILD | 26 ++++++++++++++------- mingw-w64-vulkan-validation-layers/PKGBUILD | 25 +++++++++++++------- 3 files changed, 48 insertions(+), 23 deletions(-) diff --git a/mingw-w64-vulkan-headers/PKGBUILD b/mingw-w64-vulkan-headers/PKGBUILD index 6e123883ba..0ca1b29001 100644 --- a/mingw-w64-vulkan-headers/PKGBUILD +++ b/mingw-w64-vulkan-headers/PKGBUILD @@ -4,7 +4,7 @@ _realname=Vulkan-Headers pkgbase=mingw-w64-vulkan-headers pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-headers") -pkgver=1.2.139 +pkgver=1.2.148 pkgrel=1 pkgdesc='Vulkan header files (mingw-w64)' arch=('any') @@ -13,29 +13,37 @@ groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz") -sha256sums=('1d12b73e6459b8c26a21a084a8a65b2edcdb79e6d892da96735d932424403456') +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz") +sha256sums=('fecaa9af5f7c4d85abdbbe2a63d4b8ebdf48a532e992710ba204d5dfa7513866') 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 + CFLAGS+=" -D__STDC_FORMAT_MACROS" \ CPPFLAGS+=" -D__STDC_FORMAT_MACROS" \ CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO -D__STDC_FORMAT_MACROS -fpermissive" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ + "${extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib \ ../${_realname}-${pkgver} - make + ${MINGW_PREFIX}/bin/cmake --build ./ } package() { cd ${srcdir}/build-${CARCH} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.TXT ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-headers/LICENSE } diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD index 13eb1c00cb..7eb1b19eed 100644 --- a/mingw-w64-vulkan-loader/PKGBUILD +++ b/mingw-w64-vulkan-loader/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-vulkan-loader pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-loader") provides=("${MINGW_PACKAGE_PREFIX}-vulkan") replaces=("${MINGW_PACKAGE_PREFIX}-vulkan") -pkgver=1.2.137 +pkgver=1.2.148 pkgrel=1 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)' arch=('any') @@ -17,11 +17,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-vulkan-headers") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-vulkan-headers" "${MINGW_PACKAGE_PREFIX}-python") -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" 001-build-fix.patch 002-proper-def-files-for-32bit.patch 003-generate-pkgconfig-files.patch) -sha256sums=('098a59996fcb32daeda6423fa3fb8a74cff532ec37b33235601ac06f0df00485' +sha256sums=('8f4dca3d125965dcb4c4f19ff9dddae893b5f071d63cfd9e47658ccae2414843' 'd0be58fb70d1d0ba66ddfca8c7fe693d1ae5f77e9e2f8341e9a62934e0e94556' 'd101e9718b5dc974641ab63084b2f55c48633b4f1fc713d386df34960995e73b' '5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad') @@ -37,23 +37,31 @@ build() { [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH} mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH} - CFLAGS+=" -D__STDC_FORMAT_MACROS" \ + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + CFLAGS+=" -D__STDC_FORMAT_MACROS -Wno-unused-function" \ CPPFLAGS+=" -D__STDC_FORMAT_MACROS" \ - CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO -D__STDC_FORMAT_MACROS -fpermissive" \ + CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO -D__STDC_FORMAT_MACROS -fpermissive -Wno-unused-function" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ + "${extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_TESTS=OFF \ ../${_realname}-${pkgver} - make + + ${MINGW_PREFIX}/bin/cmake --build ./ } package() { cd ${srcdir}/build-${CARCH} - make DESTDIR="${pkgdir}" install - + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install + if [ "${CARCH}" = "i686" ]; then rm -f ${pkgdir}${MINGW_PREFIX}/lib/libvulkan.dll.a ${MINGW_PREFIX}/bin/gendef ${pkgdir}${MINGW_PREFIX}/bin/libvulkan-1.dll diff --git a/mingw-w64-vulkan-validation-layers/PKGBUILD b/mingw-w64-vulkan-validation-layers/PKGBUILD index 0dc69e16ad..24c91c3043 100644 --- a/mingw-w64-vulkan-validation-layers/PKGBUILD +++ b/mingw-w64-vulkan-validation-layers/PKGBUILD @@ -4,7 +4,7 @@ _realname=Vulkan-ValidationLayers pkgbase=mingw-w64-vulkan-validation-layers pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-validation-layers") -pkgver=1.2.133 +pkgver=1.2.148 pkgrel=1 pkgdesc='Vulkan Validation Layers (mingw-w64)' arch=('any') @@ -16,12 +16,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-glslang" "${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-spirv-headers" "${MINGW_PACKAGE_PREFIX}-spirv-tools") -source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" 001-build-fix.patch 002-proper-def-files-for-32bit.patch 003-install-layout.patch) -sha256sums=('f9a87f424960457d6798baa3c592b09a14e2f29533851dddb3fa8a110cf0ae8a' +sha256sums=('da43a161e280cd7dce63a18e929efb586f08024d23b2ee205437f7949a8063fc' '1ad7c68024636709c43a7f039f382c0c0d1b87f97a7b13db067c233c31f8ea5f' '6fb0f9e4b2fb2903a50d0b4bbce06e8e8f5ed1045b8d7c875067e0fb2aa6ebb9' 'c158197f8bcb39e540e4156597f3ca6c4b97a007070f882dec5dec68bd72814d') @@ -37,25 +38,33 @@ build() { [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH} mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH} - CFLAGS+=" -D__STDC_FORMAT_MACROS" \ + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + CFLAGS+=" -D__STDC_FORMAT_MACROS -Wno-unused-function" \ CPPFLAGS+=" -D__STDC_FORMAT_MACROS" \ - CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO -D__STDC_FORMAT_MACROS -fpermissive" \ + CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO -D__STDC_FORMAT_MACROS -fpermissive -Wno-unused-function" \ MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ + "${extra_config[@]}" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DGLSLANG_INSTALL_DIR=${MINGW_PREFIX} \ + -DSPIRV_HEADERS_INSTALL_DIR=${MINGW_PREFIX} \ -DBUILD_LAYER_SUPPORT_FILES=OFF \ -DBUILD_TESTS=OFF \ ../${_realname}-${pkgver} - make + ${MINGW_PREFIX}/bin/cmake --build ./ } package() { cd ${srcdir}/build-${CARCH} - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.TXT ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-validation-layers/LICENSE } From 747e6a8f44b3042df301a3ce08b227cfeea824f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Mon, 27 Jul 2020 10:54:04 +0200 Subject: [PATCH 71/72] libraw: update to 0.20.0 --- mingw-w64-libraw/LibRaw_configure-zlib.patch | 30 -------------------- mingw-w64-libraw/PKGBUILD | 7 ++--- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 mingw-w64-libraw/LibRaw_configure-zlib.patch diff --git a/mingw-w64-libraw/LibRaw_configure-zlib.patch b/mingw-w64-libraw/LibRaw_configure-zlib.patch deleted file mode 100644 index 5923191f3b..0000000000 --- a/mingw-w64-libraw/LibRaw_configure-zlib.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index fa11137..2547a6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -83,7 +83,24 @@ if test x$jasper = xtrue; then - ) - fi - -- -+# check if we want zlib support -+AC_ARG_ENABLE([zlib], -+ [ --enable-zlib Enable zlib support for deflate compressed DNG files], -+ [case "${enableval}" in -+ yes) zlib=true ;; -+ no) zlib=false ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-zlib]) ;; -+ esac],[zlib=true]) -+ -+if test x$zlib = xtrue; then -+ PKG_CHECK_MODULES([ZLIB],[zlib],[ -+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -DUSE_ZLIB" -+ LIBS="$LIBS $ZLIB_LIBS" -+ AC_SUBST([PACKAGE_REQUIRES],[zlib]) -+ ], -+ AC_MSG_WARN([zlib support cannot be enabled]) -+ ) -+fi - - # check if we want LCMS support - AC_ARG_ENABLE([lcms], diff --git a/mingw-w64-libraw/PKGBUILD b/mingw-w64-libraw/PKGBUILD index f302da9167..570e8d44b7 100644 --- a/mingw-w64-libraw/PKGBUILD +++ b/mingw-w64-libraw/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-libraw" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.19.5 +pkgver=0.20.0 pkgrel=1 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)" arch=('any') @@ -21,17 +21,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" options=('staticlibs' 'strip') source=("https://www.libraw.org/data/${_realname}-${pkgver}.tar.gz" "LibRaw_wsock32.patch" - "LibRaw_configure-zlib.patch" "LibRaw_obsolete-macros.patch") -sha256sums=('40a262d7cc71702711a0faec106118ee004f86c86cc228281d12d16da03e02f5' +sha256sums=('1f0a383da2ce9f409087facd28261decbf6be72cc90c78cd003b0766e4d694a3' '4bd077917fb8f37fa736e3a8bf32fabe3df3ff5438b684acbb5adff8a6c2a73b' - 'f57a186d3c4b74b74d6ddb62a5589a7cc6f330e0eee1b40a0119f0df4634aecc' '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch" - patch -Np1 -i "${srcdir}/LibRaw_configure-zlib.patch" patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch" autoreconf -ifv From 3d9323bb67b4af0e4fe054ddcb52b55be8659469 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Mon, 27 Jul 2020 20:00:16 +0200 Subject: [PATCH 72/72] fmt: update to 7.0.1 --- mingw-w64-fmt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-fmt/PKGBUILD b/mingw-w64-fmt/PKGBUILD index c93fb79718..acddfdc0f8 100644 --- a/mingw-w64-fmt/PKGBUILD +++ b/mingw-w64-fmt/PKGBUILD @@ -5,7 +5,7 @@ _realname=fmt pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=6.2.1 +pkgver=7.0.1 pkgrel=1 pkgdesc="A small, safe and fast formatting library for C++ (mingw-w64)" arch=('any') @@ -16,7 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs') source=("${_realname}-${pkgver}.tar.gz::https://github.com/fmtlib/${_realname}/archive/${pkgver}.tar.gz") -sha256sums=('5edf8b0f32135ad5fafb3064de26d063571e95e8ae46829c2f4f4b52696bbff0') +sha256sums=('ac335a4ca6beaebec4ddb2bc35b9ae960b576f3b64a410ff2c379780f0cd4948') build() { # Shared Build