From 64fb0c845399bd7149a0a351ec4e4fa0c9b82fb8 Mon Sep 17 00:00:00 2001 From: Biswa96 Date: Thu, 25 Jun 2020 14:59:16 +0530 Subject: [PATCH 001/120] uncrustify: add package --- .../0001-cmake-install-docs.patch | 54 +++++++++++++++++++ mingw-w64-uncrustify/PKGBUILD | 48 +++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 mingw-w64-uncrustify/0001-cmake-install-docs.patch create mode 100644 mingw-w64-uncrustify/PKGBUILD diff --git a/mingw-w64-uncrustify/0001-cmake-install-docs.patch b/mingw-w64-uncrustify/0001-cmake-install-docs.patch new file mode 100644 index 0000000000..c7566c0b91 --- /dev/null +++ b/mingw-w64-uncrustify/0001-cmake-install-docs.patch @@ -0,0 +1,54 @@ +diff --unified --recursive --text uncrustify-uncrustify-0.71.0-orig/CMakeLists.txt uncrustify-uncrustify-0.71.0/CMakeLists.txt +--- uncrustify-uncrustify-0.71.0-orig/CMakeLists.txt 2020-06-25 14:16:25.673189300 +0530 ++++ uncrustify-uncrustify-0.71.0/CMakeLists.txt 2020-06-25 14:18:44.791493400 +0530 +@@ -396,6 +396,15 @@ + ${PROJECT_BINARY_DIR}/uncrustify_version.h + ) + ++set(uncrustify_docs ++ "${PROJECT_SOURCE_DIR}/AUTHORS" ++ "${PROJECT_SOURCE_DIR}/BUGS" ++ "${PROJECT_SOURCE_DIR}/ChangeLog" ++ "${PROJECT_SOURCE_DIR}/COPYING" ++ "${PROJECT_SOURCE_DIR}/HELP" ++ "${PROJECT_SOURCE_DIR}/README.md" ++) ++ + add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers}) + add_dependencies(uncrustify generate_version_header) + +@@ -482,23 +491,6 @@ + # + # Install + # +-if(CMAKE_SYSTEM_NAME STREQUAL "Windows") +- install(TARGETS uncrustify DESTINATION ".") +- install( +- FILES +- "${PROJECT_SOURCE_DIR}/README.md" +- "${PROJECT_SOURCE_DIR}/BUGS" +- "${PROJECT_SOURCE_DIR}/ChangeLog" +- DESTINATION "." +- ) +- install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html" +- DESTINATION "doc" +- ) +- install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/" +- DESTINATION "cfg" +- FILES_MATCHING PATTERN "*.cfg" +- ) +-else() + include(GNUInstallDirs) + install(TARGETS uncrustify + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" +@@ -510,7 +502,9 @@ + DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples" + FILES_MATCHING PATTERN "*.cfg" + ) +-endif() ++ install(FILES ${uncrustify_docs} ++ DESTINATION "${CMAKE_INSTALL_DOCDIR}" ++ ) + + # + # add to build the compile_commands.json file, to be used by clang-tidy diff --git a/mingw-w64-uncrustify/PKGBUILD b/mingw-w64-uncrustify/PKGBUILD new file mode 100644 index 0000000000..af035b8216 --- /dev/null +++ b/mingw-w64-uncrustify/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Alexey Pavlov + +_realname=uncrustify +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=0.71.0 +pkgrel=1 +pkgdesc="Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA (mingw-w64)" +arch=(any) +url="http://uncrustify.sourceforge.net/" +license=(GPL) +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-python") +source=("https://github.com/uncrustify/uncrustify/archive/${_realname}-${pkgver}.tar.gz" + "0001-cmake-install-docs.patch") +sha512sums=('220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181' + 'b419ecd625145ef2ad841ead56992cf5c0ff758e81a6e29089789aa3ed38ea20cd636951e6563a215a8674601060c624f494d233e24a3fa379ba9836db6ee3b8') + +prepare() { + cd ${srcdir}/${_realname}-${_realname}-${pkgver} + patch -Nbp1 -i "${srcdir}"/0001-cmake-install-docs.patch +} + +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} \ + ../${_realname}-${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build . +} + +package() { + cd ${srcdir}/build-${MINGW_CHOST} + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install + + cd ${srcdir}/${_realname}-${_realname}-${pkgver} + install -d -m755 "$pkgdir"/${MINGW_PREFIX}/share/uncrustify + install -m644 etc/*.cfg "$pkgdir"/${MINGW_PREFIX}/share/uncrustify +} From e1e0982351241ea186a309aad14f5582c9ec186b Mon Sep 17 00:00:00 2001 From: 106062316 Date: Mon, 13 Jul 2020 21:24:20 +0800 Subject: [PATCH 002/120] clang: fix license also move uasm to makedepends --- mingw-w64-clang/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 4c1e08da56..3aaaf5a2a9 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -36,7 +36,7 @@ pkgrel=3 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') url="https://llvm.org/" -license=("custom:University of Illinois/NCSA Open Source License") +license=("custom:Apache 2.0 with LLVM Exception") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.4.3" "${MINGW_PACKAGE_PREFIX}-z3" "${MINGW_PACKAGE_PREFIX}-libffi" @@ -44,6 +44,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.4.3" "${MINGW_PACKAGE_PREFIX}-python-sphinx" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-swig" + "${MINGW_PACKAGE_PREFIX}-uasm" "tar" "groff" $([[ "$_compiler" == "clang" ]] && echo \ @@ -51,8 +52,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake>=3.4.3" $([[ "$_generator" == "Ninja" ]] && echo \ "${MINGW_PACKAGE_PREFIX}-ninja") ) -depends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-uasm") +depends=("${MINGW_PACKAGE_PREFIX}-gcc") options=('!debug' 'strip') #_url=https://releases.llvm.org _url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver} From aace33790deeeab0baa8d4d0729aeb6c4f52ea88 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Sat, 11 Jul 2020 16:48:23 +1000 Subject: [PATCH 003/120] New package: dfu-util 0.9 --- mingw-w64-dfu-util/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 mingw-w64-dfu-util/PKGBUILD diff --git a/mingw-w64-dfu-util/PKGBUILD b/mingw-w64-dfu-util/PKGBUILD new file mode 100644 index 0000000000..f086631699 --- /dev/null +++ b/mingw-w64-dfu-util/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: fauxpark + +_realname=dfu-util +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=0.9 +pkgrel=1 +pkgdesc='Device firmware upgrade utilities (mingw-w64)' +arch=('any') +license=('GPL2') +url='http://dfu-util.sourceforge.net/' +depends=("${MINGW_PACKAGE_PREFIX}-libusb") +source=("https://downloads.sourceforge.net/project/dfu-util/dfu-util-${pkgver}.tar.gz") +sha256sums=('36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833') + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + ./configure --prefix=${MINGW_PREFIX} +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make DESTDIR="$pkgdir" install +} From 978028ba826640bc96757393390181f16bf45195 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 15 Jul 2020 14:40:07 +1000 Subject: [PATCH 004/120] New package: teensy-loader-cli 2.1 --- .../01-libusb-compat-header.patch | 11 ++++++ .../02-win32-checks.patch | 20 ++++++++++ mingw-w64-teensy-loader-cli/PKGBUILD | 37 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 mingw-w64-teensy-loader-cli/01-libusb-compat-header.patch create mode 100644 mingw-w64-teensy-loader-cli/02-win32-checks.patch create mode 100644 mingw-w64-teensy-loader-cli/PKGBUILD diff --git a/mingw-w64-teensy-loader-cli/01-libusb-compat-header.patch b/mingw-w64-teensy-loader-cli/01-libusb-compat-header.patch new file mode 100644 index 0000000000..15e6e3f1cc --- /dev/null +++ b/mingw-w64-teensy-loader-cli/01-libusb-compat-header.patch @@ -0,0 +1,11 @@ +--- a/teensy_loader_cli.c ++++ b/teensy_loader_cli.c +@@ -212,7 +212,7 @@ + #if defined(USE_LIBUSB) + + // http://libusb.sourceforge.net/doc/index.html +-#include ++#include + + usb_dev_handle * open_usb_device(int vid, int pid) + { diff --git a/mingw-w64-teensy-loader-cli/02-win32-checks.patch b/mingw-w64-teensy-loader-cli/02-win32-checks.patch new file mode 100644 index 0000000000..ec6e3ebe74 --- /dev/null +++ b/mingw-w64-teensy-loader-cli/02-win32-checks.patch @@ -0,0 +1,20 @@ +--- a/teensy_loader_cli.c ++++ b/teensy_loader_cli.c +@@ -1013,7 +1013,7 @@ + + void delay(double seconds) + { +- #ifdef WIN32 ++ #ifdef USE_WIN32 + Sleep(seconds * 1000.0); + #else + usleep(seconds * 1000000.0); +@@ -1030,7 +1030,7 @@ + exit(1); + } + +-#if defined(WIN32) ++#if defined(USE_WIN32) + #define strcasecmp stricmp + #endif + diff --git a/mingw-w64-teensy-loader-cli/PKGBUILD b/mingw-w64-teensy-loader-cli/PKGBUILD new file mode 100644 index 0000000000..546307b4b9 --- /dev/null +++ b/mingw-w64-teensy-loader-cli/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: fauxpark + +_realname=teensy_loader_cli +pkgbase=mingw-w64-${_realname//_/-} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname//_/-} +pkgver=2.1 +pkgrel=1 +pkgdesc='Command line loader for PJRC Teensy microcontrollers (mingw-w64)' +arch=('any') +license=('GPL3') +url='https://www.pjrc.com/teensy/loader_cli.html' +depends=("${MINGW_PACKAGE_PREFIX}-libusb-compat") +source=( + "https://github.com/PaulStoffregen/teensy_loader_cli/archive/${pkgver}/teensy-loader-cli-${pkgver}.tar.gz" + 01-libusb-compat-header.patch + 02-win32-checks.patch +) +sha256sums=( + '5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388' + '04e92ebbe9b60551d32d579d6c346c994e0ada8828c1953034ac13552b773521' + '45bc4a7459216c4924331acb905400424420d3b2f10f4b3883628fd426367973' +) + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + patch -p1 -i ../01-libusb-compat-header.patch + patch -p1 -i ../02-win32-checks.patch + + OS=LINUX make teensy_loader_cli +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + install -Dm755 teensy_loader_cli ${pkgdir}${MINGW_PREFIX}/bin/teensy_loader_cli +} From b9e57c6ecc01b12728d7bee64a7266e789dc207d Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 13 Jul 2020 18:40:26 +1000 Subject: [PATCH 005/120] New package: libusb-win32 1.2.6.0 --- .../01-mingw32-ddk-headers.patch | 22 +++++++++++ mingw-w64-libusb-win32/PKGBUILD | 39 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 mingw-w64-libusb-win32/01-mingw32-ddk-headers.patch create mode 100644 mingw-w64-libusb-win32/PKGBUILD diff --git a/mingw-w64-libusb-win32/01-mingw32-ddk-headers.patch b/mingw-w64-libusb-win32/01-mingw32-ddk-headers.patch new file mode 100644 index 0000000000..3a85928a6a --- /dev/null +++ b/mingw-w64-libusb-win32/01-mingw32-ddk-headers.patch @@ -0,0 +1,22 @@ +--- a/src/install.c ++++ b/src/install.c +@@ -35,7 +35,7 @@ + #if defined(_WIN64) + #include + #else +-#include ++#include + #endif + #else + #include +--- a/src/registry.c ++++ b/src/registry.c +@@ -28,7 +28,7 @@ + #if defined(_WIN64) + #include + #else +-#include ++#include + #endif + #else + #include diff --git a/mingw-w64-libusb-win32/PKGBUILD b/mingw-w64-libusb-win32/PKGBUILD new file mode 100644 index 0000000000..360170ca97 --- /dev/null +++ b/mingw-w64-libusb-win32/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: fauxpark + +_realname=libusb-win32 +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=1.2.6.0 +pkgrel=1 +pkgdesc='Port of libusb-0.1 under Windows (mingw-w64)' +arch=('any') +license=('GPL3') +url='https://sourceforge.net/projects/libusb-win32/' +source=( + "https://downloads.sourceforge.net/project/libusb-win32/libusb-win32-releases/${pkgver}/libusb-win32-src-${pkgver}.zip" + 01-mingw32-ddk-headers.patch +) +sha256sums=( + 'f3faf094c9b3415ede42eeb5032feda2e71945f13f0ca3da58ca10dcb439bfee' + '71c3f422719cf229e7aaf9e06369ef5a0065b799f2184a4bbd8826bc5fad1687' +) + +prepare() { + cd ${srcdir}/${_realname}-src-${pkgver} + + patch -p1 -i ../01-mingw32-ddk-headers.patch +} + +build() { + cd ${srcdir}/${_realname}-src-${pkgver} + + make dll +} + +package() { + cd ${srcdir}/${_realname}-src-${pkgver} + + install -Dm755 libusb0.dll "${pkgdir}${MINGW_PREFIX}/bin/libusb0.dll" + install -Dm644 libusb.a "${pkgdir}${MINGW_PREFIX}/lib/libusb0.dll.a" + install -Dm644 src/lusb0_usb.h "${pkgdir}${MINGW_PREFIX}/include/lusb0_usb.h" +} From a8e38a5603aa897a8f30fc72f54fa53e8e53c301 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Mon, 20 Jul 2020 16:56:38 +0800 Subject: [PATCH 006/120] 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 3aaaf5a2a9..77b1d98ee6 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=3 +pkgrel=4 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') url="https://llvm.org/" From 8bc4423cc831c57434733836a256dcf83b0d9b08 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 30 Jul 2020 12:15:24 +1000 Subject: [PATCH 007/120] zbar: enable building zbarcam --- mingw-w64-zbar/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-zbar/PKGBUILD b/mingw-w64-zbar/PKGBUILD index 6612eeb366..e905acdd09 100644 --- a/mingw-w64-zbar/PKGBUILD +++ b/mingw-w64-zbar/PKGBUILD @@ -34,7 +34,7 @@ build() { --without-qt \ --without-gtk \ --with-python=no \ - --disable-video + --with-directshow make } From 939d89909b0975c3a3c60c89a6309f110ee36781 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Sun, 7 Jun 2020 18:01:00 +0300 Subject: [PATCH 008/120] python-blinker: New package --- mingw-w64-python-blinker/PKGBUILD | 43 +++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 mingw-w64-python-blinker/PKGBUILD diff --git a/mingw-w64-python-blinker/PKGBUILD b/mingw-w64-python-blinker/PKGBUILD new file mode 100644 index 0000000000..d087768c8b --- /dev/null +++ b/mingw-w64-python-blinker/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Konstantin Podsvirov + +_realname=blinker +pkgbase=mingw-w64-python-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") +pkgver=1.4 +pkgrel=1 +pkgdesc='Fast, simple object-to-object and broadcast signaling (mingw-w64)' +arch=('any') +url='https://pythonhosted.org/blinker/' +license=('MIT') +depends=("${MINGW_PACKAGE_PREFIX}-python") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") +checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose") +source=("blinker-rel-${pkgver}.tar.gz"::"https://github.com/jek/blinker/archive/rel-${pkgver}.tar.gz") +sha256sums=('ee9d6d52cbb93a8f9fe40205f7e0bd33af90458e27214ffcd35415d1a940c36b') + +prepare() { + cd "${srcdir}" + rm -rf "python-build-${CARCH}" | true + cp -r "blinker-rel-${pkgver}" "python-build-${CARCH}" +} + +build() { + msg "Python build for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build +} + +check() { + cd "${srcdir}/python-build-${CARCH}" + PYTHONPATH="${srcdir}/python-build-${CARCH}/build/lib:${PYTHONPATH}" \ + ${MINGW_PREFIX}/bin/nosetests +} + +package() { + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" +} + +# vim: ts=2 sw=2 et: From fe06a6c93d072c373176fd81b604b1fadeb65d61 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Fri, 31 Jul 2020 13:10:11 +0800 Subject: [PATCH 009/120] Upgrade LLVM to 10.0.1 --- mingw-w64-clang/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 77b1d98ee6..0a2ee35d4f 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -31,8 +31,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-llvm" "${MINGW_PACKAGE_PREFIX}-openmp" "${MINGW_PACKAGE_PREFIX}-polly") -pkgver=10.0.0 -pkgrel=4 +pkgver=10.0.1 +pkgrel=1 pkgdesc="C language family frontend for LLVM (mingw-w64)" arch=('any') url="https://llvm.org/" From 9d5ffab7c6ccc3e7ef9026756f5c450c95191f8f Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 31 Jul 2020 15:47:24 +1000 Subject: [PATCH 010/120] zbar: increased pkgrel --- mingw-w64-zbar/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-zbar/PKGBUILD b/mingw-w64-zbar/PKGBUILD index e905acdd09..c5aceeda52 100644 --- a/mingw-w64-zbar/PKGBUILD +++ b/mingw-w64-zbar/PKGBUILD @@ -4,7 +4,7 @@ _realname=zbar pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="Application and library for reading bar codes from various sources (mingw-w64)" arch=('any') url="https://github.com/mchehab/zbar" From 6a44a0578c63698ddb460e439c3e77b901aaafed Mon Sep 17 00:00:00 2001 From: Horimoto Yasuhiro Date: Fri, 31 Jul 2020 15:55:11 +0900 Subject: [PATCH 011/120] groonga: Update to 10.0.5 --- mingw-w64-groonga/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-groonga/PKGBUILD b/mingw-w64-groonga/PKGBUILD index 03ef2fb775..e379d21ed3 100644 --- a/mingw-w64-groonga/PKGBUILD +++ b/mingw-w64-groonga/PKGBUILD @@ -3,7 +3,7 @@ _realname=groonga pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=10.0.4 +pkgver=10.0.5 pkgrel=1 pkgdesc="An opensource fulltext search engine (mingw-w64)" arch=('any') @@ -26,7 +26,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-arrow" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-zstd") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -sha256sums=('32d3c98978030b165aa7ff0e8d8e44635775fe6afc8264712f2e210c25dec9bd') +sha256sums=('e0d60ecbf441f86fe8a7e2448ec2e5b1e0a9f26405a71258abb2940d69c53213') build() { [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH} From d1c634d2b8f89b6aceeef71991e380337ce3ba46 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Fri, 31 Jul 2020 16:32:42 +0800 Subject: [PATCH 012/120] Update sha256sums --- mingw-w64-clang/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mingw-w64-clang/PKGBUILD b/mingw-w64-clang/PKGBUILD index 0a2ee35d4f..5b85580901 100644 --- a/mingw-w64-clang/PKGBUILD +++ b/mingw-w64-clang/PKGBUILD @@ -103,29 +103,29 @@ source=(${_url}/llvm-${pkgver}.src.tar.xz{,.sig} #0701-0799 -> libc++abi #0801-0899 -> polly #0901-0999 -> openmp -sha256sums=('df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf' +sha256sums=('c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3' 'SKIP' - '3b9ff29a45d0509a1e9667a0feb43538ef402ea8cfc7df3758a01f20df08adfa' + 'd19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44' 'SKIP' - '885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21' + 'f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24' 'SKIP' - '6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75' + 'd90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa' 'SKIP' - '2bcf0f76263572bf45bf7c552e3eae886ec2f315bbc529f3a68603bfc1d13b33' + '3418a2d6fd32f4fa2901e740c4a90b512675a941639cdbb9becfbbdc8981f5f1' 'SKIP' - '270f8a3f176f1981b0f6ab8aa556720988872ec2b48ed3b605d0ced8d09156c7' + 'def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c' 'SKIP' - 'e71bac75a88c9dde455ad3f2a2b449bf745eafd41d2d8432253b2964e0ca14e1' + 'a97ef810b2e9fb70e8f7e317b74e646ed4944f488b02ac5ddd9c99e385381a7b' 'SKIP' - 'acdf8cf6574b40e6b1dabc93e76debb84a9feb6f22970126b04d4ba18b92911c' + 'd093782bcfcd0c3f496b67a5c2c997ab4b85816b62a7dd5b27026634ccf5c11a' 'SKIP' - 'b9a0d7c576eeef05bc06d6e954938a01c5396cee1d1e985891e0b1cf16e3d708' + '591449e0aa623a6318d5ce2371860401653c48bb540982ccdd933992cb88df7a' 'SKIP' - 'dd1ffcb42ed033f5167089ec4c6ebe84fbca1db4a9eaebf5c614af09d89eb135' + '07abe87c25876aa306e73127330f5f37d270b6b082d50cc679e31b4fc02a3714' 'SKIP' - '09dc5ecc4714809ecf62908ae8fe8635ab476880455287036a2730966833c626' + '741903ec1ebff2253ff19d803629d88dc7612598758b6e48bea2da168de95e27' 'SKIP' - '35fba6ed628896fe529be4c10407f1b1c8a7264d40c76bced212180e701b4d97' + 'd2fb0bb86b21db1f52402ba231da7c119c35c21dfb843c9496fe901f2d6aa25a' 'SKIP' '9b6d3ecb0ef4a38d34aefaefff8c6257ff22d366d84630020d7f079dc8065d97' '1f318c0370357fdf9c54ae6d31bad761b0caa58ac099998937b636309ecb6590' From 398eadd3ca7e2ffcdf90f4464b5ac57b1e75a373 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sun, 2 Aug 2020 11:25:05 +0530 Subject: [PATCH 013/120] faudio: udpate to 20.08 * Replace dependency ffmpeg to gstreamer * Add glib2, gstreamer, gst-plugins-base as dependencies * Use -DGSTREAMER instead of -DFFMPEG option for cmake --- mingw-w64-faudio/PKGBUILD | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mingw-w64-faudio/PKGBUILD b/mingw-w64-faudio/PKGBUILD index 5378172baf..11d8ef33b8 100644 --- a/mingw-w64-faudio/PKGBUILD +++ b/mingw-w64-faudio/PKGBUILD @@ -3,18 +3,20 @@ _realname=FAudio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=20.06 +pkgver=20.08 pkgrel=1 pkgdesc="FAudio - Accuracy-focused XAudio reimplementation for open platforms (mingw-w64)" arch=('any') url="https://github.com/FNA-XNA/FAudio" license=('custom') -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-ffmpeg" - "${MINGW_PACKAGE_PREFIX}-SDL2") +depends=("${MINGW_PACKAGE_PREFIX}-SDL2" + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-gst-plugins-base") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") options=('strip' 'staticlibs') source=(${_realname}-${pkgver}.tar.gz::"https://github.com/FNA-XNA/FAudio/archive/${pkgver}.tar.gz") -sha256sums=('d6e89e1d5d2a95e2c2759318c6dba6ecd922c452668996e6e7e40294c3875725') +sha256sums=('5c3409fa0e532591f0ab4de1ae57d07cc345efa5cbe83ec25e9f5ba180f920f4') build() { [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} @@ -30,7 +32,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G'MSYS Makefiles' \ - -DFFMPEG=ON \ + -DGSTREAMER=ON \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ ../${_realname}-${pkgver} From e31527c43fc1a5c132e24824526567a191e82da7 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 2 Aug 2020 12:18:38 +0200 Subject: [PATCH 014/120] cargo-c: Update to 0.6.10 --- mingw-w64-cargo-c/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-cargo-c/PKGBUILD b/mingw-w64-cargo-c/PKGBUILD index 271af8c544..1f9b228d95 100644 --- a/mingw-w64-cargo-c/PKGBUILD +++ b/mingw-w64-cargo-c/PKGBUILD @@ -3,7 +3,7 @@ _realname=cargo-c pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.6.9 +pkgver=0.6.10 pkgrel=1 pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)' arch=('any') @@ -18,8 +18,8 @@ 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") -sha256sums=('d88bad2ada3432b15d2a871a5071f2bd7554beec5ecc4807c91599533de76cb4' - 'a12f2a572848fa18c502dc33f114307959554fe3311ee1dd7da0a2787e444912') +sha256sums=('3e0f6c70291e48b09f936a5918656159b1d840d7a3b010316d0fc61e9b048bca' + '3959b780a22afa6d9ac2a620fce6c1601957bfec465afd204e0db40b5693bc09') prepare() { cp "${srcdir}/${_realname}-${pkgver}.Cargo.lock" "${_realname}-${pkgver}/Cargo.lock" From 3b3e6bd2ef4e475747de7437a6778e3c09967d93 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Sun, 2 Aug 2020 13:24:20 +0300 Subject: [PATCH 015/120] binaryen: Update to 95 --- mingw-w64-binaryen/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-binaryen/PKGBUILD b/mingw-w64-binaryen/PKGBUILD index cc14a15e5d..daffcecf63 100644 --- a/mingw-w64-binaryen/PKGBUILD +++ b/mingw-w64-binaryen/PKGBUILD @@ -3,7 +3,7 @@ _realname=binaryen pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=94 +pkgver=95 pkgrel=1 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++ (mingw-w64)" arch=('any') @@ -11,7 +11,7 @@ url="https://github.com/WebAssembly/binaryen" license=('Apache') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") source=("${_realname}-${pkgver}.tar.gz::https://github.com/WebAssembly/binaryen/archive/version_${pkgver}.tar.gz") -sha256sums=('af7d9d66cb3d8667ee8b3f92927cf94599ce4fcf308fc919853c11197f28b03d') +sha256sums=('d0fc0f7b5ec147a886aea7dc40a2fff7a675e970c8fc38768e1908458b97aaab') build() { declare -a extra_config From 11027f80b0c1d8f72b9fb3e3fce1634f2a46ee45 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Sun, 2 Aug 2020 14:21:28 +0300 Subject: [PATCH 016/120] cglm: Update to 0.7.7 --- mingw-w64-cglm/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-cglm/PKGBUILD b/mingw-w64-cglm/PKGBUILD index cd6aa09cb6..cfe48f370e 100644 --- a/mingw-w64-cglm/PKGBUILD +++ b/mingw-w64-cglm/PKGBUILD @@ -3,7 +3,7 @@ _realname=cglm pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=1 pkgdesc="OpenGL Mathematics (glm) for C (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme") options=(!strip staticlibs !buildflags) source=("${_realname}-${pkgver}.tar.gz::https://github.com/recp/cglm/archive/v${pkgver}.tar.gz") -sha256sums=('29ff8af4edc03697e36d3e6f99a80b884a80ee09d46055ce45765e5d6b2456d9') +sha256sums=('2614a61cafc5d2e908364795943b9eebc8be3231128e4c77498e9c3448d365cc') prepare() { cd "${srcdir}/${_realname}-${pkgver}" From 6ea59e21d505959408ecb8b44a584502cf72c266 Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Sun, 2 Aug 2020 16:50:02 +0300 Subject: [PATCH 017/120] spdlog: Update to 1.7.0 --- mingw-w64-spdlog/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-spdlog/PKGBUILD b/mingw-w64-spdlog/PKGBUILD index 8a5f8614e4..99e7bcd731 100644 --- a/mingw-w64-spdlog/PKGBUILD +++ b/mingw-w64-spdlog/PKGBUILD @@ -3,7 +3,7 @@ _realname=spdlog pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.6.1 +pkgver=1.7.0 pkgrel=1 pkgdesc='Very fast, header-only/compiled, C++ logging library (mingw-w64)' arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" depends=("${MINGW_PACKAGE_PREFIX}-fmt") options=('staticlibs' '!strip' '!buildflags') source=("${_realname}-${pkgver}.tar.gz::https://github.com/gabime/spdlog/archive/v${pkgver}.tar.gz") -sha256sums=('378a040d91f787aec96d269b0c39189f58a6b852e4cbf9150ccfacbe85ebbbfc') +sha256sums=('f0114a4d3c88be9e696762f37a7c379619443ce9d668546c61b21d41affe5b62') build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" From 7c803f71c91c045251170b3e4a593eb25a034b7f Mon Sep 17 00:00:00 2001 From: dofuuz Date: Sun, 2 Aug 2020 23:59:49 +0900 Subject: [PATCH 018/120] libsndfile: Update to 1.0.29pre2 --- .../0003-fix-source-searches.mingw.patch | 160 ------------------ mingw-w64-libsndfile/PKGBUILD | 20 +-- 2 files changed, 8 insertions(+), 172 deletions(-) delete mode 100644 mingw-w64-libsndfile/0003-fix-source-searches.mingw.patch diff --git a/mingw-w64-libsndfile/0003-fix-source-searches.mingw.patch b/mingw-w64-libsndfile/0003-fix-source-searches.mingw.patch deleted file mode 100644 index e6b002478c..0000000000 --- a/mingw-w64-libsndfile/0003-fix-source-searches.mingw.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- libsndfile-1.0.26/configure.ac.orig 2013-04-08 00:08:06 +0400 -+++ libsndfile-1.0.6/configure.ac 2013-04-08 00:08:00 +0400 -@@ -651,6 +651,7 @@ - M4/Makefile doc/Makefile Win32/Makefile Octave/Makefile programs/Makefile \ - Makefile \ - src/version-metadata.rc tests/test_wrapper.sh tests/pedantic-header-test.sh \ -+ tests/win32_ordinal_test.c \ - doc/libsndfile.css Scripts/build-test-tarball.mk libsndfile.spec sndfile.pc \ - src/sndfile.h \ - echo-install-dirs ---- /dev/null 2013-04-08 00:11:18 +0400 -+++ libsndfile-1.0.25/tests/win32_ordinal_test.c.in 2013-04-08 00:06:17 +0400 -@@ -0,0 +1,147 @@ -+/* -+** Copyright (C) 2006-2011 Erik de Castro Lopo -+** -+** This program is free software; you can redistribute it and/or modify -+** it under the terms of the GNU General Public License as published by -+** the Free Software Foundation; either version 2 of the License, or -+** (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU General Public License for more details. -+** -+** You should have received a copy of the GNU General Public License -+** along with this program; if not, write to the Free Software -+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+*/ -+ -+#include "sfconfig.h" -+#include "sndfile.h" -+ -+#include -+#include -+ -+#if HAVE_UNISTD_H -+#include -+#endif -+ -+#if (HAVE_DECL_S_IRGRP == 0) -+#include -+#endif -+ -+#include -+#include -+#include -+ -+#include "utils.h" -+ -+#if (defined (WIN32) || defined (_WIN32) || defined (__CYGWIN__)) -+#define TEST_WIN32 1 -+#else -+#define TEST_WIN32 0 -+#endif -+ -+#if TEST_WIN32 -+#include -+ -+ -+static const char * locations [] = -+{ ".", "../src/", "src/", "../src/.libs/", "src/.libs/", -+ "@top_srcdir@/src", -+ NULL -+} ; /* locations. */ -+ -+static int -+test_ordinal (HMODULE hmod, const char * func_name, int ordinal) -+{ char *lpmsg ; -+ void *name, *ord ; -+ -+ print_test_name ("win32_ordinal_test", func_name) ; -+ -+#if SIZEOF_VOIDP == 8 -+#define LPCSTR_OF_ORDINAL(x) ((LPCSTR) ((int64_t) (x))) -+#else -+#define LPCSTR_OF_ORDINAL(x) ((LPCSTR) (x)) -+#endif -+ -+ ord = GetProcAddress (hmod, LPCSTR_OF_ORDINAL (ordinal)) ; -+ if ((name = GetProcAddress (hmod, func_name)) == NULL) -+ { FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError (), -+ MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &lpmsg, 0, NULL) ; -+ /*-puts (lpmsg) ;-*/ -+ } ; -+ -+ if (name != NULL && ord != NULL && name == ord) -+ { puts ("ok") ; -+ return 0 ; -+ } ; -+ -+ puts ("fail") ; -+ return 1 ; -+} /* test_ordinal */ -+ -+static void -+win32_ordinal_test (void) -+{ static char buffer [1024] ; -+ static char func_name [1024] ; -+ HMODULE hmod = NULL ; -+ FILE * file = NULL ; -+ int k, ordinal, errors = 0 ; -+ -+ for (k = 0 ; locations [k] != NULL ; k++) -+ { snprintf (buffer, sizeof (buffer), "%s/libsndfile-1.def", locations [k]) ; -+ if ((file = fopen (buffer, "r")) != NULL) -+ break ; -+ } ; -+ -+ if (file == NULL) -+ { puts ("\n\nError : cannot open DEF file.\n") ; -+ exit (1) ; -+ } ; -+ -+ for (k = 0 ; locations [k] != NULL ; k++) -+ { snprintf (buffer, sizeof (buffer), "%s/libsndfile-1.dll", locations [k]) ; -+ if ((hmod = (HMODULE) LoadLibrary (buffer)) != NULL) -+ break ; -+ } ; -+ -+ if (hmod == NULL) -+ { puts ("\n\nError : cannot load DLL.\n") ; -+ exit (1) ; -+ } ; -+ -+ while (fgets (buffer, sizeof (buffer), file) != NULL) -+ { func_name [0] = 0 ; -+ ordinal = 0 ; -+ -+ if (sscanf (buffer, "%s @%d", func_name, &ordinal) != 2) -+ continue ; -+ -+ errors += test_ordinal (hmod, func_name, ordinal) ; -+ } ; -+ -+ FreeLibrary (hmod) ; -+ -+ fclose (file) ; -+ -+ if (errors > 0) -+ { printf ("\n\nErrors : %d\n\n", errors) ; -+ exit (1) ; -+ } ; -+ -+ return ; -+} /* win32_ordinal_test */ -+ -+#endif -+ -+int -+main (void) -+{ -+#if (TEST_WIN32 && WIN32_TARGET_DLL) -+ win32_ordinal_test () ; -+#endif -+ -+ return 0 ; -+} /* main */ -+ diff --git a/mingw-w64-libsndfile/PKGBUILD b/mingw-w64-libsndfile/PKGBUILD index 268f111731..00abf1edbc 100644 --- a/mingw-w64-libsndfile/PKGBUILD +++ b/mingw-w64-libsndfile/PKGBUILD @@ -3,27 +3,23 @@ _realname=libsndfile pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.0.28 +pkgver=1.0.29pre2 pkgrel=1 pkgdesc="A C library for reading and writing files containing sampled sound (mingw-w64)" arch=('any') url="http://www.mega-nerd.com/libsndfile" license=('LGPL') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -depends=("${MINGW_PACKAGE_PREFIX}-flac" "${MINGW_PACKAGE_PREFIX}-libvorbis" "${MINGW_PACKAGE_PREFIX}-speex") +depends=("${MINGW_PACKAGE_PREFIX}-flac" "${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-libvorbis" "${MINGW_PACKAGE_PREFIX}-opus") options=('staticlibs' 'strip') -source=(http://www.mega-nerd.com/libsndfile/files/${_realname}-${pkgver}.tar.gz - 0003-fix-source-searches.mingw.patch) -sha256sums=('1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9' - '35633bbc54583d3f0a5dff3c3adfe95107a444ce85fc2cfc907b4bc947268c89') +source=("http://www.mega-nerd.com/libsndfile/files/${pkgver}/${_realname}-${pkgver}.tar.bz2") +sha256sums=('ffe2d6bff622bc66e6f96059ada79cfcdc43b3e8bc9cc4f45dbc567dccbfae75') +validpgpkeys=('6A91A5CF22C24C99A35E013FCFDCF91FB242ACED') # Erik de Castro Lopo + prepare() { cd ${srcdir}/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/0003-fix-source-searches.mingw.patch - - #sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \ - # src/create_symbols_file.py programs/test-sndfile-metadata-set.py - autoreconf -fi -I M4 + autoreconf -vfi } build() { @@ -37,7 +33,7 @@ build() { --disable-sqlite \ --disable-test-coverage \ --enable-external-libs \ - --enable-experimental \ + --enable-stack-smash-protection \ --enable-shared \ --enable-static From c22e57f10a37442c4f87e8ae27698ad4d053771f Mon Sep 17 00:00:00 2001 From: Andrew Sun Date: Mon, 3 Aug 2020 09:23:18 -0400 Subject: [PATCH 019/120] json-c: update to 0.15 --- mingw-w64-json-c/002-library-version.patch | 13 +++++++------ mingw-w64-json-c/PKGBUILD | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/mingw-w64-json-c/002-library-version.patch b/mingw-w64-json-c/002-library-version.patch index 87a13eb0cd..81e9329564 100644 --- a/mingw-w64-json-c/002-library-version.patch +++ b/mingw-w64-json-c/002-library-version.patch @@ -1,20 +1,21 @@ ---- json-c-json-c-0.14/CMakeLists.txt.orig 2020-04-27 16:22:14.788180700 +0300 -+++ json-c-json-c-0.14/CMakeLists.txt 2020-04-27 16:25:33.974302700 +0300 -@@ -380,10 +380,16 @@ +--- a/CMakeLists.txt 2020-08-03 08:55:10.090125184 -0400 ++++ b/CMakeLists.txt 2020-08-03 08:57:21.002463125 -0400 +@@ -416,9 +416,17 @@ ${JSON_C_SOURCES} ${JSON_C_HEADERS} ) + +set(JSON_C_SOVERSION 5) set_target_properties(${PROJECT_NAME} PROPERTIES - VERSION 5.0.0 + VERSION 5.1.0 - SOVERSION 5) + SOVERSION ${JSON_C_SOVERSION}) - ++ +set_target_properties(${PROJECT_NAME} PROPERTIES + OUTPUT_NAME ${PROJECT_NAME} + RUNTIME_OUTPUT_NAME ${PROJECT_NAME}-${JSON_C_SOVERSION} + ARCHIVE_OUTPUT_NAME ${PROJECT_NAME}) ++ + list(APPEND CMAKE_TARGETS ${PROJECT_NAME}) # If json-c is used as subroject it set to target correct interface -I flags and allow # to build external target without extra include_directories(...) - target_include_directories(${PROJECT_NAME} diff --git a/mingw-w64-json-c/PKGBUILD b/mingw-w64-json-c/PKGBUILD index 69b0cc83ea..ce8ed3a48a 100644 --- a/mingw-w64-json-c/PKGBUILD +++ b/mingw-w64-json-c/PKGBUILD @@ -4,7 +4,7 @@ _realname=json-c pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.14 +pkgver=0.15 pkgrel=1 arch=('any') pkgdesc="A JSON implementation in C (mingw-w64)" @@ -18,9 +18,9 @@ license=('MIT') source=(https://github.com/json-c/json-c/archive/${_realname}-${pkgver//_/-}.tar.gz 001-install-private-header.patch 002-library-version.patch) -sha256sums=('7eccf1f949ce7ebc2187d316d73407baa991f1c7cc7a3eea14d92b2d98e987e5' +sha256sums=('74985882e39467b34722e584ab836ed2abd47061888f318125fd4b167002afd5' '197e33a56fc3d655e058d6936e92698c8aa65b7297cb218345b8ad51350c4ecf' - '01070781c13c7c5732d5d6779443381079be22d7d5612d0be1936e9cb9c95b7e') + '2288c0ad1c0f98f2b43a8e4bdd09a6cf91710c7c8b1e7bf7a2b516ed21e81705') noextract=(${_realname}-${pkgver//_/-}.tar.gz) prepare() { From c6691ad1bd9d4c6823a18068ca0683c3e32ea005 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Tue, 4 Aug 2020 13:14:52 -0700 Subject: [PATCH 020/120] termcap: add patch to replace write with fprintf(stderr) --- ...01-tparam-replace-write-with-fprintf.patch | 19 +++++++++++++++++++ mingw-w64-termcap/PKGBUILD | 12 +++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-termcap/0001-tparam-replace-write-with-fprintf.patch diff --git a/mingw-w64-termcap/0001-tparam-replace-write-with-fprintf.patch b/mingw-w64-termcap/0001-tparam-replace-write-with-fprintf.patch new file mode 100644 index 0000000000..030fc41337 --- /dev/null +++ b/mingw-w64-termcap/0001-tparam-replace-write-with-fprintf.patch @@ -0,0 +1,19 @@ +--- termcap-1.3.1.orig/tparam.c ++++ termcap-1.3.1/tparam.c +@@ -26,6 +26,7 @@ + #else + + #ifdef STDC_HEADERS ++#include + #include + #include + #else +@@ -48,7 +49,7 @@ + static void + memory_out () + { +- write (2, "virtual memory exhausted\n", 25); ++ fprintf (stderr, "virtual memory exhausted\n"); + exit (1); + } + diff --git a/mingw-w64-termcap/PKGBUILD b/mingw-w64-termcap/PKGBUILD index d692817826..820e28f185 100644 --- a/mingw-w64-termcap/PKGBUILD +++ b/mingw-w64-termcap/PKGBUILD @@ -4,7 +4,7 @@ _realname=termcap pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.1 -pkgrel=5 +pkgrel=6 pkgdesc="Terminal feature database (mingw-w64)" arch=('any') url="https://www.gnu.org/software/termutils/" @@ -12,11 +12,17 @@ license=("GPL" "LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs' 'strip') -source=("https://ftp.gnu.org/gnu/termcap/${_realname}-${pkgver}.tar.gz") -sha256sums=('91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100') +source=("https://ftp.gnu.org/gnu/termcap/${_realname}-${pkgver}.tar.gz" + "0001-tparam-replace-write-with-fprintf.patch") +sha256sums=('91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100' + '47d5da2df6bc7f3401b7e33eb80d40153bca60278e58b503ffb19589acd7c2da') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + + # fixes tparam.c: warning: implicit declaration of function 'write' + patch -Nbp1 -i "${srcdir}/0001-tparam-replace-write-with-fprintf.patch" + autoconf } From e4c112bc7fc1509fac4f40fc9da176645bd776f1 Mon Sep 17 00:00:00 2001 From: HP Date: Wed, 5 Aug 2020 18:41:03 +0800 Subject: [PATCH 021/120] Update grep to 3.4 --- mingw-w64-grep/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-grep/PKGBUILD b/mingw-w64-grep/PKGBUILD index 4d786e2a89..aef2406955 100644 --- a/mingw-w64-grep/PKGBUILD +++ b/mingw-w64-grep/PKGBUILD @@ -4,7 +4,7 @@ _realname=grep pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.24 +pkgver=3.4 pkgrel=1 pkgdesc="Grep searches one or more input files for lines containing a match to a specified pattern (mingw-w64)" arch=('any') @@ -13,7 +13,7 @@ license=('GPL3') depends=("${MINGW_PACKAGE_PREFIX}-pcre") options=('strip' '!libtool' 'staticlibs') source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz") -sha256sums=('f248beb9098c5aab94d2fdd03b5a21d705e5ba8a3ce4d8c9f607a670498eec14') +sha256sums=('58e6751c41a7c25bfc6e9363a41786cff3ba5709cf11d5ad903cf7cce31cc3fb') prepare() { cd ${srcdir}/${_realname}-${pkgver} From 2dea73fc34b9c0986198f7c8ed9c6702a98ff442 Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Wed, 5 Aug 2020 16:27:57 +0200 Subject: [PATCH 022/120] Rename gprbuild-gpl into gprbuild --- .../PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename {mingw-w64-gprbuild-gpl => mingw-w64-gprbuild}/PKGBUILD (87%) diff --git a/mingw-w64-gprbuild-gpl/PKGBUILD b/mingw-w64-gprbuild/PKGBUILD similarity index 87% rename from mingw-w64-gprbuild-gpl/PKGBUILD rename to mingw-w64-gprbuild/PKGBUILD index c7f959ec18..b41402dc78 100644 --- a/mingw-w64-gprbuild-gpl/PKGBUILD +++ b/mingw-w64-gprbuild/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Jürgen Pfeifer # Contributor: Tim S -_realname=gprbuild-gpl +_realname=gprbuild pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2020.0.43e55df pkgrel=1 pkgdesc="Software tool designed to help automate the construction of multi-language systems (mingw-w64)" arch=('any') -provides=("${MINGW_PACKAGE_PREFIX}-${_realname%-*}") +replaces=("${MINGW_PACKAGE_PREFIX}-gprbuild-gpl") license=('GPL3') url="https://www.adacore.com/gnatpro/toolsuite/gprbuild/" makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" @@ -21,21 +21,21 @@ source=("${_realname}"::"git+https://github.com/AdaCore/gprbuild.git#commit=43e5 sha256sums=('SKIP') prepare() { - cd ${srcdir}/gprbuild-gpl + cd ${srcdir}/gprbuild #./bootstrap.sh } build() { - cd ${srcdir}/gprbuild-gpl + cd ${srcdir}/gprbuild make SOURCE_DIR="$PWD" prefix=${MINGW_PREFIX} setup - make + make } package() { - cd ${srcdir}/gprbuild-gpl + cd ${srcdir}/gprbuild make prefix="${pkgdir}${MINGW_PREFIX}" INSTALL=cp install # Copy License Files From 41d625f10a2134dc18aa36fdc33a62dd2d9f7c68 Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Wed, 5 Aug 2020 07:55:21 -0700 Subject: [PATCH 023/120] Rename xmlada-gpr into xmlada --- {mingw-w64-xmlada-gpl => mingw-w64-xmlada}/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename {mingw-w64-xmlada-gpl => mingw-w64-xmlada}/PKGBUILD (95%) diff --git a/mingw-w64-xmlada-gpl/PKGBUILD b/mingw-w64-xmlada/PKGBUILD similarity index 95% rename from mingw-w64-xmlada-gpl/PKGBUILD rename to mingw-w64-xmlada/PKGBUILD index 9b0d890ea2..c07482ff05 100644 --- a/mingw-w64-xmlada-gpl/PKGBUILD +++ b/mingw-w64-xmlada/PKGBUILD @@ -5,14 +5,14 @@ # I recommend to use a short BUILDDIR setting to avoid problems # -_realname=xmlada-gpl +_realname=xmlada pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2017 pkgrel=2 pkgdesc="A full XML suite for Ada (mingw-w64)" arch=('any') -provides=("${MINGW_PACKAGE_PREFIX}-${_realname%-*}") +replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-gpl") url="https://libre.adacore.com/libre/tools/xmlada/" license=('GPL3') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" From 14fdbd44487a760b2d8b69b70d550b507b03cd5f Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Wed, 5 Aug 2020 08:24:12 -0700 Subject: [PATCH 024/120] Update xmlada This update is required to compile with gcc-ada 10 because of package g-socket incompatible API changes. --- mingw-w64-xmlada/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-xmlada/PKGBUILD b/mingw-w64-xmlada/PKGBUILD index c07482ff05..6a882e5443 100644 --- a/mingw-w64-xmlada/PKGBUILD +++ b/mingw-w64-xmlada/PKGBUILD @@ -8,8 +8,8 @@ _realname=xmlada pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgver=2017 -pkgrel=2 +pkgver=2020 +pkgrel=1 pkgdesc="A full XML suite for Ada (mingw-w64)" arch=('any') replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-gpl") @@ -18,7 +18,7 @@ license=('GPL3') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git") depends=() -source=("${_realname}"::"git+https://github.com/AdaCore/xmlada.git#branch=gpl-${pkgver}") +source=("${_realname}"::"git+https://github.com/AdaCore/xmlada.git#commit=c16f24ebf752b7d75dfdd0eaa7dd501a08a31256") sha256sums=('SKIP') options=('strip') From 0b62d12e709d99e056e1c6a8e32c5070e56f9420 Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Wed, 5 Aug 2020 08:25:54 -0700 Subject: [PATCH 025/120] Set fixed commit ids for gprbuild-boostrap-git sources Instead of the latest commit from the master branch. --- mingw-w64-gprbuild-bootstrap-git/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD index ad9e1f4bfa..4432efbd70 100644 --- a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD +++ b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD @@ -19,8 +19,8 @@ provides=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap") conflicts=("${MINGW_PACKAGE_PREFIX}-gprbuild" "${MINGW_PACKAGE_PREFIX}-gprbuild-gpl" "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap") -source=('git+https://github.com/AdaCore/gprbuild.git' - 'git+https://github.com/AdaCore/xmlada.git') +source=(gprbuild::"git+https://github.com/AdaCore/gprbuild.git#commit=43e55df6c26e2bd48ab6c2f4214f497c4ddbc943" + xmlada::"git+https://github.com/AdaCore/xmlada.git#commit=c16f24ebf752b7d75dfdd0eaa7dd501a08a31256") sha256sums=('SKIP' 'SKIP') From e45036c8f730addc200c78c6b8af6a5c01d8b8a2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 5 Aug 2020 18:31:57 +0200 Subject: [PATCH 026/120] graphviz: fix the build It's an ancient version, but this is easier than updating. Use a commit hash because the git tag was removed upstream. Build with -fcommon which was the default before gcc 10. --- mingw-w64-graphviz/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mingw-w64-graphviz/PKGBUILD b/mingw-w64-graphviz/PKGBUILD index f1722fa593..d95426a923 100644 --- a/mingw-w64-graphviz/PKGBUILD +++ b/mingw-w64-graphviz/PKGBUILD @@ -4,7 +4,8 @@ _realname=graphviz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.40.1 -pkgrel=11 +_commit='67cd2e5121379a38e0801cc05cce503' # stable_release_2.40.1 +pkgrel=12 pkgdesc="Graph Visualization Software (mingw-w64)" arch=('any') url='https://www.graphviz.org/' @@ -38,7 +39,7 @@ makedepends=(#"${MINGW_PACKAGE_PREFIX}-ocaml" "git") options=(libtool) install=${_realname}-${CARCH}.install -source=(${_realname}-${pkgver}::git+https://gitlab.com/graphviz/graphviz.git#tag=stable_release_${pkgver} +source=(${_realname}-${pkgver}::git+https://gitlab.com/graphviz/graphviz.git#commit=${_commit} #https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz #"https://www.graphviz.org/pub/${_realname}/stable/SOURCES/${_realname}-${pkgver}.tar.gz" 001-msvc-pragma.patch.patch @@ -83,6 +84,7 @@ build() { local gd_incdir=$(pkg-config --variable=includedir gdlib) CFLAGS+=" -Wno-sign-conversion -Wno-sign-compare -Wno-conversion" CXXFLAGS+=" -Wno-sign-conversion -Wno-sign-compare -Wno-conversion" + CFLAGS+=" -fcommon" # GCC10 is stricter, change to the previous default [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} ../${_realname}-${pkgver}/configure \ From 727ef7f011bbaa3f8dfe299f206c5a4d70d26694 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 5 Aug 2020 18:49:56 +0200 Subject: [PATCH 027/120] graphviz: try building without Python not clear if it even needs it --- mingw-w64-graphviz/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-graphviz/PKGBUILD b/mingw-w64-graphviz/PKGBUILD index d95426a923..3caff71e0c 100644 --- a/mingw-w64-graphviz/PKGBUILD +++ b/mingw-w64-graphviz/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.40.1 _commit='67cd2e5121379a38e0801cc05cce503' # stable_release_2.40.1 -pkgrel=12 +pkgrel=13 pkgdesc="Graph Visualization Software (mingw-w64)" arch=('any') url='https://www.graphviz.org/' @@ -32,7 +32,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo" makedepends=(#"${MINGW_PACKAGE_PREFIX}-ocaml" #"${MINGW_PACKAGE_PREFIX}-lua" "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-python2" + #"${MINGW_PACKAGE_PREFIX}-python" #"${MINGW_PACKAGE_PREFIX}-ruby" #"${MINGW_PACKAGE_PREFIX}-tcl" "${MINGW_PACKAGE_PREFIX}-zlib" From 2735a68781cc6eace9533e4166e7c041ccd6b92d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 5 Aug 2020 20:54:56 +0200 Subject: [PATCH 028/120] harfbuzz: Update to 2.7.0 revert the cairo dep change since it's now fixed upstream --- mingw-w64-harfbuzz/PKGBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mingw-w64-harfbuzz/PKGBUILD b/mingw-w64-harfbuzz/PKGBUILD index 3d76221391..74a60e6b69 100644 --- a/mingw-w64-harfbuzz/PKGBUILD +++ b/mingw-w64-harfbuzz/PKGBUILD @@ -4,7 +4,7 @@ _realname=harfbuzz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.6.8 +pkgver=2.7.0 pkgrel=1 pkgdesc="OpenType text shaping engine (mingw-w64)" arch=('any') @@ -14,12 +14,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-icu" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-ragel") -depends=("${MINGW_PACKAGE_PREFIX}-cairo" - "${MINGW_PACKAGE_PREFIX}-freetype" +depends=("${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glib2" "${MINGW_PACKAGE_PREFIX}-graphite2") @@ -28,10 +28,12 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-fonttools" options=('strip' 'staticlibs') optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support" "${MINGW_PACKAGE_PREFIX}-cairo: hb-view program") -source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/${_realname}-${pkgver}.tar.xz") -sha256sums=('6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035') +source=("https://github.com/harfbuzz/harfbuzz/archive/${pkgver}.tar.gz") +sha256sums=('4dba05de1fd44705f54c40d801e0e3d4833555d004cb611cc18675173feae75b') +noextract=("${pkgver}.tar.gz") prepare() { + tar -xzf ${srcdir}/${pkgver}.tar.gz -C ${srcdir} || true cd "${srcdir}/${_realname}-${pkgver}" } From a648c98dcb818e0536bf0f143397128e4fac61d7 Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:22:47 +0200 Subject: [PATCH 029/120] sqlite3: amend configure flag (instead of using patch) * PKGBUILD: - amend configure flag --with-readline-inc (making lemon.patch obsolete) - remove lemon.patch from package source files * lemon.patch: remove file --- mingw-w64-sqlite3/PKGBUILD | 9 +++------ mingw-w64-sqlite3/lemon.patch | 11 ----------- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 mingw-w64-sqlite3/lemon.patch diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index 4c3f708821..8b6c0b4596 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -24,17 +24,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=(https://www.sqlite.org/2020/sqlite-src-${_amalgamationver}.zip https://www.sqlite.org/2020/sqlite-doc-${_docver}.zip - LICENSE - lemon.patch) + LICENSE) sha256sums=('9312f0865d3692384d466048f746d18f88e7ffd1758b77d4f07904e03ed5f5b9' '36920536daf7f8b19c2e646dc79db62e13cc1a992f562ba9a11fa7c191f24a4e' - '0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f' - 'd29bb02ea8b83a947d9465af1ed420c030c948ef574f00fdf436080809d6ff53') + '0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f') options=('!strip' 'staticlibs' '!buildflags') prepare() { cd "${srcdir}/sqlite-src-${_amalgamationver}" - patch -p0 -i "${srcdir}"/lemon.patch } build() { @@ -66,7 +63,7 @@ build() { --enable-fts4 \ --enable-fts5 \ --enable-session \ - --with-readline-inc=${MINGW_PREFIX}/include \ + --with-readline-inc=-I${MINGW_PREFIX}/include \ --with-tcl=${MINGW_PREFIX}/lib \ TCLLIBDIR=${MINGW_PREFIX}/lib/sqlite${pkgver} diff --git a/mingw-w64-sqlite3/lemon.patch b/mingw-w64-sqlite3/lemon.patch deleted file mode 100644 index 68fdf521fc..0000000000 --- a/mingw-w64-sqlite3/lemon.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2016-02-06 23:40:09.701335700 +0100 -+++ Makefile.in 2016-02-06 23:38:20.866820100 +0100 -@@ -55,7 +55,7 @@ - - # Compiler options needed for programs that use the readline() library. - # --READLINE_FLAGS = -DHAVE_READLINE=@TARGET_HAVE_READLINE@ @TARGET_READLINE_INC@ -+READLINE_FLAGS = -DHAVE_READLINE=@TARGET_HAVE_READLINE@ -I@TARGET_READLINE_INC@ - READLINE_FLAGS += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@ - - # The library that programs using readline() must link against. From c0d8a82a664d1419c5a253a83a57349c4b41138a Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:32:51 +0200 Subject: [PATCH 030/120] sqlite3: add soundex() to sqlite3 SQL functions * PKGBUILD: - add CPP flag '-DSQLITE_SOUNDEX=1' --- mingw-w64-sqlite3/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index 8b6c0b4596..486682384f 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -47,6 +47,7 @@ build() { -DSQLITE_DISABLE_DIRSYNC=1 \ -DSQLITE_ENABLE_RTREE=1 \ -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ + -DSQLITE_SOUNDEX=1 \ " CFLAGS+=" -fexceptions -fno-strict-aliasing ${SQLITE_OPTIONS}" From ec86bd30903cfc36c8cdb0bdd8928bf3ad875f6d Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:40:45 +0200 Subject: [PATCH 031/120] sqlite3: cleanup configure feature flags for better maintenance * PKGBUILD: - prefer configure flag '--enable-all' which comprises --enable-json1, --enable-fts4, --enable-fts5 - add configure flag --enable-rtree and remove CPP flag '-DSQLITE_ENABLE_RTREE=1' (NB: In sqlite 3.32.3 --enable-rtree is not implied by --enable-all in contrast to the documentation. Once this bug is fixed --enable-rtree can be removed here.) --- mingw-w64-sqlite3/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index 486682384f..d78c76e5a1 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -45,14 +45,13 @@ build() { -DSQLITE_USE_MALLOC_H=1 \ -DSQLITE_USE_MSIZE=1 \ -DSQLITE_DISABLE_DIRSYNC=1 \ - -DSQLITE_ENABLE_RTREE=1 \ -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ -DSQLITE_SOUNDEX=1 \ " CFLAGS+=" -fexceptions -fno-strict-aliasing ${SQLITE_OPTIONS}" - ../sqlite-src-${_amalgamationver}/configure \ + ../sqlite-src-${_amalgamationver}/configure -C \ --prefix=${MINGW_PREFIX} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -60,9 +59,8 @@ build() { --enable-threadsafe \ --disable-editline \ --enable-readline \ - --enable-json1 \ - --enable-fts4 \ - --enable-fts5 \ + --enable-all \ + --enable-rtree \ --enable-session \ --with-readline-inc=-I${MINGW_PREFIX}/include \ --with-tcl=${MINGW_PREFIX}/lib \ From f04cff51801b88c139f5af6b2ac63844cd95bb11 Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:45:32 +0200 Subject: [PATCH 032/120] sqlite3: add executables dbhash.exe, sqldiff.exe to the package --- mingw-w64-sqlite3/PKGBUILD | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index d78c76e5a1..894ce7691e 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -30,6 +30,8 @@ sha256sums=('9312f0865d3692384d466048f746d18f88e7ffd1758b77d4f07904e03ed5f5b9' '0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f') options=('!strip' 'staticlibs' '!buildflags') +sqlite_tools="sqlite3_analyzer.exe dbhash.exe sqldiff.exe" + prepare() { cd "${srcdir}/sqlite-src-${_amalgamationver}" } @@ -67,15 +69,18 @@ build() { TCLLIBDIR=${MINGW_PREFIX}/lib/sqlite${pkgver} make + # build additional tools - make sqlite3_analyzer.exe + make $sqlite_tools } package() { cd ${srcdir}/build-${MINGW_CHOST} make DESTDIR="${pkgdir}" install - install -Dm755 .libs/sqlite3_analyzer.exe "${pkgdir}${MINGW_PREFIX}/bin/sqlite3_analyzer.exe" + for t in $sqlite_tools; do + install -Dm755 .libs/$t "${pkgdir}${MINGW_PREFIX}/bin/$t" + done mv ${pkgdir}${MINGW_PREFIX}/lib/bin/*.* ${pkgdir}${MINGW_PREFIX}/lib/sqlite${pkgver}/ rm -rf ${pkgdir}${MINGW_PREFIX}/lib/bin From 02634131e3ed28008fd8158d82550ca6dec37b3f Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:52:52 +0200 Subject: [PATCH 033/120] sqlite3: add amalgamation version to build directory name in PKGBUILD --- mingw-w64-sqlite3/PKGBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index 894ce7691e..d14df2de56 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -37,8 +37,10 @@ prepare() { } build() { - [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} - mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + test -d ${srcdir}/build-${_amalgamationver}-${MINGW_CHOST} && \ + rm -rf ${srcdir}/build-${_amalgamationver}-${MINGW_CHOST} + mkdir -p ${srcdir}/build-${_amalgamationver}-${MINGW_CHOST} && \ + cd ${srcdir}/build-${_amalgamationver}-${MINGW_CHOST} export lt_cv_deplibs_check_method='pass_all' @@ -75,7 +77,7 @@ build() { } package() { - cd ${srcdir}/build-${MINGW_CHOST} + cd ${srcdir}/build-${_amalgamationver}-${MINGW_CHOST} make DESTDIR="${pkgdir}" install for t in $sqlite_tools; do From dcab6273244acc1d93343ffe9091e89bb3f4cbd9 Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 20:57:31 +0200 Subject: [PATCH 034/120] sqlite3: add sqlite extensions to package sqlite extensions are shared libraries loadable at run-time enhancing sqlite's SQl code. The source code of each of the sqlite extensions is located in directory 'ext/misc' of the source code package. A hand-written Makefile, adjusted using a project's autoconf tool (config.status), is generated in the extensions build folder. The extensions (together with each of the source c-files containing the extension documentation in the file header) are installed in the directory '${prefix}/share/sqlite/extensions'. * PKGBUILD: - increase pkgrel - add build and install routines for sqlite extensions. * Makefile.ext.in: add file. * README.md.in: add file. --- mingw-w64-sqlite3/Makefile.ext.in | 47 +++++++++++++++++++++++++++++++ mingw-w64-sqlite3/PKGBUILD | 20 +++++++++++-- mingw-w64-sqlite3/README.md.in | 24 ++++++++++++++++ 3 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-sqlite3/Makefile.ext.in create mode 100644 mingw-w64-sqlite3/README.md.in diff --git a/mingw-w64-sqlite3/Makefile.ext.in b/mingw-w64-sqlite3/Makefile.ext.in new file mode 100644 index 0000000000..6c546fc808 --- /dev/null +++ b/mingw-w64-sqlite3/Makefile.ext.in @@ -0,0 +1,47 @@ +# Makefile template to generate sqlite extensions in sub-folder ext/misc + +DLL_PREFIX = +DLL_SUFFIX = + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ + +vpath %.c $(srcdir) +vpath %.in ../$(top_srcdir) + +PACKAGE_VERSION = @PACKAGE_VERSION@ +prefix = @prefix@ +datadir = @datadir@ +extdir = $(datadir)/sqlite/extensions + +# c-source for each of which an extension is built +CSRCS = $(filter-out $(addprefix $(srcdir)/,$(CSRCS_IGNORE)),$(wildcard $(srcdir)/*.c)) +# c-sources not to compile as standalone sqlite-extensions +CSRCS_IGNORE = memtrace.c json1.c +# c-source to be ignored because of compilation errors +CSRCS_IGNORE += fileio.c + +DLLS = $(patsubst %.c,$(DLL_PREFIX)%$(DLL_SUFFIX).dll,$(notdir $(CSRCS))) + +CC = @CC@ +CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src +CFLAGS = -pedantic +LIBS = -Wl,--no-undefined -L$(top_builddir)/.libs -lsqlite3 -lz + +.PHONY : all +all : $(DLLS) + +$(DLL_PREFIX)%$(DLL_SUFFIX).dll: %.c + $(CC) -shared $(CPPFLAGS) $(CFLAGS) -o $@ $< $(LIBS) + +%.i: %.c + $(CC) -E $(CPPFLAGS) -o $@ $< + +.PHONY: clean install +clean: + -rm -f $(DLLS) 2> /dev/nul + +install: $(DLLS) $(CSRCS) + mkdir -p $(DESTDIR)$(extdir) + cp -vp $^ $(DESTDIR)$(extdir) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index d14df2de56..00a46f76d6 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -8,7 +8,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _amalgamationver=3320300 _docver=${_amalgamationver} pkgver=3.32.3 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that implements an SQL database engine (mingw-w64)" arch=('any') license=(PublicDomain) @@ -24,9 +24,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=(https://www.sqlite.org/2020/sqlite-src-${_amalgamationver}.zip https://www.sqlite.org/2020/sqlite-doc-${_docver}.zip + Makefile.ext.in + README.md.in LICENSE) sha256sums=('9312f0865d3692384d466048f746d18f88e7ffd1758b77d4f07904e03ed5f5b9' '36920536daf7f8b19c2e646dc79db62e13cc1a992f562ba9a11fa7c191f24a4e' + '6e3994c2e10af6fdc70530778c674bfcf6df65a257dd10cfdfb4f34b399de004' + '5ca42f1f92abfb61bacc9ff60f5836cc56e2ce2af52264f918cb06c3d566d562' '0b76663a90e034f3d7f2af5bfada4cedec5ebc275361899eccc5c18e6f01ff1f') options=('!strip' 'staticlibs' '!buildflags') @@ -74,6 +78,10 @@ build() { # build additional tools make $sqlite_tools + + # build extensions + ./config.status --file=ext/misc/Makefile:../Makefile.ext.in + make -C ext/misc } package() { @@ -85,7 +93,15 @@ package() { done mv ${pkgdir}${MINGW_PREFIX}/lib/bin/*.* ${pkgdir}${MINGW_PREFIX}/lib/sqlite${pkgver}/ rm -rf ${pkgdir}${MINGW_PREFIX}/lib/bin - + + # Install extensions + make -C ext/misc DESTDIR="${pkgdir}" install + cat "${srcdir}/README.md.in" | sed \ + -e "s|@MINGW_PREFIX@|${MINGW_PREFIX}|g" \ + -e "s|@MSYSTEM@|${MSYSTEM}|g;" \ + -e "s|@VERSION@|${pkgver}|g;" \ + > "${pkgdir}${MINGW_PREFIX}/share/sqlite/extensions/README.md" + # Install docs cd ${srcdir}/sqlite-doc-${_docver} mkdir -p ${pkgdir}${MINGW_PREFIX}/share/doc/${_realname} diff --git a/mingw-w64-sqlite3/README.md.in b/mingw-w64-sqlite3/README.md.in new file mode 100644 index 0000000000..fc47b26888 --- /dev/null +++ b/mingw-w64-sqlite3/README.md.in @@ -0,0 +1,24 @@ +# Sqlite Extensions - Usage (Sqlite @VERSION@) + +This folder contains shared libraries (dll files) `sqlite3.exe` can be +instructed to load at run-time in order to add functions usable in `sqlite3` SQL code. + + +Here an example of how to call an extension from the command line (example with +extension `csv`, other extensions are in this directory): + +- open a shell (e.g. the `@MSYSTEM@` shell) +- call `sqlite3.exe` (residing in `@MINGW_PREFIX@/bin`) +- load the sqlite extension (use an absolute path in Windows notation, see below + for an example of an absolute path) + +~~~bash + sqlite3 + sqlite3> .load "C:/msys64@MINGW_PREFIX@/share/sqlite/extensions/csv.dll" +~~~ + +Usage information to each extension is contained in the header of the c-file +corresponding to the extension you can find in this directory. + + +More information here: https://www.sqlite.org/loadext.html#loading_an_extension. From 06a5cfa558e4cbcfb15b63b15d5b5a05c53ca74e Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 5 Aug 2020 23:32:21 +0300 Subject: [PATCH 035/120] nlohmann-json: Update to 3.9.0 --- mingw-w64-nlohmann-json/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-nlohmann-json/PKGBUILD b/mingw-w64-nlohmann-json/PKGBUILD index 92e8d7b159..59f936b2e5 100644 --- a/mingw-w64-nlohmann-json/PKGBUILD +++ b/mingw-w64-nlohmann-json/PKGBUILD @@ -4,7 +4,7 @@ _realname=json _pkgname=nlohmann-json pkgbase=mingw-w64-${_pkgname} pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -pkgver=3.8.0 +pkgver=3.9.0 pkgrel=1 pkgdesc="JSON for Modern C++ (mingw-w64)" arch=('any') @@ -17,7 +17,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") replaces=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") options=('staticlibs' '!strip' '!buildflags') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nlohmann/json/archive/v${pkgver}.tar.gz") -sha256sums=('7d0edf65f2ac7390af5e5a0b323b31202a6c11d744a74b588dc30f5a8c9865ba') +sha256sums=('9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b') build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" From 686fc03453df8a6f065f64abe0bba17ec17aaf2d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 5 Aug 2020 22:34:43 +0200 Subject: [PATCH 036/120] openssl: switch license to "custom:BSD" as suggested in #6658 --- mingw-w64-openssl/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-openssl/PKGBUILD b/mingw-w64-openssl/PKGBUILD index dc4241c175..60cb22dbfc 100644 --- a/mingw-w64-openssl/PKGBUILD +++ b/mingw-w64-openssl/PKGBUILD @@ -12,7 +12,7 @@ pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Se depends=("${MINGW_PACKAGE_PREFIX}-ca-certificates" "${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") options=('strip' '!buildflags' 'staticlibs') -license=('BSD') +license=('custom:BSD') url="https://www.openssl.org" noextract=(${_realname}-${_ver}.tar.gz) source=(https://www.openssl.org/source/${_realname}-${_ver}.tar.gz{,.asc} From 0f226d7554a2fbcae6987f3397fae97d91160878 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 6 Aug 2020 00:19:46 +0200 Subject: [PATCH 037/120] mpg123: Update to 1.26.3 --- mingw-w64-mpg123/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mpg123/PKGBUILD b/mingw-w64-mpg123/PKGBUILD index 36bff46c0e..c4c326b753 100644 --- a/mingw-w64-mpg123/PKGBUILD +++ b/mingw-w64-mpg123/PKGBUILD @@ -3,7 +3,7 @@ _realname=mpg123 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.26.1 +pkgver=1.26.3 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (mingw-w64)" arch=('any') @@ -20,7 +20,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-openal" "${MINGW_PACKAGE_PREFIX}-SDL") options=('strip' 'staticlibs' 'libtool') source=("https://www.mpg123.com/download/mpg123-${pkgver}.tar.bz2"{,.sig}) -sha256sums=('74d6629ab7f3dd9a588b0931528ba7ecfa989a2cad6bf53ffeef9de31b0fe032' +sha256sums=('30c998785a898f2846deefc4d17d6e4683a5a550b7eacf6ea506e30a7a736c6e' 'SKIP') validpgpkeys=('D021FF8ECF4BE09719D61A27231C4CBC60D5CAFE') From 50cabdcf778e3aec661bbf6941a123d95db1c1af Mon Sep 17 00:00:00 2001 From: Fabien Chouteau Date: Thu, 6 Aug 2020 04:07:34 -0700 Subject: [PATCH 038/120] gprbuild/xmlada: use tarball from api.github.com --- mingw-w64-gprbuild-bootstrap-git/PKGBUILD | 22 ++++++++++++++-------- mingw-w64-gprbuild/PKGBUILD | 14 +++++++++----- mingw-w64-xmlada/PKGBUILD | 18 +++++++++--------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD index 4432efbd70..2d422ab97d 100644 --- a/mingw-w64-gprbuild-bootstrap-git/PKGBUILD +++ b/mingw-w64-gprbuild-bootstrap-git/PKGBUILD @@ -8,6 +8,12 @@ pkgbase=mingw-w64-${_realname}-git pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-git pkgver=r3576.43e55df6 pkgrel=1 + +_gprbuild_commit="43e55df6c26e2bd48ab6c2f4214f497c4ddbc943" +_gprbuild_extract_dir="AdaCore-gprbuild-43e55df" +_xmlada_commit="c16f24ebf752b7d75dfdd0eaa7dd501a08a31256" +_xmlada_extract_dir="AdaCore-xmlada-c16f24e" + pkgdesc="Static GPRbuild to bootstrap XML/Ada and GPRbuild itself (mingw-w64)" arch=('any') url='https://github.com/AdaCore/gprbuild/' @@ -19,18 +25,18 @@ provides=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap") conflicts=("${MINGW_PACKAGE_PREFIX}-gprbuild" "${MINGW_PACKAGE_PREFIX}-gprbuild-gpl" "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap") -source=(gprbuild::"git+https://github.com/AdaCore/gprbuild.git#commit=43e55df6c26e2bd48ab6c2f4214f497c4ddbc943" - xmlada::"git+https://github.com/AdaCore/xmlada.git#commit=c16f24ebf752b7d75dfdd0eaa7dd501a08a31256") -sha256sums=('SKIP' - 'SKIP') +source=("gprbuild.tar.gz::https://api.github.com/repos/AdaCore/gprbuild/tarball/${_gprbuild_commit}" + "xmlada.tar.gz::https://api.github.com/repos/AdaCore/xmlada/tarball/${_xmlada_commit}") +sha256sums=('d4491ae831ce3ab89ea930cc58280372325476046054cf64691bda867a52b028' + '12139d8c3d511b516f9dcf68ee76a70f2dc52031d379e9e4942aa84346974751') pkgver() { - cd "${srcdir}/gprbuild" + cd "${srcdir}/${_gprbuild_extract_dir}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "${srcdir}/gprbuild" + cd "${srcdir}/${_gprbuild_extract_dir}" # GPRbuild hard-codes references to ${MINGW_PREFIX}/libexec, but MINGW packages # must use ${MINGW_PREFIX}/lib instead. @@ -41,14 +47,14 @@ prepare() { } build() { - cd "${srcdir}/gprbuild" + cd "${srcdir}/${_gprbuild_extract_dir}" export GNATMAKEFLAGS="-j$(nproc)" export DESTDIR="${srcdir}/bootstrap" ./bootstrap.sh \ --prefix=${MINGW_PREFIX} \ --libexecdir=/lib \ - --with-xmlada="${srcdir}/xmlada" + --with-xmlada="${srcdir}/${_xmlada_extract_dir}" } package() { diff --git a/mingw-w64-gprbuild/PKGBUILD b/mingw-w64-gprbuild/PKGBUILD index b41402dc78..0aa504c2d1 100644 --- a/mingw-w64-gprbuild/PKGBUILD +++ b/mingw-w64-gprbuild/PKGBUILD @@ -6,6 +6,10 @@ pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2020.0.43e55df pkgrel=1 + +_gprbuild_commit="43e55df6c26e2bd48ab6c2f4214f497c4ddbc943" +_gprbuild_extract_dir="AdaCore-gprbuild-43e55df" + pkgdesc="Software tool designed to help automate the construction of multi-language systems (mingw-w64)" arch=('any') replaces=("${MINGW_PACKAGE_PREFIX}-gprbuild-gpl") @@ -17,17 +21,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" depends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" "${MINGW_PACKAGE_PREFIX}-xmlada") conflicts=("${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap") -source=("${_realname}"::"git+https://github.com/AdaCore/gprbuild.git#commit=43e55df6c26e2bd48ab6c2f4214f497c4ddbc943") -sha256sums=('SKIP') +source=("gprbuild.tar.gz::https://api.github.com/repos/AdaCore/gprbuild/tarball/${_gprbuild_commit}") +sha256sums=('d4491ae831ce3ab89ea930cc58280372325476046054cf64691bda867a52b028') prepare() { - cd ${srcdir}/gprbuild + cd "${srcdir}/${_gprbuild_extract_dir}" #./bootstrap.sh } build() { - cd ${srcdir}/gprbuild + cd "${srcdir}/${_gprbuild_extract_dir}" make SOURCE_DIR="$PWD" prefix=${MINGW_PREFIX} setup @@ -35,7 +39,7 @@ build() { } package() { - cd ${srcdir}/gprbuild + cd "${srcdir}/${_gprbuild_extract_dir}" make prefix="${pkgdir}${MINGW_PREFIX}" INSTALL=cp install # Copy License Files diff --git a/mingw-w64-xmlada/PKGBUILD b/mingw-w64-xmlada/PKGBUILD index 6a882e5443..74d44dacd5 100644 --- a/mingw-w64-xmlada/PKGBUILD +++ b/mingw-w64-xmlada/PKGBUILD @@ -10,6 +10,10 @@ pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2020 pkgrel=1 + +_xmlada_commit="c16f24ebf752b7d75dfdd0eaa7dd501a08a31256" +_xmlada_extract_dir="AdaCore-xmlada-c16f24e" + pkgdesc="A full XML suite for Ada (mingw-w64)" arch=('any') replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-gpl") @@ -18,16 +22,12 @@ license=('GPL3') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-ada" "${MINGW_PACKAGE_PREFIX}-gprbuild-bootstrap-git") depends=() -source=("${_realname}"::"git+https://github.com/AdaCore/xmlada.git#commit=c16f24ebf752b7d75dfdd0eaa7dd501a08a31256") -sha256sums=('SKIP') +source=("xmlada.tar.gz::https://api.github.com/repos/AdaCore/xmlada/tarball/${_xmlada_commit}") +sha256sums=('12139d8c3d511b516f9dcf68ee76a70f2dc52031d379e9e4942aa84346974751') options=('strip') -prepare() { - cd ${srcdir}/${_realname} -} - build() { - cd ${srcdir}/${_realname} + cd ${srcdir}/${_xmlada_extract_dir} ./configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -43,7 +43,7 @@ package() { mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/xmlada/relocatable mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/gnat/xmlada - cd ${srcdir}/${_realname} + cd ${srcdir}/${_xmlada_extract_dir} make -j1 prefix=${pkgdir}${MINGW_PREFIX} INSTALL=cp install rm -rf ${pkgdir}${MINGW_PREFIX}/share/examples @@ -51,6 +51,6 @@ package() { # Copy License Files mkdir -p ${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname - cp -pf ${srcdir}/${_realname}/COPYING* \ + cp -pf ${srcdir}/${_xmlada_extract_dir}/COPYING* \ ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname} } From 7848f317465b037796edd49bcc2312115bc2086c Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 6 Aug 2020 16:42:58 +0300 Subject: [PATCH 039/120] Update mingw-w64-mesa to 20.1.5 --- 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 df5ee43cf8..3fdb16c1df 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.4 +pkgver=20.1.5 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=('6800271c2be2a0447510eb4e9b67edd9521859a4d565310617c4b359eb6799fe' +sha256sums=('fac1861e6e0bf1aec893f8d86dbfb9d8a0f426ff06b05256df10e3ad7e02c69b' 'SKIP' '3ad048a4c395adf6d24f2e9325d6a125822b323d494149e00d5cc435d16075e4') validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov From 208376ced7e58711443e18d68bf97e5301230f9d Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Sun, 7 Jun 2020 19:51:44 +0300 Subject: [PATCH 040/120] pelican: New package --- mingw-w64-pelican/PKGBUILD | 89 ++++++++++++++++++++++++ mingw-w64-pelican/pelican-i686.install | 14 ++++ mingw-w64-pelican/pelican-x86_64.install | 14 ++++ 3 files changed, 117 insertions(+) create mode 100644 mingw-w64-pelican/PKGBUILD create mode 100644 mingw-w64-pelican/pelican-i686.install create mode 100644 mingw-w64-pelican/pelican-x86_64.install diff --git a/mingw-w64-pelican/PKGBUILD b/mingw-w64-pelican/PKGBUILD new file mode 100644 index 0000000000..98fae23a39 --- /dev/null +++ b/mingw-w64-pelican/PKGBUILD @@ -0,0 +1,89 @@ +# Maintainer: Konstantin Podsvirov + +_realname=pelican +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=4.2.0 +pkgrel=1 +pkgdesc='A tool to generate a static blog, with restructured text (or markdown) input files (mingw-w64)' +arch=('any') +url='https://getpelican.com/' +license=('AGPL3') +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-jinja" + "${MINGW_PACKAGE_PREFIX}-python-pygments" + "${MINGW_PACKAGE_PREFIX}-python-feedgenerator" + "${MINGW_PACKAGE_PREFIX}-python-pytz" + "${MINGW_PACKAGE_PREFIX}-python-docutils" + "${MINGW_PACKAGE_PREFIX}-python-blinker" + "${MINGW_PACKAGE_PREFIX}-python-unidecode" + "${MINGW_PACKAGE_PREFIX}-python-six" + "${MINGW_PACKAGE_PREFIX}-python-dateutil") +makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-sphinx" + "${MINGW_PACKAGE_PREFIX}-python-sphinx_rtd_theme") +checkdepends=("${MINGW_PACKAGE_PREFIX}-python-nose") +optdepends=("${MINGW_PACKAGE_PREFIX}-python-markdown: Markdown support" + "${MINGW_PACKAGE_PREFIX}-asciidoc: AsciiDoc support" + "${MINGW_PACKAGE_PREFIX}-python-beautifulsoup4: importing from wordpress/dotclear/posterous" + #"${MINGW_PACKAGE_PREFIX}-python-feedparser: importing from feeds" + "${MINGW_PACKAGE_PREFIX}-python-rst2pdf: PDF generation" + "openssh: uploading through SSH" + "rsync: uploading through rsync+SSH" + "lftp: uploading through FTP" + #"s3cmd: uploading through S3" + #"${MINGW_PACKAGE_PREFIX}-python-ghp-import: uploading through gh-pages" + #"${MINGW_PACKAGE_PREFIX}-python-typogrify: typographical enhancements" + #"${MINGW_PACKAGE_PREFIX}-pandoc: for pelican-import auto convert" + #"${MINGW_PACKAGE_PREFIX}-python-mdx-video: easier embedding of youtube videos in markdown" + ) +source=("pelican-${pkgver}.tar.gz"::"https://github.com/getpelican/pelican/archive/${pkgver}.tar.gz") +install=${_realname}-${CARCH}.install +sha256sums=('4b0d4c9439217b49ace89f4f8b52c90e13fa283a786d7b12e2020a11f32f9a33') + +prepare() { + cd "${srcdir}" + rm -rf "python-build-${CARCH}" | true + cp -r "pelican-${pkgver}" "python-build-${CARCH}" +} + +build() { + msg "Python build for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build + + msg "Building documentation" + cd "${srcdir}/python-build-${CARCH}/docs" + PYTHONPATH="${srcdir}/python-build-${CARCH}/build/lib" \ + make man html +} + +check() { + cd "${srcdir}/python-build-${CARCH}" + PYTHONPATH="${srcdir}/python-build-${CARCH}/build/lib" \ + ${MINGW_PREFIX}/bin/nosetests +} + +package() { + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build + # fix python command in files + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + for _ff in "${pkgdir}${MINGW_PREFIX}/bin/*.py"; do + sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff} + done + # documentation + local _docdir="${srcdir}/python-build-${CARCH}/docs/_build" + mkdir -p "${pkgdir}${MINGW_PREFIX}/share/man/man1" + for _ff in "${_docdir}/man/*.1" + do + cp ${_ff} "${pkgdir}${MINGW_PREFIX}/share/man/man1/" + done + mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc" + cp -r "${_docdir}/html/" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}" + # license + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} + +# vim: ts=2 sw=2 et: diff --git a/mingw-w64-pelican/pelican-i686.install b/mingw-w64-pelican/pelican-i686.install new file mode 100644 index 0000000000..561c9df626 --- /dev/null +++ b/mingw-w64-pelican/pelican-i686.install @@ -0,0 +1,14 @@ +post_install() { + cd mingw32 + local _prefix=$(pwd -W) + cd - + local _it + for _it in pelican pelican-import pelican-quickstart pelican-themes; do + sed -e "s|/mingw32|${_prefix}|g" \ + -i ${_prefix}/bin/${_it}-script.py + done +} + +post_upgrade() { + post_install +} diff --git a/mingw-w64-pelican/pelican-x86_64.install b/mingw-w64-pelican/pelican-x86_64.install new file mode 100644 index 0000000000..e1ec65b1ee --- /dev/null +++ b/mingw-w64-pelican/pelican-x86_64.install @@ -0,0 +1,14 @@ +post_install() { + cd mingw64 + local _prefix=$(pwd -W) + cd - + local _it + for _it in pelican pelican-import pelican-quickstart pelican-themes; do + sed -e "s|/mingw64|${_prefix}|g" \ + -i ${_prefix}/bin/${_it}-script.py + done +} + +post_upgrade() { + post_install +} From 74eaffed045b924c04da5c643301e3505b1d4435 Mon Sep 17 00:00:00 2001 From: ofry Date: Fri, 7 Aug 2020 14:10:45 +0300 Subject: [PATCH 041/120] pkgrel=3: Fix Windows draft configs in mk/sys directory. Now all link operations should go through ${CC} compiler. Signed-off-by: ofry --- .../0004-add-windows-draft-configs.patch | 36 ++++++++++++++----- mingw-w64-bmake/PKGBUILD | 4 +-- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/mingw-w64-bmake/0004-add-windows-draft-configs.patch b/mingw-w64-bmake/0004-add-windows-draft-configs.patch index 5e699a6428..52d0230d59 100644 --- a/mingw-w64-bmake/0004-add-windows-draft-configs.patch +++ b/mingw-w64-bmake/0004-add-windows-draft-configs.patch @@ -9,14 +9,20 @@ index a6bf9a2..fa50e79 100644 +sys/MSYS.mk sys/NetBSD.mk diff --git a/mk/sys/MINGW32.mk b/mk/sys/MINGW32.mk -index 10da919..5ba0424 100644 +index 10da919..5e9f2b5 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 +@@ -14,5 +14,13 @@ NEED_SOLINKS=yes + ++LD_X= ++LD_x= ++SHLIB_LD = ${CC} ++ + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 -.LIBS: .a +.LIBS: .a .dll @@ -25,21 +31,27 @@ index 10da919..5ba0424 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +25,5 @@ ARFLAGS= rl +@@ -21,2 +29,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 +index 10da919..29f6ef2 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 +@@ -14,5 +14,13 @@ NEED_SOLINKS=yes + ++LD_X= ++LD_x= ++SHLIB_LD = ${CC} ++ + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 -.LIBS: .a +.LIBS: .a .dll @@ -48,21 +60,27 @@ index 10da919..f7a1fe7 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +25,5 @@ ARFLAGS= rl +@@ -21,2 +29,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 +index 10da919..d91ca9d 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 +@@ -14,5 +14,13 @@ NEED_SOLINKS=yes + ++LD_X= ++LD_x= ++SHLIB_LD = ${CC} ++ + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 -.LIBS: .a +.LIBS: .a .dll @@ -71,7 +89,7 @@ index 10da919..2454fd1 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +25,5 @@ ARFLAGS= rl +@@ -21,2 +29,5 @@ ARFLAGS= rl RANLIB= ranlib +LD_shared= -Bshareable +LD_so= dll.${SHLIB_FULLVERSION} diff --git a/mingw-w64-bmake/PKGBUILD b/mingw-w64-bmake/PKGBUILD index a84b20d97e..7467ddfdfb 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=2 +pkgrel=3 pkgdesc='Portable version of the NetBSD make build tool' arch=('any') url='http://www.crufty.net/help/sjg/bmake.html' @@ -72,6 +72,6 @@ package() { # install profile script mkdir -p "${pkgdir}${MINGW_PREFIX}"/etc/profile.d - echo "export SYSROOTWINDOWSPATH=$(cygpath -w /)" > "${pkgdir}${MINGW_PREFIX}"/etc/profile.d/bmake.sh + echo "export SYSROOTWINDOWSPATH=$(cygpath -w /); export MAKESYSPATH=${MINGW_PREFIX}/share/mk" > "${pkgdir}${MINGW_PREFIX}"/etc/profile.d/bmake.sh cp "${pkgdir}${MINGW_PREFIX}"/etc/profile.d/bmake.{sh,zsh} } \ No newline at end of file From a2f0fb67362d8039d788955cac6100f8b4054937 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Fri, 7 Aug 2020 23:22:58 +0200 Subject: [PATCH 042/120] fmt: update to 7.0.3 --- 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 15883b3a9d..af8a62bdb3 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=7.0.2 +pkgver=7.0.3 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=('7697e022f9cdc4f90b5e0a409643faa2cde0a6312f85e575c8388a1913374de5') +sha256sums=('b4b51bc16288e2281cddc59c28f0b4f84fed58d016fb038273a09f05f8473297') build() { # Shared Build From c50523d5789bae62c94d702a2045f8a852d0f048 Mon Sep 17 00:00:00 2001 From: kojix2 <2xijok@gmail.com> Date: Sun, 9 Aug 2020 06:28:05 +0900 Subject: [PATCH 043/120] gr: Update to 0.51.2 --- mingw-w64-gr/PKGBUILD | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mingw-w64-gr/PKGBUILD b/mingw-w64-gr/PKGBUILD index dcc0b0373a..ffa66a180e 100644 --- a/mingw-w64-gr/PKGBUILD +++ b/mingw-w64-gr/PKGBUILD @@ -3,7 +3,7 @@ _realname=gr pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.50.0 +pkgver=0.51.2 pkgrel=1 pkgdesc="A graphics library for visualisation applications (mingw-w64)" arch=("any") @@ -24,11 +24,9 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") options=("staticlibs" "strip" "!buildflags") -source=("${_realname}-${pkgver}.tar.gz::https://github.com/sciapp/gr/archive/v${pkgver}.tar.gz" - "https://github.com/kou/gr/commit/20204e37d8411b19b69a7ee5c776035c07f7175d.patch") +source=("${_realname}-${pkgver}.tar.gz::https://github.com/sciapp/gr/archive/v${pkgver}.tar.gz") noextract=("${_realname}-${pkgver}.tar.gz") -sha256sums=("59947975c364b8ce98940eee4cf98a665ede66083362e60f3e3520d9c7d8bc1e" - "db6fc6d88700bb918cf548e897a609c78ffa3f52abfa21a31e67316500d1393e") +sha256sums=("E6A3D0ED911F6E59CC2293B5694EE18A0620849E666143870A9EDA71C02BB833") prepare() { # We can't use bsdtar to extract the archive because the archive includes @@ -36,9 +34,6 @@ prepare() { cd "${srcdir}/" rm -rf "${_realname}-${pkgver}" tar -xf "${_realname}-${pkgver}.tar.gz" - - cd "${srcdir}/${_realname}-${pkgver}/" - patch -p1 -i "${srcdir}/20204e37d8411b19b69a7ee5c776035c07f7175d.patch" } build() { From ff2d6d9927ebe78a448774492687d3ccfc82cf45 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ito Date: Sun, 9 Aug 2020 20:43:27 +0900 Subject: [PATCH 044/120] * ngraph-gtk: new upstream release (version 6.08.06). --- mingw-w64-ngraph-gtk/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-ngraph-gtk/PKGBUILD b/mingw-w64-ngraph-gtk/PKGBUILD index 6a35931b55..0097fbacf4 100644 --- a/mingw-w64-ngraph-gtk/PKGBUILD +++ b/mingw-w64-ngraph-gtk/PKGBUILD @@ -3,7 +3,7 @@ _realname=ngraph-gtk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=6.08.05 +pkgver=6.08.06 pkgrel=1 arch=('any') pkgdesc="create scientific 2-dimensional graphs (mingw-w64)" @@ -22,7 +22,7 @@ options=('strip' 'staticlibs') license=("GPL") url="https://htrb.github.io/ngraph-gtk/" source=("https://github.com/htrb/ngraph-gtk/releases/download/v${pkgver}/ngraph-gtk-${pkgver}.tar.gz") -sha256sums=("f151f816b2d3382054408bac1bc378be9f5c7f60a6fdfe9b3f4fe840745c3f27") +sha256sums=("fa7d68774fc6d01421344211d456d75541f0a82e82768bfe073160cbcba44fbf") prepare() { cd "${srcdir}"/${_realname}-${pkgver} From c7ada8bfa7038e5f3ee0bd0a31270aecc43e8981 Mon Sep 17 00:00:00 2001 From: ofry Date: Sun, 9 Aug 2020 20:31:17 +0300 Subject: [PATCH 045/120] Fix nvidia-cg-toolkit package. Signed-off-by: ofry --- mingw-w64-nvidia-cg-toolkit/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-nvidia-cg-toolkit/PKGBUILD b/mingw-w64-nvidia-cg-toolkit/PKGBUILD index 19211c41b5..0fb0deb817 100644 --- a/mingw-w64-nvidia-cg-toolkit/PKGBUILD +++ b/mingw-w64-nvidia-cg-toolkit/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc="NVIDIA Cg libraries (mingw-w64)" arch=('any') url="https://developer.nvidia.com/cg-toolkit" license=("custom") -makedepends=("dos2unix" "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-binutils") #"${MINGW_PACKAGE_PREFIX}-innoextract" +makedepends=("dos2unix" "${MINGW_PACKAGE_PREFIX}-innoextract" "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-binutils") #"${MINGW_PACKAGE_PREFIX}-innoextract" depends=("${MINGW_PACKAGE_PREFIX}-crt") options=('!strip' 'staticlibs') source=("https://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_Setup.exe") From 39614377b67f550c6a12ee6a0e855e5255e5902f Mon Sep 17 00:00:00 2001 From: ofry Date: Sun, 9 Aug 2020 21:02:26 +0300 Subject: [PATCH 046/120] Remove outdated comment. Signed-off-by: ofry --- mingw-w64-nvidia-cg-toolkit/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-nvidia-cg-toolkit/PKGBUILD b/mingw-w64-nvidia-cg-toolkit/PKGBUILD index 0fb0deb817..abfbfb9838 100644 --- a/mingw-w64-nvidia-cg-toolkit/PKGBUILD +++ b/mingw-w64-nvidia-cg-toolkit/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc="NVIDIA Cg libraries (mingw-w64)" arch=('any') url="https://developer.nvidia.com/cg-toolkit" license=("custom") -makedepends=("dos2unix" "${MINGW_PACKAGE_PREFIX}-innoextract" "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-binutils") #"${MINGW_PACKAGE_PREFIX}-innoextract" +makedepends=("dos2unix" "${MINGW_PACKAGE_PREFIX}-innoextract" "${MINGW_PACKAGE_PREFIX}-tools" "${MINGW_PACKAGE_PREFIX}-binutils") depends=("${MINGW_PACKAGE_PREFIX}-crt") options=('!strip' 'staticlibs') source=("https://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_Setup.exe") From feb51fec93a22f55c15ab74389f610c79e2f6ecd Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Mon, 10 Aug 2020 14:08:50 +0200 Subject: [PATCH 047/120] Add mingw-w64-aws-sdk --- mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch | 188 +++++++++++ mingw-w64-aws-sdk-cpp/BuildAwsChecksums.patch | 11 + mingw-w64-aws-sdk-cpp/PKGBUILD | 56 ++++ .../Patch-cmake-submodules.patch | 23 ++ .../WinHttp-missing-flags.patch | 20 ++ .../aws-sdk-cpp-pr-1333.patch | 291 ++++++++++++++++++ 6 files changed, 589 insertions(+) create mode 100644 mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch create mode 100644 mingw-w64-aws-sdk-cpp/BuildAwsChecksums.patch create mode 100644 mingw-w64-aws-sdk-cpp/PKGBUILD create mode 100644 mingw-w64-aws-sdk-cpp/Patch-cmake-submodules.patch create mode 100644 mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch create mode 100644 mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch diff --git a/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch new file mode 100644 index 0000000000..b75607f7fa --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch @@ -0,0 +1,188 @@ +diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake +index 42d146e82..cb9d7f36b 100644 +--- a/cmake/AwsCFlags.cmake ++++ b/cmake/AwsCFlags.cmake +@@ -68,6 +68,10 @@ function(aws_set_common_properties target) + if (LEGACY_COMPILER_SUPPORT) + list(APPEND AWS_C_FLAGS -Wno-strict-aliasing) + endif() ++ ++ if(CMAKE_C_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32") ++ list(APPEND AWS_C_FLAGS -D__USE_MINGW_ANSI_STDIO=1 -Wno-unused-local-typedefs) ++ endif() + endif() + + check_include_file(stdint.h HAS_STDINT) +diff --git a/include/aws/common/byte_order.inl b/include/aws/common/byte_order.inl +index 69ee56792..847e726af 100644 +--- a/include/aws/common/byte_order.inl ++++ b/include/aws/common/byte_order.inl +@@ -19,11 +19,11 @@ + #include + #include + +-#ifdef _MSC_VER ++#ifdef _WIN32 + # include + #else + # include +-#endif /* _MSC_VER */ ++#endif /* _WIN32 */ + + AWS_EXTERN_C_BEGIN + +@@ -49,7 +49,7 @@ AWS_STATIC_IMPL uint64_t aws_hton64(uint64_t x) { + uint64_t v; + __asm__("bswap %q0" : "=r"(v) : "0"(x)); + return v; +-#elif defined(_MSC_VER) ++#elif defined(_WIN32) + return _byteswap_uint64(x); + #else + uint32_t low = (uint32_t)x; +@@ -69,7 +69,7 @@ AWS_STATIC_IMPL uint64_t aws_ntoh64(uint64_t x) { + * Convert 32 bit integer from host to network byte order. + */ + AWS_STATIC_IMPL uint32_t aws_hton32(uint32_t x) { +-#ifdef _MSC_VER ++#ifdef _WIN32 + return aws_is_big_endian() ? x : _byteswap_ulong(x); + #else + return htonl(x); +@@ -126,7 +126,7 @@ AWS_STATIC_IMPL double aws_htonf64(double x) { + * Convert 32 bit integer from network to host byte order. + */ + AWS_STATIC_IMPL uint32_t aws_ntoh32(uint32_t x) { +-#ifdef _MSC_VER ++#ifdef _WIN32 + return aws_is_big_endian() ? x : _byteswap_ulong(x); + #else + return ntohl(x); +@@ -151,7 +151,7 @@ AWS_STATIC_IMPL double aws_ntohf64(double x) { + * Convert 16 bit integer from host to network byte order. + */ + AWS_STATIC_IMPL uint16_t aws_hton16(uint16_t x) { +-#ifdef _MSC_VER ++#ifdef _WIN32 + return aws_is_big_endian() ? x : _byteswap_ushort(x); + #else + return htons(x); +@@ -162,7 +162,7 @@ AWS_STATIC_IMPL uint16_t aws_hton16(uint16_t x) { + * Convert 16 bit integer from network to host byte order. + */ + AWS_STATIC_IMPL uint16_t aws_ntoh16(uint16_t x) { +-#ifdef _MSC_VER ++#ifdef _WIN32 + return aws_is_big_endian() ? x : _byteswap_ushort(x); + #else + return ntohs(x); +diff --git a/include/aws/common/logging.h b/include/aws/common/logging.h +index 8ef813c75..bfef7cfad 100644 +--- a/include/aws/common/logging.h ++++ b/include/aws/common/logging.h +@@ -111,7 +111,9 @@ struct aws_logger_vtable { + aws_log_subject_t subject, + const char *format, + ...) +-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) ++#if defined(__MINGW32__) ++ __attribute__((format(gnu_printf, 4, 5))) ++#elif defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) + __attribute__((format(printf, 4, 5))) + #endif /* non-ms compilers: TODO - find out what versions format support was added in */ + ; +diff --git a/include/aws/testing/aws_test_harness.h b/include/aws/testing/aws_test_harness.h +index 88ef03e21..d598e2f97 100644 +--- a/include/aws/testing/aws_test_harness.h ++++ b/include/aws/testing/aws_test_harness.h +@@ -365,6 +365,9 @@ struct aws_test_harness { + }; + + #if defined(_WIN32) ++# ifdef __MINGW32__ ++# include ++# endif + # include + static LONG WINAPI s_test_print_stack_trace(struct _EXCEPTION_POINTERS *exception_pointers) { + # if !defined(AWS_HEADER_CHECKER) +diff --git a/source/windows/environment.c b/source/windows/environment.c +index 8c042ddc5..ae50d0a59 100644 +--- a/source/windows/environment.c ++++ b/source/windows/environment.c +@@ -23,12 +23,16 @@ int aws_get_environment_value( + const struct aws_string *variable_name, + struct aws_string **value_out) { + +-#pragma warning(push) +-#pragma warning(disable : 4996) ++#ifndef __MINGW32__ ++# pragma warning(push) ++# pragma warning(disable : 4996) ++#endif + + const char *value = getenv(aws_string_c_str(variable_name)); + +-#pragma warning(pop) ++#ifndef __MINGW32__ ++# pragma warning(pop) ++#endif + + if (value == NULL) { + *value_out = NULL; +diff --git a/source/windows/system_info.c b/source/windows/system_info.c +index acbfd97ce..927a81b4a 100644 +--- a/source/windows/system_info.c ++++ b/source/windows/system_info.c +@@ -40,7 +40,9 @@ void aws_debug_break(void) { + } + + /* If I meet the engineer that wrote the dbghelp.h file for the windows 8.1 SDK we're gonna have words! */ +-#pragma warning(disable : 4091) ++#ifndef __MINGW32__ ++# pragma warning(disable : 4091) ++#endif + #include + + struct win_symbol_data { +@@ -124,7 +126,7 @@ static void s_init_dbghelp_impl(void *user_data) { + return; + } + +-static bool s_init_dbghelp() { ++static bool s_init_dbghelp(void) { + if (AWS_LIKELY(s_SymInitialize)) { + return true; + } +@@ -188,7 +190,7 @@ char **aws_backtrace_symbols(void *const *stack, size_t num_frames) { + /* no luck, record the address and last error */ + DWORD last_error = GetLastError(); + int len = snprintf( +- sym_buf, AWS_ARRAY_SIZE(sym_buf), "at 0x%p: Failed to lookup symbol: error %u", stack[i], last_error); ++ sym_buf, AWS_ARRAY_SIZE(sym_buf), "at 0x%p: Failed to lookup symbol: error %lu", stack[i], last_error); + if (len > 0) { + struct aws_byte_cursor sym_cur = aws_byte_cursor_from_array(sym_buf, len); + aws_byte_buf_append_dynamic(&symbols, &sym_cur); +@@ -209,7 +211,7 @@ char **aws_backtrace_addr2line(void *const *frames, size_t stack_depth) { + void aws_backtrace_print(FILE *fp, void *call_site_data) { + struct _EXCEPTION_POINTERS *exception_pointers = call_site_data; + if (exception_pointers) { +- fprintf(fp, "** Exception 0x%x occured **\n", exception_pointers->ExceptionRecord->ExceptionCode); ++ fprintf(fp, "** Exception 0x%lx occured **\n", exception_pointers->ExceptionRecord->ExceptionCode); + } + + if (!s_init_dbghelp()) { +diff --git a/tests/atomics_test.c b/tests/atomics_test.c +index 36dbbd1a5..90f0497e2 100644 +--- a/tests/atomics_test.c ++++ b/tests/atomics_test.c +@@ -23,7 +23,9 @@ + + #ifdef _WIN32 + # include +-# define alloca _alloca ++# ifndef __MINGW32__ ++# define alloca _alloca ++# endif + #elif defined(__FreeBSD__) || defined(__NetBSD__) + # include + #else diff --git a/mingw-w64-aws-sdk-cpp/BuildAwsChecksums.patch b/mingw-w64-aws-sdk-cpp/BuildAwsChecksums.patch new file mode 100644 index 0000000000..828a63e7d5 --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/BuildAwsChecksums.patch @@ -0,0 +1,11 @@ +diff -aurp AwsChecksums/source/intel/cpuid.c AwsChecksums-orig/source/intel/cpuid.c +--- AwsChecksums/source/intel/cpuid.c 2020-08-08 21:25:59.314437100 +0000 ++++ AwsChecksums-orig/source/intel/cpuid.c 2020-08-08 21:25:44.210636300 +0000 +@@ -40,4 +40,9 @@ int aws_checksums_do_cpu_id(int32_t *cpu + ++#else ++int aws_checksums_do_cpu_id(int32_t *cpuid) { ++ (void)cpuid; ++ return 0; ++} + #endif /* defined(__x86_64__) && !(defined(__GNUC__) && defined(DEBUG_BUILD)) */ diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD new file mode 100644 index 0000000000..e827d801a4 --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Andrew Sun + +_realname=aws-sdk-cpp +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.7.365 +pkgrel=1 +pkgdesc="AWS SDK for C++ (mingw-w64)" +arch=('any') +url="https://github.com/aws/aws-sdk-cpp" +license=('Apache-2.0') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +options=('strip' 'staticlibs') +source=("${_realname}-${pkgver}.tar.gz::https://github.com/aws/aws-sdk-cpp/archive/${pkgver}.tar.gz" + "aws-sdk-cpp-pr-1333.patch" + "WinHttp-missing-flags.patch" + "Patch-cmake-submodules.patch" + "BuildAwsCCommon.patch" + "BuildAwsChecksums.patch") +sha256sums=('95e3f40efaea7b232741bfb76c54c9507c02631edfc198720b0e84be0ebb5e9d' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') + +prepare() { + cd "${_realname}-${pkgver}" + patch -p1 -i "${srcdir}/aws-sdk-cpp-pr-1333.patch" + patch -p1 -i "${srcdir}/WinHttp-missing-flags.patch" + patch -p1 -i "${srcdir}/Patch-cmake-submodules.patch" +} + +build() { + export CFLAGS="-D_WIN32_WINNT=0x0600" + export CXXFLAGS="-D_WIN32_WINNT=0x0600" + + [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static + mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DCMAKE_PREFIX_PATH=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G'MSYS Makefiles' \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_INSTALL_PREFIX="c:${MINGW_PREFIX}" \ + -DBUILD_ONLY="config;s3;transfer" \ + -DENABLE_UNITY_BUILD=ON \ + -DAUTORUN_UNIT_TESTS=OFF \ + ../${_realname}-${pkgver} + make +} + +package() { + cd "${srcdir}"/build-${CARCH}-static + make install DESTDIR="${pkgdir}" +} diff --git a/mingw-w64-aws-sdk-cpp/Patch-cmake-submodules.patch b/mingw-w64-aws-sdk-cpp/Patch-cmake-submodules.patch new file mode 100644 index 0000000000..2cf2b3f568 --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/Patch-cmake-submodules.patch @@ -0,0 +1,23 @@ +diff -aurp aws-sdk-cpp-1.7.288-orig/third-party/cmake/BuildAwsCCommon.cmake aws-sdk-cpp-1.7.288/third-party/cmake/BuildAwsCCommon.cmake +--- aws-sdk-cpp-1.7.288-orig/third-party/cmake/BuildAwsCCommon.cmake 2020-08-08 14:05:06.174688800 +0000 ++++ aws-sdk-cpp-1.7.288/third-party/cmake/BuildAwsCCommon.cmake 2020-08-08 14:03:44.967180800 +0000 +@@ -42,6 +42,7 @@ else() + GIT_TAG ${AWS_C_COMMON_TAG} + BUILD_IN_SOURCE 0 + UPDATE_COMMAND "" ++ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/../../../BuildAwsCCommon.patch + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + +diff -aurp aws-sdk-cpp-1.7.288-orig/third-party/cmake/BuildAwsChecksums.cmake aws-sdk-cpp-1.7.288/third-party/cmake/BuildAwsChecksums.cmake +--- aws-sdk-cpp-1.7.288-orig/third-party/cmake/BuildAwsChecksums.cmake 2020-08-08 14:05:06.174688800 +0000 ++++ aws-sdk-cpp-1.7.288/third-party/cmake/BuildAwsChecksums.cmake 2020-08-08 14:03:44.967180800 +0000 +@@ -42,6 +42,7 @@ else() + GIT_TAG ${AWS_CHECKSUMS_TAG} + BUILD_IN_SOURCE 0 + UPDATE_COMMAND "" ++ PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/../../../BuildAwsChecksums.patch + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${AWS_DEPS_INSTALL_DIR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} diff --git a/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch b/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch new file mode 100644 index 0000000000..e44a9ecd6f --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch @@ -0,0 +1,20 @@ +diff -aurp aws-sdk-cpp-1.7.365-orig/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp aws-sdk-cpp-1.7.365/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp +--- aws-sdk-cpp-1.7.365-orig/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp 2020-08-08 19:54:09.998144200 +0000 ++++ aws-sdk-cpp-1.7.365/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp 2020-08-08 19:58:40.273220200 +0000 +@@ -22,6 +22,16 @@ + #include + #include + ++#ifndef WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL ++#define WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL 116 ++#endif ++#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 ++#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200 ++#endif ++#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 ++#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800 ++#endif ++ + using namespace Aws::Client; + using namespace Aws::Http; + using namespace Aws::Http::Standard; diff --git a/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch b/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch new file mode 100644 index 0000000000..92f1005771 --- /dev/null +++ b/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch @@ -0,0 +1,291 @@ +From f9b4499ccb63ef02d8c9de462fbbcf301eb1907a Mon Sep 17 00:00:00 2001 +From: Daniel Schulte +Date: Tue, 3 Mar 2020 11:09:15 +0100 +Subject: [PATCH] Add support for building with MinGW + +--- + aws-cpp-sdk-core/include/aws/core/utils/Array.h | 8 ++++---- + .../include/aws/core/utils/crypto/bcrypt/CryptoImpl.h | 7 +++++++ + .../include/aws/core/utils/event/EventHeader.h | 10 ++++++++++ + .../source/http/windows/WinHttpSyncHttpClient.cpp | 4 ++-- + .../source/http/windows/WinINetSyncHttpClient.cpp | 2 +- + .../source/http/windows/WinSyncHttpClient.cpp | 2 +- + .../source/platform/windows/Environment.cpp | 5 +++++ + .../source/platform/windows/FileSystem.cpp | 7 ++++++- + .../source/platform/windows/OSVersionInfo.cpp | 2 ++ + .../source/utils/crypto/factory/Factories.cpp | 4 ++-- + .../BucketAndObjectOperationTest.cpp | 4 ++-- + cmake/compiler_settings.cmake | 6 ++++++ + .../source/platform/windows/PlatformTesting.cpp | 2 ++ + 13 files changed, 50 insertions(+), 13 deletions(-) + +diff --git a/aws-cpp-sdk-core/include/aws/core/utils/Array.h b/aws-cpp-sdk-core/include/aws/core/utils/Array.h +index 1dbb9020f4..6768b6b850 100644 +--- a/aws-cpp-sdk-core/include/aws/core/utils/Array.h ++++ b/aws-cpp-sdk-core/include/aws/core/utils/Array.h +@@ -64,7 +64,7 @@ namespace Aws + { + m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); + +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + std::copy(arrayToCopy, arrayToCopy + arraySize, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); + #else + std::copy(arrayToCopy, arrayToCopy + arraySize, m_data.get()); +@@ -92,7 +92,7 @@ namespace Aws + if(arr->m_size > 0 && arr->m_data) + { + size_t arraySize = arr->m_size; +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, stdext::checked_array_iterator< T * >(m_data.get() + location, m_size)); + #else + std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, m_data.get() + location); +@@ -111,7 +111,7 @@ namespace Aws + { + m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); + +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); + #else + std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get()); +@@ -144,7 +144,7 @@ namespace Aws + { + m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); + +-#ifdef _WIN32 ++#if defined(_WIN32) && !defined(__MINGW32__) + std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); + #else + std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get()); +diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h +index 992efab47c..406380033a 100644 +--- a/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h ++++ b/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h +@@ -39,7 +39,14 @@ namespace Aws + { + namespace Crypto + { ++ #ifdef __MINGW32__ ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wunused-variable" ++ #endif + static const char* SecureRandom_BCrypt_Tag = "SecureRandom_BCrypt"; ++ #ifdef __MINGW32__ ++ #pragma GCC diagnostic pop ++ #endif + + class SecureRandomBytes_BCrypt : public SecureRandomBytes + { +diff --git a/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h b/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h +index 2041b208da..6fb333bff7 100644 +--- a/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h ++++ b/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h +@@ -24,6 +24,12 @@ + #include + #include + ++#ifdef __MINGW32__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" ++#pragma GCC diagnostic ignored "-Wuninitialized" ++#endif ++ + namespace Aws + { + namespace Utils +@@ -319,3 +325,7 @@ namespace Aws + } + } + } ++ ++#ifdef __MINGW32__ ++#pragma GCC diagnostic pop ++#endif +diff --git a/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp +index 4a0f80a161..a98635f706 100644 +--- a/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp ++++ b/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp +@@ -267,7 +267,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptr(dwSize / sizeof(wchar_t))); + + WinHttpQueryHeaders(hHttpRequest, WINHTTP_QUERY_CONTENT_TYPE, nullptr, &contentTypeStr, &dwSize, 0); +- if (contentTypeStr[0] != NULL) ++ if (contentTypeStr[0] != 0) + { + Aws::String contentStr = StringUtils::FromWString(contentTypeStr); + response->SetContentType(contentStr); +@@ -298,7 +298,7 @@ bool WinHttpSyncHttpClient::DoQueryHeaders(void* hHttpRequest, std::shared_ptrSetContentType(contentTypeStr); + AWS_LOGSTREAM_DEBUG(GetLogTag(), "Received content type " << contentTypeStr); +diff --git a/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp b/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp +index 3758006a53..2b4ce940b7 100644 +--- a/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp ++++ b/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp +@@ -322,7 +322,7 @@ void WinSyncHttpClient::MakeRequestInternal(HttpRequest& request, + } + } + +- if (!success && !IsRequestProcessingEnabled() || !ContinueRequest(request)) ++ if (!success && (!IsRequestProcessingEnabled() || !ContinueRequest(request))) + { + response->SetClientErrorType(CoreErrors::USER_CANCELLED); + response->SetClientErrorMessage("Request processing disabled or continuation cancelled by user's continuation handler."); +diff --git a/aws-cpp-sdk-core/source/platform/windows/Environment.cpp b/aws-cpp-sdk-core/source/platform/windows/Environment.cpp +index fd8d58f291..097274a56b 100644 +--- a/aws-cpp-sdk-core/source/platform/windows/Environment.cpp ++++ b/aws-cpp-sdk-core/source/platform/windows/Environment.cpp +@@ -29,6 +29,7 @@ that would need to be manually freed in all the client functions, just copy it i + */ + Aws::String GetEnv(const char *variableName) + { ++#ifdef _MSC_VER + char* variableValue = nullptr; + std::size_t valueSize = 0; + auto queryResult = _dupenv_s(&variableValue, &valueSize, variableName); +@@ -41,6 +42,10 @@ Aws::String GetEnv(const char *variableName) + } + + return result; ++#else // __MINGW32__ ++ auto variableValue = std::getenv(variableName); ++ return Aws::String( variableValue ? variableValue : "" ); ++#endif + } + + } // namespace Environment +diff --git a/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp b/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp +index 49af3c1f79..f427fa9233 100644 +--- a/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp ++++ b/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp +@@ -21,7 +21,9 @@ + #include + #include + +-#pragma warning( disable : 4996) ++#ifdef _MSC_VER ++# pragma warning( disable : 4996) ++#endif + + using namespace Aws::Utils; + namespace Aws +@@ -314,6 +316,9 @@ Aws::String CreateTempFilePath() + { + #ifdef _MSC_VER + #pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS ++#elif !defined(L_tmpnam_s) ++ // Definition from the MSVC stdio.h ++ #define L_tmpnam_s (sizeof("\\") + 16) + #endif + char s_tempName[L_tmpnam_s+1]; + +diff --git a/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp +index 23f395f6bb..18bd5836da 100644 +--- a/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp ++++ b/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp +@@ -19,7 +19,9 @@ + + #include + ++#ifdef _MSC_VER + #pragma warning(disable: 4996) ++#endif + #include + #include + namespace Aws +diff --git a/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp b/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp +index d7cb481d5c..3b34d7fc62 100644 +--- a/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp ++++ b/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp +@@ -755,7 +755,7 @@ std::shared_ptr Aws::Utils::Crypto::CreateSha256HMACIm + return s_Sha256HMACFactory->CreateImplementation(); + } + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #pragma warning( push ) + #pragma warning( disable : 4702 ) + #endif +@@ -840,7 +840,7 @@ std::shared_ptr Aws::Utils::Crypto::CreateAES_KeyWrapImplementa + return s_AES_KeyWrapFactory->CreateImplementation(key); + } + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #pragma warning(pop) + #endif + +diff --git a/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp b/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp +index 0f31fcd061..586303e044 100644 +--- a/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp ++++ b/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp +@@ -54,9 +54,9 @@ + #include + #include + +-#ifdef _WIN32 ++#ifdef _MSC_VER + #pragma warning(disable: 4127) +-#endif //_WIN32 ++#endif //_MSC_VER + + #include + +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index db054b2c1b..e1d6dce55e 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -11,6 +11,9 @@ else() + set(COMPILER_CLANG 1) + else() + set(COMPILER_GCC 1) ++ if(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32") ++ set(COMPILER_MINGW 1) ++ endif() + endif() + set(USE_GCC_FLAGS 1) + endif() +@@ -34,6 +37,9 @@ endfunction() + + macro(set_gcc_flags) + list(APPEND AWS_COMPILER_FLAGS "-fno-exceptions" "-std=c++${CPP_STANDARD}") ++ if(COMPILER_IS_MINGW) ++ list(APPEND AWS_COMPILER_FLAGS -D__USE_MINGW_ANSI_STDIO=1) ++ endif() + + if(NOT BUILD_SHARED_LIBS) + list(APPEND AWS_COMPILER_FLAGS "-fPIC") +diff --git a/testing-resources/source/platform/windows/PlatformTesting.cpp b/testing-resources/source/platform/windows/PlatformTesting.cpp +index 2b0a04c0b4..2a27710557 100644 +--- a/testing-resources/source/platform/windows/PlatformTesting.cpp ++++ b/testing-resources/source/platform/windows/PlatformTesting.cpp +@@ -15,7 +15,9 @@ + + #include + ++#ifdef _MSC_VER + #pragma warning(disable: 4996) ++#endif + #include + #include + From 4b8b3fbfb3fdf46b765839cd75c8e3424a2898e1 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Tue, 11 Aug 2020 09:55:38 +1000 Subject: [PATCH 048/120] New package: dfu-programmer 0.7.2 --- .../01-use-libusb-win32.patch | 60 +++++++++++++++++++ mingw-w64-dfu-programmer/PKGBUILD | 41 +++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 mingw-w64-dfu-programmer/01-use-libusb-win32.patch create mode 100644 mingw-w64-dfu-programmer/PKGBUILD diff --git a/mingw-w64-dfu-programmer/01-use-libusb-win32.patch b/mingw-w64-dfu-programmer/01-use-libusb-win32.patch new file mode 100644 index 0000000000..1d88ba83ab --- /dev/null +++ b/mingw-w64-dfu-programmer/01-use-libusb-win32.patch @@ -0,0 +1,60 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -41,9 +41,9 @@ + dnl Fallback to the old libusb + dnl libusb >= 0.1.8 is required, as we need usb_interrupt_read() + AS_ECHO("using libusb"); +- AC_CHECK_HEADER(usb.h, +- AC_CHECK_LIB(usb, usb_interrupt_read, +- [LIBS="$LIBS -lusb" ++ AC_CHECK_HEADER(lusb0_usb.h, ++ AC_CHECK_LIB(usb0, usb_interrupt_read, ++ [LIBS="$LIBS -lusb0" + HAVE_USB=yes])) + fi + + +--- a/src/dfu-device.h ++++ b/src/dfu-device.h +@@ -8,7 +8,7 @@ + #ifdef HAVE_LIBUSB_1_0 + #include + #else +-#include ++#include + #endif + + // Atmel device classes are now defined with one bit per class. +--- a/src/dfu.c ++++ b/src/dfu.c +@@ -29,7 +29,7 @@ + #ifdef HAVE_LIBUSB_1_0 + #include + #else +-#include ++#include + #endif + #include + #include "dfu.h" +--- a/src/dfu.h ++++ b/src/dfu.h +@@ -27,7 +27,7 @@ + #ifdef HAVE_LIBUSB_1_0 + #include + #else +-#include ++#include + #endif + #include + #include +--- a/src/main.c ++++ b/src/main.c +@@ -26,7 +26,7 @@ + #ifdef HAVE_LIBUSB_1_0 + #include + #else +-#include ++#include + #endif + + #include "config.h" diff --git a/mingw-w64-dfu-programmer/PKGBUILD b/mingw-w64-dfu-programmer/PKGBUILD new file mode 100644 index 0000000000..dc489476bc --- /dev/null +++ b/mingw-w64-dfu-programmer/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: fauxpark + +_realname=dfu-programmer +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=0.7.2 +pkgrel=1 +pkgdesc='Device firmware update based USB programmer for Atmel chips (mingw-w64)' +arch=('any') +license=('GPL') +url='https://github.com/dfu-programmer/dfu-programmer' +makedepends=("${MINGW_PACKAGE_PREFIX}-libusb-win32") +source=( + "https://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/${pkgver}/dfu-programmer-${pkgver}.tar.gz" + 01-use-libusb-win32.patch +) +sha256sums=( + '1db4d36b1aedab2adc976e8faa5495df3cf82dc4bf883633dc6ba71f7c4af995' + '7c8d27dbc8b24aefa54514594711301852741021623b25af136271d767a0fdc8' +) + +prepare() { + cd ${srcdir}/${_realname}-${pkgver} + + patch -p1 -i ../01-use-libusb-win32.patch +} + +build() { + cd ${srcdir}/${_realname}-${pkgver} + + ./bootstrap.sh + ./configure \ + --prefix=${MINGW_PREFIX} \ + --disable-libusb_1_0 +} + +package() { + cd ${srcdir}/${_realname}-${pkgver} + + make DESTDIR="$pkgdir" install +} From 84542480a6535d03ed0e90bd1cfc8eaa9523d6d0 Mon Sep 17 00:00:00 2001 From: Oscar Fuentes Date: Tue, 11 Aug 2020 02:16:02 +0200 Subject: [PATCH 049/120] emacs: updated to version 27.1 Other changes: Changed ctags to universal-ctags-git. ctags is unmaintaind and obsolete. Disabled imagemagick support. See the commentary in PKGBUILD. Removed patch lread.c.diff, apparently it is unnecessary and there is no clue about why it was introduced anyway. Removed linker flag -fstack-protector. Judging by the commit message that introduced it, looks like a left-over of the effort to debug imagemagick crashes. --- mingw-w64-emacs/PKGBUILD | 27 ++++++++++++--------------- mingw-w64-emacs/lread.c.diff | 15 --------------- 2 files changed, 12 insertions(+), 30 deletions(-) delete mode 100644 mingw-w64-emacs/lread.c.diff diff --git a/mingw-w64-emacs/PKGBUILD b/mingw-w64-emacs/PKGBUILD index 16702b2549..c6c7ea2ba6 100644 --- a/mingw-w64-emacs/PKGBUILD +++ b/mingw-w64-emacs/PKGBUILD @@ -4,15 +4,16 @@ _realname=emacs pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=26.3 -pkgrel=3 +pkgver=27.1 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)" url="https://www.gnu.org/software/${_realname}/" license=('GPL3') arch=('any') -depends=("${MINGW_PACKAGE_PREFIX}-ctags" +depends=("${MINGW_PACKAGE_PREFIX}-universal-ctags-git" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-xpm-nox" + "${MINGW_PACKAGE_PREFIX}-harfbuzz" "${MINGW_PACKAGE_PREFIX}-gnutls" "${MINGW_PACKAGE_PREFIX}-libwinpthread") optdepends=("${MINGW_PACKAGE_PREFIX}-giflib" @@ -20,7 +21,11 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-giflib" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-librsvg" "${MINGW_PACKAGE_PREFIX}-libtiff" - "${MINGW_PACKAGE_PREFIX}-imagemagick" + # ImageMagick is considered unsafe and unstable. See + # INSTALL file on Emacs top source directory. If + # ImageMagick support is restored, check if the patch in + # image.c.diff is still necessary: + # "${MINGW_PACKAGE_PREFIX}-imagemagick" "${MINGW_PACKAGE_PREFIX}-libxml2") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" @@ -32,18 +37,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" # Don't zip info files because the built-in info reader uses gzip to # decompress them. gzip is not available as a mingw binary. options=('strip' '!zipman') -source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig} - 'image.c.diff' - 'lread.c.diff') -sha256sums=('4D90E6751AD8967822C6E092DB07466B9D383EF1653FEB2F95C93E7DE66D3485' - 'SKIP' - '4571d45ec26fd556e73a70bb0ab0a2a8fa1efc5e3b3c5b472ab68bb7dc9bf52c' - '24b2201aa2e965c759cfc9539aa4b610d97f1d0240d9888e335da490b87b84b5') +source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41' + 'SKIP') prepare() { cd "${_realname}-${pkgver}" - patch --binary --forward -p0 < "${srcdir}/image.c.diff" - patch --binary --forward -p0 < "${srcdir}/lread.c.diff" ./autogen.sh } @@ -52,8 +51,6 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "build-${MINGW_CHOST}" - LDFLAGS+=" -fstack-protector" - ../${_realname}-${pkgver}/configure \ --prefix="${MINGW_PREFIX}" \ --build="${MINGW_CHOST}" \ diff --git a/mingw-w64-emacs/lread.c.diff b/mingw-w64-emacs/lread.c.diff deleted file mode 100644 index a0dcc16daf..0000000000 --- a/mingw-w64-emacs/lread.c.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lread.c.orig 2014-11-04 20:29:22.129549000 +0100 -+++ src/lread.c 2014-11-04 22:33:07.346414100 +0100 -@@ -4323,6 +4323,12 @@ - } /* Vinstallation_directory != Vsource_directory */ - - } /* if Vinstallation_directory */ -+ else -+ { -+ Vsource_directory -+ = Fexpand_file_name (build_string ("../"), -+ Fcar (decode_env_path (0, PATH_DATA, 0))); -+ } - } - else /* !initialized */ - { From 5ca82f23b5e69b94cf840b24655f26f5e2246778 Mon Sep 17 00:00:00 2001 From: ofry Date: Tue, 11 Aug 2020 05:15:28 +0300 Subject: [PATCH 050/120] rel=4. Fix DLL building on Windows. Signed-off-by: ofry --- mingw-w64-bmake/0004-add-windows-draft-configs.patch | 12 ++++++------ mingw-w64-bmake/PKGBUILD | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mingw-w64-bmake/0004-add-windows-draft-configs.patch b/mingw-w64-bmake/0004-add-windows-draft-configs.patch index 52d0230d59..e8ad984228 100644 --- a/mingw-w64-bmake/0004-add-windows-draft-configs.patch +++ b/mingw-w64-bmake/0004-add-windows-draft-configs.patch @@ -9,7 +9,7 @@ index a6bf9a2..fa50e79 100644 +sys/MSYS.mk sys/NetBSD.mk diff --git a/mk/sys/MINGW32.mk b/mk/sys/MINGW32.mk -index 10da919..5e9f2b5 100644 +index 10da919..470b3b0 100644 --- a/mk/sys/MINGW32.mk +++ b/mk/sys/MINGW32.mk @@ -1,2 +1,2 @@ @@ -33,12 +33,12 @@ index 10da919..5e9f2b5 100644 @@ -21,2 +29,5 @@ ARFLAGS= rl RANLIB= ranlib -+LD_shared= -Bshareable ++LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} +LD_solink= dll diff --git a/mk/sys/MINGW64.mk b/mk/sys/MINGW64.mk -index 10da919..29f6ef2 100644 +index 10da919..3caac1c 100644 --- a/mk/sys/MINGW64.mk +++ b/mk/sys/MINGW64.mk @@ -1,2 +1,2 @@ @@ -62,12 +62,12 @@ index 10da919..29f6ef2 100644 @@ -21,2 +29,5 @@ ARFLAGS= rl RANLIB= ranlib -+LD_shared= -Bshareable ++LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} +LD_solink= dll diff --git a/mk/sys/MSYS.mk b/mk/sys/MSYS.mk -index 10da919..d91ca9d 100644 +index 10da919..510002f 100644 --- a/mk/sys/MSYS.mk +++ b/mk/sys/MSYS.mk @@ -1,2 +1,2 @@ @@ -91,7 +91,7 @@ index 10da919..d91ca9d 100644 @@ -21,2 +29,5 @@ ARFLAGS= rl RANLIB= ranlib -+LD_shared= -Bshareable ++LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} +LD_solink= dll diff --git a/mingw-w64-bmake/PKGBUILD b/mingw-w64-bmake/PKGBUILD index 7467ddfdfb..8f9d8b2342 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=3 +pkgrel=4 pkgdesc='Portable version of the NetBSD make build tool' arch=('any') url='http://www.crufty.net/help/sjg/bmake.html' From 99627475f3dc7d67c834996b86bfa5857d518b1c Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 11 Aug 2020 23:47:10 +0200 Subject: [PATCH 051/120] Set validpgpkeys for various packages --- mingw-w64-emacs/PKGBUILD | 1 + mingw-w64-gdbm/PKGBUILD | 1 + mingw-w64-indent/PKGBUILD | 1 + mingw-w64-kate/PKGBUILD | 1 + mingw-w64-libcdio-paranoia/PKGBUILD | 1 + mingw-w64-mpc/PKGBUILD | 1 + mingw-w64-msmtp/PKGBUILD | 1 + mingw-w64-ncurses/PKGBUILD | 1 + mingw-w64-qca-qt5/PKGBUILD | 1 + mingw-w64-spice-gtk/PKGBUILD | 1 + mingw-w64-wget/PKGBUILD | 1 + mingw-w64-wined3d/PKGBUILD | 3 ++- 12 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mingw-w64-emacs/PKGBUILD b/mingw-w64-emacs/PKGBUILD index c6c7ea2ba6..c0640db937 100644 --- a/mingw-w64-emacs/PKGBUILD +++ b/mingw-w64-emacs/PKGBUILD @@ -40,6 +40,7 @@ options=('strip' '!zipman') source=("https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}.tar.xz"{,.sig}) sha256sums=('4a4c128f915fc937d61edfc273c98106711b540c9be3cd5d2e2b9b5b2f172e41' 'SKIP') +validpgpkeys=('28D3BED851FDF3AB57FEF93C233587A47C207910') prepare() { cd "${_realname}-${pkgver}" diff --git a/mingw-w64-gdbm/PKGBUILD b/mingw-w64-gdbm/PKGBUILD index ad6eca0da2..75a0ebb276 100644 --- a/mingw-w64-gdbm/PKGBUILD +++ b/mingw-w64-gdbm/PKGBUILD @@ -19,6 +19,7 @@ source=(https://ftp.gnu.org/gnu/gdbm/${_realname}-${pkgver}.tar.gz{,.sig} sha256sums=('86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc' 'SKIP' 'f6398a1a00839bed53565b6fae857a94ee6d12aaccd2a1e87b35203994a6ecd0') +validpgpkeys=('325F650C4C2B6AD58807327A3602B07F55D0C732') prepare() { cd ${srcdir}/${_realname}-${pkgver} diff --git a/mingw-w64-indent/PKGBUILD b/mingw-w64-indent/PKGBUILD index c937b0ea57..1283db65dd 100644 --- a/mingw-w64-indent/PKGBUILD +++ b/mingw-w64-indent/PKGBUILD @@ -20,6 +20,7 @@ sha256sums=('e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b' '63c66b49831a90c5191cd3295d17a4e1888d8fa2a0b02589448de3b78d4e0293' '624ae1c52b01e52dfd4417bb160ef606342f25548fbd90c58ef4962367179750' 'd0ecfbc7cbf694b4222545bbd19d1b81f320ee9f5a2d5bfc86f27fe365f63145') +validpgpkeys=('782130B4C9944247977B82FD6EA4D2311A2D268D') prepare() { cd "${srcdir}"/${_realname}-${pkgver} diff --git a/mingw-w64-kate/PKGBUILD b/mingw-w64-kate/PKGBUILD index 2d4519c2d8..08e8b7166a 100644 --- a/mingw-w64-kate/PKGBUILD +++ b/mingw-w64-kate/PKGBUILD @@ -25,6 +25,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-breeze-icons-qt5${_namesuff}: application i source=(https://download.kde.org/stable/release-service/${pkgver}/src/${_realname}-${pkgver}.tar.xz{,.sig}) sha256sums=('f60b52e5a6a78920ac703a458f1eaf0ced02ffcd8b5f2d49de9a48674eeb007c' 'SKIP') +validpgpkeys=('F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87') prepare() { mkdir -p build-${CARCH}${_variant} diff --git a/mingw-w64-libcdio-paranoia/PKGBUILD b/mingw-w64-libcdio-paranoia/PKGBUILD index da0377bb41..52f3835e63 100644 --- a/mingw-w64-libcdio-paranoia/PKGBUILD +++ b/mingw-w64-libcdio-paranoia/PKGBUILD @@ -16,6 +16,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") source=(https://ftp.gnu.org/gnu/libcdio/${_realname}-${pkgver}.tar.bz2{,.sig}) sha256sums=('4565c18caf401083c53733e6d2847b6671ba824cff1c7792b9039693d34713c1' 'SKIP') +validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') build() { [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} diff --git a/mingw-w64-mpc/PKGBUILD b/mingw-w64-mpc/PKGBUILD index 6c60ff682b..3f22928855 100644 --- a/mingw-w64-mpc/PKGBUILD +++ b/mingw-w64-mpc/PKGBUILD @@ -16,6 +16,7 @@ source=(#"http://www.multiprecision.org/mpc/download/${_realname}-${pkgver}.tar. https://ftp.gnu.org/gnu/mpc/${_realname}-${pkgver}.tar.gz{,.sig}) sha256sums=('6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e' 'SKIP') +validpgpkeys=('AD17A21EF8AED8F1CC02DBD9F7D5C9BF765C61E3') build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} diff --git a/mingw-w64-msmtp/PKGBUILD b/mingw-w64-msmtp/PKGBUILD index 806df2fc7a..41ce629872 100644 --- a/mingw-w64-msmtp/PKGBUILD +++ b/mingw-w64-msmtp/PKGBUILD @@ -23,6 +23,7 @@ source=(https://marlam.de/msmtp/releases/${_realname}-${pkgver}.tar.xz{,.sig} sha256sums=('f25f0fa177ce9e0ad65c127e790a37f35fb64fee9e33d90345844c5c86780e60' 'SKIP' '3729fc8d9a11370324561a76cafe09035391e48c9a55876d1aaa5077944ebf8d') +validpgpkeys=('2F61B4828BBA779AECB3F32703A2A4AB1E32FD34') prepare () { cd ${srcdir}/${_realname}-${pkgver} diff --git a/mingw-w64-ncurses/PKGBUILD b/mingw-w64-ncurses/PKGBUILD index e493c7ccf7..cf4fcd7223 100644 --- a/mingw-w64-ncurses/PKGBUILD +++ b/mingw-w64-ncurses/PKGBUILD @@ -21,6 +21,7 @@ source=(#"${_realname}-${pkgver}.tar.gz"::"https://invisible-mirror.net/archives sha256sums=('30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d' 'SKIP' 'd8fb37262372f3e5c9a553bdeff07c8b874bac6f3c416e2a372877cef0af1925') +validpgpkeys=('C52048C0C0748FEE227D47A2702353E0F7E48EDB') prepare() { cd ${_realname}-${pkgver} diff --git a/mingw-w64-qca-qt5/PKGBUILD b/mingw-w64-qca-qt5/PKGBUILD index 16ed58bccd..df84430cc8 100644 --- a/mingw-w64-qca-qt5/PKGBUILD +++ b/mingw-w64-qca-qt5/PKGBUILD @@ -38,6 +38,7 @@ sha256sums=('1d68ef41a1b61dc9786beb923a68902a6276a77cced5e5ea7ff985ef113932d7' '57602e5272a079ca1e8f4b4452030094010c7a6b33ed4606e1497cd0b4126717' '037b615f8b6f609112383b69e6050e7c939b12b0c7c0fa210a58e075c0d1c589' 'b031ceac3ed4e1228349545cf536f75fd6e21a3cfb6a0412e5eb87c1f45b1bbc') +validpgpkeys=('CB9387521E1EE0127DA804843FDBB55084CC5D84') prepare() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD index 9218027685..97bb51212b 100644 --- a/mingw-w64-spice-gtk/PKGBUILD +++ b/mingw-w64-spice-gtk/PKGBUILD @@ -32,6 +32,7 @@ source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{, sha256sums=('5ae974731baf2b41316d4f0b3ae0c2e47f00bff91a5a617e189cd3dedcd96d8e' 'SKIP' '8bb6f1896df080746736a74200f094bae4f48ac766d46a1793a761728fb01202') +validpgpkeys=('206D3B352F566F3B0E6572E997D9123DE37A484F') prepare() { cd "${srcdir}"/${_realname}-${pkgver} diff --git a/mingw-w64-wget/PKGBUILD b/mingw-w64-wget/PKGBUILD index 7376a4b721..55fc07e4e6 100644 --- a/mingw-w64-wget/PKGBUILD +++ b/mingw-w64-wget/PKGBUILD @@ -25,6 +25,7 @@ sha256sums=('69607ce8216c2d1126b7a872db594b3f21e511e660e07ca1f81be96650932abb' '528369e9339eeeec7066632a1badc91a190decc2842810a6bd89a49c62565423' 'd707a4e223433f6e79dd4f455c26dc162d26de79495d85dc4f2f92b877139325') options=('strip' '!libtool' 'staticlibs') +validpgpkeys=('7845120B07CBD8D6ECE5FF2B2A1743EDA91A35B6') prepare() { cd ${srcdir}/${_realname}-${pkgver} diff --git a/mingw-w64-wined3d/PKGBUILD b/mingw-w64-wined3d/PKGBUILD index 16e82f86e6..a54fe90f9e 100644 --- a/mingw-w64-wined3d/PKGBUILD +++ b/mingw-w64-wined3d/PKGBUILD @@ -8,7 +8,7 @@ pkgver=3.8 pkgrel=1 pkgdesc="Direct3D to OpenGL translator (mingw-w64)" arch=('any') -depends=("") +depends=() makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") url="https://www.winehq.org" license=('LGPL') @@ -16,6 +16,7 @@ options=('staticlibs' 'strip') source=(https://prdownloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.xz{.sign,}) sha256sums=('SKIP' '02b00c6c948b3bab717e1b1e2075a5406b14d138bd2e01fdb1268a93d1c20d51') +validpgpkeys=('DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D') build() { case ${MINGW_CHOST} in From 53cab4bdbf89532372cd68a215081f05b2eed269 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 12 Aug 2020 07:59:57 +1000 Subject: [PATCH 052/120] New package: avr-binutils 2.35 --- mingw-w64-avr-binutils/01-avr-size.patch | 435 +++++++++++++++++++++++ mingw-w64-avr-binutils/PKGBUILD | 54 +++ 2 files changed, 489 insertions(+) create mode 100644 mingw-w64-avr-binutils/01-avr-size.patch create mode 100644 mingw-w64-avr-binutils/PKGBUILD diff --git a/mingw-w64-avr-binutils/01-avr-size.patch b/mingw-w64-avr-binutils/01-avr-size.patch new file mode 100644 index 0000000000..ae78228b0a --- /dev/null +++ b/mingw-w64-avr-binutils/01-avr-size.patch @@ -0,0 +1,435 @@ +diff --git a/binutils/size.c b/binutils/size.c +index 3697087714..f99d45a6bf 100644 +--- a/binutils/size.c ++++ b/binutils/size.c +@@ -51,7 +51,8 @@ enum output_format + { + FORMAT_BERKLEY, + FORMAT_SYSV, +- FORMAT_GNU ++ FORMAT_GNU, ++ FORMAT_AVR + }; + static enum output_format selected_output_format = + #if BSD_DEFAULT +@@ -74,6 +75,246 @@ static bfd_size_type total_textsize; + /* Program exit status. */ + static int return_code = 0; + ++ ++/* AVR Size specific stuff */ ++ ++#define AVR64 64UL ++#define AVR128 128UL ++#define AVR256 256UL ++#define AVR512 512UL ++#define AVR1K 1024UL ++#define AVR2K 2048UL ++#define AVR4K 4096UL ++#define AVR8K 8192UL ++#define AVR16K 16384UL ++#define AVR20K 20480UL ++#define AVR24K 24576UL ++#define AVR32K 32768UL ++#define AVR36K 36864UL ++#define AVR40K 40960UL ++#define AVR64K 65536UL ++#define AVR68K 69632UL ++#define AVR128K 131072UL ++#define AVR136K 139264UL ++#define AVR200K 204800UL ++#define AVR256K 262144UL ++#define AVR264K 270336UL ++ ++typedef struct ++{ ++ char *name; ++ long flash; ++ long ram; ++ long eeprom; ++} avr_device_t; ++ ++avr_device_t avr[] = ++{ ++ {"atxmega256a3", AVR264K, AVR16K, AVR4K}, ++ {"atxmega256a3b", AVR264K, AVR16K, AVR4K}, ++ {"atxmega256d3", AVR264K, AVR16K, AVR4K}, ++ ++ {"atmega2560", AVR256K, AVR8K, AVR4K}, ++ {"atmega2561", AVR256K, AVR8K, AVR4K}, ++ ++ {"atxmega192a3", AVR200K, AVR16K, AVR2K}, ++ {"atxmega192d3", AVR200K, AVR16K, AVR2K}, ++ ++ {"atxmega128a1", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128a1u", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128a3", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128d3", AVR136K, AVR8K, AVR2K}, ++ ++ {"at43usb320", AVR128K, 608UL, 0UL}, ++ {"at90can128", AVR128K, AVR4K, AVR4K}, ++ {"at90usb1286", AVR128K, AVR8K, AVR4K}, ++ {"at90usb1287", AVR128K, AVR8K, AVR4K}, ++ {"atmega128", AVR128K, AVR4K, AVR4K}, ++ {"atmega1280", AVR128K, AVR8K, AVR4K}, ++ {"atmega1281", AVR128K, AVR8K, AVR4K}, ++ {"atmega1284p", AVR128K, AVR16K, AVR4K}, ++ {"atmega128rfa1", AVR128K, AVR16K, AVR4K}, ++ {"atmega103", AVR128K, 4000UL, AVR4K}, ++ ++ {"atxmega64a1", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64a1u", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64a3", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64d3", AVR68K, AVR4K, AVR2K}, ++ ++ {"at90can64", AVR64K, AVR4K, AVR2K}, ++ {"at90scr100", AVR64K, AVR4K, AVR2K}, ++ {"at90usb646", AVR64K, AVR4K, AVR2K}, ++ {"at90usb647", AVR64K, AVR4K, AVR2K}, ++ {"atmega64", AVR64K, AVR4K, AVR2K}, ++ {"atmega640", AVR64K, AVR8K, AVR4K}, ++ {"atmega644", AVR64K, AVR4K, AVR2K}, ++ {"atmega644a", AVR64K, AVR4K, AVR2K}, ++ {"atmega644p", AVR64K, AVR4K, AVR2K}, ++ {"atmega644pa", AVR64K, AVR4K, AVR2K}, ++ {"atmega645", AVR64K, AVR4K, AVR2K}, ++ {"atmega645a", AVR64K, AVR4K, AVR2K}, ++ {"atmega645p", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450a", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450p", AVR64K, AVR4K, AVR2K}, ++ {"atmega649", AVR64K, AVR4K, AVR2K}, ++ {"atmega649a", AVR64K, AVR4K, AVR2K}, ++ {"atmega649p", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490a", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490p", AVR64K, AVR4K, AVR2K}, ++ {"atmega64c1", AVR64K, AVR4K, AVR2K}, ++ {"atmega64hve", AVR64K, AVR4K, AVR1K}, ++ {"atmega64m1", AVR64K, AVR4K, AVR2K}, ++ {"m3000", AVR64K, AVR4K, 0UL}, ++ ++ {"atmega406", AVR40K, AVR2K, AVR512}, ++ ++ {"atxmega32a4", AVR36K, AVR4K, AVR1K}, ++ {"atxmega32d4", AVR36K, AVR4K, AVR1K}, ++ ++ {"at90can32", AVR32K, AVR2K, AVR1K}, ++ {"at94k", AVR32K, AVR4K, 0UL}, ++ {"atmega32", AVR32K, AVR2K, AVR1K}, ++ {"atmega323", AVR32K, AVR2K, AVR1K}, ++ {"atmega324a", AVR32K, AVR2K, AVR1K}, ++ {"atmega324p", AVR32K, AVR2K, AVR1K}, ++ {"atmega324pa", AVR32K, AVR2K, AVR1K}, ++ {"atmega325", AVR32K, AVR2K, AVR1K}, ++ {"atmega325a", AVR32K, AVR2K, AVR1K}, ++ {"atmega325p", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250a", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250p", AVR32K, AVR2K, AVR1K}, ++ {"atmega328", AVR32K, AVR2K, AVR1K}, ++ {"atmega328p", AVR32K, AVR2K, AVR1K}, ++ {"atmega329", AVR32K, AVR2K, AVR1K}, ++ {"atmega329a", AVR32K, AVR2K, AVR1K}, ++ {"atmega329p", AVR32K, AVR2K, AVR1K}, ++ {"atmega329pa", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290a", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290p", AVR32K, AVR2K, AVR1K}, ++ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, ++ {"atmega32c1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, ++ {"atmega32m1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32u2", AVR32K, AVR1K, AVR1K}, ++ {"atmega32u4", AVR32K, 2560UL, AVR1K}, ++ {"atmega32u6", AVR32K, 2560UL, AVR1K}, ++ ++ {"at43usb355", AVR24K, 1120UL, 0UL}, ++ ++ {"atxmega16a4", AVR20K, AVR2K, AVR1K}, ++ {"atxmega16d4", AVR20K, AVR2K, AVR1K}, ++ ++ {"at76c711", AVR16K, AVR2K, 0UL}, ++ {"at90pwm216", AVR16K, AVR1K, AVR512}, ++ {"at90pwm316", AVR16K, AVR1K, AVR512}, ++ {"at90usb162", AVR16K, AVR512, AVR512}, ++ {"atmega16", AVR16K, AVR1K, AVR512}, ++ {"atmega16a", AVR16K, AVR1K, AVR512}, ++ {"atmega161", AVR16K, AVR1K, AVR512}, ++ {"atmega162", AVR16K, AVR1K, AVR512}, ++ {"atmega163", AVR16K, AVR1K, AVR512}, ++ {"atmega164", AVR16K, AVR1K, AVR512}, ++ {"atmega164a", AVR16K, AVR1K, AVR512}, ++ {"atmega164p", AVR16K, AVR1K, AVR512}, ++ {"atmega165a", AVR16K, AVR1K, AVR512}, ++ {"atmega165", AVR16K, AVR1K, AVR512}, ++ {"atmega165p", AVR16K, AVR1K, AVR512}, ++ {"atmega168", AVR16K, AVR1K, AVR512}, ++ {"atmega168a", AVR16K, AVR1K, AVR512}, ++ {"atmega168p", AVR16K, AVR1K, AVR512}, ++ {"atmega169", AVR16K, AVR1K, AVR512}, ++ {"atmega169a", AVR16K, AVR1K, AVR512}, ++ {"atmega169p", AVR16K, AVR1K, AVR512}, ++ {"atmega169pa", AVR16K, AVR1K, AVR512}, ++ {"atmega16hva", AVR16K, 768UL, AVR256}, ++ {"atmega16hva2", AVR16K, AVR1K, AVR256}, ++ {"atmega16hvb", AVR16K, AVR1K, AVR512}, ++ {"atmega16m1", AVR16K, AVR1K, AVR512}, ++ {"atmega16u2", AVR16K, AVR512, AVR512}, ++ {"atmega16u4", AVR16K, 1280UL, AVR512}, ++ {"attiny167", AVR16K, AVR512, AVR512}, ++ ++ {"at90c8534", AVR8K, 352UL, AVR512}, ++ {"at90pwm1", AVR8K, AVR512, AVR512}, ++ {"at90pwm2", AVR8K, AVR512, AVR512}, ++ {"at90pwm2b", AVR8K, AVR512, AVR512}, ++ {"at90pwm3", AVR8K, AVR512, AVR512}, ++ {"at90pwm3b", AVR8K, AVR512, AVR512}, ++ {"at90pwm81", AVR8K, AVR256, AVR512}, ++ {"at90s8515", AVR8K, AVR512, AVR512}, ++ {"at90s8535", AVR8K, AVR512, AVR512}, ++ {"at90usb82", AVR8K, AVR512, AVR512}, ++ {"ata6289", AVR8K, AVR512, 320UL}, ++ {"atmega8", AVR8K, AVR1K, AVR512}, ++ {"atmega8515", AVR8K, AVR512, AVR512}, ++ {"atmega8535", AVR8K, AVR512, AVR512}, ++ {"atmega88", AVR8K, AVR1K, AVR512}, ++ {"atmega88a", AVR8K, AVR1K, AVR512}, ++ {"atmega88p", AVR8K, AVR1K, AVR512}, ++ {"atmega88pa", AVR8K, AVR1K, AVR512}, ++ {"atmega8hva", AVR8K, 768UL, AVR256}, ++ {"atmega8u2", AVR8K, AVR512, AVR512}, ++ {"attiny84", AVR8K, AVR512, AVR512}, ++ {"attiny84a", AVR8K, AVR512, AVR512}, ++ {"attiny85", AVR8K, AVR512, AVR512}, ++ {"attiny861", AVR8K, AVR512, AVR512}, ++ {"attiny861a", AVR8K, AVR512, AVR512}, ++ {"attiny87", AVR8K, AVR512, AVR512}, ++ {"attiny88", AVR8K, AVR512, AVR64}, ++ ++ {"at90s4414", AVR4K, 352UL, AVR256}, ++ {"at90s4433", AVR4K, AVR128, AVR256}, ++ {"at90s4434", AVR4K, 352UL, AVR256}, ++ {"atmega48", AVR4K, AVR512, AVR256}, ++ {"atmega48a", AVR4K, AVR512, AVR256}, ++ {"atmega48p", AVR4K, AVR512, AVR256}, ++ {"attiny4313", AVR4K, AVR256, AVR256}, ++ {"attiny43u", AVR4K, AVR256, AVR64}, ++ {"attiny44", AVR4K, AVR256, AVR256}, ++ {"attiny44a", AVR4K, AVR256, AVR256}, ++ {"attiny45", AVR4K, AVR256, AVR256}, ++ {"attiny461", AVR4K, AVR256, AVR256}, ++ {"attiny461a", AVR4K, AVR256, AVR256}, ++ {"attiny48", AVR4K, AVR256, AVR64}, ++ ++ {"at86rf401", AVR2K, 224UL, AVR128}, ++ {"at90s2313", AVR2K, AVR128, AVR128}, ++ {"at90s2323", AVR2K, AVR128, AVR128}, ++ {"at90s2333", AVR2K, 224UL, AVR128}, ++ {"at90s2343", AVR2K, AVR128, AVR128}, ++ {"attiny20", AVR2K, AVR128, 0UL}, ++ {"attiny22", AVR2K, 224UL, AVR128}, ++ {"attiny2313", AVR2K, AVR128, AVR128}, ++ {"attiny2313a", AVR2K, AVR128, AVR128}, ++ {"attiny24", AVR2K, AVR128, AVR128}, ++ {"attiny24a", AVR2K, AVR128, AVR128}, ++ {"attiny25", AVR2K, AVR128, AVR128}, ++ {"attiny26", AVR2K, AVR128, AVR128}, ++ {"attiny261", AVR2K, AVR128, AVR128}, ++ {"attiny261a", AVR2K, AVR128, AVR128}, ++ {"attiny28", AVR2K, 0UL, 0UL}, ++ {"attiny40", AVR2K, AVR256, 0UL}, ++ ++ {"at90s1200", AVR1K, 0UL, AVR64}, ++ {"attiny9", AVR1K, 32UL, 0UL}, ++ {"attiny10", AVR1K, 32UL, 0UL}, ++ {"attiny11", AVR1K, 0UL, AVR64}, ++ {"attiny12", AVR1K, 0UL, AVR64}, ++ {"attiny13", AVR1K, AVR64, AVR64}, ++ {"attiny13a", AVR1K, AVR64, AVR64}, ++ {"attiny15", AVR1K, 0UL, AVR64}, ++ ++ {"attiny4", AVR512, 32UL, 0UL}, ++ {"attiny5", AVR512, 32UL, 0UL}, ++}; ++ ++static char *avrmcu = NULL; ++ ++ + static char *target = NULL; + + /* Forward declarations. */ +@@ -89,7 +330,8 @@ usage (FILE *stream, int status) + fprintf (stream, _(" Displays the sizes of sections inside binary files\n")); + fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n")); + fprintf (stream, _(" The options are:\n\ +- -A|-B|-G --format={sysv|berkeley|gnu} Select output style (default is %s)\n\ ++ -A|-B|-G|-C --format={sysv|berkeley|gnu|avr} Select output style (default is %s)\n\ ++ --mcu= MCU name for AVR format only\n\ + -o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\ + -t --totals Display the total sizes (Berkeley only)\n\ + --common Display total size for *COM* syms\n\ +@@ -113,6 +355,7 @@ usage (FILE *stream, int status) + #define OPTION_FORMAT (200) + #define OPTION_RADIX (OPTION_FORMAT + 1) + #define OPTION_TARGET (OPTION_RADIX + 1) ++#define OPTION_MCU (OPTION_TARGET + 1) + + static struct option long_options[] = + { +@@ -120,6 +363,7 @@ static struct option long_options[] = + {"format", required_argument, 0, OPTION_FORMAT}, + {"radix", required_argument, 0, OPTION_RADIX}, + {"target", required_argument, 0, OPTION_TARGET}, ++ {"mcu", required_argument, 0, 203}, + {"totals", no_argument, &show_totals, 1}, + {"version", no_argument, &show_version, 1}, + {"help", no_argument, &show_help, 1}, +@@ -153,7 +397,7 @@ main (int argc, char **argv) + fatal (_("fatal error: libbfd ABI mismatch")); + set_default_bfd_target (); + +- while ((c = getopt_long (argc, argv, "ABGHhVvdfotx", long_options, ++ while ((c = getopt_long (argc, argv, "ABCGHhVvdfotx", long_options, + (int *) 0)) != EOF) + switch (c) + { +@@ -172,12 +416,20 @@ main (int argc, char **argv) + case 'g': + selected_output_format = FORMAT_GNU; + break; ++ case 'A': ++ case 'a': ++ selected_output_format = FORMAT_AVR; ++ break; + default: + non_fatal (_("invalid argument to --format: %s"), optarg); + usage (stderr, 1); + } + break; + ++ case OPTION_MCU: ++ avrmcu = optarg; ++ break; ++ + case OPTION_TARGET: + target = optarg; + break; +@@ -214,6 +466,9 @@ main (int argc, char **argv) + case 'G': + selected_output_format = FORMAT_GNU; + break; ++ case 'C': ++ selected_output_format = FORMAT_AVR; ++ break; + case 'v': + case 'V': + show_version = 1; +@@ -656,6 +911,98 @@ print_sysv_format (bfd *file) + printf ("\n\n"); + } + ++static avr_device_t * ++avr_find_device (void) ++{ ++ unsigned int i; ++ if (avrmcu != NULL) ++ { ++ for (i = 0; i < sizeof(avr) / sizeof(avr[0]); i++) ++ { ++ if (strcmp(avr[i].name, avrmcu) == 0) ++ { ++ /* Match found */ ++ return (&avr[i]); ++ } ++ } ++ } ++ return (NULL); ++} ++ ++static void ++print_avr_format (bfd *file) ++{ ++ char *avr_name = "Unknown"; ++ int flashmax = 0; ++ int rammax = 0; ++ int eeprommax = 0; ++ asection *section; ++ bfd_size_type my_datasize = 0; ++ bfd_size_type my_textsize = 0; ++ bfd_size_type my_bsssize = 0; ++ bfd_size_type bootloadersize = 0; ++ bfd_size_type noinitsize = 0; ++ bfd_size_type eepromsize = 0; ++ ++ avr_device_t *avrdevice = avr_find_device(); ++ if (avrdevice != NULL) ++ { ++ avr_name = avrdevice->name; ++ flashmax = avrdevice->flash; ++ rammax = avrdevice->ram; ++ eeprommax = avrdevice->eeprom; ++ } ++ ++ if ((section = bfd_get_section_by_name (file, ".data")) != NULL) ++ my_datasize = bfd_section_size (section); ++ if ((section = bfd_get_section_by_name (file, ".text")) != NULL) ++ my_textsize = bfd_section_size (section); ++ if ((section = bfd_get_section_by_name (file, ".bss")) != NULL) ++ my_bsssize = bfd_section_size (section); ++ if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL) ++ bootloadersize = bfd_section_size (section); ++ if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL) ++ noinitsize = bfd_section_size (section); ++ if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL) ++ eepromsize = bfd_section_size (section); ++ ++ bfd_size_type text = my_textsize + my_datasize + bootloadersize; ++ bfd_size_type data = my_datasize + my_bsssize + noinitsize; ++ bfd_size_type eeprom = eepromsize; ++ ++ printf ("AVR Memory Usage\n" ++ "----------------\n" ++ "Device: %s\n\n", avr_name); ++ ++ /* Text size */ ++ printf ("Program:%8ld bytes", text); ++ if (flashmax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)text / flashmax) * 100); ++ } ++ printf ("\n(.text + .data + .bootloader)\n\n"); ++ ++ /* Data size */ ++ printf ("Data: %8ld bytes", data); ++ if (rammax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)data / rammax) * 100); ++ } ++ printf ("\n(.data + .bss + .noinit)\n\n"); ++ ++ /* EEPROM size */ ++ if (eeprom > 0) ++ { ++ printf ("EEPROM: %8ld bytes", eeprom); ++ if (eeprommax > 0) ++ { ++ printf (" (%2.1f%% Full)", ((float)eeprom / eeprommax) * 100); ++ } ++ printf ("\n(.eeprom)\n\n"); ++ } ++} ++ ++ + static void + print_sizes (bfd *file) + { +@@ -663,6 +1010,8 @@ print_sizes (bfd *file) + calculate_common_size (file); + if (selected_output_format == FORMAT_SYSV) + print_sysv_format (file); ++ else if (selected_output_format == FORMAT_AVR) ++ print_avr_format (file); + else + print_berkeley_or_gnu_format (file); + } diff --git a/mingw-w64-avr-binutils/PKGBUILD b/mingw-w64-avr-binutils/PKGBUILD new file mode 100644 index 0000000000..24de1103a1 --- /dev/null +++ b/mingw-w64-avr-binutils/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: fauxpark + +_realname=avr-binutils +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=2.35 +pkgrel=1 +pkgdesc='GNU Binutils for the AVR target (mingw-w64)' +arch=('any') +license=('GPL') +url='https://www.gnu.org/software/binutils/binutils.html' +source=( + "https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz" + "01-avr-size.patch" +) +sha256sums=( + '1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85' + '7aed303887a8541feba008943d0331dc95dd90a309575f81b7a195650e4cba1e' +) + +prepare() { + cd ${srcdir}/binutils-${pkgver} + + mkdir binutils-build + + # https://github.com/archlinux/svntogit-community/blob/packages/avr-binutils/trunk/avr-size.patch + patch -p1 < ../01-avr-size.patch +} + +build() { + cd ${srcdir}/binutils-${pkgver}/binutils-build + + ../configure \ + --build=${MINGW_CHOST} \ + --prefix=${MINGW_PREFIX} \ + --target=avr \ + --disable-nls \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-werror + make +} + +package() { + cd ${srcdir}/binutils-${pkgver}/binutils-build + + make DESTDIR="$pkgdir" install + + cd ${pkgdir}${MINGW_PREFIX} + + for info in as bfd binutils gprof ld; do + mv share/info/${info}.info share/info/avr-${info}.info + done +} From bb41e30224343d8e5da89530984bc41f5f527659 Mon Sep 17 00:00:00 2001 From: Cyril Richard Date: Wed, 12 Aug 2020 15:05:41 +0200 Subject: [PATCH 053/120] Update PKGBUILD --- mingw-w64-cfitsio/PKGBUILD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD index 29e40b17da..b4a77e0cd9 100644 --- a/mingw-w64-cfitsio/PKGBUILD +++ b/mingw-w64-cfitsio/PKGBUILD @@ -39,6 +39,8 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ + -D_LARGEFILE_SOURCE \ + -D_FILE_OFFSET_BITS=64 \ ../${_realname} make @@ -52,6 +54,8 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ + -D_LARGEFILE_SOURCE \ + -D_FILE_OFFSET_BITS=64 \ ../${_realname} make From 81fc51eae6125c56e60f7e8619cb986143b9e66e Mon Sep 17 00:00:00 2001 From: Cyril Richard Date: Wed, 12 Aug 2020 15:29:38 +0200 Subject: [PATCH 054/120] Update PKGBUILD --- mingw-w64-cfitsio/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD index b4a77e0cd9..052ba1374e 100644 --- a/mingw-w64-cfitsio/PKGBUILD +++ b/mingw-w64-cfitsio/PKGBUILD @@ -4,7 +4,7 @@ _realname=cfitsio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.450 -pkgrel=1 +pkgrel=2 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format (mingw-w64)" arch=('any') url="https://heasarc.gsfc.nasa.gov/fitsio/" @@ -39,7 +39,7 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ - -D_LARGEFILE_SOURCE \ + -D_LARGEFILE_SOURCE=ON \ -D_FILE_OFFSET_BITS=64 \ ../${_realname} @@ -54,7 +54,7 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ - -D_LARGEFILE_SOURCE \ + -D_LARGEFILE_SOURCE=ON \ -D_FILE_OFFSET_BITS=64 \ ../${_realname} From dfcb94304cd6da2c01210edeee6d7f90f5f40178 Mon Sep 17 00:00:00 2001 From: Cyril Richard Date: Wed, 12 Aug 2020 16:39:41 +0200 Subject: [PATCH 055/120] Trying to add large file support --- mingw-w64-cfitsio/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD index 052ba1374e..d16a73fd60 100644 --- a/mingw-w64-cfitsio/PKGBUILD +++ b/mingw-w64-cfitsio/PKGBUILD @@ -35,7 +35,8 @@ build() { mkdir ${srcdir}/static-${MINGW_CHOST} && cd "${srcdir}/static-${MINGW_CHOST}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \ - ${MINGW_PREFIX}/bin/cmake.exe \ + CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \ + ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ @@ -50,7 +51,8 @@ build() { mkdir ${srcdir}/shared-${MINGW_CHOST} && cd "${srcdir}/shared-${MINGW_CHOST}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \ - ${MINGW_PREFIX}/bin/cmake.exe \ + CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \ + ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ From a83e427a7c551c1ad8d4d6f0d6f058e3d9123063 Mon Sep 17 00:00:00 2001 From: Cyril Richard Date: Wed, 12 Aug 2020 22:11:22 +0200 Subject: [PATCH 056/120] Removing wrong cmake arguments in favor of CFLAGS. --- mingw-w64-cfitsio/PKGBUILD | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD index d16a73fd60..f8d80f0431 100644 --- a/mingw-w64-cfitsio/PKGBUILD +++ b/mingw-w64-cfitsio/PKGBUILD @@ -40,8 +40,6 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ - -D_LARGEFILE_SOURCE=ON \ - -D_FILE_OFFSET_BITS=64 \ ../${_realname} make @@ -56,8 +54,6 @@ build() { -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ - -D_LARGEFILE_SOURCE=ON \ - -D_FILE_OFFSET_BITS=64 \ ../${_realname} make From f6166c044e8c548fc42a2ad9a2d63169f598e7d5 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 12 Aug 2020 22:16:08 +0200 Subject: [PATCH 057/120] jq: add missing dep on libwinpthread Fixes #6784 --- mingw-w64-jq/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw-w64-jq/PKGBUILD b/mingw-w64-jq/PKGBUILD index 31957b9899..8132051cd5 100644 --- a/mingw-w64-jq/PKGBUILD +++ b/mingw-w64-jq/PKGBUILD @@ -4,13 +4,14 @@ _realname=jq pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.6 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line JSON processor (mingw-w64)" arch=('any') url='https://stedolan.github.io/jq/' license=('MIT') makedepends=("autoconf" "automake" "bison" "flex") -depends=("${MINGW_PACKAGE_PREFIX}-oniguruma") +depends=("${MINGW_PACKAGE_PREFIX}-oniguruma" + "${MINGW_PACKAGE_PREFIX}-libwinpthread") source=("https://github.com/stedolan/${_realname}/releases/download/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz" no-undefined.patch) sha256sums=('5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72' From b99c05cb4833a06d9e00606d9ef5f59c073f9b54 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 13 Aug 2020 01:56:01 +0530 Subject: [PATCH 058/120] openimageio: update to 2.1.18.1 Summary: * add patch file not to export inline functions * add mingw-w64-fmt as a dependency * remove unused HIDE_SYMBOLS cmake option * disable building tests explicitly --- ...strutil-dont-export-inline-functions.patch | 19 +++++++++++++++++++ mingw-w64-openimageio/PKGBUILD | 15 +++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 mingw-w64-openimageio/0016-strutil-dont-export-inline-functions.patch diff --git a/mingw-w64-openimageio/0016-strutil-dont-export-inline-functions.patch b/mingw-w64-openimageio/0016-strutil-dont-export-inline-functions.patch new file mode 100644 index 0000000000..a3df918707 --- /dev/null +++ b/mingw-w64-openimageio/0016-strutil-dont-export-inline-functions.patch @@ -0,0 +1,19 @@ +--- oiio-Release-2.1.18.1.orig/src/include/OpenImageIO/strutil.h ++++ oiio-Release-2.1.18.1/src/include/OpenImageIO/strutil.h +@@ -362,14 +362,14 @@ + void OIIO_API to_upper (std::string &a); + + /// Return an all-upper case version of `a` (locale-independent). +-inline std::string OIIO_API lower (string_view a) { ++inline std::string lower (string_view a) { + std::string result(a); + to_lower(result); + return result; + } + + /// Return an all-upper case version of `a` (locale-independent). +-inline std::string OIIO_API upper (string_view a) { ++inline std::string upper (string_view a) { + std::string result(a); + to_upper(result); + return result; diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index a5eec95465..eaf95c96e9 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -3,7 +3,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.1.16.0 +pkgver=2.1.18.1 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') @@ -12,6 +12,7 @@ license=("custom") depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-field3d" "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-fmt" "${MINGW_PACKAGE_PREFIX}-jasper" "${MINGW_PACKAGE_PREFIX}-giflib" "${MINGW_PACKAGE_PREFIX}-glew" @@ -52,8 +53,9 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi 0012-maybe-uninitialized-errors.patch 0013-dont-export-enums.patch 0014-fix-ptex-string-format.patch - 0015-python-module-ext.patch) -sha256sums=('f44e3b3cffe9a8f47395da1ae59e972ecb26adf65f17581e6a489fdcce0cb116' + 0015-python-module-ext.patch + 0016-strutil-dont-export-inline-functions.patch) +sha256sums=('e2cf54f5b28e18fc88e76e1703f2e39bf144c88378334527e4a1246974659a85' 'SKIP' '73c46166c1d19922b6b54f4e1e18128c33dadbc72a36b683049ec297ce1056b3' '9e4e21333676268a91c0f4e7676aeab7658e5f748e7e5cfe43a92f0fd7931229' @@ -64,7 +66,8 @@ sha256sums=('f44e3b3cffe9a8f47395da1ae59e972ecb26adf65f17581e6a489fdcce0cb116' 'bc37ea8326f7f5f26068051b537f2491e9554a380e6584bf55aaad111d33eb81' 'b3d1ce84de09b2de5047c79c7a9fbaff59d7cd45d0ce92ddd11fe40082a781b4' '6845acb6229a40512407a983aa07470e9ff1832db7a1e01c408ee74898ddc504' - '7e9ab73459f1d4fe859d51682da75c2e0eaa42e3a14deb1b012db31867a45fa7') + '7e9ab73459f1d4fe859d51682da75c2e0eaa42e3a14deb1b012db31867a45fa7' + '8fc1c63974ca1a1aff3fadbdbb855f7e977680e510624815dabc35ec413e2a86') prepare() { cd ${srcdir}/oiio-Release-${pkgver} @@ -78,6 +81,7 @@ prepare() { patch -p1 -i ${srcdir}/0013-dont-export-enums.patch patch -p1 -i ${srcdir}/0014-fix-ptex-string-format.patch patch -p1 -i ${srcdir}/0015-python-module-ext.patch + patch -p1 -i ${srcdir}/0016-strutil-dont-export-inline-functions.patch } build() { @@ -103,10 +107,9 @@ build() { -DUSE_OPENGL=ON \ -DUSE_QT=OFF \ -DUSE_FFMPEG=ON \ - -DHIDE_SYMBOLS=ON \ -DPYTHON_VERSION=${_pyver} \ -DUSE_EXTERNAL_PUGIXML=ON \ - -DOIIO_BUILD_TESTS=ON \ + -DOIIO_BUILD_TESTS=OFF \ -DSTOP_ON_WARNING=OFF \ ${extra_config} \ ../oiio-Release-${pkgver} From 3f3c0ec7736dbe4e5b53cf29ed0e1d20d9b70a4e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 08:14:01 +0200 Subject: [PATCH 059/120] CI: disable fail-fast In case only one of them fails we want to know it the other one worked and it's only a 32/64 bit problem. --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a9a77b66ec..2f06b9838e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,7 @@ jobs: build: runs-on: windows-latest strategy: + fail-fast: false matrix: include: [ { msystem: MINGW64, arch: x86_64 }, From 059a982501322a8beb9a853539dce6fb266c7e32 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 08:35:57 +0200 Subject: [PATCH 060/120] opencv: rebuild see #6587 --- mingw-w64-opencv/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 2bbce4047b..b72496f11a 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -4,7 +4,7 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=4.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="https://opencv.org/" From cb219f9ff9ea34159649ce5593f77b1f47e9c5d4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 08:39:37 +0200 Subject: [PATCH 061/120] CI: verify signatures of source files With auto-key-retrieve enabled gpg called by makepkg will fetch keys from validpgpkeys in the PKGBUILD and verify the result. Uses the ubuntu keyserver because that one isn't as flaky. This requires that all our packages get an up-to-date validpgpkeys array. But we no longer have to trust the users to have checked the signature before creating a PR. --- ci-build.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci-build.sh b/ci-build.sh index cc82f6990f..4c143fbf54 100644 --- a/ci-build.sh +++ b/ci-build.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + # AppVeyor and Drone Continuous Integration for MSYS2 # Author: Renato Silva # Author: Qian Hong @@ -12,6 +14,8 @@ git_config user.email 'ci@msys2.org' git_config user.name 'MSYS2 Continuous Integration' git remote add upstream 'https://github.com/MSYS2/MINGW-packages' git fetch --quiet upstream +# So that makepkg auto-fetches keys from validpgpkeys +mkdir -p ~/.gnupg && echo -e "keyserver keyserver.ubuntu.com\nkeyserver-options auto-key-retrieve" > ~/.gnupg/gpg.conf # reduce time required to install packages by disabling pacman's disk space checking sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf @@ -27,8 +31,8 @@ message 'Building packages' "${packages[@]}" execute 'Updating system' update_system execute 'Approving recipe quality' check_recipe_quality for package in "${packages[@]}"; do - execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --skippgpcheck --nocheck --syncdeps --rmdeps --cleanbuild - execute 'Building source' makepkg --noconfirm --noprogressbar --skippgpcheck --allsource --config '/etc/makepkg_mingw64.conf' + execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --nocheck --syncdeps --rmdeps --cleanbuild + execute 'Building source' makepkg --noconfirm --noprogressbar --allsource --config '/etc/makepkg_mingw64.conf' execute 'Installing' yes:pacman --noprogressbar --upgrade *"${PKGEXT}" deploy_enabled && mv "${package}"/*"${PKGEXT}" artifacts deploy_enabled && mv "${package}"/*"${SRCEXT}" artifacts From 08c13446c40765c6bb84a436f82697edf7e23eb2 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 13 Aug 2020 14:05:53 +0530 Subject: [PATCH 062/120] openimageio: add patch to remove Werror option in CI --- .../0017-cmake-compiler-remove-Werror.patch | 15 +++++++++++++++ mingw-w64-openimageio/PKGBUILD | 7 +++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch diff --git a/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch b/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch new file mode 100644 index 0000000000..59bb863b13 --- /dev/null +++ b/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch @@ -0,0 +1,15 @@ +--- oiio-Release-2.1.18.1.orig/src/cmake/compiler.cmake ++++ oiio-Release-2.1.18.1/src/cmake/compiler.cmake +@@ -83,12 +83,6 @@ + option (STOP_ON_WARNING "Stop building if there are any compiler warnings" OFF) + if (NOT MSVC) + add_compile_options ("-Wall") +- if (STOP_ON_WARNING OR DEFINED ENV{CI}) +- add_compile_options ("-Werror") +- # N.B. Force CI builds (Travis defines $CI) to use -Werror, even if +- # STOP_ON_WARNING has been switched off by default, which we may do +- # in release branches. +- endif () + endif () + + diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index eaf95c96e9..08d9fa9d01 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -54,7 +54,8 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi 0013-dont-export-enums.patch 0014-fix-ptex-string-format.patch 0015-python-module-ext.patch - 0016-strutil-dont-export-inline-functions.patch) + 0016-strutil-dont-export-inline-functions.patch + 0017-cmake-compiler-remove-Werror.patch) sha256sums=('e2cf54f5b28e18fc88e76e1703f2e39bf144c88378334527e4a1246974659a85' 'SKIP' '73c46166c1d19922b6b54f4e1e18128c33dadbc72a36b683049ec297ce1056b3' @@ -67,7 +68,8 @@ sha256sums=('e2cf54f5b28e18fc88e76e1703f2e39bf144c88378334527e4a1246974659a85' 'b3d1ce84de09b2de5047c79c7a9fbaff59d7cd45d0ce92ddd11fe40082a781b4' '6845acb6229a40512407a983aa07470e9ff1832db7a1e01c408ee74898ddc504' '7e9ab73459f1d4fe859d51682da75c2e0eaa42e3a14deb1b012db31867a45fa7' - '8fc1c63974ca1a1aff3fadbdbb855f7e977680e510624815dabc35ec413e2a86') + '8fc1c63974ca1a1aff3fadbdbb855f7e977680e510624815dabc35ec413e2a86' + '887dbdea1f74a5745ce0a1f3782174b4b5ce676d0c35124ec19e2dde6f841ff9') prepare() { cd ${srcdir}/oiio-Release-${pkgver} @@ -82,6 +84,7 @@ prepare() { patch -p1 -i ${srcdir}/0014-fix-ptex-string-format.patch patch -p1 -i ${srcdir}/0015-python-module-ext.patch patch -p1 -i ${srcdir}/0016-strutil-dont-export-inline-functions.patch + patch -p1 -i ${srcdir}/0017-cmake-compiler-remove-Werror.patch } build() { From acb4b8216a4f15d35656a158e645492b763f8d65 Mon Sep 17 00:00:00 2001 From: Christoph Kahl <26385576+kanonet@users.noreply.github.com> Date: Thu, 13 Aug 2020 12:06:54 +0200 Subject: [PATCH 063/120] update OpenCV to 4.4.0 --- mingw-w64-opencv/0009-openblas-find.patch | 11 ----------- mingw-w64-opencv/PKGBUILD | 11 ++++------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 mingw-w64-opencv/0009-openblas-find.patch diff --git a/mingw-w64-opencv/0009-openblas-find.patch b/mingw-w64-opencv/0009-openblas-find.patch deleted file mode 100644 index c6139c4119..0000000000 --- a/mingw-w64-opencv/0009-openblas-find.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/cmake/OpenCVFindOpenBLAS.cmake b/cmake/OpenCVFindOpenBLAS.cmake ---- a/cmake/OpenCVFindOpenBLAS.cmake 2017-03-08 20:21:41.669934400 -0500 -+++ b/cmake/OpenCVFindOpenBLAS.cmake 2017-03-08 20:23:59.354590300 -0500 -@@ -46,6 +46,7 @@ - SET(Open_BLAS_INCLUDE_SEARCH_PATHS - $ENV{OpenBLAS_HOME} - $ENV{OpenBLAS_HOME}/include -+ $ENV{OpenBLAS_HOME}/include/OpenBLAS - /opt/OpenBLAS/include - /usr/local/include/openblas - /usr/include/openblas diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index b72496f11a..05fb701c36 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -3,8 +3,8 @@ _realname=opencv pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.3.0 -pkgrel=3 +pkgver=4.4.0 +pkgrel=1 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="https://opencv.org/" @@ -59,7 +59,6 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv '0003-issue-4107.patch' '0004-generate-proper-pkg-config-file.patch' '0008-mingw-w64-cmake-lib-path.patch' - '0009-openblas-find.patch' '0010-find-libpng-header.patch' '0012-make-header-usable-with-C-compiler.patch' '0014-python-install-path.patch' @@ -68,14 +67,13 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/opencv/opencv/archiv '0102-mingw-w64-have-sincos.patch' '0103-sfm-module-linking.patch' '0104-rgbd-module-missing-include.patch') -sha256sums=('68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a' - 'acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55' +sha256sums=('bb95acd849e458be7f7024d17968568d1ccd2f0681d47fd60d34ffb4b8c52563' + 'a69772f553b32427e09ffbfd0c8d5e5e47f7dab8b3ffc02851ffd7f912b76840' '496165d79ffdaee4626697c7f1c90891c1108854da2a266138c94dcb28e7a90f' 'fd4e095c3c879413184fc6b91a7b0a77dbb128612341a8be2c99d804a203e362' '52ebc8875b9ef3ea70897f34509228daeff73d0cab0aa9eb8b931be6a7d32d7f' 'aaf2a1952b04c9be3a133b08b0a06f536b4e9ba5f312a03f41301dba61a3fc94' '7398e66f80be37382bd427b5eb3a1201a23113c14e71435a44df8779ea1b8a34' - 'e3e2cfc85a9588c545c08f12dcdf933b8b32df9b887944b84c01d520f563ac21' 'f4d9c95251d74165de89f9c4f17a9a265302aca10ac8723a866f413a2181a361' '7350e41ac9dfd95213b880ff017edda155ad704e35e024cfd9f42d286178b1fb' 'e7ca030c5fc9d1292ff464afe5fd83ebe7d58df98321ed83dc55afba8a60ea3d' @@ -112,7 +110,6 @@ prepare() { 0003-issue-4107.patch \ 0004-generate-proper-pkg-config-file.patch \ 0008-mingw-w64-cmake-lib-path.patch \ - 0009-openblas-find.patch \ 0010-find-libpng-header.patch \ 0012-make-header-usable-with-C-compiler.patch \ 0014-python-install-path.patch \ From 38cae5f0f62417346efc5baa0689d9f943d92180 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 19:33:22 +0200 Subject: [PATCH 064/120] opencv: rebuild reverse deps --- mingw-w64-gmic/PKGBUILD | 2 +- mingw-w64-gst-plugins-bad/PKGBUILD | 2 +- mingw-w64-itk/PKGBUILD | 2 +- mingw-w64-openimageio/PKGBUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-gmic/PKGBUILD b/mingw-w64-gmic/PKGBUILD index a7720f0f4f..d71670209f 100644 --- a/mingw-w64-gmic/PKGBUILD +++ b/mingw-w64-gmic/PKGBUILD @@ -4,7 +4,7 @@ _realname=gmic pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Full-Featured Open-Source Framework for Image Processing (mingw-w64)" arch=(any) url="https://gmic.eu" diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD index 042f6a9423..9472a53562 100644 --- a/mingw-w64-gst-plugins-bad/PKGBUILD +++ b/mingw-w64-gst-plugins-bad/PKGBUILD @@ -6,7 +6,7 @@ _realname=gst-plugins-bad pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.2 -pkgrel=6 +pkgrel=7 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)" arch=('any') url="https://gstreamer.freedesktop.org/" diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD index 32a7364162..60901c99e5 100644 --- a/mingw-w64-itk/PKGBUILD +++ b/mingw-w64-itk/PKGBUILD @@ -4,7 +4,7 @@ _realname=itk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=5.1.0 -pkgrel=1 +pkgrel=2 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)' arch=('any') url='https://www.itk.org/' diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index 08d9fa9d01..177cad2013 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -4,7 +4,7 @@ _realname=openimageio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.1.18.1 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications (mingw-w64)" arch=('any') url="https://www.openimageio.org/" From 1d6d977c29449469a12a67d13ca90d50c77b546d Mon Sep 17 00:00:00 2001 From: ice0 Date: Fri, 19 Jun 2020 10:18:09 -0700 Subject: [PATCH 065/120] MLT (An open source multimedia framework) --- .../010-mlt-6.20.0-fix-configure-paths.patch | 24 ++++++++++ mingw-w64-mlt/PKGBUILD | 44 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 mingw-w64-mlt/010-mlt-6.20.0-fix-configure-paths.patch create mode 100644 mingw-w64-mlt/PKGBUILD diff --git a/mingw-w64-mlt/010-mlt-6.20.0-fix-configure-paths.patch b/mingw-w64-mlt/010-mlt-6.20.0-fix-configure-paths.patch new file mode 100644 index 0000000000..f68e2cdee6 --- /dev/null +++ b/mingw-w64-mlt/010-mlt-6.20.0-fix-configure-paths.patch @@ -0,0 +1,24 @@ +--- ./configure 2020-02-16 14:31:58.000000000 -0800 ++++ ./configure.fix 2020-06-19 03:07:16.152206200 -0700 +@@ -182,8 +182,8 @@ + echo datadir=$datadir + echo mandir=$mandir + echo version=$version +- echo cflags=`grep ^framework packages.dat | cut -f 2` +- echo libs=`grep ^framework packages.dat | cut -f 3` ++ echo cflags=`grep ^framework packages.dat | cut -f 2 | sed "s#${prefix}/include#\\${includedir}#g"` ++ echo libs=`grep ^framework packages.dat | cut -f 3 | sed "s#${libdir}#\\${libdir}#g"` + echo moduledir=${moduledir} + echo mltdatadir=${mltdatadir} + echo meltbin=${prefix}/bin/${meltname} +@@ -198,8 +198,8 @@ + echo datadir=$datadir + echo mandir=$mandir + echo version=$version +- echo cflags=`grep ^mlt++ packages.dat | cut -f 2` +- echo libs=`grep ^mlt++ packages.dat | cut -f 3` ++ echo cflags=`grep ^mlt++ packages.dat | cut -f 2 | sed "s#${prefix}/include#\\${includedir}#g"` ++ echo libs=`grep ^mlt++ packages.dat | cut -f 3 | sed "s#${libdir}#\\${libdir}#g"` + ) >> mlt++.pc + cat mlt++.pc.in >>mlt++.pc + } diff --git a/mingw-w64-mlt/PKGBUILD b/mingw-w64-mlt/PKGBUILD new file mode 100644 index 0000000000..a639d75341 --- /dev/null +++ b/mingw-w64-mlt/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Artem Konoplin + +_realname=mlt +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=6.20.0 +pkgrel=1 +pkgdesc="An open source multimedia framework" +arch=('any') +url="https://www.mltframework.org" +license=('GPL') +makedepends=("${MINGW_PACKAGE_PREFIX}-dlfcn" + "${MINGW_PACKAGE_PREFIX}-SDL2" + "${MINGW_PACKAGE_PREFIX}-fftw" + "${MINGW_PACKAGE_PREFIX}-ffmpeg") +#options=('strip' 'staticlibs') +source=("https://github.com/mltframework/mlt/archive/v$pkgver.tar.gz" + "010-mlt-6.20.0-fix-configure-paths.patch") +sha256sums=('ab211e27c06c0688f9cbe2d74dc0623624ef75ea4f94eea915cdc313196be2dd' + 'a039599ffbf976e9bb60da2be33876f7cac19a9540e7a0576aec75bc9831773e') + +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -i "${srcdir}/010-mlt-6.20.0-fix-configure-paths.patch" +} + +build() { + cd mlt-$pkgver + + ./configure \ + --avformat-swscale \ + --enable-gpl \ + --enable-gpl3 \ + --enable-opencv \ + --disable-gtk2 \ + --prefix=${MINGW_PREFIX} \ + --target-arch=${MSYSTEM_CARCH} + make -j$(nproc) +} + +package() { + cd mlt-$pkgver + make DESTDIR="$pkgdir" install +} From 2bef95022ad55427de57184435a11767277e63e2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 19:47:54 +0200 Subject: [PATCH 066/120] mlt: Update description --- mingw-w64-mlt/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-mlt/PKGBUILD b/mingw-w64-mlt/PKGBUILD index a639d75341..0a344a8bf7 100644 --- a/mingw-w64-mlt/PKGBUILD +++ b/mingw-w64-mlt/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=6.20.0 pkgrel=1 -pkgdesc="An open source multimedia framework" +pkgdesc="An open source multimedia framework (mingw-w64)" arch=('any') url="https://www.mltframework.org" license=('GPL') From a7a7e3d91537e29cb569ef79be1605131409bfc6 Mon Sep 17 00:00:00 2001 From: yumetodo Date: Wed, 6 May 2020 23:06:58 +0900 Subject: [PATCH 067/120] feat: intorduce tl-expected 1.0.0 --- mingw-w64-tl-expected/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 mingw-w64-tl-expected/PKGBUILD diff --git a/mingw-w64-tl-expected/PKGBUILD b/mingw-w64-tl-expected/PKGBUILD new file mode 100644 index 0000000000..4a9490ca05 --- /dev/null +++ b/mingw-w64-tl-expected/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: yumetodo + +_realname=tl-expected +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.0.0 +pkgrel=1 +pkgdesc="C++11/14/17 std::expected with functional-style extensions" +arch=('any') +url='https://github.com/TartanLlama/expected' +license=('custom:CC0') +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") +source=("expected-v1.0.0.tar.gz::https://github.com/TartanLlama/expected/archive/v1.0.0.tar.gz") +sha256sums=("8f5124085a124113e75e3890b4e923e3a4de5b26a973b891b3deb40e19c03cee") + +prepare() { + mkdir "expected-$pkgver/build" +} + +build() { + cd "expected-$pkgver/build" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G"MSYS Makefiles" \ + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + .. + + make +} + +check() { + cd "expected-$pkgver/build" + ./tests +} + +package() { + cd "expected-$pkgver/build" + make DESTDIR="$pkgdir/" install + cd .. + install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/$pkgname/LICENSE" +} From c85311335a0baba485a56b90e27d755442c41e50 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 20:03:53 +0200 Subject: [PATCH 068/120] tl-expected: Update description --- mingw-w64-tl-expected/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-tl-expected/PKGBUILD b/mingw-w64-tl-expected/PKGBUILD index 4a9490ca05..81fd80e4ec 100644 --- a/mingw-w64-tl-expected/PKGBUILD +++ b/mingw-w64-tl-expected/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.0.0 pkgrel=1 -pkgdesc="C++11/14/17 std::expected with functional-style extensions" +pkgdesc="C++11/14/17 std::expected with functional-style extensions (mingw-w64)" arch=('any') url='https://github.com/TartanLlama/expected' license=('custom:CC0') From cb821864e2ad6770e50be4e95b880e62c493ed23 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 20:06:51 +0200 Subject: [PATCH 069/120] tl-expected: fix license directory name --- mingw-w64-tl-expected/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-tl-expected/PKGBUILD b/mingw-w64-tl-expected/PKGBUILD index 81fd80e4ec..578cb9aef6 100644 --- a/mingw-w64-tl-expected/PKGBUILD +++ b/mingw-w64-tl-expected/PKGBUILD @@ -38,5 +38,5 @@ package() { cd "expected-$pkgver/build" make DESTDIR="$pkgdir/" install cd .. - install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/${_realname}/LICENSE" } From aa63c572a39b72649fccb226693a9e7e224d200a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 20:10:02 +0200 Subject: [PATCH 070/120] tl-expected: build with ninja instead of make --- mingw-w64-tl-expected/PKGBUILD | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mingw-w64-tl-expected/PKGBUILD b/mingw-w64-tl-expected/PKGBUILD index 578cb9aef6..5d4b7db1d7 100644 --- a/mingw-w64-tl-expected/PKGBUILD +++ b/mingw-w64-tl-expected/PKGBUILD @@ -4,12 +4,14 @@ _realname=tl-expected pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="C++11/14/17 std::expected with functional-style extensions (mingw-w64)" arch=('any') url='https://github.com/TartanLlama/expected' license=('custom:CC0') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") source=("expected-v1.0.0.tar.gz::https://github.com/TartanLlama/expected/archive/v1.0.0.tar.gz") sha256sums=("8f5124085a124113e75e3890b4e923e3a4de5b26a973b891b3deb40e19c03cee") @@ -21,12 +23,12 @@ build() { cd "expected-$pkgver/build" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ + -G"Ninja" \ -DCMAKE_CXX_STANDARD=17 \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ .. - make + ${MINGW_PREFIX}/bin/cmake --build ./ } check() { @@ -36,7 +38,8 @@ check() { package() { cd "expected-$pkgver/build" - make DESTDIR="$pkgdir/" install + + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install cd .. install -Dm644 COPYING "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/${_realname}/LICENSE" } From fa3a27c5e120c43df52b72de885ec63cc8d96f26 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 20:23:55 +0200 Subject: [PATCH 071/120] winpthreads: Update to latest git Drop a patch which is now upstream: https://github.com/mirror/mingw-w64/commit/e82b4f5681c1e4a81f2ac22 Fixes #6678 --- ...-build-without-_USE_MINGW_ANSI_STDIO.patch | 22 ------------------- mingw-w64-winpthreads-git/PKGBUILD | 10 ++++----- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 mingw-w64-winpthreads-git/0002-build-without-_USE_MINGW_ANSI_STDIO.patch diff --git a/mingw-w64-winpthreads-git/0002-build-without-_USE_MINGW_ANSI_STDIO.patch b/mingw-w64-winpthreads-git/0002-build-without-_USE_MINGW_ANSI_STDIO.patch deleted file mode 100644 index 3ddfcc76de..0000000000 --- a/mingw-w64-winpthreads-git/0002-build-without-_USE_MINGW_ANSI_STDIO.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c402bcc0139033a365f30e00caecff9f8be40974 Mon Jun 1 00:00:00 2020 -From: Liu Hao -Date: Fri, 7 Nov 2014 22:43:58 +0000 -Subject: [PATCH] Build winpthreads without __USE_MINGW_ANSI_STDIO - ---- - mingw-w64-libraries/winpthreads/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/mingw-w64-libraries/winpthreads/Makefile.am b/mingw-w64-libraries/winpthreads/Makefile.am -index e674a35e..8a3b758c 100644 ---- a/mingw-w64-libraries/winpthreads/Makefile.am -+++ b/mingw-w64-libraries/winpthreads/Makefile.am -@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I m4 - lib_LTLIBRARIES = libwinpthread.la - - include_HEADERS = include/pthread.h include/sched.h include/semaphore.h include/pthread_unistd.h include/pthread_time.h include/pthread_compat.h include/pthread_signal.h --libwinpthread_la_CPPFLAGS = -I$(srcdir)/include -DIN_WINPTHREAD -DWINPTHREAD_DBG=1 -+libwinpthread_la_CPPFLAGS = -I$(srcdir)/include -DIN_WINPTHREAD -DWINPTHREAD_DBG=1 -D__USE_MINGW_ANSI_STDIO=0 - libwinpthread_la_LDFLAGS = -no-undefined -version-info 1:0:0 -L$(builddir)/fakelib -Wc,-no-pthread - EXTRA_libwinpthread_la_DEPENDENCIES = fakelib/libgcc.a fakelib/libgcc_eh.a fakelib/libgcc_s.a - libwinpthread_la_SOURCES = \ diff --git a/mingw-w64-winpthreads-git/PKGBUILD b/mingw-w64-winpthreads-git/PKGBUILD index 79324a3d9f..f544a40bf2 100644 --- a/mingw-w64-winpthreads-git/PKGBUILD +++ b/mingw-w64-winpthreads-git/PKGBUILD @@ -5,7 +5,7 @@ _realname=winpthreads pkgbase=mingw-w64-${_realname}-git pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-libwinpthread-git") -pkgver=8.0.0.5906.c9a21571 +pkgver=8.0.0.5973.940f25f5 pkgrel=1 pkgdesc="MinGW-w64 winpthreads library" url="https://mingw-w64.sourceforge.io/" @@ -22,11 +22,9 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-headers-git") options=('strip' '!buildflags' 'staticlibs' '!emptydirs' '!debug') source=("mingw-w64"::"git+https://git.code.sf.net/p/mingw-w64/mingw-w64" - "0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch" - "0002-build-without-_USE_MINGW_ANSI_STDIO.patch") + "0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch") sha256sums=('SKIP' - 'd9e8af81682d9bf70e3d87506f51156cec61260b810a234bce861cb2eb3a5919' - '0936d2542dea52faa1d2fb18f02a87b2c8a9cf7a208028df442dd47f04bd76d0') + 'd9e8af81682d9bf70e3d87506f51156cec61260b810a234bce861cb2eb3a5919') pkgver() { cd "${srcdir}/mingw-w64" @@ -40,7 +38,7 @@ prepare() { cd "${srcdir}/mingw-w64" [[ -f mingw-w64-libraries/winpthreads/src/libgcc/dll_frame_info.c ]] && rm -rf mingw-w64-libraries/winpthreads/src/libgcc/dll_frame_info.c git am --committer-date-is-author-date "${srcdir}"/0001-Define-__-de-register_frame_info-in-fake-libgcc_s.patch - git am --committer-date-is-author-date "${srcdir}"/0002-build-without-_USE_MINGW_ANSI_STDIO.patch + cd "${srcdir}"/mingw-w64/mingw-w64-libraries/winpthreads autoreconf -vfi } From 94b687508346d10cec7e8c769785f73da18b4e54 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 13 Aug 2020 20:35:22 +0200 Subject: [PATCH 072/120] gst-plugins-bad: allow building against opencv 4.4 patch from upstream, merged the existing ones into it. --- .../0001-opencv-42.patch | 25 ------------------- .../0004-opencv-version-require.patch | 18 ++++++------- mingw-w64-gst-plugins-bad/PKGBUILD | 7 ++---- 3 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 mingw-w64-gst-plugins-bad/0001-opencv-42.patch diff --git a/mingw-w64-gst-plugins-bad/0001-opencv-42.patch b/mingw-w64-gst-plugins-bad/0001-opencv-42.patch deleted file mode 100644 index f4a58f2a75..0000000000 --- a/mingw-w64-gst-plugins-bad/0001-opencv-42.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2c67d0d2f05a1dd6f3c9b6c0c7a387d738117052 Mon Sep 17 00:00:00 2001 -From: Nicola Murino -Date: Thu, 26 Dec 2019 22:43:35 +0100 -Subject: [PATCH] opencv: allow compilation against 4.2.x - ---- - ext/opencv/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index f38b55dfe..2e1380313 100644 ---- a/ext/opencv/meson.build -+++ b/ext/opencv/meson.build -@@ -65,7 +65,7 @@ if opencv_found - endif - endforeach - else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.3.0'], required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers --- -2.24.1 - diff --git a/mingw-w64-gst-plugins-bad/0004-opencv-version-require.patch b/mingw-w64-gst-plugins-bad/0004-opencv-version-require.patch index f5199ba1d4..5f1a1ed982 100644 --- a/mingw-w64-gst-plugins-bad/0004-opencv-version-require.patch +++ b/mingw-w64-gst-plugins-bad/0004-opencv-version-require.patch @@ -1,25 +1,23 @@ -From 4cf362e2df0fb809ea0f21dd4a6fbb8b46ca54ef Mon Sep 17 00:00:00 2001 -From: Luka Blaskovic -Date: Fri, 1 May 2020 07:46:56 +0200 -Subject: [PATCH] opencv: allow compilation against 4.3.x +From 8544f3928ea46d2da3f27dc65576e8baf42a46d0 Mon Sep 17 00:00:00 2001 +From: Nicola Murino +Date: Fri, 31 Jul 2020 23:38:56 +0200 +Subject: [PATCH] opencv: allow compilation against 4.4.x -Part-of: +Part-of: --- ext/opencv/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build -index d9bc871126..8434628e5f 100644 +index 9ee306501a..730a1345fb 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -65,7 +65,7 @@ if opencv_found endif endforeach else -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.3.0'], required : false) -+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.5.0'], required : false) opencv_found = opencv_dep.found() if opencv_found foreach h : libopencv4_headers --- -2.26.2 diff --git a/mingw-w64-gst-plugins-bad/PKGBUILD b/mingw-w64-gst-plugins-bad/PKGBUILD index 9472a53562..c1f4dadcdc 100644 --- a/mingw-w64-gst-plugins-bad/PKGBUILD +++ b/mingw-w64-gst-plugins-bad/PKGBUILD @@ -6,7 +6,7 @@ _realname=gst-plugins-bad pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.2 -pkgrel=7 +pkgrel=8 pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)" arch=('any') url="https://gstreamer.freedesktop.org/" @@ -64,18 +64,15 @@ depends=("${MINGW_PACKAGE_PREFIX}-aom" "${MINGW_PACKAGE_PREFIX}-zbar") options=(!libtool strip staticlibs) source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz - 0001-opencv-42.patch 0003-meson-lrdf-optional.patch 0004-opencv-version-require.patch) sha256sums=('f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74' - '3201b6b24b426c7f959d491bae0a7151719818ecaa9a891cdd4cb7b3676fd2cc' 'a992cf5fe1d159cf2cfe74556b5fe4018f9bcf421112f07e0e7571aa5bc912a0' - '50455ccf422405fedb3e23f320de3d77452596421e4b7b24f0ac05775e59fb57') + 'b664a3291cd62dcfb7ce047c11c2a493e5740b0deedc7cfe03552ceea78bad7f') prepare() { cd "${srcdir}"/${_realname}-${pkgver} - patch -p1 -i "${srcdir}"/0001-opencv-42.patch patch -p1 -i "${srcdir}"/0003-meson-lrdf-optional.patch patch -p1 -i "${srcdir}"/0004-opencv-version-require.patch } From 9160b7f05c9614c140e36f6af81e09b606c50165 Mon Sep 17 00:00:00 2001 From: Zach Bacon Date: Thu, 11 Jun 2020 03:38:19 -0400 Subject: [PATCH 073/120] Enable Windows hypervisor support this should be now available within current mingw-w64 headers. --- mingw-w64-qemu/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD index 946089ffed..464d0eabc0 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -68,6 +68,7 @@ build() { --enable-gtk \ --enable-sdl \ --enable-zstd \ + --enable-whpx \ --prefix=${MINGW_PREFIX} \ --bindir=${MINGW_PREFIX}/bin \ --datadir=${MINGW_PREFIX}/bin \ From b7dc533626cb65797bbc105aeac7447a5608ae7c Mon Sep 17 00:00:00 2001 From: Zach Bacon Date: Tue, 7 Jul 2020 08:34:08 -0400 Subject: [PATCH 074/120] Make sure hypervisor support is enabled for 64bit only. --- mingw-w64-qemu/PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD index 464d0eabc0..b9efcb7b85 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -41,6 +41,12 @@ sha256sums=('2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6' validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth noextract=(${_realname}-${pkgver}.tar.xz) +case ${MINGW_CHOST} in + x86_64*) + _whpx=--enable-whpx + ;; +esac + prepare() { [[ -d "${srcdir}"/${_realname}-${pkgver} ]] && rm -rf "${srcdir}"/${_realname}-${pkgver} tar -xJf ${srcdir}/${_realname}-${pkgver}.tar.xz -C ${srcdir} || true @@ -68,7 +74,7 @@ build() { --enable-gtk \ --enable-sdl \ --enable-zstd \ - --enable-whpx \ + ${_mach} \ --prefix=${MINGW_PREFIX} \ --bindir=${MINGW_PREFIX}/bin \ --datadir=${MINGW_PREFIX}/bin \ From 4c6caebd344dc5400ff70f9d817a7105c76f8430 Mon Sep 17 00:00:00 2001 From: Zach Bacon Date: Thu, 13 Aug 2020 19:18:51 -0400 Subject: [PATCH 075/120] fix variable in configure to use proper _whpx variable --- mingw-w64-qemu/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD index b9efcb7b85..236d0208af 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -74,7 +74,7 @@ build() { --enable-gtk \ --enable-sdl \ --enable-zstd \ - ${_mach} \ + ${_whpx} \ --prefix=${MINGW_PREFIX} \ --bindir=${MINGW_PREFIX}/bin \ --datadir=${MINGW_PREFIX}/bin \ From 2436470233940678b8ccbc30d7db1aaac32b0325 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 14 Aug 2020 10:11:27 +0200 Subject: [PATCH 076/120] qemu: bump pkgrel --- mingw-w64-qemu/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD index 236d0208af..8b5bf60557 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _base_ver=5.0.0 _rc= pkgver=${_base_ver}${_rc//-/.} -pkgrel=2 +pkgrel=3 pkgdesc="A generic and open source processor emulator (mingw-w64)" arch=('any') license=('GPL2' 'LGPL2') From f8acca2064af59accd437bd6c25e5a7cb2c192f9 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 14 Aug 2020 18:27:53 +1000 Subject: [PATCH 077/120] New package: avr-gcc 8.4.0 --- mingw-w64-avr-gcc/PKGBUILD | 60 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 mingw-w64-avr-gcc/PKGBUILD diff --git a/mingw-w64-avr-gcc/PKGBUILD b/mingw-w64-avr-gcc/PKGBUILD new file mode 100644 index 0000000000..ba587d9909 --- /dev/null +++ b/mingw-w64-avr-gcc/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: fauxpark + +_realname=avr-gcc +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=8.4.0 +pkgrel=1 +pkgdesc='GNU compiler collection for AVR 8-bit and 32-bit microcontrollers (mingw-w64)' +arch=('any') +license=('GPL') +options=(!strip) +url='https://www.gnu.org/software/gcc/gcc.html' +depends=( + "${MINGW_PACKAGE_PREFIX}-avr-binutils" + "${MINGW_PACKAGE_PREFIX}-gmp" + "${MINGW_PACKAGE_PREFIX}-isl" + "${MINGW_PACKAGE_PREFIX}-mpc" + "${MINGW_PACKAGE_PREFIX}-mpfr" +) +source=("https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz") +sha256sums=('e30a6e52d10e1f27ed55104ad233c30bd1e99cfb5ff98ab022dc941edd1b2dd4') + +prepare() { + cd ${srcdir}/gcc-${pkgver} + + mkdir gcc-build +} + +build() { + cd ${srcdir}/gcc-${pkgver}/gcc-build + + ../configure \ + --build=${MINGW_CHOST} \ + --prefix=${MINGW_PREFIX} \ + --target=avr \ + --enable-languages=c,c++ \ + --disable-nls \ + --disable-libssp \ + --disable-shared \ + --disable-threads \ + --disable-libgomp \ + --disable-libada \ + --with-dwarf2 \ + --enable-mingw-wildcard + make +} + +package() { + cd ${srcdir}/gcc-${pkgver}/gcc-build + + make DESTDIR="$pkgdir" install + + cd ${pkgdir}${MINGW_PREFIX} + + # strip debug symbols from libraries + find lib -type f -name "*.a" -exec ${MINGW_PREFIX}/bin/avr-strip --strip-debug '{}' \; + + # info and man7 files conflict with native gcc + rm -rf share/info share/man/man7 +} From 914bfbc972eac5abe01782dad37031f52c0f0766 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 15 Aug 2020 00:38:46 +0530 Subject: [PATCH 078/120] qemu: update to 5.1.0 Also: * Use separate build path instead of building in source directory. * Move the logic to enable whpx option into build function. --- mingw-w64-qemu/PKGBUILD | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD index 8b5bf60557..3ae942ee3e 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -3,10 +3,10 @@ _realname=qemu pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_base_ver=5.0.0 +_base_ver=5.1.0 _rc= pkgver=${_base_ver}${_rc//-/.} -pkgrel=3 +pkgrel=1 pkgdesc="A generic and open source processor emulator (mingw-w64)" arch=('any') license=('GPL2' 'LGPL2') @@ -36,17 +36,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-capstone" "${MINGW_PACKAGE_PREFIX}-usbredir" "${MINGW_PACKAGE_PREFIX}-zstd") source=(https://download.qemu.org/${_realname}-${pkgver}.tar.xz{,.sig}) -sha256sums=('2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6' +sha256sums=('c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5' 'SKIP') validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth noextract=(${_realname}-${pkgver}.tar.xz) -case ${MINGW_CHOST} in - x86_64*) - _whpx=--enable-whpx - ;; -esac - prepare() { [[ -d "${srcdir}"/${_realname}-${pkgver} ]] && rm -rf "${srcdir}"/${_realname}-${pkgver} tar -xJf ${srcdir}/${_realname}-${pkgver}.tar.xz -C ${srcdir} || true @@ -57,8 +51,15 @@ prepare() { build() { LDFLAGS+=" -fstack-protector" - cd "${srcdir}/${_realname}-${pkgver}" - ./configure \ + local -a _extra_config + if [[ "$CARCH" = 'x86_64' ]]; then + _extra_config+=("--enable-whpx") + fi + + [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} + mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} + + ../${_realname}-${pkgver}/configure \ --disable-werror \ --disable-kvm \ --disable-spice \ @@ -74,7 +75,7 @@ build() { --enable-gtk \ --enable-sdl \ --enable-zstd \ - ${_whpx} \ + "${_extra_config[@]}" \ --prefix=${MINGW_PREFIX} \ --bindir=${MINGW_PREFIX}/bin \ --datadir=${MINGW_PREFIX}/bin \ @@ -82,10 +83,11 @@ build() { --python=${MINGW_PREFIX}/bin/python \ --mandir=${MINGW_PREFIX}/share/qemu \ --docdir=${MINGW_PREFIX}/share/qemu + make } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}"/build-${CARCH} make DESTDIR="${pkgdir}/" install } From 90b522aa9e703e179838311aef5e45634135c71b Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 14 Aug 2020 20:37:14 +0000 Subject: [PATCH 079/120] switch to ninja build --- mingw-w64-aws-sdk-cpp/PKGBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD index e827d801a4..7d7cebbf17 100644 --- a/mingw-w64-aws-sdk-cpp/PKGBUILD +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -9,7 +9,8 @@ pkgdesc="AWS SDK for C++ (mingw-w64)" arch=('any') url="https://github.com/aws/aws-sdk-cpp" license=('Apache-2.0') -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") options=('strip' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz::https://github.com/aws/aws-sdk-cpp/archive/${pkgver}.tar.gz" "aws-sdk-cpp-pr-1333.patch" @@ -39,7 +40,7 @@ build() { mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DCMAKE_PREFIX_PATH=" \ ${MINGW_PREFIX}/bin/cmake \ - -G'MSYS Makefiles' \ + -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=OFF \ -DCMAKE_INSTALL_PREFIX="c:${MINGW_PREFIX}" \ @@ -47,10 +48,11 @@ build() { -DENABLE_UNITY_BUILD=ON \ -DAUTORUN_UNIT_TESTS=OFF \ ../${_realname}-${pkgver} - make + + ${MINGW_PREFIX}/bin/cmake --build . } package() { cd "${srcdir}"/build-${CARCH}-static - make install DESTDIR="${pkgdir}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install } From 4673d47b66cac26f6fa280151c4ca5f453dfaded Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 14 Aug 2020 22:51:25 +0200 Subject: [PATCH 080/120] fix install path --- mingw-w64-aws-sdk-cpp/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD index 7d7cebbf17..50be3c513b 100644 --- a/mingw-w64-aws-sdk-cpp/PKGBUILD +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -43,7 +43,7 @@ build() { -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_INSTALL_PREFIX="c:${MINGW_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ -DBUILD_ONLY="config;s3;transfer" \ -DENABLE_UNITY_BUILD=ON \ -DAUTORUN_UNIT_TESTS=OFF \ From e3ef5b67464d99cb22090d0f14f1913e875dfec3 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 14 Aug 2020 23:27:46 +0200 Subject: [PATCH 081/120] Patch improvements by Christopher Degawa --- mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch | 6 +++--- mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch index b75607f7fa..c5d6ba2e6a 100644 --- a/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch +++ b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch @@ -115,7 +115,7 @@ index 8c042ddc5..ae50d0a59 100644 -#pragma warning(push) -#pragma warning(disable : 4996) -+#ifndef __MINGW32__ ++#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable : 4996) +#endif @@ -123,7 +123,7 @@ index 8c042ddc5..ae50d0a59 100644 const char *value = getenv(aws_string_c_str(variable_name)); -#pragma warning(pop) -+#ifndef __MINGW32__ ++#ifdef _MSC_VER +# pragma warning(pop) +#endif @@ -138,7 +138,7 @@ index acbfd97ce..927a81b4a 100644 /* If I meet the engineer that wrote the dbghelp.h file for the windows 8.1 SDK we're gonna have words! */ -#pragma warning(disable : 4091) -+#ifndef __MINGW32__ ++#ifdef _MSC_VER +# pragma warning(disable : 4091) +#endif #include diff --git a/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch b/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch index 92f1005771..847ab4e6f4 100644 --- a/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch +++ b/mingw-w64-aws-sdk-cpp/aws-sdk-cpp-pr-1333.patch @@ -28,7 +28,7 @@ index 1dbb9020f4..6768b6b850 100644 m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); -#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) ++#ifdef _MSC_VER std::copy(arrayToCopy, arrayToCopy + arraySize, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); #else std::copy(arrayToCopy, arrayToCopy + arraySize, m_data.get()); @@ -37,7 +37,7 @@ index 1dbb9020f4..6768b6b850 100644 { size_t arraySize = arr->m_size; -#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) ++#ifdef _MSC_VER std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, stdext::checked_array_iterator< T * >(m_data.get() + location, m_size)); #else std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, m_data.get() + location); @@ -46,7 +46,7 @@ index 1dbb9020f4..6768b6b850 100644 m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); -#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) ++#ifdef _MSC_VER std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); #else std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get()); @@ -55,7 +55,7 @@ index 1dbb9020f4..6768b6b850 100644 m_data.reset(Aws::NewArray(m_size, ARRAY_ALLOCATION_TAG)); -#ifdef _WIN32 -+#if defined(_WIN32) && !defined(__MINGW32__) ++#ifdef _MSC_VER std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size)); #else std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get()); @@ -112,7 +112,7 @@ index 4a0f80a161..a98635f706 100644 WinHttpQueryHeaders(hHttpRequest, WINHTTP_QUERY_CONTENT_TYPE, nullptr, &contentTypeStr, &dwSize, 0); - if (contentTypeStr[0] != NULL) -+ if (contentTypeStr[0] != 0) ++ if (contentTypeStr[0]) { Aws::String contentStr = StringUtils::FromWString(contentTypeStr); response->SetContentType(contentStr); @@ -134,7 +134,7 @@ index 8b42c64dab..ef1fd99975 100644 dwSize = sizeof(contentTypeStr); HttpQueryInfoA(hHttpRequest, HTTP_QUERY_CONTENT_TYPE, &contentTypeStr, &dwSize, 0); - if (contentTypeStr[0] != NULL) -+ if (contentTypeStr[0] != 0) ++ if (contentTypeStr[0]) { response->SetContentType(contentTypeStr); AWS_LOGSTREAM_DEBUG(GetLogTag(), "Received content type " << contentTypeStr); @@ -259,7 +259,7 @@ index db054b2c1b..e1d6dce55e 100644 set(COMPILER_CLANG 1) else() set(COMPILER_GCC 1) -+ if(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES MATCHES "mingw32") ++ if(MINGW) + set(COMPILER_MINGW 1) + endif() endif() From dc024e478a6fe606eaa79d637e4f452c57d2a965 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 14 Aug 2020 23:39:56 +0200 Subject: [PATCH 082/120] cleanups --- mingw-w64-aws-sdk-cpp/PKGBUILD | 8 +------- .../WinHttp-missing-flags.patch | 20 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD index 50be3c513b..979fdbb57c 100644 --- a/mingw-w64-aws-sdk-cpp/PKGBUILD +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -14,7 +14,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" options=('strip' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz::https://github.com/aws/aws-sdk-cpp/archive/${pkgver}.tar.gz" "aws-sdk-cpp-pr-1333.patch" - "WinHttp-missing-flags.patch" "Patch-cmake-submodules.patch" "BuildAwsCCommon.patch" "BuildAwsChecksums.patch") @@ -22,23 +21,18 @@ sha256sums=('95e3f40efaea7b232741bfb76c54c9507c02631edfc198720b0e84be0ebb5e9d' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' 'SKIP') prepare() { cd "${_realname}-${pkgver}" patch -p1 -i "${srcdir}/aws-sdk-cpp-pr-1333.patch" - patch -p1 -i "${srcdir}/WinHttp-missing-flags.patch" patch -p1 -i "${srcdir}/Patch-cmake-submodules.patch" } build() { - export CFLAGS="-D_WIN32_WINNT=0x0600" - export CXXFLAGS="-D_WIN32_WINNT=0x0600" - [[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static mkdir -p "${srcdir}"/build-${CARCH}-static && cd "${srcdir}"/build-${CARCH}-static - MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;-DCMAKE_PREFIX_PATH=" \ + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -GNinja \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch b/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch deleted file mode 100644 index e44a9ecd6f..0000000000 --- a/mingw-w64-aws-sdk-cpp/WinHttp-missing-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -aurp aws-sdk-cpp-1.7.365-orig/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp aws-sdk-cpp-1.7.365/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp ---- aws-sdk-cpp-1.7.365-orig/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp 2020-08-08 19:54:09.998144200 +0000 -+++ aws-sdk-cpp-1.7.365/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp 2020-08-08 19:58:40.273220200 +0000 -@@ -22,6 +22,16 @@ - #include - #include - -+#ifndef WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL -+#define WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL 116 -+#endif -+#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 -+#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200 -+#endif -+#ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 -+#define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800 -+#endif -+ - using namespace Aws::Client; - using namespace Aws::Http; - using namespace Aws::Http::Standard; From 3168da37ce3d83792530655b20770a56e587063f Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 14 Aug 2020 23:55:53 +0200 Subject: [PATCH 083/120] Final tweak --- mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch index c5d6ba2e6a..ae227070f7 100644 --- a/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch +++ b/mingw-w64-aws-sdk-cpp/BuildAwsCCommon.patch @@ -180,7 +180,7 @@ index 36dbbd1a5..90f0497e2 100644 #ifdef _WIN32 # include -# define alloca _alloca -+# ifndef __MINGW32__ ++# ifdef _MSC_VER +# define alloca _alloca +# endif #elif defined(__FreeBSD__) || defined(__NetBSD__) From 790b49c5c72454499b65b298afadf3a1dba9464f Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Sat, 15 Aug 2020 00:10:03 +0200 Subject: [PATCH 084/120] fix maintainer --- mingw-w64-aws-sdk-cpp/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD index 979fdbb57c..7c76f20dd8 100644 --- a/mingw-w64-aws-sdk-cpp/PKGBUILD +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Andrew Sun +# Maintainer: Jeroen Ooms _realname=aws-sdk-cpp pkgbase=mingw-w64-${_realname} From 20761b4a03e22b6ad8c4a5d9355025a61fd680bf Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Sat, 15 Aug 2020 00:42:26 +0200 Subject: [PATCH 085/120] updpkgsums --- mingw-w64-aws-sdk-cpp/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-aws-sdk-cpp/PKGBUILD b/mingw-w64-aws-sdk-cpp/PKGBUILD index 7c76f20dd8..08f128868d 100644 --- a/mingw-w64-aws-sdk-cpp/PKGBUILD +++ b/mingw-w64-aws-sdk-cpp/PKGBUILD @@ -18,10 +18,10 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/aws/aws-sdk-cpp/archi "BuildAwsCCommon.patch" "BuildAwsChecksums.patch") sha256sums=('95e3f40efaea7b232741bfb76c54c9507c02631edfc198720b0e84be0ebb5e9d' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') + '14abbdb71e615d93d5aa1e83f94f994b7fbe05edc63477e37325a6f5148c7278' + 'edb6ef4ac7d3e48dfc1fa4b0b02a6a191bb405ae69c19d9f7bcf3856269bc6fb' + '957eb1cc68b151622b7667e6a13506c96fdef8f566a227ac1608c9e02d3826d3' + '20359b6e79430d1deb69bb05214a2f18258cb54ca56e15cd24605ad0c0094df1') prepare() { cd "${_realname}-${pkgver}" From d410ca50b8c8de6964c9c622201184122b697a2f Mon Sep 17 00:00:00 2001 From: 106062316 Date: Sat, 15 Aug 2020 07:09:21 +0800 Subject: [PATCH 086/120] mpfr: update to 4.1.0 --- mingw-w64-mpfr/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-mpfr/PKGBUILD b/mingw-w64-mpfr/PKGBUILD index 4e208d4f13..9efec247b0 100644 --- a/mingw-w64-mpfr/PKGBUILD +++ b/mingw-w64-mpfr/PKGBUILD @@ -4,7 +4,7 @@ _realname=mpfr pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -_pkgver=4.0.2 +_pkgver=4.1.0 _patchlevel= pkgver=${_pkgver} if [ -n "${_patchlevel}" ]; then @@ -21,7 +21,7 @@ source=(https://ftp.gnu.org/gnu/mpfr/${_realname}-${_pkgver}.tar.xz{,.sig} #https://www.mpfr.org/mpfr-current/${_realname}-${_pkgver}.tar.xz{,.asc} #mpfr-${_pkgver}-${_patchlevel}.patch ) -sha256sums=('1d3be708604eae0e42d578ba93b390c2a145f17743a744d8f3f8c2ad5855a38a' +sha256sums=('0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f' 'SKIP') validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D') From 0943adf66e559bf7b904ccb498aeb9bd6bb38cec Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Sat, 15 Aug 2020 10:55:20 +0200 Subject: [PATCH 087/120] CI: store packages as GHA artifacts --- .github/workflows/main.yml | 12 ++++++++++++ ci-build.sh | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f06b9838e..849ee742aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,3 +31,15 @@ jobs: - name: CI-Build run: MINGW_INSTALLS=${{ matrix.msystem }} ./ci-build.sh + + - name: "Upload binaries" + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.msystem }}-packages + path: artifacts/*.pkg.tar.* + + - name: "Upload sources" + uses: actions/upload-artifact@v2 + with: + name: sources + path: artifacts/*.src.tar.* diff --git a/ci-build.sh b/ci-build.sh index 4c143fbf54..443b430cf1 100644 --- a/ci-build.sh +++ b/ci-build.sh @@ -9,7 +9,7 @@ set -e # Configure cd "$(dirname "$0")" source 'ci-library.sh' -deploy_enabled && mkdir artifacts +mkdir artifacts git_config user.email 'ci@msys2.org' git_config user.name 'MSYS2 Continuous Integration' git remote add upstream 'https://github.com/MSYS2/MINGW-packages' @@ -34,8 +34,8 @@ for package in "${packages[@]}"; do execute 'Building binary' makepkg-mingw --noconfirm --noprogressbar --nocheck --syncdeps --rmdeps --cleanbuild execute 'Building source' makepkg --noconfirm --noprogressbar --allsource --config '/etc/makepkg_mingw64.conf' execute 'Installing' yes:pacman --noprogressbar --upgrade *"${PKGEXT}" - deploy_enabled && mv "${package}"/*"${PKGEXT}" artifacts - deploy_enabled && mv "${package}"/*"${SRCEXT}" artifacts + mv "${package}"/*"${PKGEXT}" artifacts + mv "${package}"/*"${SRCEXT}" artifacts unset package done From b38bf72d9132af2a2ac4be2be71267f9188f21b6 Mon Sep 17 00:00:00 2001 From: JS Deck Date: Sat, 15 Aug 2020 12:54:15 -0300 Subject: [PATCH 088/120] vulkan-validation-layers: Build layer support files --- mingw-w64-vulkan-validation-layers/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mingw-w64-vulkan-validation-layers/PKGBUILD b/mingw-w64-vulkan-validation-layers/PKGBUILD index 24c91c3043..a6ff4b8b9c 100644 --- a/mingw-w64-vulkan-validation-layers/PKGBUILD +++ b/mingw-w64-vulkan-validation-layers/PKGBUILD @@ -5,7 +5,7 @@ _realname=Vulkan-ValidationLayers pkgbase=mingw-w64-vulkan-validation-layers pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-validation-layers") pkgver=1.2.148 -pkgrel=1 +pkgrel=2 pkgdesc='Vulkan Validation Layers (mingw-w64)' arch=('any') url="https://www.khronos.org/vulkan/" @@ -55,7 +55,8 @@ build() { -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DGLSLANG_INSTALL_DIR=${MINGW_PREFIX} \ -DSPIRV_HEADERS_INSTALL_DIR=${MINGW_PREFIX} \ - -DBUILD_LAYER_SUPPORT_FILES=OFF \ + -DBUILD_LAYER_SUPPORT_FILES=ON \ + -DCMAKE_INSTALL_INCLUDEDIR=include/vulkan \ -DBUILD_TESTS=OFF \ ../${_realname}-${pkgver} @@ -66,5 +67,6 @@ package() { cd ${srcdir}/build-${CARCH} DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install + install -Dm644 ${srcdir}/${_realname}-${pkgver}/docs/* -t ${pkgdir}${MINGW_PREFIX}/share/doc/vulkan-validation-layers/ install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.TXT ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-validation-layers/LICENSE } From 9b6e364ef3c1f1621ab2ace6f4c64877b220aa75 Mon Sep 17 00:00:00 2001 From: Tom Schoonjans Date: Sat, 15 Aug 2020 18:26:37 +0100 Subject: [PATCH 089/120] hub 2.14.2 --- mingw-w64-hub/PKGBUILD | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mingw-w64-hub/PKGBUILD b/mingw-w64-hub/PKGBUILD index 403c08bbf8..1cbfb72175 100644 --- a/mingw-w64-hub/PKGBUILD +++ b/mingw-w64-hub/PKGBUILD @@ -1,10 +1,11 @@ # Maintainer: Øystein Krog +# Maintainer: Tom Schoonjans _realname=hub pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.2.1 -pkgrel=1 +pkgver=2.14.2 +pkgrel=0 pkgdesc="hub introduces git to GitHub (mingw-w64)" arch=('any') url="https://hub.github.com" @@ -15,22 +16,20 @@ options=('!strip') depends=('git') makedepends=("git" "${MINGW_PACKAGE_PREFIX}-go") source=(${_realname}-${pkgver}.tar.gz::https://github.com/github/${_realname}/archive/v${pkgver}.tar.gz) -sha256sums=('9350aba6a8e3da9d26b7258a4020bf84491af69595f7484f922d75fc8b86dc10') +sha256sums=('e19e0fdfd1c69c401e1c24dd2d4ecf3fd9044aa4bd3f8d6fd942ed1b2b2ad21a') build() { cd "${srcdir}/${_realname}-${pkgver}" - GOROOT=${MINGW_PREFIX}/lib/go ./script/build - gzip --best -c man/${_realname}.1> ${_realname}.1.gz + export GOROOT=${MINGW_PREFIX}/lib/go + make } package() { cd "${srcdir}/${_realname}-${pkgver}" - install -Dm755 "${_realname}" "${pkgdir}${MINGW_PREFIX}/bin/${_realname}" + make install prefix=${pkgdir}${MINGW_PREFIX} install -Dm644 "LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" - install -Dm644 "man/${_realname}.1" "${pkgdir}${MINGWPREFIX}/share/man/man1/${_realname}.1" - install -Dm644 "etc/hub.bash_completion.sh" "${pkgdir}/usr/share/bash-completion/completions/hub" install -Dm644 "etc/hub.zsh_completion" "${pkgdir}/usr/share/zsh/site-functions/_hub" } From d67ba656b94fe702cfb8697cd18f9393e10ffd63 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 15 Aug 2020 19:52:24 +0200 Subject: [PATCH 090/120] hub: fix pkgrel --- mingw-w64-hub/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-hub/PKGBUILD b/mingw-w64-hub/PKGBUILD index 1cbfb72175..ad6bef05b5 100644 --- a/mingw-w64-hub/PKGBUILD +++ b/mingw-w64-hub/PKGBUILD @@ -5,7 +5,7 @@ _realname=hub pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.14.2 -pkgrel=0 +pkgrel=1 pkgdesc="hub introduces git to GitHub (mingw-w64)" arch=('any') url="https://hub.github.com" From ba17b33e13fe5fe96036f2bc252902eb69cb031e Mon Sep 17 00:00:00 2001 From: ofry Date: Sat, 15 Aug 2020 21:22:20 +0300 Subject: [PATCH 091/120] rel=5. Fix DLL linking with another DLL on Windows. Signed-off-by: ofry --- .../0004-add-windows-draft-configs.patch | 21 +++++++++++-------- mingw-w64-bmake/PKGBUILD | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mingw-w64-bmake/0004-add-windows-draft-configs.patch b/mingw-w64-bmake/0004-add-windows-draft-configs.patch index e8ad984228..0fee169fd0 100644 --- a/mingw-w64-bmake/0004-add-windows-draft-configs.patch +++ b/mingw-w64-bmake/0004-add-windows-draft-configs.patch @@ -9,18 +9,19 @@ index a6bf9a2..fa50e79 100644 +sys/MSYS.mk sys/NetBSD.mk diff --git a/mk/sys/MINGW32.mk b/mk/sys/MINGW32.mk -index 10da919..470b3b0 100644 +index 10da919..9d04333 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 $ -@@ -14,5 +14,13 @@ NEED_SOLINKS=yes +@@ -14,5 +14,14 @@ NEED_SOLINKS=yes +LD_X= +LD_x= +SHLIB_LD = ${CC} ++SHLIB_LDADD?= ${LDADD} + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 @@ -31,25 +32,26 @@ index 10da919..470b3b0 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +29,5 @@ ARFLAGS= rl +@@ -21,2 +30,5 @@ ARFLAGS= rl RANLIB= ranlib +LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} +LD_solink= dll diff --git a/mk/sys/MINGW64.mk b/mk/sys/MINGW64.mk -index 10da919..3caac1c 100644 +index 10da919..793b169 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 $ -@@ -14,5 +14,13 @@ NEED_SOLINKS=yes +@@ -14,5 +14,14 @@ NEED_SOLINKS=yes +LD_X= +LD_x= +SHLIB_LD = ${CC} ++SHLIB_LDADD?= ${LDADD} + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 @@ -60,25 +62,26 @@ index 10da919..3caac1c 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +29,5 @@ ARFLAGS= rl +@@ -21,2 +30,5 @@ ARFLAGS= rl RANLIB= ranlib +LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} +LD_solink= dll diff --git a/mk/sys/MSYS.mk b/mk/sys/MSYS.mk -index 10da919..510002f 100644 +index 10da919..16b3b53 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 $ -@@ -14,5 +14,13 @@ NEED_SOLINKS=yes +@@ -14,5 +14,14 @@ NEED_SOLINKS=yes +LD_X= +LD_x= +SHLIB_LD = ${CC} ++SHLIB_LDADD?= ${LDADD} + .SUFFIXES: .out .a .ln .o .c ${CXX_SUFFIXES} .F .f .r .y .l .s .S .cl .p .h .sh .m4 @@ -89,7 +92,7 @@ index 10da919..510002f 100644 +HOST_LIBEXT = .dll +DSHLIBEXT = .dll -@@ -21,2 +29,5 @@ ARFLAGS= rl +@@ -21,2 +30,5 @@ ARFLAGS= rl RANLIB= ranlib +LD_shared= -Bshareable -shared +LD_so= dll.${SHLIB_FULLVERSION} diff --git a/mingw-w64-bmake/PKGBUILD b/mingw-w64-bmake/PKGBUILD index 8f9d8b2342..6d5c325782 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=4 +pkgrel=5 pkgdesc='Portable version of the NetBSD make build tool' arch=('any') url='http://www.crufty.net/help/sjg/bmake.html' From 9a5b32cc7967321f3dee14b466b2edd8bb8ab4cc Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 15 Aug 2020 22:10:02 +0200 Subject: [PATCH 092/120] meson: Update to 0.55.1 --- mingw-w64-meson/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-meson/PKGBUILD b/mingw-w64-meson/PKGBUILD index bd8bc2a50d..4a87fa5f8d 100644 --- a/mingw-w64-meson/PKGBUILD +++ b/mingw-w64-meson/PKGBUILD @@ -3,7 +3,7 @@ _realname=meson pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.54.3 +pkgver=0.55.1 pkgrel=1 pkgdesc="High-productivity build system (mingw-w64)" arch=('any') @@ -18,7 +18,7 @@ source=("https://github.com/mesonbuild/${_realname}/releases/download/${pkgver}/ '0002-Default-to-sys.prefix-as-the-default-prefix.patch' '0003-Strip-the-prefix-from-all-paths-when-installing-with.patch' 'install-man.patch') -sha256sums=('f2bdf4cf0694e696b48261cdd14380fb1d0fe33d24744d8b2df0c12f33ebb662' +sha256sums=('3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080' '5805aed0a117536eb16dd8eef978c6be57c2471b655ede63e25517c28b4f4cf0' '363182db7e7059526353278966aa4704e8a26cbaf7c3b7dc5d6e4f01692a40e6' '2093c617cf3146a4cea601e7c73400d8ec5fd52ac5cf642c4f5af2d6493b1cb1' From 851825b23ee7f2243b877527b002978594d4f22b Mon Sep 17 00:00:00 2001 From: ofry Date: Sun, 16 Aug 2020 01:48:14 +0300 Subject: [PATCH 093/120] Update innoextract to 1.9. Get rid of patch. Signed-off-by: ofry --- .../0001-fix-segfault-windows.patch | 9 --------- mingw-w64-innoextract/PKGBUILD | 14 ++++---------- 2 files changed, 4 insertions(+), 19 deletions(-) delete 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 deleted file mode 100644 index 0130c0aedf..0000000000 --- a/mingw-w64-innoextract/0001-fix-segfault-windows.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 c513a7f337..169a7bd2c8 100644 --- a/mingw-w64-innoextract/PKGBUILD +++ b/mingw-w64-innoextract/PKGBUILD @@ -3,8 +3,8 @@ _realname=innoextract pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A tool to extract installers created by Inno Setup (mingw-w64)" arch=('any') url="https://constexpr.org/innoextract/" @@ -19,16 +19,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' '!strip') source=("https://constexpr.org/innoextract/files/${_realname}-${pkgver}.tar.gz" - 0001-fix-segfault-windows.patch -) -sha256sums=('5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269' - 'BFBDF47059B1EFDD74F7847679B0ED9B61E00E8A6236BA518C050B43C4D09D2A' ) -prepare() { - cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -l -i "${srcdir}"/0001-fix-segfault-windows.patch # see https://github.com/dscharrer/innoextract/pull/114 for details -} +sha256sums=('6344A69FC1ED847D4ED3E272E0DA5998948C6B828CB7AF39C6321ABA6CF88126' +) build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} From 8bb364f046ef54148afcee67c1d9746125c90c72 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 16 Aug 2020 21:53:33 +0200 Subject: [PATCH 094/120] fontconfig: backport upstream patch See #6661 --- .../0008-fix-font-search.patch | 122 ++++++++++++++++++ mingw-w64-fontconfig/PKGBUILD | 10 +- 2 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-fontconfig/0008-fix-font-search.patch diff --git a/mingw-w64-fontconfig/0008-fix-font-search.patch b/mingw-w64-fontconfig/0008-fix-font-search.patch new file mode 100644 index 0000000000..893a38c611 --- /dev/null +++ b/mingw-w64-fontconfig/0008-fix-font-search.patch @@ -0,0 +1,122 @@ +From fcada522913e5e07efa6367eff87ace9f06d24c8 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 28 Aug 2019 17:46:03 +0900 +Subject: [PATCH] Do not return FcFalse from FcConfigParseAndLoad*() if + complain is set to false + +https://bugzilla.redhat.com/show_bug.cgi?id=1744377 +--- + src/fcxml.c | 8 ++++--- + test/Makefile.am | 4 ++++ + test/test-bz1744377.c | 51 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 3 deletions(-) + create mode 100644 test/test-bz1744377.c + +diff --git a/src/fcxml.c b/src/fcxml.c +index 2e26e77a..076fa301 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -3526,7 +3526,7 @@ _FcConfigParse (FcConfig *config, + int len; + FcStrBuf sbuf; + char buf[BUFSIZ]; +- FcBool ret = FcFalse; ++ FcBool ret = FcFalse, complain_again = complain; + + #ifdef _WIN32 + if (!pGetSystemWindowsDirectory) +@@ -3605,7 +3605,7 @@ _FcConfigParse (FcConfig *config, + close (fd); + + ret = FcConfigParseAndLoadFromMemoryInternal (config, filename, FcStrBufDoneStatic (&sbuf), complain, load); +- complain = FcFalse; /* no need to reclaim here */ ++ complain_again = FcFalse; /* no need to reclaim here */ + bail1: + FcStrBufDestroy (&sbuf); + bail0: +@@ -3613,7 +3613,9 @@ bail0: + FcStrFree (filename); + if (realfilename) + FcStrFree (realfilename); +- if (!ret && complain) ++ if (!complain) ++ return FcTrue; ++ if (!ret && complain_again) + { + if (name) + FcConfigMessage (0, FcSevereError, "Cannot %s config file \"%s\"", load ? "load" : "scan", name); +diff --git a/test/Makefile.am b/test/Makefile.am +index f9c21581..a9fa089a 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -131,6 +131,10 @@ TESTS += test-d1f48f11 + endif + endif + ++check_PROGRAMS += test-bz1744377 ++test_bz1744377_LDADD = $(top_builddir)/src/libfontconfig.la ++TESTS += test-bz1744377 ++ + EXTRA_DIST=run-test.sh run-test-conf.sh $(LOG_COMPILER) $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names + + CLEANFILES=out out1 out2 fonts.conf out.expected +diff --git a/test/test-bz1744377.c b/test/test-bz1744377.c +new file mode 100644 +index 00000000..d7f10535 +--- /dev/null ++++ b/test/test-bz1744377.c +@@ -0,0 +1,51 @@ ++/* ++ * fontconfig/test/test-bz1744377.c ++ * ++ * Copyright © 2000 Keith Packard ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of the author(s) not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. The authors make no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++#include ++ ++int ++main (void) ++{ ++ const FcChar8 *doc = "" ++ "\n" ++ " blahblahblah\n" ++ "\n" ++ ""; ++ const FcChar8 *doc2 = "" ++ "\n" ++ " blahblahblah\n" ++ "\n" ++ ""; ++ FcConfig *cfg = FcConfigCreate (); ++ ++ if (!FcConfigParseAndLoadFromMemory (cfg, doc, FcTrue)) ++ return 1; ++ if (FcConfigParseAndLoadFromMemory (cfg, doc2, FcTrue)) ++ return 1; ++ if (!FcConfigParseAndLoadFromMemory (cfg, doc2, FcFalse)) ++ return 1; ++ ++ FcConfigDestroy (cfg); ++ ++ return 0; ++} +-- +GitLab + diff --git a/mingw-w64-fontconfig/PKGBUILD b/mingw-w64-fontconfig/PKGBUILD index f818f789c1..e905fa164f 100644 --- a/mingw-w64-fontconfig/PKGBUILD +++ b/mingw-w64-fontconfig/PKGBUILD @@ -5,7 +5,7 @@ _realname=fontconfig pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.13.92 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access (mingw-w64)" arch=('any') url="https://wiki.freedesktop.org/www/Software/fontconfig/" @@ -26,13 +26,15 @@ source=("https://www.freedesktop.org/software/fontconfig/release/fontconfig-${pk 0002-fix-mkdir.mingw.patch 0004-fix-mkdtemp.mingw.patch 0005-fix-setenv.mingw.patch - 0007-pkgconfig.mingw.patch) + 0007-pkgconfig.mingw.patch + 0008-fix-font-search.patch) sha256sums=('506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e' '1266d4bbd8270f013fee2401c890f0251babf50a175a69d681d3a6af5003c899' '0d950eb8a19858bff1f0b26e4a560f589e79e7eb7f22f723267748dfe55e0b63' '57ff8420dbf62873b6fcb38b52fb7b37e0e278425a9125e15dccba54668c8ab9' '552b54010f9fe4097f332cf2397bbd3e78489542d3bbf07792ed1cfe9381796e' - 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b') + 'af373531873da46d0356305da5444c1ec74f443cd2635ea2db6b7dadd1561f5b' + '557bfa2c83746da9d3d2be956c3c6906e80625c324d64eb7504d8c5164c2eca3') prepare() { cd "${srcdir}"/${_realname}-${pkgver} @@ -42,6 +44,8 @@ prepare() { patch -p1 -i ${srcdir}/0004-fix-mkdtemp.mingw.patch patch -p1 -i ${srcdir}/0005-fix-setenv.mingw.patch patch -p1 -i ${srcdir}/0007-pkgconfig.mingw.patch + # https://github.com/msys2/MINGW-packages/issues/6661#issuecomment-674536893 + patch -p1 -i ${srcdir}/0008-fix-font-search.patch autoreconf -fiv } From 820dcca0c79986887b31a769327203267fa957f9 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 17 Aug 2020 07:23:40 +1000 Subject: [PATCH 095/120] New package: avr-libc 2.0.0 --- mingw-w64-avr-libc/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 mingw-w64-avr-libc/PKGBUILD diff --git a/mingw-w64-avr-libc/PKGBUILD b/mingw-w64-avr-libc/PKGBUILD new file mode 100644 index 0000000000..6d9ee9d730 --- /dev/null +++ b/mingw-w64-avr-libc/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: fauxpark + +_realname=avr-libc +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=2.0.0 +pkgrel=1 +pkgdesc='The C runtime library for the AVR family of microcontrollers (mingw-w64)' +arch=('any') +license=('BSD') +url='https://savannah.nongnu.org/projects/avr-libc/' +options=(!strip) +depends=("${MINGW_PACKAGE_PREFIX}-avr-gcc") +source=("https://download.savannah.gnu.org/releases/avr-libc/avr-libc-${pkgver}.tar.bz2") +sha256sums=('b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97') + +prepare() { + cd ${srcdir}/avr-libc-${pkgver} + + mkdir avr-libc-build +} + +build() { + cd ${srcdir}/avr-libc-${pkgver}/avr-libc-build + + ../configure \ + --build=${MINGW_CHOST} \ + --host=avr \ + --prefix=${MINGW_PREFIX} + make +} + +package() { + cd ${srcdir}/${_realname}-${pkgver}/avr-libc-build + + make DESTDIR="$pkgdir" install +} From 1f7f8c900bdc90cb209678313ba1db4fc96dfeae Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 17 Aug 2020 07:24:57 +1000 Subject: [PATCH 096/120] New package: avr-gdb 9.2 --- mingw-w64-avr-gdb/PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 mingw-w64-avr-gdb/PKGBUILD diff --git a/mingw-w64-avr-gdb/PKGBUILD b/mingw-w64-avr-gdb/PKGBUILD new file mode 100644 index 0000000000..bce4f69888 --- /dev/null +++ b/mingw-w64-avr-gdb/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: fauxpark + +_realname=avr-gdb +pkgbase=mingw-w64-${_realname} +pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} +pkgver=9.2 +pkgrel=1 +pkgdesc='The GNU Debugger for AVR (mingw-w64)' +arch=('any') +license=('GPL') +url='https://www.gnu.org/software/gdb/' +source=("https://ftp.gnu.org/gnu/gdb/gdb-${pkgver}.tar.xz") +sha256sums=('360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555') + +prepare() { + cd ${srcdir}/gdb-${pkgver} + + mkdir gdb-build +} + +build() { + cd ${srcdir}/gdb-${pkgver}/gdb-build + + ../configure \ + --build=${MINGW_CHOST} \ + --prefix=${MINGW_PREFIX} \ + --target=avr \ + --disable-nls \ + --disable-debug \ + --disable-dependency-tracking \ + --disable-binutils \ + --disable-libssp \ + --disable-install-libbfd \ + --disable-install-libiberty \ + --with-system-readline + make +} + +package() { + cd ${srcdir}/gdb-${pkgver}/gdb-build + + make DESTDIR="$pkgdir" install-gdb + + cd ${pkgdir}${MINGW_PREFIX} + + # Remove files that conflict with native gdb + rm -rf include share/gdb share/info +} From c5bcf2120651c3f768ea4300a2390a687352ec4e Mon Sep 17 00:00:00 2001 From: lillolollo <730814+lillolollo@users.noreply.github.com> Date: Mon, 17 Aug 2020 05:41:44 +0200 Subject: [PATCH 097/120] update harfbuzz to 2.7.1 --- mingw-w64-harfbuzz/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-harfbuzz/PKGBUILD b/mingw-w64-harfbuzz/PKGBUILD index 74a60e6b69..b2414621dd 100644 --- a/mingw-w64-harfbuzz/PKGBUILD +++ b/mingw-w64-harfbuzz/PKGBUILD @@ -4,7 +4,7 @@ _realname=harfbuzz pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.7.0 +pkgver=2.7.1 pkgrel=1 pkgdesc="OpenType text shaping engine (mingw-w64)" arch=('any') @@ -29,7 +29,7 @@ options=('strip' 'staticlibs') optdepends=("${MINGW_PACKAGE_PREFIX}-icu: harfbuzz-icu support" "${MINGW_PACKAGE_PREFIX}-cairo: hb-view program") source=("https://github.com/harfbuzz/harfbuzz/archive/${pkgver}.tar.gz") -sha256sums=('4dba05de1fd44705f54c40d801e0e3d4833555d004cb611cc18675173feae75b') +sha256sums=('431c856ff18eeca89b2a36b58f2c2d56273cd522c34c0ffbc9dd6f7da4b9bd08') noextract=("${pkgver}.tar.gz") prepare() { From 6899c46e559104fc06402c61a7ac7c5fdbfcedba Mon Sep 17 00:00:00 2001 From: lillolollo <730814+lillolollo@users.noreply.github.com> Date: Mon, 17 Aug 2020 06:20:27 +0200 Subject: [PATCH 098/120] update vala to 0.48.9 --- mingw-w64-vala/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-vala/PKGBUILD b/mingw-w64-vala/PKGBUILD index dc922188bb..7be880a825 100644 --- a/mingw-w64-vala/PKGBUILD +++ b/mingw-w64-vala/PKGBUILD @@ -3,7 +3,7 @@ _realname=vala pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.48.8 +pkgver=0.48.9 pkgrel=1 pkgdesc="Compiler for the GObject type system (mingw-w64)" arch=('any') @@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-glib2" source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz 001-change-pkg-config-invocations.mingw.patch 002-use_time_s_functions_on_windows.mingw.patch) -sha256sums=('c83a9b7292627bc259dae7cd414c813a48f285b4b2f4b574fa28e6af9a582ab4' +sha256sums=('9cea16d3bb3daddbfe0556b99fbfa08146230db7651e1e674cd08b4df5cefea9' 'c588a3a69097aae30ada1d543001d5029865b1dd1f46132d9e60d12e1833b325' '1309ae50867b81ea5d170487b36443a41c8dfee202213198c980a133300d6f9a') From 04c622c5b1f03acee290e417f930468fc9dad947 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 17 Aug 2020 23:07:37 +0530 Subject: [PATCH 099/120] python-coverage: update to 5.2.1 --- mingw-w64-python-coverage/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mingw-w64-python-coverage/PKGBUILD b/mingw-w64-python-coverage/PKGBUILD index d45b7127bc..af5ce59aa4 100644 --- a/mingw-w64-python-coverage/PKGBUILD +++ b/mingw-w64-python-coverage/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=5.0.1 +pkgver=5.2.1 pkgrel=1 pkgdesc="Code coverage measurement for Python (mingw-w64)" arch=('any') @@ -16,16 +16,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") install=${_realname}3-${CARCH}.install source=("${_realname}-${pkgver}.tar.gz::https://github.com/nedbat/coveragepy/archive/coverage-${pkgver}.tar.gz") -sha256sums=('ea6d1b82bc758ca33483685c821ea8a75a0da63060d3a11ad12755f1965cf2dd') +sha256sums=('d4b1405f26b70021b28c50823e9345f203280ab104e65c01b52fe57b2dd96455') -prepare() { +prepare() { cd "${srcdir}" rm -rf python-build-${CARCH} | true cp -r "coveragepy-${_realname}-${pkgver}" "python-build-${CARCH}" } - + build() { - msg "Python build for ${CARCH}" + msg "Python build for ${CARCH}" cd "${srcdir}/python-build-${CARCH}" ${MINGW_PREFIX}/bin/python setup.py build } From b115fa30297791347cbb341cb92c486f0761bb00 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 17 Aug 2020 23:14:55 +0530 Subject: [PATCH 100/120] python-six: update to 1.15.0 --- mingw-w64-python-six/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-python-six/PKGBUILD b/mingw-w64-python-six/PKGBUILD index 8336d7dc35..e8a46cd95f 100644 --- a/mingw-w64-python-six/PKGBUILD +++ b/mingw-w64-python-six/PKGBUILD @@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=1.14.0 +pkgver=1.15.0 pkgrel=1 pkgdesc="Python 2 and 3 compatibility utilities (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ url="https://pypi.python.org/pypi/six/" license=('MIT') depends=("${MINGW_PACKAGE_PREFIX}-python") source=(https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz) -sha256sums=('236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a') +sha256sums=('30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259') prepare() { cd "${srcdir}" @@ -39,4 +39,4 @@ package() { --root "${pkgdir}" --optimize=1 --skip-build install -Dm644 "${srcdir}/six-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" -} \ No newline at end of file +} From 73864ae0fddc19fbfc213dc360cdf24f2ac08ab6 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 17 Aug 2020 23:34:32 +0530 Subject: [PATCH 101/120] scour: add package --- mingw-w64-scour/PKGBUILD | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 mingw-w64-scour/PKGBUILD diff --git a/mingw-w64-scour/PKGBUILD b/mingw-w64-scour/PKGBUILD new file mode 100644 index 0000000000..2e27448bc7 --- /dev/null +++ b/mingw-w64-scour/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Biswapriyo Nath + +_realname=scour +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=0.37 +pkgrel=1 +pkgdesc="An SVG scrubber (mingw-w64)" +arch=('any') +url='https://github.com/codedread/scour' +license=('Apache') +depends=("${MINGW_PACKAGE_PREFIX}-python" + "${MINGW_PACKAGE_PREFIX}-python-setuptools" + "${MINGW_PACKAGE_PREFIX}-python-six") +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/scour-project/scour/archive/v${pkgver}.tar.gz") +sha256sums=('4fcb961586d8a6d98ac9343ca5647421b98fdc79b51d81a1d3d18576b7908823') + +prepare() { + cd "${srcdir}" + cp -r ${_realname}-${pkgver} python-build-${CARCH} +} + +build() { + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build +} + +check() { + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py check +} + +package() { + cd "${srcdir}/python-build-${CARCH}" + MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ + --root "${pkgdir}" --optimize=1 --skip-build + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" + + local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) + # fix python command in files + for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do + sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \ + -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f} + done +} From a88b3da50f5c69b4e62db0753dd913588eead157 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Tue, 18 Aug 2020 01:46:17 +0530 Subject: [PATCH 102/120] scour: update to 0.38 --- mingw-w64-scour/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-scour/PKGBUILD b/mingw-w64-scour/PKGBUILD index 2e27448bc7..ca580f0b7c 100644 --- a/mingw-w64-scour/PKGBUILD +++ b/mingw-w64-scour/PKGBUILD @@ -3,17 +3,17 @@ _realname=scour pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.37 +pkgver=0.38 pkgrel=1 pkgdesc="An SVG scrubber (mingw-w64)" arch=('any') -url='https://github.com/codedread/scour' +url="https://github.com/scour-project/scour" license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-python-setuptools" "${MINGW_PACKAGE_PREFIX}-python-six") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/scour-project/scour/archive/v${pkgver}.tar.gz") -sha256sums=('4fcb961586d8a6d98ac9343ca5647421b98fdc79b51d81a1d3d18576b7908823') +sha256sums=('565d52331b40793f038a2725fcc3ee53539d9ef287d582b7c305789cb1d503eb') prepare() { cd "${srcdir}" From e7b7bc03e12468a48efc920db937aca6ed1fc446 Mon Sep 17 00:00:00 2001 From: lillolollo <730814+lillolollo@users.noreply.github.com> Date: Tue, 18 Aug 2020 01:46:41 +0200 Subject: [PATCH 103/120] librsvg: Update to 2.48.8 --- mingw-w64-librsvg/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-librsvg/PKGBUILD b/mingw-w64-librsvg/PKGBUILD index 82eacf1391..0d75e04226 100644 --- a/mingw-w64-librsvg/PKGBUILD +++ b/mingw-w64-librsvg/PKGBUILD @@ -3,7 +3,7 @@ _realname=librsvg pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.48.7 +pkgver=2.48.8 pkgrel=1 pkgdesc="SVG rendering library (mingw-w64)" arch=('any') @@ -23,7 +23,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3: for rsvg-view-3") options=('staticlibs' 'strip') source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" "0005-hack-unixy-paths.patch") -sha256sums=('35de5d93e262fcd85fa4529cee147687d21c6e092f223c293921eaaf57e2fec0' +sha256sums=('f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692' 'b23b094c0cb65fcbbbb952350448de6f3430b30f273e05acdbf7a56d634212dc') prepare() { From ea653c057c764dc8cec7cbf2c986562e5448a799 Mon Sep 17 00:00:00 2001 From: lillolollo <730814+lillolollo@users.noreply.github.com> Date: Tue, 18 Aug 2020 02:17:33 +0200 Subject: [PATCH 104/120] Update glib2 to 2.64.4 --- mingw-w64-glib2/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mingw-w64-glib2/PKGBUILD b/mingw-w64-glib2/PKGBUILD index f1eabe2e51..2033568688 100644 --- a/mingw-w64-glib2/PKGBUILD +++ b/mingw-w64-glib2/PKGBUILD @@ -6,11 +6,11 @@ _realname=glib2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.64.3 +pkgver=2.64.4 pkgrel=1 url="https://www.gtk.org/" arch=('any') -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (mingw-w64)" +pkgdesc="Common C routines used by GTK+ 3 and other libs (mingw-w64)" license=(LGPL2) install=glib2-${CARCH}.install depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" @@ -31,7 +31,7 @@ source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-${pkgver}.tar gio-querymodules.hook.in 0002-disable_glib_compile_schemas_warning.patch pyscript2exe.py) -sha256sums=('fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22' +sha256sums=('f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50' '51d02360a1ee978fd45e77b84bca9cfbcf080d91986b5c0efe0732779c6a54ec' '1e3ac7cfd4644f3849704e54fcfbb12d15440a33cd5c2d014d4a479c6aaab185' '0f44135a139e3951c4b5fa7d4628d75226e0666d891faf524777e1d1ec3b440b' From 9ba9ccb0a0e29c70c5719f4f84da47124eb8ba57 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 12:50:29 +0900 Subject: [PATCH 105/120] Apply patch to fix the-silversearcher --- mingw-w64-ag/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mingw-w64-ag/PKGBUILD b/mingw-w64-ag/PKGBUILD index 23dbeece8b..02ae539452 100644 --- a/mingw-w64-ag/PKGBUILD +++ b/mingw-w64-ag/PKGBUILD @@ -24,7 +24,8 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ggreer/the_silver_s "0004-lang-Add-autotools-ac-am-in-m4-pc.patch" "0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch" "0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch" - "0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch") + "0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch" + "0008-Use-NUL-for-git-config.patch") sha256sums=('6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9' '9a3c1cc11547219f699e953e05c53b779f396b3d54d1410ae78a62f7550ca7c7' '45b75b164cb283c4324e27a46c744e0f2df86e4860506e9a4f2c1e98e848f51e' @@ -32,7 +33,8 @@ sha256sums=('6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9' '3a42e02928f7ae288de69f91c198c6111216f0af23d2de1bc65d8f5e5a28a401' 'fada103d58911e876af36e76675793764c4019e009351d615dede9c3ba7618d1' 'b80e3efd854425e0e5df29cdf585b5132b5ab19e93c06713a4f4f0653bed5f84' - '0659935f2f5e6c38260a603ef696de7e3e5d8dd7f62ec7711b58bd657ab5b511') + '0659935f2f5e6c38260a603ef696de7e3e5d8dd7f62ec7711b58bd657ab5b511' + '5d97da8a363346ac5e952e4ea00c0d70406392a4b6de1adeac029f7814cfac77') # Helper macros to help make tasks easier # apply_patch_with_msg() { From fa5456c4da12eef3430d62b6f1548a26d8d0c262 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 12:52:43 +0900 Subject: [PATCH 106/120] Add missing file --- .../0008-Use-NUL-for-git-config.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 mingw-w64-ag/0008-Use-NUL-for-git-config.patch diff --git a/mingw-w64-ag/0008-Use-NUL-for-git-config.patch b/mingw-w64-ag/0008-Use-NUL-for-git-config.patch new file mode 100644 index 0000000000..991eadd262 --- /dev/null +++ b/mingw-w64-ag/0008-Use-NUL-for-git-config.patch @@ -0,0 +1,26 @@ +From 9ded9f120b3961580ea7b08de54d6ee7dcd7b603 Mon Sep 17 00:00:00 2001 +From: Yasuhiro Matsumoto +Date: Tue, 18 Aug 2020 12:42:13 +0900 +Subject: [PATCH] Use "NUL", "r"); ++ gitconfig_file = popen("git config -z --path --get core.excludesfile 2>NUL /dev/null", "r"); + #endif +-- +2.27.0 + From c412e68b31d309f2c896a2e90ec37c36dd49b970 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 12:59:43 +0900 Subject: [PATCH 107/120] Fix patch filename --- .../0008-Use-NUL-for-git-config.patch | 26 ------------------- mingw-w64-ag/PKGBUILD | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 mingw-w64-ag/0008-Use-NUL-for-git-config.patch diff --git a/mingw-w64-ag/0008-Use-NUL-for-git-config.patch b/mingw-w64-ag/0008-Use-NUL-for-git-config.patch deleted file mode 100644 index 991eadd262..0000000000 --- a/mingw-w64-ag/0008-Use-NUL-for-git-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9ded9f120b3961580ea7b08de54d6ee7dcd7b603 Mon Sep 17 00:00:00 2001 -From: Yasuhiro Matsumoto -Date: Tue, 18 Aug 2020 12:42:13 +0900 -Subject: [PATCH] Use "NUL", "r"); -+ gitconfig_file = popen("git config -z --path --get core.excludesfile 2>NUL /dev/null", "r"); - #endif --- -2.27.0 - diff --git a/mingw-w64-ag/PKGBUILD b/mingw-w64-ag/PKGBUILD index 02ae539452..714b99a7d7 100644 --- a/mingw-w64-ag/PKGBUILD +++ b/mingw-w64-ag/PKGBUILD @@ -25,7 +25,7 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ggreer/the_silver_s "0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch" "0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch" "0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch" - "0008-Use-NUL-for-git-config.patch") + "0008-win32-Use-NUL-for-git-config.patch") sha256sums=('6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9' '9a3c1cc11547219f699e953e05c53b779f396b3d54d1410ae78a62f7550ca7c7' '45b75b164cb283c4324e27a46c744e0f2df86e4860506e9a4f2c1e98e848f51e' From 4505ab1d3089f3b26cedc1a514e691b0bb4b7cd5 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 13:06:10 +0900 Subject: [PATCH 108/120] Rename --- .../0008-win32-Use-NUL-for-git-config.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch diff --git a/mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch b/mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch new file mode 100644 index 0000000000..991eadd262 --- /dev/null +++ b/mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch @@ -0,0 +1,26 @@ +From 9ded9f120b3961580ea7b08de54d6ee7dcd7b603 Mon Sep 17 00:00:00 2001 +From: Yasuhiro Matsumoto +Date: Tue, 18 Aug 2020 12:42:13 +0900 +Subject: [PATCH] Use "NUL", "r"); ++ gitconfig_file = popen("git config -z --path --get core.excludesfile 2>NUL /dev/null", "r"); + #endif +-- +2.27.0 + From adfa8a5fa29c626beb4046621aa2b08c2cb01ae9 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 15:25:17 +0900 Subject: [PATCH 109/120] Fixes patches --- ...-multiple-global-symbols-definitions.patch | 211 ++++++++++++++++++ ...> 0009-win32-Use-NUL-for-git-config.patch} | 2 +- mingw-w64-ag/PKGBUILD | 12 +- 3 files changed, 220 insertions(+), 5 deletions(-) create mode 100644 mingw-w64-ag/0008-Fix-multiple-global-symbols-definitions.patch rename mingw-w64-ag/{0008-win32-Use-NUL-for-git-config.patch => 0009-win32-Use-NUL-for-git-config.patch} (93%) diff --git a/mingw-w64-ag/0008-Fix-multiple-global-symbols-definitions.patch b/mingw-w64-ag/0008-Fix-multiple-global-symbols-definitions.patch new file mode 100644 index 0000000000..8113420a7f --- /dev/null +++ b/mingw-w64-ag/0008-Fix-multiple-global-symbols-definitions.patch @@ -0,0 +1,211 @@ +From 127b82d81ff41cc4ab26695f6c42af2d7443909f Mon Sep 17 00:00:00 2001 +From: Shlomi Fish +Date: Wed, 15 Apr 2020 20:23:52 +0300 +Subject: [PATCH 8/9] Subject: [PATCH 8/9] Fix multiple global symbols + definitions. + +See the use of extern here: + +* https://www.geeksforgeeks.org/understanding-extern-keyword-in-c/ + +* https://en.wikipedia.org/wiki/External_variable + +* +https://stackoverflow.com/questions/496448/how-to-correctly-use-the-extern-keyword-in-c +--- + src/ignore.c | 2 ++ + src/ignore.h | 2 +- + src/log.c | 1 + + src/log.h | 2 +- + src/options.c | 2 ++ + src/options.h | 2 +- + src/search.c | 13 +++++++++++++ + src/search.h | 20 ++++++++++---------- + src/util.c | 2 ++ + src/util.h | 4 ++-- + 10 files changed, 35 insertions(+), 15 deletions(-) + +diff --git a/src/ignore.c b/src/ignore.c +index fa41889..32464d7 100644 +--- a/src/ignore.c ++++ b/src/ignore.c +@@ -20,6 +20,8 @@ + const int fnmatch_flags = FNM_PATHNAME; + #endif + ++ignores *root_ignores; ++ + /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */ + + const char *evil_hardcoded_ignore_files[] = { +diff --git a/src/ignore.h b/src/ignore.h +index 20d5a6a..8db0f37 100644 +--- a/src/ignore.h ++++ b/src/ignore.h +@@ -29,7 +29,7 @@ struct ignores { + }; + typedef struct ignores ignores; + +-ignores *root_ignores; ++extern ignores *root_ignores; + + extern const char *evil_hardcoded_ignore_files[]; + extern const char *ignore_pattern_files[]; +diff --git a/src/log.c b/src/log.c +index 1481b6d..f6f4e9a 100644 +--- a/src/log.c ++++ b/src/log.c +@@ -4,6 +4,7 @@ + #include "log.h" + #include "util.h" + ++pthread_mutex_t print_mtx = PTHREAD_MUTEX_INITIALIZER; + static enum log_level log_threshold = LOG_LEVEL_ERR; + + void set_log_level(enum log_level threshold) { +diff --git a/src/log.h b/src/log.h +index 85847ee..318622c 100644 +--- a/src/log.h ++++ b/src/log.h +@@ -9,7 +9,7 @@ + #include + #endif + +-pthread_mutex_t print_mtx; ++extern pthread_mutex_t print_mtx; + + enum log_level { + LOG_LEVEL_DEBUG = 10, +diff --git a/src/options.c b/src/options.c +index a469845..0ff5526 100644 +--- a/src/options.c ++++ b/src/options.c +@@ -21,6 +21,8 @@ const char *color_line_number = "\033[1;33m"; /* bold yellow */ + const char *color_match = "\033[30;43m"; /* black with yellow background */ + const char *color_path = "\033[1;32m"; /* bold green */ + ++cli_options opts; ++ + /* TODO: try to obey out_fd? */ + void usage(void) { + printf("\n"); +diff --git a/src/options.h b/src/options.h +index 990ce6a..09cd058 100644 +--- a/src/options.h ++++ b/src/options.h +@@ -101,7 +101,7 @@ typedef struct { + } cli_options; + + /* global options. parse_options gives it sane values, everything else reads from it */ +-cli_options opts; ++extern cli_options opts; + + typedef struct option option_t; + +diff --git a/src/search.c b/src/search.c +index ff5e386..8539bac 100644 +--- a/src/search.c ++++ b/src/search.c +@@ -2,6 +2,19 @@ + #include "print.h" + #include "scandir.h" + ++size_t alpha_skip_lookup[256]; ++size_t *find_skip_lookup; ++uint8_t h_table[H_SIZE] __attribute__((aligned(64))); ++ ++work_queue_t *work_queue = NULL; ++work_queue_t *work_queue_tail = NULL; ++int done_adding_files = 0; ++pthread_cond_t files_ready = PTHREAD_COND_INITIALIZER; ++pthread_mutex_t stats_mtx = PTHREAD_MUTEX_INITIALIZER; ++pthread_mutex_t work_queue_mtx = PTHREAD_MUTEX_INITIALIZER; ++ ++symdir_t *symhash = NULL; ++ + void search_buf(const char *buf, const size_t buf_len, + const char *dir_full_path) { + int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */ +diff --git a/src/search.h b/src/search.h +index 1071114..a1bc5d7 100644 +--- a/src/search.h ++++ b/src/search.h +@@ -31,9 +31,9 @@ + #include "uthash.h" + #include "util.h" + +-size_t alpha_skip_lookup[256]; +-size_t *find_skip_lookup; +-uint8_t h_table[H_SIZE] __attribute__((aligned(64))); ++extern size_t alpha_skip_lookup[256]; ++extern size_t *find_skip_lookup; ++extern uint8_t h_table[H_SIZE] __attribute__((aligned(64))); + + struct work_queue_t { + char *path; +@@ -41,12 +41,12 @@ struct work_queue_t { + }; + typedef struct work_queue_t work_queue_t; + +-work_queue_t *work_queue; +-work_queue_t *work_queue_tail; +-int done_adding_files; +-pthread_cond_t files_ready; +-pthread_mutex_t stats_mtx; +-pthread_mutex_t work_queue_mtx; ++extern work_queue_t *work_queue; ++extern work_queue_t *work_queue_tail; ++extern int done_adding_files; ++extern pthread_cond_t files_ready; ++extern pthread_mutex_t stats_mtx; ++extern pthread_mutex_t work_queue_mtx; + + + /* For symlink loop detection */ +@@ -64,7 +64,7 @@ typedef struct { + UT_hash_handle hh; + } symdir_t; + +-symdir_t *symhash; ++extern symdir_t *symhash; + + void search_buf(const char *buf, const size_t buf_len, + const char *dir_full_path); +diff --git a/src/util.c b/src/util.c +index cb23914..0431148 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -21,6 +21,8 @@ + } \ + return ptr; + ++FILE *out_fd = NULL; ++ag_stats stats; + void *ag_malloc(size_t size) { + void *ptr = malloc(size); + CHECK_AND_RETURN(ptr) +diff --git a/src/util.h b/src/util.h +index 0c9b9b1..338b05f 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -12,7 +12,7 @@ + #include "log.h" + #include "options.h" + +-FILE *out_fd; ++extern FILE *out_fd; + + #ifndef TRUE + #define TRUE 1 +@@ -51,7 +51,7 @@ typedef struct { + } ag_stats; + + +-ag_stats stats; ++extern ag_stats stats; + + /* Union to translate between chars and words without violating strict aliasing */ + typedef union { +-- +2.27.0 + diff --git a/mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch b/mingw-w64-ag/0009-win32-Use-NUL-for-git-config.patch similarity index 93% rename from mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch rename to mingw-w64-ag/0009-win32-Use-NUL-for-git-config.patch index 991eadd262..3cf281b362 100644 --- a/mingw-w64-ag/0008-win32-Use-NUL-for-git-config.patch +++ b/mingw-w64-ag/0009-win32-Use-NUL-for-git-config.patch @@ -1,7 +1,7 @@ From 9ded9f120b3961580ea7b08de54d6ee7dcd7b603 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Tue, 18 Aug 2020 12:42:13 +0900 -Subject: [PATCH] Use " Date: Tue, 18 Aug 2020 15:28:07 +0900 Subject: [PATCH 110/120] Update patch-indexes --- ...-Allow-both-extensions-and-full-filenames.patch | 2 +- .../0002-win32-Detect-Cygwin-MSYS-PTY.patch | 2 +- ...-options-Fix-ordering-problems-with-color.patch | 2 +- .../0004-lang-Add-autotools-ac-am-in-m4-pc.patch | 2 +- ...-make-Makefile-Makefile.Debug-Makefile.Re.patch | 2 +- ...dd-makepkg-PKGBUILD-diff-patch-in-install.patch | 2 +- ...g-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch | 2 +- mingw-w64-ag/PKGBUILD | 14 +++++++------- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mingw-w64-ag/0001-lang-Allow-both-extensions-and-full-filenames.patch b/mingw-w64-ag/0001-lang-Allow-both-extensions-and-full-filenames.patch index d7ceceab4c..6c7f51be11 100644 --- a/mingw-w64-ag/0001-lang-Allow-both-extensions-and-full-filenames.patch +++ b/mingw-w64-ag/0001-lang-Allow-both-extensions-and-full-filenames.patch @@ -1,7 +1,7 @@ From bacedeb21cd30101b787838d003d686ae3036838 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 23 Feb 2015 21:46:45 +0000 -Subject: [PATCH 1/7] lang: Allow both extensions and full filenames +Subject: [PATCH 1/9] lang: Allow both extensions and full filenames Because many filetypes (e.g. make) are not indicated by the file extension but instead by the full filename (Makefile). diff --git a/mingw-w64-ag/0002-win32-Detect-Cygwin-MSYS-PTY.patch b/mingw-w64-ag/0002-win32-Detect-Cygwin-MSYS-PTY.patch index f3c82ab5a8..57ce11cc6d 100644 --- a/mingw-w64-ag/0002-win32-Detect-Cygwin-MSYS-PTY.patch +++ b/mingw-w64-ag/0002-win32-Detect-Cygwin-MSYS-PTY.patch @@ -1,7 +1,7 @@ From d7dfee733c29dae96984be373db934298d4ac53f Mon Sep 17 00:00:00 2001 From: "K.Takata" Date: Thu, 1 Jun 2017 22:19:25 +0900 -Subject: [PATCH 2/7] win32: Detect Cygwin/MSYS PTY +Subject: [PATCH 2/9] win32: Detect Cygwin/MSYS PTY When running Win32 version of Ag on mintty or other Cygwin/MSYS terminal emulators, Ag cannot detect Cygwin/MSYS pty and it causes some problems. diff --git a/mingw-w64-ag/0003-options-Fix-ordering-problems-with-color.patch b/mingw-w64-ag/0003-options-Fix-ordering-problems-with-color.patch index 13d6f69037..a309df452b 100644 --- a/mingw-w64-ag/0003-options-Fix-ordering-problems-with-color.patch +++ b/mingw-w64-ag/0003-options-Fix-ordering-problems-with-color.patch @@ -1,7 +1,7 @@ From ff4e9c3db5b42541494764ad921c80250733e84a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 23 Feb 2015 22:12:15 +0000 -Subject: [PATCH 3/7] options: Fix ordering problems with --color +Subject: [PATCH 3/9] options: Fix ordering problems with --color Moved around the logic of setting opts.color so that: diff --git a/mingw-w64-ag/0004-lang-Add-autotools-ac-am-in-m4-pc.patch b/mingw-w64-ag/0004-lang-Add-autotools-ac-am-in-m4-pc.patch index cabe69fa3e..7fc7e5ec13 100644 --- a/mingw-w64-ag/0004-lang-Add-autotools-ac-am-in-m4-pc.patch +++ b/mingw-w64-ag/0004-lang-Add-autotools-ac-am-in-m4-pc.patch @@ -1,7 +1,7 @@ From b266b48b70a736927a8ee585fc888f270005973b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 23 Feb 2015 22:16:54 +0000 -Subject: [PATCH 4/7] lang: Add autotools (ac, am, in, m4, pc) +Subject: [PATCH 4/9] lang: Add autotools (ac, am, in, m4, pc) --- src/lang.c | 1 + diff --git a/mingw-w64-ag/0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch b/mingw-w64-ag/0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch index c5080440f3..41c55c1ffa 100644 --- a/mingw-w64-ag/0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch +++ b/mingw-w64-ag/0005-lang-Add-to-make-Makefile-Makefile.Debug-Makefile.Re.patch @@ -1,7 +1,7 @@ From 1ce3c7f6347a86f210cfa2578444fcb09a5aaa6c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 23 Feb 2015 22:18:27 +0000 -Subject: [PATCH 5/7] lang: Add to make (^Makefile, ^Makefile.Debug, +Subject: [PATCH 5/9] lang: Add to make (^Makefile, ^Makefile.Debug, ^Makefile.Release, *.make) All but one addition are full filename patterns. The diff --git a/mingw-w64-ag/0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch b/mingw-w64-ag/0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch index 49affd560a..d79be38cc3 100644 --- a/mingw-w64-ag/0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch +++ b/mingw-w64-ag/0006-lang-Add-makepkg-PKGBUILD-diff-patch-in-install.patch @@ -1,7 +1,7 @@ From add99f2fab7f6015e5a414c33248c3a8b3b20fe6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 23 Feb 2015 22:21:26 +0000 -Subject: [PATCH 6/7] lang: Add makepkg (^PKGBUILD, diff, patch, in, install) +Subject: [PATCH 6/9] lang: Add makepkg (^PKGBUILD, diff, patch, in, install) Used by the makepkg build system of ArchLinux and MSYS2 --- diff --git a/mingw-w64-ag/0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch b/mingw-w64-ag/0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch index 023a261d81..30c2d1ecb9 100644 --- a/mingw-w64-ag/0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch +++ b/mingw-w64-ag/0007-lang-Add-cmake-CMakeLists.txt-CMakeCache.txt.patch @@ -1,7 +1,7 @@ From e7ff323818bfd2bbf7d00a885e5a28da9b36f64b Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 12 Dec 2015 19:55:47 +0000 -Subject: [PATCH 7/7] lang: Add cmake (^CMakeLists.txt, ^CMakeCache.txt .. +Subject: [PATCH 7/9] lang: Add cmake (^CMakeLists.txt, ^CMakeCache.txt .. .. ^CMakeError.log, ^CMakeOutput.log, cmake) --- diff --git a/mingw-w64-ag/PKGBUILD b/mingw-w64-ag/PKGBUILD index a1311f9372..44f3d79259 100644 --- a/mingw-w64-ag/PKGBUILD +++ b/mingw-w64-ag/PKGBUILD @@ -28,13 +28,13 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ggreer/the_silver_s "0008-Fix-multiple-global-symbols-definitions.patch" "0009-win32-Use-NUL-for-git-config.patch") sha256sums=('6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9' - '9a3c1cc11547219f699e953e05c53b779f396b3d54d1410ae78a62f7550ca7c7' - '45b75b164cb283c4324e27a46c744e0f2df86e4860506e9a4f2c1e98e848f51e' - '63ded2c4bf859faa8dc33cbda89c4bbdb047b014d7b3b4d3f77f9dfb5d1a0ee4' - '3a42e02928f7ae288de69f91c198c6111216f0af23d2de1bc65d8f5e5a28a401' - 'fada103d58911e876af36e76675793764c4019e009351d615dede9c3ba7618d1' - 'b80e3efd854425e0e5df29cdf585b5132b5ab19e93c06713a4f4f0653bed5f84' - '0659935f2f5e6c38260a603ef696de7e3e5d8dd7f62ec7711b58bd657ab5b511' + 'dd33d804a654073acbb78cde1caf7b7c6feea13965f1cfa68588f84f4adcc8ef' + '247a0008a00cbd6c045c6872d61ded1fa455e31faff74ef6932fd4f921681f0d' + 'da69609723c4f019f822af81163914f924998575c009836cd2d4ea887acd4977' + '1972392e4762bff91d4e542d478c0a01ddd4dbd507543867aa3b2dd3f159084b' + 'a16340cc33cdf95300f353ae87d3af2a0c667987ea9ce9b8c77d3e5c9a8a1007' + 'f38d5807ba0486e5004ff86d76a222221a390ac58475c464bc446d4154da8d75' + '88fc3742a0bea4a1f1d533ad4f0b841423930e40639d4a9ea16312eadf21415a' 'ae8cc32f94432b6482a379b0fdfc4095c836f3a947363a101ca69362b5a7f0a1' '6d98aedccb3c380fe2069373e8b45ddcc8d6c4936cb37da7967a7d5d29557164') From daf1da0686b2923e4114a9211afd8a1683e80bbd Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sun, 16 Aug 2020 17:06:58 +0200 Subject: [PATCH 111/120] Add a CI job for creating SRCINFO for all packages in the repo It caches them on a github release and updates them as the repo changes. This will be used by packages.msys2.org to show the content of the repo. --- .github/workflows/generate-srcinfo.yml | 48 ++++++ ci-generate-srcinfo.py | 203 +++++++++++++++++++++++++ 2 files changed, 251 insertions(+) create mode 100644 .github/workflows/generate-srcinfo.yml create mode 100644 ci-generate-srcinfo.py diff --git a/.github/workflows/generate-srcinfo.yml b/.github/workflows/generate-srcinfo.yml new file mode 100644 index 0000000000..4a35accf66 --- /dev/null +++ b/.github/workflows/generate-srcinfo.yml @@ -0,0 +1,48 @@ +name: generate-srcinfo + +on: + push: + branches: + - master + workflow_dispatch: + +jobs: + update-srcinfo: + runs-on: windows-latest + defaults: + run: + shell: msys2 {0} + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - uses: msys2/setup-msys2@v2 + with: + msystem: MSYS + install: python git mingw-w64-x86_64-toolchain mingw-w64-i686-toolchain + update: true + + - run: | + curl -L --retry 5 -o srcinfo.json "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/srcinfo.json" + python ci-generate-srcinfo.py --time-limit 19800 mingw . srcinfo.json + + - uses: actions/upload-artifact@v2 + with: + name: result + path: srcinfo.json + + upload-srcinfo: + needs: update-srcinfo + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v2 + with: + name: result + + - uses: eine/tip@master + with: + token: ${{ secrets.GITHUB_TOKEN }} + tag: srcinfo-cache + rm: true + files: srcinfo.json \ No newline at end of file diff --git a/ci-generate-srcinfo.py b/ci-generate-srcinfo.py new file mode 100644 index 0000000000..6af822984d --- /dev/null +++ b/ci-generate-srcinfo.py @@ -0,0 +1,203 @@ +#!/usr/bin/env python3 +# Copyright 2017 Christoph Reiter +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE + +import sys +import argparse +import os +import json +import shutil +from collections import OrderedDict +import hashlib +import time +import subprocess +from concurrent.futures import ThreadPoolExecutor + +from typing import List, Iterator, Tuple, Dict, Optional, Union, Collection + + +CacheEntry = Dict[str, Union[str, Collection[str]]] +CacheTuple = Tuple[str, CacheEntry] +Cache = Dict[str, CacheEntry] + + +def normalize_repo(repo: str) -> str: + if repo.endswith(".git"): + repo = repo.rsplit(".", 1)[0] + return repo + + +def normalize_path(path: str) -> str: + return path.replace("\\", "/") + + +def get_cache_key(pkgbuild_path: str) -> str: + pkgbuild_path = os.path.abspath(pkgbuild_path) + git_cwd = os.path.dirname(pkgbuild_path) + git_path = os.path.relpath(pkgbuild_path, git_cwd) + h = hashlib.new("SHA1") + + with open(pkgbuild_path, "rb") as f: + h.update(f.read()) + + fileinfo = subprocess.check_output( + ["git", "ls-files", "-s", "--full-name", git_path], + cwd=git_cwd).decode("utf-8").strip() + h.update(normalize_path(fileinfo).encode("utf-8")) + + repo = subprocess.check_output( + ["git", "ls-remote", "--get-url", "origin"], + cwd=git_cwd).decode("utf-8").strip() + repo = normalize_repo(repo) + h.update(repo.encode("utf-8")) + + return h.hexdigest() + + +def get_srcinfo_for_pkgbuild(args: Tuple[str, str]) -> Optional[CacheTuple]: + pkgbuild_path, mode = args + pkgbuild_path = os.path.abspath(pkgbuild_path) + git_cwd = os.path.dirname(pkgbuild_path) + git_path = os.path.relpath(pkgbuild_path, git_cwd) + key = get_cache_key(pkgbuild_path) + + bash = shutil.which("bash") + if bash is None: + print("ERROR: bash not found") + return None + + print("Parsing %r" % pkgbuild_path) + try: + srcinfos = {} + + if mode == "mingw": + for name in ["mingw32", "mingw64"]: + env = os.environ.copy() + env["MINGW_INSTALLS"] = name + srcinfos[name] = subprocess.check_output( + [bash, "/usr/bin/makepkg-mingw", + "--printsrcinfo", "-p", git_path], + cwd=git_cwd, + env=env).decode("utf-8") + else: + srcinfos["msys"] = subprocess.check_output( + [bash, "/usr/bin/makepkg", + "--printsrcinfo", "-p", git_path], + cwd=git_cwd).decode("utf-8") + + repo = subprocess.check_output( + ["git", "ls-remote", "--get-url", "origin"], + cwd=git_cwd).decode("utf-8").strip() + repo = normalize_repo(repo) + + relpath = subprocess.check_output( + ["git", "ls-files", "--full-name", git_path], + cwd=git_cwd).decode("utf-8").strip() + relpath = normalize_path(os.path.dirname(relpath)) + + date = subprocess.check_output( + ["git", "log", "-1", "--format=%aI", git_path], + cwd=git_cwd).decode("utf-8").strip() + + meta = {"repo": repo, "path": relpath, "date": date, "srcinfo": srcinfos} + except subprocess.CalledProcessError as e: + print("ERROR: %s %s" % (pkgbuild_path, e.output.splitlines())) + return None + + return (key, meta) + + +def iter_pkgbuild_paths(repo_path: str) -> Iterator[str]: + repo_path = os.path.abspath(repo_path) + print("Searching for PKGBUILD files in %s" % repo_path) + for base, dirs, files in os.walk(repo_path): + for f in files: + if f == "PKGBUILD": + # in case we find a PKGBUILD, don't go deeper + del dirs[:] + path = os.path.join(base, f) + yield path + + +def get_srcinfo_from_cache(args: Tuple[str, Cache]) -> Tuple[str, Optional[CacheTuple]]: + pkgbuild_path, cache = args + key = get_cache_key(pkgbuild_path) + if key in cache: + return (pkgbuild_path, (key, cache[key])) + else: + return (pkgbuild_path, None) + + +def iter_srcinfo(repo_path: str, mode: str, cache: Cache) -> Iterator[Optional[CacheTuple]]: + with ThreadPoolExecutor() as executor: + to_parse: List[Tuple[str, str]] = [] + pool_iter = executor.map( + get_srcinfo_from_cache, ((p, cache) for p in iter_pkgbuild_paths(repo_path))) + for pkgbuild_path, srcinfo in pool_iter: + if srcinfo is not None: + yield srcinfo + else: + to_parse.append((pkgbuild_path, mode)) + + print("Parsing PKGBUILD files...") + for srcinfo in executor.map(get_srcinfo_for_pkgbuild, to_parse): + yield srcinfo + + +def main(argv: List[str]) -> Optional[Union[int, str]]: + parser = argparse.ArgumentParser(description="Create SRCINFOs for all packages in a repo", allow_abbrev=False) + parser.add_argument('mode', choices=['msys', 'mingw'], help="The type of the repo") + parser.add_argument("repo_path", help="The path to GIT repo") + parser.add_argument("json_cache", help="The path to the json file used to fetch/store the results") + parser.add_argument("--time-limit", action="store", + type=int, dest="time_limit", default=0, + help='time after which it will stop and save, 0 means no limit') + args = parser.parse_args(argv[1:]) + + t = time.monotonic() + + srcinfo_path = os.path.abspath(args.json_cache) + cache: Cache = {} + try: + with open(srcinfo_path, "rb") as h: + cache = json.loads(h.read()) + except FileNotFoundError: + pass + + srcinfos = [] + for entry in iter_srcinfo(args.repo_path, args.mode, cache): + if entry is None: + continue + srcinfos.append(entry) + # So we stop before CI times out + if args.time_limit and time.monotonic() - t > args.time_limit: + print("time limit reached, stopping") + break + + srcinfos_dict = OrderedDict(sorted(srcinfos)) + with open(srcinfo_path, "wb") as h: + h.write(json.dumps(srcinfos_dict, indent=2).encode("utf-8")) + + return None + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) From 873f8d33f1b3011c243ff8fd9f978fc6731ed81d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Tue, 18 Aug 2020 20:13:31 +0200 Subject: [PATCH 112/120] generate-scrinfo: make curl fail if the download fails --- .github/workflows/generate-srcinfo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-srcinfo.yml b/.github/workflows/generate-srcinfo.yml index 4a35accf66..2591f9c6bd 100644 --- a/.github/workflows/generate-srcinfo.yml +++ b/.github/workflows/generate-srcinfo.yml @@ -24,7 +24,7 @@ jobs: update: true - run: | - curl -L --retry 5 -o srcinfo.json "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/srcinfo.json" + curl --fail -L --retry 5 -o srcinfo.json "https://github.com/$GITHUB_REPOSITORY/releases/download/srcinfo-cache/srcinfo.json" python ci-generate-srcinfo.py --time-limit 19800 mingw . srcinfo.json - uses: actions/upload-artifact@v2 @@ -45,4 +45,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} tag: srcinfo-cache rm: true - files: srcinfo.json \ No newline at end of file + files: srcinfo.json From e0267955e67b2b4cbaf67fab04e68b96aa1cd2ce Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 19 Aug 2020 01:51:57 +0530 Subject: [PATCH 113/120] cpputest: add package Description: Unit testing and mocking framework for C and C++ (mingw-w64) Fixes #6822 --- mingw-w64-cpputest/PKGBUILD | 53 +++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 mingw-w64-cpputest/PKGBUILD diff --git a/mingw-w64-cpputest/PKGBUILD b/mingw-w64-cpputest/PKGBUILD new file mode 100644 index 0000000000..624a626d7e --- /dev/null +++ b/mingw-w64-cpputest/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Biswapriyo Nath + +_realname=cpputest +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=4.0 +pkgrel=1 +pkgdesc="Unit testing and mocking framework for C and C++ (mingw-w64)" +url="https://cpputest.github.io/" +arch=('any') +license=('BSD-3-Clause') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") +options=('staticlibs' 'strip') +source=("https://github.com/cpputest/cpputest/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz") +sha512sums=('69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7') + +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_INSTALL_PREFIX=${MINGW_PREFIX} \ + "${extra_config[@]}" \ + -DC++11=ON \ + -DTESTS=ON \ + -DEXAMPLES=ON \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake --build ./ +} + +check() { + cd ${srcdir}/build-${MINGW_CHOST} + ${MINGW_PREFIX}/bin/ctest ./ || true +} + +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}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING +} From 018b594d9bae38bbeb8804067af08c810e8463a5 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Wed, 19 Aug 2020 08:38:37 +0800 Subject: [PATCH 114/120] update libhandy to 0.90.0 --- mingw-w64-libhandy/PKGBUILD | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/mingw-w64-libhandy/PKGBUILD b/mingw-w64-libhandy/PKGBUILD index b3a09ac5d8..a02d09c22a 100644 --- a/mingw-w64-libhandy/PKGBUILD +++ b/mingw-w64-libhandy/PKGBUILD @@ -3,7 +3,7 @@ _realname=libhandy pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.84.0 +pkgver=0.90.0 pkgrel=1 pkgdesc="A library full of GTK+ widgets for mobile phones (mingw-w64)" url="https://gitlab.gnome.org/GNOME/libhandy" @@ -15,14 +15,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-gobject-introspection") options=('strip' 'staticlibs' '!debug') -source=("http://ftp.gnome.org/pub/GNOME/sources/libhandy/${pkgver:0:4}/libhandy-${pkgver}.tar.xz" - 001-fix-types.patch) -sha256sums=('c05c539f96f91cdf29a07320576c74909fcf77d216d7328e602fe16599f561aa' - '0d7833c87deaf5b25f6e1205fe54c1814a1cf91ab19f89b3cef1b96bac401d27') +source=("https://download.gnome.org/sources/libhandy/${pkgver:0:4}/libhandy-${pkgver}.tar.xz") +sha256sums=('6ab0869a3aa483298ea20ec89d4c14c38ba4de416b33181d21e15a6039df5985') prepare() { cd libhandy-${pkgver} - patch -p1 -i ${srcdir}/001-fix-types.patch } build() { From 9cab286d3d9a5e9fbc8249b1e34d5922b4184cbd Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Wed, 19 Aug 2020 08:39:00 +0800 Subject: [PATCH 115/120] Delete 001-fix-types.patch --- mingw-w64-libhandy/001-fix-types.patch | 44 -------------------------- 1 file changed, 44 deletions(-) delete mode 100644 mingw-w64-libhandy/001-fix-types.patch diff --git a/mingw-w64-libhandy/001-fix-types.patch b/mingw-w64-libhandy/001-fix-types.patch deleted file mode 100644 index 776143a283..0000000000 --- a/mingw-w64-libhandy/001-fix-types.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/hdy-swipe-group.c b/src/hdy-swipe-group.c -index 18b167ab5a260093bc0e6cd8fc4deef86211cb0f..2779a312e066f698635f151a8df6c57b6ac8b125 100644 ---- a/src/hdy-swipe-group.c -+++ b/src/hdy-swipe-group.c -@@ -104,7 +104,7 @@ hdy_swipe_group_new (void) - - static void - child_switched_cb (HdySwipeGroup *self, -- uint index, -+ guint index, - gint64 duration, - HdySwipeable *swipeable) - { -diff --git a/tests/test-carousel.c b/tests/test-carousel.c -index 538ca6e1a8f9589ebf10d0099bfdb56349f0a357..25ccb3e68700612dc8ed5f0c3e4debb6e8cbdc8e 100644 ---- a/tests/test-carousel.c -+++ b/tests/test-carousel.c -@@ -158,7 +158,7 @@ static void - test_hdy_carousel_indicator_spacing (void) - { - HdyCarousel *carousel = HDY_CAROUSEL (hdy_carousel_new ()); -- uint spacing; -+ guint spacing; - - notified = 0; - g_signal_connect (carousel, "notify::indicator-spacing", G_CALLBACK (notify_cb), NULL); -@@ -210,7 +210,7 @@ static void - test_hdy_carousel_spacing (void) - { - HdyCarousel *carousel = HDY_CAROUSEL (hdy_carousel_new ()); -- uint spacing; -+ guint spacing; - - notified = 0; - g_signal_connect (carousel, "notify::spacing", G_CALLBACK (notify_cb), NULL); -@@ -236,7 +236,7 @@ static void - test_hdy_carousel_animation_duration (void) - { - HdyCarousel *carousel = HDY_CAROUSEL (hdy_carousel_new ()); -- uint duration; -+ guint duration; - - notified = 0; - g_signal_connect (carousel, "notify::animation-duration", G_CALLBACK (notify_cb), NULL); From 31103ca29d6ded7f96407303135cc5e76353b4d9 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 19 Aug 2020 12:44:39 +1000 Subject: [PATCH 116/120] dfu-programmer: Fix libusb-win32 dependency --- mingw-w64-dfu-programmer/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-dfu-programmer/PKGBUILD b/mingw-w64-dfu-programmer/PKGBUILD index dc489476bc..600fa9fe31 100644 --- a/mingw-w64-dfu-programmer/PKGBUILD +++ b/mingw-w64-dfu-programmer/PKGBUILD @@ -4,12 +4,12 @@ _realname=dfu-programmer pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='Device firmware update based USB programmer for Atmel chips (mingw-w64)' arch=('any') license=('GPL') url='https://github.com/dfu-programmer/dfu-programmer' -makedepends=("${MINGW_PACKAGE_PREFIX}-libusb-win32") +depends=("${MINGW_PACKAGE_PREFIX}-libusb-win32") source=( "https://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/${pkgver}/dfu-programmer-${pkgver}.tar.gz" 01-use-libusb-win32.patch From 40843c5e79092a554c6f4c44a52b831a55159375 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Wed, 19 Aug 2020 17:40:38 +0800 Subject: [PATCH 117/120] nasm: update to 2.15.03 --- mingw-w64-nasm/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-nasm/PKGBUILD b/mingw-w64-nasm/PKGBUILD index 3c1940608a..fed85f81f3 100644 --- a/mingw-w64-nasm/PKGBUILD +++ b/mingw-w64-nasm/PKGBUILD @@ -3,7 +3,7 @@ _realname=nasm pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.14.02 +pkgver=2.15.03 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity (mingw-w64)" arch=('any') @@ -12,7 +12,7 @@ url="https://www.nasm.us" options=('strip' '!libtool' 'staticlibs' '!makeflags') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") source=(https://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${_realname}-${pkgver}.tar.xz) -sha256sums=('e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5') +sha256sums=('c0c39a305f08ccf0c5c6edba4294dd2851b3925b6d9642dd1efd62f72829822f') build() { [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} From bba3083102d862423cb03f532438d6b6a27da54e Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 19 Aug 2020 13:18:22 +0300 Subject: [PATCH 118/120] binaryen: Update to 96 --- mingw-w64-binaryen/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw-w64-binaryen/PKGBUILD b/mingw-w64-binaryen/PKGBUILD index daffcecf63..ae5a029c34 100644 --- a/mingw-w64-binaryen/PKGBUILD +++ b/mingw-w64-binaryen/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Diego Sogari +# Contributor: Konstantin Podsvirov _realname=binaryen pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=95 +pkgver=96 pkgrel=1 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++ (mingw-w64)" arch=('any') @@ -11,7 +12,7 @@ url="https://github.com/WebAssembly/binaryen" license=('Apache') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") source=("${_realname}-${pkgver}.tar.gz::https://github.com/WebAssembly/binaryen/archive/version_${pkgver}.tar.gz") -sha256sums=('d0fc0f7b5ec147a886aea7dc40a2fff7a675e970c8fc38768e1908458b97aaab') +sha256sums=('fe140191607c76f02bd0f1cc641715cefcb48e723409418c2a39a50905a4514c') build() { declare -a extra_config From 83fff69bdd70bf2a836c6f78e8494470192e0e97 Mon Sep 17 00:00:00 2001 From: 106062316 Date: Wed, 19 Aug 2020 18:23:32 +0800 Subject: [PATCH 119/120] ninja: update to 1.10.1 --- mingw-w64-ninja/PKGBUILD | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/mingw-w64-ninja/PKGBUILD b/mingw-w64-ninja/PKGBUILD index e85033b0aa..7d5a37c32f 100644 --- a/mingw-w64-ninja/PKGBUILD +++ b/mingw-w64-ninja/PKGBUILD @@ -3,7 +3,7 @@ _realname=ninja pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.10.0 +pkgver=1.10.1 pkgrel=1 pkgdesc="Ninja is a small build system with a focus on speed (mingw-w64)" arch=('any') @@ -11,15 +11,9 @@ url="https://ninja-build.org" license=('Apache') depends=() options=('strip' 'staticlibs') -makedepends=("re2c" "${MINGW_PACKAGE_PREFIX}-python3") +makedepends=("re2c" "${MINGW_PACKAGE_PREFIX}-python") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/ninja-build/ninja/archive/v${pkgver}.tar.gz") -sha256sums=('3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f') - -prepare () { - cd ${srcdir}/ninja-${pkgver} - #linking assumes windows cmd line but we are bash :) - sed -i 's|cmd /c $ar cqs $out.tmp $in && move /Y $out.tmp $out|$ar crs $out $in|g' ${srcdir}/ninja-${pkgver}/configure.py -} +sha256sums=('a6b6f7ac360d4aabd54e299cc1d8fa7b234cd81b9401693da21221c62569a23e') build() { mkdir -p "${pkgdir}${MINGW_PREFIX}"/bin From b238779e32187410e445045b106cab6e7e47601e Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Wed, 19 Aug 2020 19:55:55 +0300 Subject: [PATCH 120/120] nlohmann-json: Update to 3.9.1 --- mingw-w64-nlohmann-json/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-nlohmann-json/PKGBUILD b/mingw-w64-nlohmann-json/PKGBUILD index 59f936b2e5..3c027ff11e 100644 --- a/mingw-w64-nlohmann-json/PKGBUILD +++ b/mingw-w64-nlohmann-json/PKGBUILD @@ -4,7 +4,7 @@ _realname=json _pkgname=nlohmann-json pkgbase=mingw-w64-${_pkgname} pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -pkgver=3.9.0 +pkgver=3.9.1 pkgrel=1 pkgdesc="JSON for Modern C++ (mingw-w64)" arch=('any') @@ -17,7 +17,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") replaces=("${MINGW_PACKAGE_PREFIX}-nlohmann_json") options=('staticlibs' '!strip' '!buildflags') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/nlohmann/json/archive/v${pkgver}.tar.gz") -sha256sums=('9943db11eeaa5b23e58a88fbc26c453faccef7b546e55063ad00e7caaaf76d0b') +sha256sums=('4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b') build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"