From 7fbd1cf759732165882e2d62cc9ebfdbc968b374 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 10 Jul 2021 18:07:51 +0200 Subject: [PATCH] librsvg: fix build with newer gdk-pixbuf Fixes #9122 --- mingw-w64-librsvg/0006-fix-vapigen-deps.patch | 11 +++++++++++ mingw-w64-librsvg/PKGBUILD | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 mingw-w64-librsvg/0006-fix-vapigen-deps.patch diff --git a/mingw-w64-librsvg/0006-fix-vapigen-deps.patch b/mingw-w64-librsvg/0006-fix-vapigen-deps.patch new file mode 100644 index 0000000000..326adf10fd --- /dev/null +++ b/mingw-w64-librsvg/0006-fix-vapigen-deps.patch @@ -0,0 +1,11 @@ +--- librsvg-2.50.3/Makefile.am.orig 2021-07-10 17:47:36.531222200 +0200 ++++ librsvg-2.50.3/Makefile.am 2021-07-10 17:47:38.774497600 +0200 +@@ -340,7 +340,7 @@ + + VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi + +-librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo ++librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo gdk-pixbuf-2.0 + librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir) + librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala + diff --git a/mingw-w64-librsvg/PKGBUILD b/mingw-w64-librsvg/PKGBUILD index 106bd67d9e..5e6f703918 100644 --- a/mingw-w64-librsvg/PKGBUILD +++ b/mingw-w64-librsvg/PKGBUILD @@ -4,7 +4,7 @@ _realname=librsvg pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.50.3 -pkgrel=1 +pkgrel=3 pkgdesc="SVG rendering library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "${MINGW_PACKAGE_PREFIX}-vala" "${MINGW_PACKAGE_PREFIX}-rust>=1.26" - "setconf") + "${MINGW_PACKAGE_PREFIX}-gtk-doc") depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" "${MINGW_PACKAGE_PREFIX}-pango" "${MINGW_PACKAGE_PREFIX}-cairo" @@ -23,14 +23,19 @@ depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" optdepends=("${MINGW_PACKAGE_PREFIX}-gtk3: for rsvg-view-3") options=('staticlibs' 'strip') source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" - "0005-hack-unixy-paths.patch") + "0005-hack-unixy-paths.patch" + "0006-fix-vapigen-deps.patch") sha256sums=('a4298a98e3a95fdd73c858c17d4dd018525fb09dbb13bbd668a0c2243989e958' - 'b23b094c0cb65fcbbbb952350448de6f3430b30f273e05acdbf7a56d634212dc') + 'b23b094c0cb65fcbbbb952350448de6f3430b30f273e05acdbf7a56d634212dc' + '8ac94e8b6b67c57d04f547e09a50b50a5722365b18f4ed76fb7cd0a9bc27d9c6') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i "${srcdir}/0005-hack-unixy-paths.patch" + # https://gitlab.gnome.org/GNOME/vala/-/issues/1199 + patch -p1 -i "${srcdir}/0006-fix-vapigen-deps.patch" + autoreconf -fiv }