From d1f51d73789beec53809a723a068636af49a3b88 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 29 Aug 2019 19:46:52 +0200 Subject: [PATCH] macOS build: update several libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Boost 1.67.0 → 1.71.0 • cmark 0.28.3 → 0.29.0 • FLAC 1.3.2 → 1.3.3 • gettext 0.19.8.1 → 0.20 • iconv 1.15 → 1.16 • Qt 5.12.1 → 5.12.4 --- .../cmark-patches/cmark-2-static-build.patch | 24 ------------------- packaging/macos/config.sh | 2 +- packaging/macos/specs.sh | 22 ++++++++--------- 3 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 packaging/macos/cmark-patches/cmark-2-static-build.patch diff --git a/packaging/macos/cmark-patches/cmark-2-static-build.patch b/packaging/macos/cmark-patches/cmark-2-static-build.patch deleted file mode 100644 index 8b04466f4..000000000 --- a/packaging/macos/cmark-patches/cmark-2-static-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 9ead98df8ae2a64842dd157485b69756b5a32a2c -Author: Nick Wellnhofer -Date: Tue Nov 14 14:42:06 2017 +0100 - - Generate export header for static-only build - - Fixes issue #247. - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d5a1936..995a9df 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -115,6 +115,11 @@ if (CMARK_STATIC) - VERSION ${PROJECT_VERSION}) - endif(MSVC) - -+ if (NOT CMARK_SHARED) -+ generate_export_header(${STATICLIBRARY} -+ BASE_NAME ${PROJECT_NAME}) -+ endif() -+ - list(APPEND CMARK_INSTALL ${STATICLIBRARY}) - endif() - diff --git a/packaging/macos/config.sh b/packaging/macos/config.sh index dc273cf94..e2921c674 100644 --- a/packaging/macos/config.sh +++ b/packaging/macos/config.sh @@ -15,5 +15,5 @@ export MACOSX_DEPLOYMENT_TARGET="10.9" export DRAKETHREADS=${DRAKETHREADS:-4} export MAKEFLAGS="-j ${DRAKETHREADS}" export SHARED_QT=1 -export QTVER=${QTVER:-5.12.1} +export QTVER=${QTVER:-5.12.4} export SIGNATURE_IDENTITY="Developer ID Application: Moritz Bunkus (YZ9DVS8D8C)" diff --git a/packaging/macos/specs.sh b/packaging/macos/specs.sh index 9d04a6970..49bb1f0a7 100644 --- a/packaging/macos/specs.sh +++ b/packaging/macos/specs.sh @@ -1,20 +1,20 @@ spec_autoconf=(autoconf-2.69.tar.xz https://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.xz 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684) spec_automake=(automake-1.16.1.tar.gz https://ftp.gnu.org/gnu/automake/automake-1.16.1.tar.xz 5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921) -spec_boost=(boost_1_67_0.tar.bz2 https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.tar.bz2 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba) +spec_boost=(boost_1_71_0.tar.bz2 https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee) spec_cmake=(cmake-3.11.4.tar.gz https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz 8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5) -spec_cmark=(cmark-0.28.3.tar.gz https://github.com/commonmark/cmark/archive/0.28.3.tar.gz acc98685d3c1b515ff787ac7c994188dadaf28a2d700c10c1221da4199bae1fc) +spec_cmark=(cmark-0.29.0.tar.gz https://github.com/commonmark/cmark/archive/0.29.0.tar.gz 2558ace3cbeff85610de3bda32858f722b359acdadf0c4691851865bb84924a6) spec_curl=(curl-7.60.0.tar.xz https://curl.haxx.se/download/curl-7.60.0.tar.xz 8736ff8ded89ddf7e926eec7b16f82597d029fc1469f3a551f1fafaac164e6a0) -spec_flac=(flac-1.3.2.tar.xz http://downloads.xiph.org/releases/flac/flac-1.3.2.tar.xz 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f) -spec_gettext=(gettext-0.19.8.1.tar.gz https://ftp.gnu.org/gnu/gettext/gettext-0.19.8.1.tar.xz ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43) -spec_libiconv=(libiconv-1.15.tar.gz https://ftp.gnu.org/gnu/libiconv/libiconv-1.15.tar.gz ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178) +spec_flac=(flac-1.3.3.tar.xz http://downloads.xiph.org/releases/flac/flac-1.3.3.tar.xz 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748) +spec_gettext=(gettext-0.20.tar.gz https://ftp.gnu.org/gnu/gettext/gettext-0.20.tar.xz a248207fd726ca35c57fe9f01e748c36c60b864bb624b58f9983a0f98b633924) +spec_libiconv=(libiconv-1.16.tar.gz https://ftp.gnu.org/gnu/libiconv/libiconv-1.16.tar.gz e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04) spec_ogg=(libogg-1.3.3.tar.xz http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.xz 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08) spec_pkgconfig=(pkg-config-0.29.2.tar.gz https://pkg-config.freedesktop.org/releases/pkg-config-0.29.2.tar.gz 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591) spec_vorbis=(libvorbis-1.3.6.tar.xz http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.xz af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415) spec_zlib=(zlib-1.2.11.tar.xz https://www.zlib.net/zlib-1.2.11.tar.gz c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1) -spec_qtbase=(qtbase-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049) -spec_qtimageformats=(qtimageformats-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtimageformats-everywhere-src-5.12.1.tar.xz 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421) -spec_qtmultimedia=(qtmultimedia-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtmultimedia-everywhere-src-5.12.1.tar.xz 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18) -spec_qtsvg=(qtsvg-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8) -spec_qttools=(qttools-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3) -spec_qttranslations=(qttranslations-everywhere-src-5.12.1.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttranslations-everywhere-src-5.12.1.tar.xz 7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7) +spec_qtbase=(qtbase-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtbase-everywhere-src-5.12.4.tar.xz 20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195) +spec_qtimageformats=(qtimageformats-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtimageformats-everywhere-src-5.12.4.tar.xz 2dee25c3eea90d172cbd40f41450153322b902da1daa7d2370a55124b2307bb3) +spec_qtmultimedia=(qtmultimedia-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtmultimedia-everywhere-src-5.12.4.tar.xz 7c0759ab6fca2480b10b71a35beeffe0b847adeff5af94eacd1a4531d033423d) +spec_qtsvg=(qtsvg-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qtsvg-everywhere-src-5.12.4.tar.xz 110812515a73c650e5ebc41305d9a243dadeb21f485aaed773e394dd84ce0d04) +spec_qttools=(qttools-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qttools-everywhere-src-5.12.4.tar.xz 3b0e353860a9c0cd4db9eeae5f94fef8811ed7d107e3e5e97e4a557f61bd6eb6) +spec_qttranslations=(qttranslations-everywhere-src-5.12.4.tar.xz https://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/qttranslations-everywhere-src-5.12.4.tar.xz ab8dd55f5ca869cab51c3a6ce0888f854b96dc03c7f25d2bd3d2c50314ab60fb)