diff --git a/mingw-w64-glib2/PKGBUILD b/mingw-w64-glib2/PKGBUILD index ae9861b908..2dc9ef5c7c 100644 --- a/mingw-w64-glib2/PKGBUILD +++ b/mingw-w64-glib2/PKGBUILD @@ -6,7 +6,7 @@ _realname=glib2 pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.66.4 +pkgver=2.66.6 pkgrel=1 url="https://www.gtk.org/" arch=('any') @@ -23,6 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-gtk-doc" "${MINGW_PACKAGE_PREFIX}-python-setuptools") +options=('strip' '!debug' 'staticlibs') source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-${pkgver}.tar.xz" 0001-Update-g_fopen-g_open-and-g_creat-to-open-with-FILE_.patch 0001-win32-Make-the-static-build-work-with-MinGW-when-pos.patch @@ -31,7 +32,7 @@ source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-${pkgver}.tar gio-querymodules.hook.in 0002-disable_glib_compile_schemas_warning.patch pyscript2exe.py) -sha256sums=('97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984' +sha256sums=('80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329' '51d02360a1ee978fd45e77b84bca9cfbcf080d91986b5c0efe0732779c6a54ec' '1e3ac7cfd4644f3849704e54fcfbb12d15440a33cd5c2d014d4a479c6aaab185' '0f44135a139e3951c4b5fa7d4628d75226e0666d891faf524777e1d1ec3b440b' @@ -62,37 +63,42 @@ build() { fi MSYS2_ARG_CONV_EXCL="--prefix=" \ - meson \ + ${MINGW_PREFIX}/bin/meson.exe \ --prefix="${MINGW_PREFIX}" \ "${extra_config[@]}" \ + --wrap-mode=nodownload \ + --auto-features=enabled \ --default-library=static \ -Dforce_posix_threads=true \ "../glib-${pkgver}" - ninja + + ${MINGW_PREFIX}/bin/meson.exe compile msg "Build shared version" [[ -d "${srcdir}"/build-${CARCH}-shared ]] && rm -rf "${srcdir}"/build-${CARCH}-shared mkdir "${srcdir}"/build-${CARCH}-shared && cd "${srcdir}"/build-${CARCH}-shared MSYS2_ARG_CONV_EXCL="--prefix=" \ - meson \ + ${MINGW_PREFIX}/bin/meson.exe \ --prefix="${MINGW_PREFIX}" \ "${extra_config[@]}" \ + --wrap-mode=nodownload \ + --auto-features=enabled \ -Ddefault_library=shared \ -Dman=true \ -Dforce_posix_threads=true \ -Dgtk_doc=false \ "../glib-${pkgver}" - ninja + ${MINGW_PREFIX}/bin/meson.exe compile } package() { cd "${srcdir}/build-${CARCH}-static" - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install cd "${srcdir}/build-${CARCH}-shared" - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/meson.exe install for hook in glib-compile-schemas gio-querymodules; do local hook_path="${srcdir}/${MINGW_PACKAGE_PREFIX}-${hook}.hook";