From 121533024964ec357e66a7b22c65a0c9b0c40655 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Mon, 30 Nov 2020 10:45:48 -0600 Subject: [PATCH] babl: update to 0.1.82 Add patch to allow gir during cross-build --- .../0001-Allow-gir-if-cross-building.patch | 34 +++++++++++++++++++ srcpkgs/babl/template | 8 ++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/babl/patches/0001-Allow-gir-if-cross-building.patch diff --git a/srcpkgs/babl/patches/0001-Allow-gir-if-cross-building.patch b/srcpkgs/babl/patches/0001-Allow-gir-if-cross-building.patch new file mode 100644 index 00000000000..8cf2b52e760 --- /dev/null +++ b/srcpkgs/babl/patches/0001-Allow-gir-if-cross-building.patch @@ -0,0 +1,34 @@ +From 1094a0b738df972bbfabb498c3036c47a8165b5b Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Thu, 10 Dec 2020 15:06:24 -0600 +Subject: [PATCH] Allow cross-building gir + +Cross-building with gir built fine on VoidLinux +should be ok to cross in general +--- + meson.build | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git meson.build meson.build +index bf0b3eb1d..1ea0e2045 100644 +--- meson.build ++++ meson.build +@@ -389,13 +389,9 @@ elif get_option('with-docs') == 'false' + build_docs = false + endif + +-# Introspection - don't build by default on cross-build environments +-if get_option('enable-gir') == 'auto' +- build_gir = meson.is_cross_build() ? false : true ++if get_option('enable-gir') == 'true' and g_ir.found() ++ build_gir = true + else +- build_gir = get_option('enable-gir') == 'true' ? true : false +-endif +-if not g_ir.found() + build_gir = false + endif + +-- +GitLab + diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index 747bad3e40c..49bc269c9a3 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -1,11 +1,11 @@ # Template file for 'babl' pkgname=babl -version=0.1.78 +version=0.1.82 revision=1 build_style=meson build_helper=gir -configure_args="-Dwith-docs=false" -hostmakedepends="pkg-config vala-devel gobject-introspection" +configure_args="-Dwith-docs=false -Denable-gir=true" +hostmakedepends="pkg-config vala-devel" makedepends="lcms2-devel" short_desc="Dynamic pixel format translation library" maintainer="Enno Boland " @@ -13,7 +13,7 @@ license="LGPL-3.0-only" homepage="http://gegl.org/babl/" changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS" distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz" -checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a +checksum=c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*) ;;