From 17b760d5a4984af50caba782c6519717e66d5900 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 19 Mar 2018 22:18:32 +0100 Subject: [PATCH] gnome-control-center: use meson, fix build --- srcpkgs/gnome-control-center/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 86183a95144..6f877540daa 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -2,8 +2,8 @@ pkgname=gnome-control-center version=3.28.0 revision=1 -build_style=gnu-configure -configure_args="--disable-static --with-cheese" +build_style=meson +configure_args="-Dcheese=true" short_desc="The GNOME control center" maintainer="Enno Boland " license="GPL-2" @@ -22,11 +22,19 @@ makedepends=" gnome-bluetooth-devel tzdata cups-devel libpwquality-devel mit-krb5-devel cheese-devel colord-gtk-devel accountsservice-devel vala-devel - libXxf86misc-devel ModemManager-devel libSM-devel iso-codes" + libXxf86misc-devel ModemManager-devel libSM-devel iso-codes + mit-krb5-devel" depends="gsettings-desktop-schemas>=3.16 alsa-plugins-pulseaudio desktop-file-utils hicolor-icon-theme sound-theme-freedesktop apg iso-codes" +CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gnome-bluetooth -DHAVE_BLUETOOTH" +LDFLAGS="-lgnome-bluetooth" +pre_configure() { + sed '/gnome_bluetooth_dep/d' -i \ + meson.build panels/power/meson.build panels/bluetooth/meson.build +} + post_configure() { if [ "$CROSS_BUILD" ]; then # Fix wrong GDESKTOP_PREFIX = /usr