Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / qt6-doc
Commits: 03bc5e2e by Antonio Rojas at 2024-06-02T22:56:37+02:00 Fix build with zstd 1.5.6 Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-doc/-/issues/1 - - - - - 2 changed files: - PKGBUILD - + fixup-zstd-targets.patch Changes: ===================================== PKGBUILD ===================================== @@ -32,8 +32,20 @@ makedepends=(alsa-lib vulkan-headers) groups=(qt6) _pkgfn=qt-everywhere-src-$pkgver -source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver/-/}/single/$_pkgfn.tar.xz) -sha256sums=('38dbf2768776e875ed5cdea8cccf1a240512a29769768084430914c4a33bedc4') +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) +sha256sums=('38dbf2768776e875ed5cdea8cccf1a240512a29769768084430914c4a33bedc4' + '94d1f6cc0dd975e2f2bc64713d3efa6fcdfa0125b0793005d72b795f163f33bb' + 'baeed7109e025eeed149a1c348393aa7a871d7042ad846069c0b80c1b2073103') + +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 +} build() { cmake -B build -S $_pkgfn -G Ninja \ ===================================== fixup-zstd-targets.patch ===================================== @@ -0,0 +1,16 @@ +--- 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/03bc5e2eca2cf9357794b58371b69e9ca7f24bac -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-doc/-/commit/03bc5e2eca2cf9357794b58371b69e9ca7f24bac You're receiving this email because of your account on gitlab.archlinux.org.
