From e621f8af06df4bccec80e4a01ab1efa0d4fbce1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Tue, 11 Feb 2025 17:14:41 +0100 Subject: [PATCH] build some packages without librsvg on mingw32. --- mingw-w64-adwaita-icon-theme/PKGBUILD | 14 ++++++-------- mingw-w64-gegl/PKGBUILD | 15 ++++++++++----- mingw-w64-gtk3/PKGBUILD | 4 ++-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/mingw-w64-adwaita-icon-theme/PKGBUILD b/mingw-w64-adwaita-icon-theme/PKGBUILD index eacf59d996..9315a16ef4 100644 --- a/mingw-w64-adwaita-icon-theme/PKGBUILD +++ b/mingw-w64-adwaita-icon-theme/PKGBUILD @@ -4,7 +4,7 @@ _realname=adwaita-icon-theme pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=47.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME standard icons (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -19,12 +19,10 @@ makedepends=( depends=( "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme-legacy" "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme" - "${MINGW_PACKAGE_PREFIX}-librsvg" + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg") "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache" ) -source=( - "https://download.gnome.org/sources/${_realname}/${pkgver:0:2}/${_realname}-${pkgver}.tar.xz" -) +source=("https://download.gnome.org/sources/${_realname}/${pkgver:0:2}/${_realname}-${pkgver}.tar.xz") noextract=("${_realname}-${pkgver}.tar.xz") sha256sums=('ad088a22958cb8469e41d9f1bba0efb27e586a2102213cd89cc26db2e002bdfe') @@ -48,7 +46,7 @@ build() { package() { "${MINGW_PREFIX}"/bin/meson.exe install -C "build-${MSYSTEM}" --destdir "${pkgdir}" - install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" - install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_LGPL "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_LGPL" - install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING_CCBYSA3 "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING_CCBYSA3" + install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING* \ + -t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname} } diff --git a/mingw-w64-gegl/PKGBUILD b/mingw-w64-gegl/PKGBUILD index 4c1e29a386..c0c793ea04 100644 --- a/mingw-w64-gegl/PKGBUILD +++ b/mingw-w64-gegl/PKGBUILD @@ -4,9 +4,9 @@ _realname=gegl pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" - "${MINGW_PACKAGE_PREFIX}-${_realname}-docs") + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")) pkgver=0.4.54 -pkgrel=1 +pkgrel=2 pkgdesc="Generic Graphics Library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -24,7 +24,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-gi-docgen" "${MINGW_PACKAGE_PREFIX}-gettext-tools" - $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-luajit") + "${MINGW_PACKAGE_PREFIX}-luajit" "${MINGW_PACKAGE_PREFIX}-vala") depends=("${MINGW_PACKAGE_PREFIX}-babl" "${MINGW_PACKAGE_PREFIX}-cairo" @@ -39,7 +39,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-babl" "${MINGW_PACKAGE_PREFIX}-libjpeg" "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libraw" - "${MINGW_PACKAGE_PREFIX}-librsvg" + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg") "${MINGW_PACKAGE_PREFIX}-libspiro" "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-libwebp" @@ -64,6 +64,11 @@ prepare() { build() { mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM} + declare -a _extra_config + if [[ ${CARCH} == i686 ]]; then + _extra_config+=("-Dlibrsvg=disabled") + fi + MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_PREFIX}/bin/meson.exe setup \ --prefix="${MINGW_PREFIX}" \ @@ -77,7 +82,7 @@ build() { -Dsdl1=disabled \ -Dintrospection=true \ -Ddocs=false \ - $([[ ${CARCH} == aarch64 ]] && echo "-Dlua=disabled") \ + "${_extra_config[@]}" \ ../${_realname}-${pkgver} ${MINGW_PREFIX}/bin/meson.exe compile diff --git a/mingw-w64-gtk3/PKGBUILD b/mingw-w64-gtk3/PKGBUILD index b52028cc05..a509c29e87 100644 --- a/mingw-w64-gtk3/PKGBUILD +++ b/mingw-w64-gtk3/PKGBUILD @@ -4,7 +4,7 @@ _realname=gtk3 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache") pkgver=3.24.48 -pkgrel=1 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3) (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -131,7 +131,7 @@ package_gtk3() { package_gtk-update-icon-cache() { pkgdesc="GTK+ icon cache updater (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" - "${MINGW_PACKAGE_PREFIX}-librsvg" + $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg") "${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme") for hook in gtk-update-icon-cache; do