[gtk-osx] Bug 776219 - Target lower than 10.9 specified in setup_sdk() fails to build
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Bug 776219 - Target lower than 10.9 specified in setup_sdk() fails to build
- Date: Sun, 18 Dec 2016 22:29:23 +0000 (UTC)
commit 9d6380fb7725a6abb79f87355b4fe2a25509a375
Author: John Ralls <jralls ceridwen us>
Date: Sun Dec 18 14:06:24 2016 -0800
Bug 776219 - Target lower than 10.9 specified in setup_sdk() fails to build
Due to using the wrong version macro from AvailabilityMacros.h
modulesets-unstable/gtk-osx.modules | 10 ++++++++++
...Build-cocoanotification-only-if-supported.patch | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 1bd02a3..9104878 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -152,6 +152,14 @@
</after>
</autotools>
+ <autotools id="graphene">
+ <branch module="ebassi/graphene" repo="github" checkoutdir="graphene"/>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="gobject-introspection"/>
+ </dependencies>
+ </autotools>
+
<autotools id="gtk+"
autogenargs="--with-gdktarget=quartz --enable-introspection=no --enable-quartz-relocation">
<branch revision="gtk-2-24" checkoutdir="gtk+-2.0"/>
@@ -166,6 +174,7 @@
<dep package="meta-gtk-osx-bootstrap"/>
</after>
</autotools>
+
<autotools id="gtk+-3.0"
autogenargs="--enable-quartz-backend --enable-quartz-relocation --disable-colord">
@@ -177,6 +186,7 @@
<dep package="atk"/>
<dep package="gobject-introspection"/>
<dep package="libepoxy"/>
+ <dep package="graphene"/>
</dependencies>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
diff --git a/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
b/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
index c477682..0a93c87 100644
--- a/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
+++ b/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
@@ -80,16 +80,16 @@ index da7c167..fec84ba 100644
#endif
-#ifdef HAVE_COCOA
-+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
extern GType g_cocoa_notification_backend_get_type (void);
#endif
-@@ -1111,7 +1115,7 @@ _g_io_modules_ensure_loaded (void)
+@@ -1111,8 +1115,7 @@ _g_io_modules_ensure_loaded (void)
g_type_ensure (g_fdo_notification_backend_get_type ());
g_type_ensure (g_gtk_notification_backend_get_type ());
#endif
-#ifdef HAVE_COCOA
-+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
g_type_ensure (g_cocoa_notification_backend_get_type ());
#endif
#ifdef G_OS_WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]