diff --git a/mingw-w64-libosmscout/PKGBUILD b/mingw-w64-libosmscout/PKGBUILD index 88e7c73fe0..4e1c1517f1 100644 --- a/mingw-w64-libosmscout/PKGBUILD +++ b/mingw-w64-libosmscout/PKGBUILD @@ -3,8 +3,8 @@ _realname=libosmscout pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2023.03.30.1 -pkgrel=5 +pkgver=2024.06.02.1 +pkgrel=1 pkgdesc="A Library for offline map rendering, routing and location lookup based on OpenStreetMap data (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -25,30 +25,30 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo" "${MINGW_PACKAGE_PREFIX}-omp" "${MINGW_PACKAGE_PREFIX}-pango" "${MINGW_PACKAGE_PREFIX}-protobuf" - "${MINGW_PACKAGE_PREFIX}-qt5-declarative" - "${MINGW_PACKAGE_PREFIX}-qt5-svg" - "${MINGW_PACKAGE_PREFIX}-qt5-location" - "${MINGW_PACKAGE_PREFIX}-qt5-multimedia" + "${MINGW_PACKAGE_PREFIX}-qt6-5compat" + "${MINGW_PACKAGE_PREFIX}-qt6-base" + "${MINGW_PACKAGE_PREFIX}-qt6-declarative" + "${MINGW_PACKAGE_PREFIX}-qt6-multimedia" + "${MINGW_PACKAGE_PREFIX}-qt6-positioning" + "${MINGW_PACKAGE_PREFIX}-qt6-svg" "${MINGW_PACKAGE_PREFIX}-xz" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-pkgconf" - "${MINGW_PACKAGE_PREFIX}-qt5-tools") + "${MINGW_PACKAGE_PREFIX}-clang-libs" + "${MINGW_PACKAGE_PREFIX}-qt6-tools") # imagemagick also installs "bin/import.exe" conflicts=("${MINGW_PACKAGE_PREFIX}-imagemagick") -source=(${_realname}-${pkgver}.tar.gz::https://github.com/Framstag/libosmscout/archive/v${pkgver}.tar.gz - 001-fix-install-destinations.patch - 002-fix-build-with-libxml2-2.12.patch::https://github.com/Framstag/libosmscout/commit/db7b307d.patch) -sha256sums=('b51dc4ecbced421ed9db6359567be030c77f781b0da09830c0f2b06f675d004d' - '1b57cf69903dacea4a6854991b83c9523a9f23b98ad39a7b773462802d8860ab' - '7827e708586cd5f3385a19940fd9d627bdea3df244dbc016413c851f76f76e97') +source=(https://github.com/Framstag/libosmscout/releases/download/v${pkgver}/libosmscout-${pkgver}.tar.xz + 001-fix-install-destinations.patch) +sha256sums=('6dc4929e24fac27b4a24683599ec46b0faedd77251729a11bd098f670fcaec7e' + '1b57cf69903dacea4a6854991b83c9523a9f23b98ad39a7b773462802d8860ab') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i "${srcdir}"/001-fix-install-destinations.patch - patch -p1 -i "${srcdir}"/002-fix-build-with-libxml2-2.12.patch } build() { @@ -70,6 +70,7 @@ build() { -DOSMSCOUT_INSTALL_QT_DLL=OFF \ -DDirect2D_D2D1_LIBRARY=${MINGW_PREFIX}/lib/libd2d1.a \ -DDirect2D_DWRITE_LIBRARY=${MINGW_PREFIX}/lib/libdwrite.a \ + -DQT_VERSION_PREFERRED=6 \ "../${_realname}-${pkgver}" ${MINGW_PREFIX}/bin/cmake --build . @@ -77,5 +78,9 @@ build() { package() { cd "${srcdir}/build-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }