Revert apple-darwin-qt5-* packages to 5.9.2

This is the last version I attempted to build. Future version updates were not really made at this point.
2020-06-14 17:49:01 +02:00 · 2020-06-14 17:49:01 +02:00 · 10bf32210d
parent ae259073ca
commit 10bf32210d
7 changed files with 33 additions and 33 deletions
--- a/qt5-base/apple-darwin/PKGBUILD
+++ b/qt5-base/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase

 pkgname=apple-darwin-qt5-base
-pkgver=5.14.2
+pkgver=5.9.2
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (apple-darwin)'
 arch=('i686' 'x86_64')
@ -16,8 +16,8 @@ groups=('apple-darwin-qt5')
 optdepends=()
 makedepends=('clang')
 options=('!strip' '!buildflags' 'staticlibs' '!emptydirs')
-_pkgfqn="qtbase-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="qtbase-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
        '0001-Enable-cross-compilation-with-osxcross.patch'
        '0002-Allow-overriding-stdlib-under-MacOS.patch'
        '0003-Remove-error-handling-for-Xcode-detection.patch'
@ -26,7 +26,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0006-Pull-dependencies-of-static-libraries-in-CMake-modul.patch'
        '0007-Fix-finding-gl.h-when-cross-compiling-with-osxcross.patch'
        '0008-Prevent-error-when-qmlimportscanner-not-available.patch')
-sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762'
+sha256sums=('bc9a21e9f6fff9629019fdf9f989f064751d5073c3a28dc596def92f4d4275c6'
            'f5b474fc11f929c8e1563136c6b53d09c9e405ebf5a7940a63dc13f00d3e2bbd'
            'a51749efb16b81f5e272a0864a6e2583942998bca1fe397c0e4205b269c97ae4'
            '73d314dad7a93073140ee9d868e1071a107b1afdecc67cb67d85a91391452a82'
--- a/qt5-declarative/apple-darwin/PKGBUILD
+++ b/qt5-declarative/apple-darwin/PKGBUILD
@ -5,8 +5,8 @@

 _qt_module=qtdeclarative
 pkgname='apple-darwin-qt5-declarative'
-pkgver=5.14.2
-pkgrel=1
+pkgver=5.9.2
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="Classes for QML and JavaScript languages (apple-darwin)"
 depends=('apple-darwin-qt5-base')
@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e'
+_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('d2fe6c9c1a9f19af6e96553c6d75366ab8f397bc232acd67d31476955fee94ff'
            'd93731901616f494b5474cf78ec938c4c7e9e79a088457275b97f1f65cc82fe3')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
--- a/qt5-imageformats/apple-darwin/PKGBUILD
+++ b/qt5-imageformats/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@

 _qt_module=qtimageformats
 pkgname='apple-darwin-qt5-imageformats'
-pkgver=5.14.2
+pkgver=5.9.2
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)"
@ -19,8 +19,8 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
 sha256sums=('79fee307310a66100bd3d907ea69bd039dcd727c15f27e990167e7a27d1b8a47')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
--- a/qt5-svg/apple-darwin/PKGBUILD
+++ b/qt5-svg/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@

 _qt_module=qtsvg
 pkgname='apple-darwin-qt5-svg'
-pkgver=5.14.2
+pkgver=5.9.2
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)"
@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('4a2aa7cae70a3156846655422b9ed884d8b08b3707b95858e49c7cf9afe5e7b0')
+_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('99f294f874b13553e4ed49cd9465580ad0c9b92e29cdfa47b2e4096835c1e2e5')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
 _osxcrossprefix='/opt/osxcross'
--- a/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch
+++ b/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch
@ -1,4 +1,4 @@
-From 1a308c71f117ef4ff33a5062663a72545160c675 Mon Sep 17 00:00:00 2001
+From 74188cdf0f85a90bf86f251480d6a41b7ea61be2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:44:42 +0200
 Subject: [PATCH] Fix linguist macro
@ -11,7 +11,7 @@ Subject: [PATCH] Fix linguist macro
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
-index 23beeb39..bf1b0ad6 100644
+index 6013cc6e..2e797326 100644
 --- a/src/linguist/Qt5LinguistToolsMacros.cmake
 +++ b/src/linguist/Qt5LinguistToolsMacros.cmake
@@ -71,8 +71,10 @@ function(QT5_CREATE_TRANSLATION _qm_files)
@ -24,19 +24,19 @@ index 23beeb39..bf1b0ad6 100644
 -            COMMAND ${Qt5_LUPDATE_EXECUTABLE}
 +            COMMAND ${LUPDATE_LOC}
             ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
-             DEPENDS ${_my_sources}
-             BYPRODUCTS ${_ts_lst_file} VERBATIM)
-@@ -103,8 +105,9 @@ function(QT5_ADD_TRANSLATION _qm_files)
-             set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm")
+             DEPENDS ${_my_sources} ${_ts_lst_file} VERBATIM)
+     endforeach()
+@@ -93,8 +95,9 @@ function(QT5_ADD_TRANSLATION _qm_files)
+             set(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm")
         endif()
 
 +        get_target_property(LRELEASE_LOC ${Qt5_LRELEASE_EXECUTABLE} IMPORTED_LOCATION)
         add_custom_command(OUTPUT ${qm}
 -            COMMAND ${Qt5_LRELEASE_EXECUTABLE}
 +            COMMAND ${LRELEASE_LOC}
-             ARGS ${_LRELEASE_OPTIONS} ${_abs_FILE} -qm ${qm}
+             ARGS ${_abs_FILE} -qm ${qm}
             DEPENDS ${_abs_FILE} VERBATIM
         )
 -- 
-2.23.0
+2.13.2

--- a/qt5-tools/apple-darwin/PKGBUILD
+++ b/qt5-tools/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@

 _qt_module=qttools
 pkgname="apple-darwin-qt5-tools"
-pkgver=5.14.2
+pkgver=5.9.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)"
@ -15,11 +15,11 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
        '0001-Fix-linguist-macro.patch')
-sha256sums=('1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32'
-            '839996d563ae8040b18094d04af81d0140673ff0b503a872ecd2a750d8a26eba')
+sha256sums=('c4eb56cf24a75661b8317b566be37396c90357b4f6730ef12b8c97a7079ca0e8'
+            'de1f0114b723d07f1c7a2c11c15e8c5b05852c690e3a36d3f65f3a411fd81127')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
 _osxcrossprefix='/opt/osxcross'
--- a/qt5-translations/apple-darwin/PKGBUILD
+++ b/qt5-translations/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@

 _qt_module=qttranslations
 pkgname='apple-darwin-qt5-translations'
-pkgver=5.14.2
+pkgver=5.9.2
 pkgrel=1
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)"
@ -15,9 +15,9 @@ options=('!strip' '!buildflags' 'staticlibs')
 groups=('apple-darwin-qt5')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('ec4dbd3601afe06d1814f4bc81af9cffbbe7de2b9f4aef4eb4595b049c8eb9be')
+_pkgfqn="${_qt_module}-opensource-src-${pkgver}"
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('4a12528a14ed77f31672bd7469cad30624e7b672f241b8f19ad59510298eb269')
 _architectures='x86_64-apple-darwin15'
 _configurations+=('CONFIG+=static')
 _osxcrossprefix='/opt/osxcross'