Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / qt6-doc
Commits: e78d0b11 by Antonio Rojas at 2024-06-03T09:09:51+02:00 Use upstream fix - - - - - 2 changed files: - PKGBUILD - − fixup-zstd-targets.patch Changes: ===================================== PKGBUILD ===================================== @@ -34,17 +34,16 @@ groups=(qt6) _pkgfn=qt-everywhere-src-$pkgver source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver/-/}/single/$_pkgfn.tar.xz qt6-base-zstd-1.5.6.patch::https://code.qt.io/cgit/qt/qtbase.git/patch?id=7d9d1220 - fixup-zstd-targets.patch) + qt6-base-zstd-1.5.6b.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0dd3e700) sha256sums=('38dbf2768776e875ed5cdea8cccf1a240512a29769768084430914c4a33bedc4' '94d1f6cc0dd975e2f2bc64713d3efa6fcdfa0125b0793005d72b795f163f33bb' - 'baeed7109e025eeed149a1c348393aa7a871d7042ad846069c0b80c1b2073103') + 'ae0e25a6e83c38f8d76a6565fb1685c38de2251380808b5ce3e0ca9fc22e9e11') prepare() { # Fix build with zstd 1.5.6 cd $_pkgfn/qtbase patch -p1 -i "$srcdir"/qt6-base-zstd-1.5.6.patch - cd .. - patch -p0 -i "$srcdir"/fixup-zstd-targets.patch + patch -p1 -i "$srcdir"/qt6-base-zstd-1.5.6b.patch } build() { ===================================== fixup-zstd-targets.patch deleted ===================================== @@ -1,16 +0,0 @@ ---- qtbase/cmake/FindWrapZSTD.cmake.0 2024-06-02 22:21:24.533823134 +0200 -+++ qtbase/cmake/FindWrapZSTD.cmake 2024-06-02 22:43:57.161830549 +0200 -@@ -28,10 +28,10 @@ - if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared OR TARGET zstd::libzstd) - find_package_handle_standard_args(WrapZSTD - REQUIRED_VARS zstd_VERSION VERSION_VAR zstd_VERSION) -- if(TARGET zstd::libzstd_shared) -- set(zstdtargetsuffix "_shared") -- elseif(TARGET zstd::libzstd) -+ if(TARGET zstd::libzstd) - set(zstdtargetsuffix "") -+ elseif(TARGET zstd::libzstd_shared) -+ set(zstdtargetsuffix "_shared") - else() - set(zstdtargetsuffix "_static") - endif() View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-doc/-/commit/e78d0b112bf27a4d2b3ebe190f70b685384850d2 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-doc/-/commit/e78d0b112bf27a4d2b3ebe190f70b685384850d2 You're receiving this email because of your account on gitlab.archlinux.org.
