[gdk-pixbuf] build: Don't require shared-mime-info on macOS
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] build: Don't require shared-mime-info on macOS
- Date: Mon, 14 Aug 2017 18:20:17 +0000 (UTC)
commit 4c63e6fea6ceda96af72c9931d49c7c002c6607b
Author: Christoph Reiter <creiter src gnome org>
Date: Fri Aug 11 18:56:54 2017 +0200
build: Don't require shared-mime-info on macOS
Since commit 2c2162c86d4f710007cfffbc582a1f0ce8740725 shared-mime-info
is required for building gdk-pixbuf, except on Windows. This disables
it on macOS as well to restore the old behaviour.
https://bugzilla.gnome.org/show_bug.cgi?id=786167
configure.ac | 3 +++
meson.build | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 712cddd..76c8adb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,9 @@ case "$host" in
;;
esac
;;
+ *-*-darwin*)
+ gio_can_sniff=no
+ ;;
*)
os_win32=no
;;
diff --git a/meson.build b/meson.build
index fd6ea9a..1691b08 100644
--- a/meson.build
+++ b/meson.build
@@ -193,8 +193,8 @@ gobject_dep = dependency('gobject-2.0', version: glib_req_version)
gmodule_dep = dependency('gmodule-no-export-2.0')
gio_dep = dependency('gio-2.0')
-# On non-Windows systems we always required shared-mime-info and GIO
-if host_machine.system() != 'windows'
+# On non-Windows/macOS systems we always required shared-mime-info and GIO
+if host_system != 'windows' and host_system != 'darwin'
shared_mime_dep = dependency('shared-mime-info')
gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]