GNOME.org
 

[gtk-osx] Bump core libraries to latest releases.

commit 371fd2f61d334ae2a9290c4ea331b1b899915a30
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 26 17:24:46 2016 -0700

    Bump core libraries to latest releases.

 modulesets-stable/gtk-osx.modules                  |   42 ++++-----
 ...Build-cocoanotification-only-if-supported.patch |   98 ++++++++++++++++++++
 2 files changed, 118 insertions(+), 22 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index d2f4fc9..476b8f2 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -75,12 +75,14 @@
     </after>
   </metamodule>
 
-  <autotools id="glib" autogen-sh="autoreconf">
-    <branch module="glib/2.44/glib-2.44.1.tar.xz"  version="2.44.1"
-            hash="sha256:8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07">
+  <autotools id="glib" autogen-sh="autoreconf"
+             autogenargs="--with-pcre=internal">
+    <branch module="glib/2.48/glib-2.48.0.tar.xz"  version="2.48.0"
+            hash="sha256:744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Fix-g_get_monotonic_time-on-non-Intel-Darwin.patch";
 strip="1"/>
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-724590-GSlice-slab_stack-corruption.patch"; 
strip="1"/>
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/gio-in-reserved-in-gcc-48.patch"; 
strip="1"/>
+      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch";
 strip="1"/>
     </branch>
     <dependencies>
         <dep package="libffi"/>
@@ -110,12 +112,10 @@
   </autotools>
 
   <autotools id="gobject-introspection" autogen-sh="configure">
-    <branch module="gobject-introspection/1.44/gobject-introspection-1.44.0.tar.xz"
-            version="1.44.0"
-            hash="sha256:6f0c2c28aeaa37b5037acbf21558098c4f95029b666db755d3a12c2f1e1627ad">
+    <branch module="gobject-introspection/1.48/gobject-introspection-1.48.0.tar.xz"
+            version="1.48.0"
+            hash="sha256:fa275aaccdbfc91ec0bc9a6fd0562051acdba731e7d584b64a277fec60e75877">
       <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gobject-introspection-625195-Fix-non-libtool-linker-flags-on-Darwin.patch";
-             strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -142,8 +142,8 @@
   </autotools>
 
  <autotools id="atk" autogen-sh="configure">
-    <branch module="atk/2.16/atk-2.16.0.tar.xz" version="2.16.0"
-            hash="sha256:095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562"/>
+    <branch module="atk/2.20/atk-2.20.0.tar.xz" version="2.20.0"
+            hash="sha256:493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"/>
     <dependencies>
     </dependencies>
     <after>
@@ -154,8 +154,8 @@
   </autotools>
 
   <autotools id="gdk-pixbuf" autogen-sh="configure">
-    <branch module="gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz" version="2.30.8"
-            hash="sha256:4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be"/>
+    <branch module="gdk-pixbuf/2.34/gdk-pixbuf-2.34.0.tar.xz" version="2.34.0"
+            hash="sha256:d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879"/>
     <after>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
@@ -164,8 +164,8 @@
 
   <autotools id="gtk+" autogen-sh="autoreconf"
              autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
-    <branch module="gtk+/2.24/gtk+-2.24.29.tar.xz" version="2.24.29"
-            hash="sha256:0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8">
+    <branch module="gtk+/2.24/gtk+-2.24.30.tar.xz" version="2.24.30"
+            hash="sha256:0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50">
       <!--patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
 strip="1"/-->
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch";
 strip="1"/>
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch";
 strip="1"/>
@@ -206,10 +206,8 @@
 
   <autotools id="gtk+-3.0" autogen-sh="autogen.sh"
              autogenargs="--enable-quartz-backend --enable-quartz-relocation">
-    <branch module="gtk+/3.16/gtk+-3.16.7.tar.xz" version="3.16.7"
-            hash="sha256:19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba">
-      <!-- https://bugzilla.gnome.org/show_bug.cgi?id=763779 -->
-      <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch";
 strip="1"/>
+    <branch module="gtk+/3.20/gtk+-3.20.3.tar.xz" version="3.20.3"
+            hash="sha256:3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694">
     </branch>
     <dependencies>
       <dep package="glib"/>
@@ -226,9 +224,9 @@
 
   <autotools id="pixman" autogenargs="--disable-gtk --disable-mmx"
              autogen-sh="configure">
-    <branch version="0.32.6" module="pixman-0.32.6.tar.gz"
+    <branch version="0.34.0" module="pixman-0.34.0.tar.gz"
             repo="cairographics"
-            hash="sha1:8791343cbf6d99451f4d08e8209d6ac11bf96df2"/>
+            hash="sha1:a1b1683c1a55acce9d928fea1ab6ceb79142ddc7"/>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
     </after>
@@ -240,9 +238,9 @@
        dependency. -->
   <autotools id="cairo"  autogen-sh="configure"
              autogenargs="--enable-pdf --enable-quartz --disable-xlib --without-x">
-    <branch module="cairo-1.14.0.tar.xz"  version="1.14.0"
+    <branch module="cairo-1.14.6.tar.xz"  version="1.14.6"
             repo="cairographics"
-            hash="sha1:53cf589b983412ea7f78feee2e1ba9cea6e3ebae">
+            hash="sha1:0a59324e6cbe031b5b898ff8b9e2ffceb9d114f5">
     </branch>
     <dependencies>
       <dep package="pixman"/>
diff --git a/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch 
b/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
new file mode 100644
index 0000000..c477682
--- /dev/null
+++ b/patches/0001-Bug747146-Build-cocoanotification-only-if-supported.patch
@@ -0,0 +1,98 @@
+From 8003b800f63590d52b9b436f62337bc709c0f951 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Fri, 26 Feb 2016 14:16:46 -0800
+Subject: [PATCH] Enable building gcocoanotification only if OS X min version
+ >= 10.9.
+
+---
+ configure.ac    | 19 ++++++++-----------
+ gio/Makefile.am |  2 ++
+ gio/giomodule.c |  8 ++++++--
+ 3 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 603f621..20c640b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,22 +221,19 @@ AS_IF([test "x$glib_have_carbon" = "xyes"], [
+ ], [CARBON_LIBS=""])
+ 
+ AC_SUBST([CARBON_LIBS])
+-
++ac_cv_have_os_x_9_or_later="no"
+ AS_IF([test "x$glib_have_cocoa" = "xyes"], [
+   AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available])
+   COCOA_LIBS="-Wl,-framework,Foundation"
+   LDFLAGS="$LDFLAGS $COCOA_LIBS"
+-
+-  osx_version=`sw_vers -productVersion`
+-  osx_min_version="10.9.0"
+-  AC_MSG_CHECKING([OSX version >= $osx_min_version])
+-  AS_VERSION_COMPARE([$osx_version], [$osx_min_version], [
+-    AC_MSG_RESULT([no])
+-    AC_MSG_ERROR([OSX version is too old!])
+-  ])
+-  AC_MSG_RESULT([yes])
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#include <AvailabilityMacros.h>
++#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
++#error Compiling for minimum OS X version before 10.9
++#endif
++  ]])],[ac_cv_have_os_x_9_or_later="yes"])
+ ], [COCOA_LIBS=""])
+-
++AM_CONDITIONAL([MAC_OS_X_9], [test "x$ac_cv_have_os_x_9_or_later" = xyes])
+ AC_SUBST([COCOA_LIBS])
+ 
+ dnl declare --enable-* args and collect ac_help strings
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index e911d91..01d3711 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -266,8 +266,10 @@ unix_sources = \
+       $(NULL)
+ 
+ if OS_COCOA
++if MAC_OS_X_9
+ unix_sources += gcocoanotificationbackend.c
+ endif
++endif
+ 
+ giounixincludedir=$(includedir)/gio-unix-2.0/gio
+ giounixinclude_HEADERS = \
+diff --git a/gio/giomodule.c b/gio/giomodule.c
+index da7c167..fec84ba 100644
+--- a/gio/giomodule.c
++++ b/gio/giomodule.c
+@@ -47,6 +47,10 @@
+ #include "gdesktopappinfo.h"
+ #endif
+ 
++#ifdef HAVE_COCOA
++#include <AvailabilityMacros.h>
++#endif
++
+ /**
+  * SECTION:giomodule
+  * @short_description: Loadable GIO Modules
+@@ -911,7 +915,7 @@ extern GType g_fdo_notification_backend_get_type (void);
+ extern GType g_gtk_notification_backend_get_type (void);
+ #endif
+ 
+-#ifdef HAVE_COCOA
++#ifdef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+ extern GType g_cocoa_notification_backend_get_type (void);
+ #endif
+ 
+@@ -1111,7 +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
+       g_type_ensure (g_cocoa_notification_backend_get_type ());
+ #endif
+ #ifdef G_OS_WIN32
+-- 
+2.2.2
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]