Revert "build some packages without librsvg on mingw32."
This reverts commit e621f8af06df4bccec80e4a01ab1efa0d4fbce1a. gtk and the icon themes no longer have png fallbacks for all svgs, so this breaks gtk based apps.
This commit is contained in:
parent
6c165d6ba5
commit
a28ce8d329
@ -4,7 +4,7 @@ _realname=adwaita-icon-theme
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=47.0
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
pkgdesc="GNOME standard icons (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
@ -19,10 +19,12 @@ makedepends=(
|
||||
depends=(
|
||||
"${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme-legacy"
|
||||
"${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme"
|
||||
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg")
|
||||
"${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')
|
||||
|
||||
@ -46,7 +48,7 @@ build() {
|
||||
package() {
|
||||
"${MINGW_PREFIX}"/bin/meson.exe install -C "build-${MSYSTEM}" --destdir "${pkgdir}"
|
||||
|
||||
install -d "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname}
|
||||
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING* \
|
||||
-t "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}
|
||||
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"
|
||||
}
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
_realname=gegl
|
||||
pkgbase="mingw-w64-${_realname}"
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-${_realname}-docs"))
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
|
||||
pkgver=0.4.54
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
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"
|
||||
"${MINGW_PACKAGE_PREFIX}-luajit"
|
||||
$([[ ${CARCH} == aarch64 ]] || echo "${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"
|
||||
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg")
|
||||
"${MINGW_PACKAGE_PREFIX}-librsvg"
|
||||
"${MINGW_PACKAGE_PREFIX}-libspiro"
|
||||
"${MINGW_PACKAGE_PREFIX}-libtiff"
|
||||
"${MINGW_PACKAGE_PREFIX}-libwebp"
|
||||
@ -64,11 +64,6 @@ 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}" \
|
||||
@ -82,7 +77,7 @@ build() {
|
||||
-Dsdl1=disabled \
|
||||
-Dintrospection=true \
|
||||
-Ddocs=false \
|
||||
"${_extra_config[@]}" \
|
||||
$([[ ${CARCH} == aarch64 ]] && echo "-Dlua=disabled") \
|
||||
../${_realname}-${pkgver}
|
||||
|
||||
${MINGW_PREFIX}/bin/meson.exe compile
|
||||
|
||||
@ -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=2
|
||||
pkgrel=1
|
||||
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"
|
||||
$([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-librsvg")
|
||||
"${MINGW_PACKAGE_PREFIX}-librsvg"
|
||||
"${MINGW_PACKAGE_PREFIX}-hicolor-icon-theme")
|
||||
|
||||
for hook in gtk-update-icon-cache; do
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user