Date: Saturday, January 28, 2023 @ 09:31:25
Author: arojas
Revision: 467489
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
qt6-imageformats/repos/kde-unstable-x86_64/PKGBUILD
(from rev 467488, qt6-imageformats/kde-unstable/PKGBUILD)
qt6-imageformats/repos/kde-unstable-x86_64/fix-webp-build.patch
(from rev 467488, qt6-imageformats/kde-unstable/fix-webp-build.patch)
Deleted:
qt6-imageformats/repos/kde-unstable-x86_64/PKGBUILD
----------------------+
PKGBUILD | 69 ++++++++++++++++++++++++++-----------------------
fix-webp-build.patch | 12 ++++++++
2 files changed, 49 insertions(+), 32 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-28 09:31:02 UTC (rev 467488)
+++ PKGBUILD 2023-01-28 09:31:25 UTC (rev 467489)
@@ -1,32 +0,0 @@
-# Maintainer: Antonio Rojas <[email protected]>
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-
-pkgname=qt6-imageformats
-_qtver=6.5.0-beta1
-pkgver=${_qtver/-/}
-pkgrel=2
-arch=(x86_64)
-url='https://www.qt.io'
-license=(GPL3 LGPL3 FDL custom)
-pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
-depends=(qt6-base jasper libwebp libmng)
-makedepends=(cmake ninja)
-groups=(qt6)
-options=(debug)
-_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
-source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz)
-sha256sums=('e95000d26ff42803972f7246f3bb3a36515956f837d0c5be8d9368cefe9b60d5')
-
-build() {
- cmake -B build -S $_pkgfn -G Ninja \
- -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- install -d "$pkgdir"/usr/share/licenses
- ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname
-}
Copied: qt6-imageformats/repos/kde-unstable-x86_64/PKGBUILD (from rev 467488,
qt6-imageformats/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-28 09:31:25 UTC (rev 467489)
@@ -0,0 +1,37 @@
+# Maintainer: Antonio Rojas <[email protected]>
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+
+pkgname=qt6-imageformats
+_qtver=6.5.0-beta2
+pkgver=${_qtver/-/}
+pkgrel=1
+arch=(x86_64)
+url='https://www.qt.io'
+license=(GPL3 LGPL3 FDL custom)
+pkgdesc='Plugins for additional image formats: TIFF, MNG, TGA, WBMP'
+depends=(qt6-base jasper libwebp libmng)
+makedepends=(cmake ninja)
+groups=(qt6)
+_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
+source=(https://download.qt.io/development_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
+ fix-webp-build.patch)
+sha256sums=('c2e652317d530adaa68ba001766b70191ace017fb902103ebc82b90f5d3649ce'
+ '10e2aa7ff3074bc15e6b86462cdb5bcd6bc3a1f979a2147c7326d7930722b9ee')
+
+prepare() {
+ patch -d $_pkgfn -p1 < fix-webp-build.patch #
https://bugreports.qt.io/browse/QTBUG-110720
+}
+
+build() {
+ cmake -B build -S $_pkgfn -G Ninja \
+ -DCMAKE_MESSAGE_LOG_LEVEL=STATUS
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -d "$pkgdir"/usr/share/licenses
+ ln -s /usr/share/licenses/qt6-base "$pkgdir"/usr/share/licenses/$pkgname
+}
Copied: qt6-imageformats/repos/kde-unstable-x86_64/fix-webp-build.patch (from
rev 467488, qt6-imageformats/kde-unstable/fix-webp-build.patch)
===================================================================
--- fix-webp-build.patch (rev 0)
+++ fix-webp-build.patch 2023-01-28 09:31:25 UTC (rev 467489)
@@ -0,0 +1,12 @@
+diff --git a/src/imageformats/configure.cmake
b/src/imageformats/configure.cmake
+index 9e618a8..5347785 100644
+--- a/src/imageformats/configure.cmake
++++ b/src/imageformats/configure.cmake
+@@ -19,6 +19,7 @@ set_property(CACHE INPUT_webp PROPERTY STRINGS undefined no
qt system)
+
+ qt_find_package(WrapJasper PROVIDED_TARGETS WrapJasper::WrapJasper
MODULE_NAME imageformats QMAKE_LIB jasper)
+ qt_find_package(TIFF PROVIDED_TARGETS TIFF::TIFF MODULE_NAME imageformats
QMAKE_LIB tiff)
++qt_internal_disable_find_package_global_promotion(Threads::Threads)
+ qt_find_package(WrapWebP PROVIDED_TARGETS WrapWebP::WrapWebP MODULE_NAME
imageformats QMAKE_LIB webp)
+ qt_find_package(Libmng PROVIDED_TARGETS Libmng::Libmng MODULE_NAME
imageformats QMAKE_LIB mng)
+
