[125966] users/devans/GNOME-3/stable/dports/gnome/gtk3
devans at macports.org
devans at macports.org
Tue Sep 30 08:52:27 PDT 2014
Revision: 125966
https://trac.macports.org/changeset/125966
Author: devans at macports.org
Date: 2014-09-30 08:52:26 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
GNOME-3/stable: gtk3, sync with trunk, update to version 3.14.1, drop backingScaleFactor patch, now fixed upstream.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gtk3/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gtk3:119527-125818
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620
/users/rmstonecipher/gnome/gtk3:102363-103172
+ /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gtk3:119527-125964
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620
/users/rmstonecipher/gnome/gtk3:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2014-09-30 15:41:41 UTC (rev 125965)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2014-09-30 15:52:26 UTC (rev 125966)
@@ -10,15 +10,15 @@
name gtk3
set real_name gtk+
epoch 1
-version 3.14.0
+version 3.14.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome x11
license LGPL-2.1+
maintainers cal devans openmaintainer
platforms darwin
-checksums rmd160 7bba8619b20b8a76794b4539b0da4cfb59483361 \
- sha256 68d6b57d15c16808d0045e96b303f3dd439cc22a9c06fdffb07025cd713a82bc
+checksums rmd160 5258f89c77177e525acf4265a6232956ea8a76c1 \
+ sha256 7e86eb7c8acc18524d7758ca2340b723ddeee1d0cd2cadd56de5a13322770a52
description GTK+ widget toolkit
@@ -36,9 +36,16 @@
ftp://ftp.gtk.org/pub/gtk/${branch}/ \
http://ftp.gtk.org/pub/gtk/${branch}/
-# See http://trac.macports.org/ticket/43283
-patchfiles patch-backingScaleFactor.diff
+# quartz build fails for 10.6 and earlier due to
+# https://git.gnome.org/browse/gtk+/commit/?id=ec17a649aed65fb0a27d6cf10ab097a5f310dfc6
+# https://trac.macports.org/ticket/45202
+# patch to disable on effected platforms until fixed upstream
+if {${os.major} < 11} {
+ patchfiles-append \
+ patch-disable-native-full-screen-support.diff
+}
+
minimum_xcodeversions {9 3.1}
depends_build port:pkgconfig
Copied: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff (from rev 125964, trunk/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff 2014-09-30 15:52:26 UTC (rev 125966)
@@ -0,0 +1,164 @@
+diff -ur gdk/quartz.orig/GdkQuartzNSWindow.c gdk/quartz/GdkQuartzNSWindow.c
+--- gdk/quartz.orig/GdkQuartzNSWindow.c 2014-09-28 22:53:28.000000000 -0700
++++ gdk/quartz/GdkQuartzNSWindow.c 2014-09-28 22:54:33.000000000 -0700
+@@ -654,19 +654,4 @@
+ _gdk_quartz_drag_source_context = NULL;
+ }
+
+-- (void)setStyleMask:(NSUInteger)styleMask
+-{
+- gboolean was_fullscreen;
+- gboolean is_fullscreen;
+-
+- was_fullscreen = (([self styleMask] & NSFullScreenWindowMask) != 0);
+-
+- [super setStyleMask:styleMask];
+-
+- is_fullscreen = (([self styleMask] & NSFullScreenWindowMask) != 0);
+-
+- if (was_fullscreen != is_fullscreen)
+- _gdk_quartz_window_update_fullscreen_state ([[self contentView] gdkWindow]);
+-}
+-
+ @end
+diff -ur gdk/quartz.orig/GdkQuartzNSWindow.h gdk/quartz/GdkQuartzNSWindow.h
+--- gdk/quartz.orig/GdkQuartzNSWindow.h 2014-09-28 22:53:28.000000000 -0700
++++ gdk/quartz/GdkQuartzNSWindow.h 2014-09-28 22:54:37.000000000 -0700
+@@ -42,7 +42,6 @@
+ -(BOOL)trackManualResize;
+ -(void)showAndMakeKey:(BOOL)makeKey;
+ -(void)hide;
+--(void)setStyleMask:(NSUInteger)styleMask;
+
+ @end
+
+diff -ur gdk/quartz.orig/gdkprivate-quartz.h gdk/quartz/gdkprivate-quartz.h
+--- gdk/quartz.orig/gdkprivate-quartz.h 2014-09-28 22:53:28.000000000 -0700
++++ gdk/quartz/gdkprivate-quartz.h 2014-09-28 22:54:39.000000000 -0700
+@@ -216,7 +216,7 @@
+ gint number);
+
+ void _gdk_quartz_window_update_position (GdkWindow *window);
+-void _gdk_quartz_window_update_fullscreen_state (GdkWindow *window);
++
+
+ /* Window methods - testing */
+ void _gdk_quartz_window_sync_rendering (GdkWindow *window);
+diff -ur gdk/quartz.orig/gdkwindow-quartz.c gdk/quartz/gdkwindow-quartz.c
+--- gdk/quartz.orig/gdkwindow-quartz.c 2014-09-28 22:53:28.000000000 -0700
++++ gdk/quartz/gdkwindow-quartz.c 2014-09-28 22:54:40.000000000 -0700
+@@ -29,7 +29,6 @@
+ #include "gdkquartzcursor.h"
+
+ #include <Carbon/Carbon.h>
+-#include <AvailabilityMacros.h>
+
+ #include <sys/time.h>
+ #include <cairo-quartz.h>
+@@ -44,10 +43,6 @@
+
+ void _gdk_quartz_window_flush (GdkWindowImplQuartz *window_impl);
+
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-static FullscreenSavedGeometry *get_fullscreen_geometry (GdkWindow *window);
+-#endif
+-
+ #define FULLSCREEN_DATA "fullscreen-data"
+
+ typedef struct
+@@ -61,6 +56,8 @@
+ static void update_toplevel_order (void);
+ static void clear_toplevel_order (void);
+
++static FullscreenSavedGeometry *get_fullscreen_geometry (GdkWindow *window);
++
+ #define WINDOW_IS_TOPLEVEL(window) \
+ (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
+ GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
+@@ -1173,10 +1170,8 @@
+ GdkWindowImplQuartz *impl;
+
+ /* Make sure we're not stuck in fullscreen mode. */
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+ if (get_fullscreen_geometry (window))
+ SetSystemUIMode (kUIModeNormal, 0);
+-#endif
+
+ check_grab_unmap (window);
+
+@@ -2640,66 +2635,6 @@
+ }
+ }
+
+-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-
+-static gboolean
+-window_is_fullscreen (GdkWindow *window)
+-{
+- GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+-
+- return ([impl->toplevel styleMask] & NSFullScreenWindowMask) != 0;
+-}
+-
+-static void
+-gdk_quartz_window_fullscreen (GdkWindow *window)
+-{
+- GdkWindowImplQuartz *impl;
+-
+- if (GDK_WINDOW_DESTROYED (window) ||
+- !WINDOW_IS_TOPLEVEL (window))
+- return;
+-
+- impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+-
+- if (!window_is_fullscreen (window))
+- [impl->toplevel toggleFullScreen:nil];
+-}
+-
+-static void
+-gdk_quartz_window_unfullscreen (GdkWindow *window)
+-{
+- GdkWindowImplQuartz *impl;
+-
+- if (GDK_WINDOW_DESTROYED (window) ||
+- !WINDOW_IS_TOPLEVEL (window))
+- return;
+-
+- impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+-
+- if (window_is_fullscreen (window))
+- [impl->toplevel toggleFullScreen:nil];
+-}
+-
+-void
+-_gdk_quartz_window_update_fullscreen_state (GdkWindow *window)
+-{
+- gboolean is_fullscreen;
+- gboolean was_fullscreen;
+-
+- is_fullscreen = window_is_fullscreen (window);
+- was_fullscreen = (gdk_window_get_state (window) & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+-
+- if (is_fullscreen != was_fullscreen)
+- {
+- if (is_fullscreen)
+- gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FULLSCREEN);
+- else
+- gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FULLSCREEN, 0);
+- }
+-}
+-
+-#else
+-
+ static FullscreenSavedGeometry *
+ get_fullscreen_geometry (GdkWindow *window)
+ {
+@@ -2783,8 +2718,6 @@
+ }
+ }
+
+-#endif
+-
+ static void
+ gdk_quartz_window_set_keep_above (GdkWindow *window,
+ gboolean setting)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140930/9a29c021/attachment.html>
More information about the macports-changes
mailing list