diff options
| author | Tim Biermann <tbier@posteo.de> | 2022-11-16 19:52:40 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2022-11-16 19:56:13 +0000 |
| commit | 7dd8010c89ecd1c637c46484cd87a52cd6dc787e (patch) | |
| tree | bfd567fea402b9310594ffcf0cc4d7a38b85c397 /qt6-imageformats | |
| parent | 5aadbddeea9ebf811f1333d9660d251520e948db (diff) | |
| download | opt-7dd8010c89ecd1c637c46484cd87a52cd6dc787e.tar.gz opt-7dd8010c89ecd1c637c46484cd87a52cd6dc787e.tar.xz | |
qt6-imageformats: 6.4.0 -> 6.4.1
Diffstat (limited to 'qt6-imageformats')
| -rw-r--r-- | qt6-imageformats/.signature | 7 | ||||
| -rw-r--r-- | qt6-imageformats/Pkgfile | 10 | ||||
| -rw-r--r-- | qt6-imageformats/qtimageformats-fix-build.patch | 14 |
3 files changed, 25 insertions, 6 deletions
diff --git a/qt6-imageformats/.signature b/qt6-imageformats/.signature index c3805869c..27644e313 100644 --- a/qt6-imageformats/.signature +++ b/qt6-imageformats/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aaRe03AcI4PxNE94B0cSmbE4O0SaR5kErO9OqZaCgYMj+mvzgGo0+UBhJ2uRGVV6zxnyHYJ8Mj1i0e1w96Bkws= -SHA256 (Pkgfile) = 658482845d585069072380203b60b002e16832fa3d2b252a510a715a0c541056 +RWSE3ohX2g5d/VRvC25EPbDWlq7bdZFQQsoupGRYOW0Hg+WoPwQO2wCxberRTAnkW17TE3tW4zhDf3wF3giKTlymy5dwioc7Ngo= +SHA256 (Pkgfile) = 18998ab70e250afa03eaaf29157a981f940142982e410c358bbf8f6d7472320f SHA256 (.footprint) = 9c962abdd1e66fb8334cde285ad40d4a98789386f6ebb65d4cc908f269a24b17 -SHA256 (qtimageformats-everywhere-src-6.4.0.tar.xz) = 1419a7b75d03c1f098a85ff772a6baad38d36be1fd75633905f043af6e945f3c +SHA256 (qtimageformats-everywhere-src-6.4.1.tar.xz) = 5e85e73eb2fa8e6f4287eab1d6bcc852ae7b3b613311a4147ec4a08f62454de6 +SHA256 (qtimageformats-fix-build.patch) = 29ee39020e3fc677d3a83a88ddf005edf268b3a8b7144642239af6a3b908dbb8 diff --git a/qt6-imageformats/Pkgfile b/qt6-imageformats/Pkgfile index 51ddccc40..63a8ab1e8 100644 --- a/qt6-imageformats/Pkgfile +++ b/qt6-imageformats/Pkgfile @@ -4,19 +4,23 @@ # Depends on: jasper libmng libwebp qt6-base name=qt6-imageformats -version=6.4.0 +version=6.4.1 release=1 -source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtimageformats-everywhere-src-$version.tar.xz) +source=(https://download.qt.io/official_releases/qt/${version%.*}/$version/submodules/qtimageformats-everywhere-src-$version.tar.xz + qtimageformats-fix-build.patch) build() { prt-get isinst ninja && PKGMK_QT6+=' -G Ninja' prt-get isinst ccache && PKGMK_QT6+=' -D QT_USE_CCACHE=ON' && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" + patch -Np1 -d qtimageformats-everywhere-src-$version -i $SRC/qtimageformats-fix-build.patch + cmake -S qtimageformats-everywhere-src-$version -B build $PKGMK_QT6 \ -D INSTALL_PUBLICBINDIR=usr/bin \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build } diff --git a/qt6-imageformats/qtimageformats-fix-build.patch b/qt6-imageformats/qtimageformats-fix-build.patch new file mode 100644 index 000000000..db9594e0b --- /dev/null +++ b/qt6-imageformats/qtimageformats-fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47694d0..3ba68b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,4 +16,9 @@ if(NOT TARGET Qt::Gui) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") + return() + endif() ++if (NOT TARGET Threads::Threads) ++ find_package(Threads) ++endif() ++qt_internal_disable_find_package_global_promotion(Threads::Threads) ++ + qt_build_repo() |