<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[125907] trunk/dports/gnome/gtk3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/125907">125907</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-09-28 23:23:16 -0700 (Sun, 28 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gtk3: back out upstream commit that breaks +quartz build on 10.6 and earlier (#45202).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3Portfile">trunk/dports/gnome/gtk3/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegtk3filespatchdisablenativefullscreensupportdiff">trunk/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegtk3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gtk3/Portfile (125906 => 125907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtk3/Portfile 2014-09-29 06:17:13 UTC (rev 125906)
+++ trunk/dports/gnome/gtk3/Portfile 2014-09-29 06:23:16 UTC (rev 125907)
</span><span class="lines">@@ -39,6 +39,16 @@
</span><span class="cx"> # See http://trac.macports.org/ticket/43283
</span><span class="cx"> patchfiles patch-backingScaleFactor.diff
</span><span class="cx">
</span><ins>+# 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
+}
+
</ins><span class="cx"> minimum_xcodeversions {9 3.1}
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegtk3filespatchdisablenativefullscreensupportdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff (0 => 125907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff (rev 0)
+++ trunk/dports/gnome/gtk3/files/patch-disable-native-full-screen-support.diff 2014-09-29 06:23:16 UTC (rev 125907)
</span><span class="lines">@@ -0,0 +1,164 @@
</span><ins>+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)
</ins></span></pre>
</div>
</div>
</body>
</html>