[153244] users/devans/GNOME-3/stable/dports/gnome/gtk3
devans at macports.org
devans at macports.org
Tue Sep 27 14:49:51 PDT 2016
Revision: 153244
https://trac.macports.org/changeset/153244
Author: devans at macports.org
Date: 2016-09-27 14:49:50 -0700 (Tue, 27 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gtk3, merge 10.6 build fixes from trunk.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gtk3/files/O_CLOEXEC-10.6-and-earlier.patch
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-152288
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944,148129-152861
/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-153242
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620,128305-134375,141777-146944,148129-152861
/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 2016-09-27 21:46:43 UTC (rev 153243)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/Portfile 2016-09-27 21:49:50 UTC (rev 153244)
@@ -48,13 +48,18 @@
port:hicolor-icon-theme
patchfiles nawk.patch \
- bz765649-get-style-earlier.patch
+ bz765649-get-style-earlier.patch \
+ O_CLOEXEC-10.6-and-earlier.patch
# gtk3 +quartz uses instancetype which is not available
# before approximately Xcode 4.6 (#49391)
+# blacklist compilers that do not support C11 (redefinition of typedef ‘GdkX11Monitor’ at gdkscreen-x11.h:33)
+
if {[variant_isset quartz]} {
compiler.blacklist *gcc* {clang < 425}
+} else {
+ compiler.blacklist *gcc* {clang < 300}
}
# gobject-introspection uses g-ir-scanner, which uses $CC from env
Copied: users/devans/GNOME-3/stable/dports/gnome/gtk3/files/O_CLOEXEC-10.6-and-earlier.patch (from rev 153242, trunk/dports/gnome/gtk3/files/O_CLOEXEC-10.6-and-earlier.patch)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk3/files/O_CLOEXEC-10.6-and-earlier.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk3/files/O_CLOEXEC-10.6-and-earlier.patch 2016-09-27 21:49:50 UTC (rev 153244)
@@ -0,0 +1,12 @@
+--- gtk/gtkprintoperation-portal.c.orig 2016-09-27 11:33:01.000000000 -0700
++++ gtk/gtkprintoperation-portal.c 2016-09-27 11:34:22.000000000 -0700
+@@ -38,6 +38,9 @@
+ #include "gtkintl.h"
+ #include "gtkwindowprivate.h"
+
++#ifndef O_CLOEXEC
++#define O_CLOEXEC 0
++#endif
+
+ typedef struct {
+ GtkPrintOperation *op;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160927/eec61e85/attachment-0001.html>
More information about the macports-changes
mailing list