Imported Upstream version 5.18.0.142

Former-commit-id: 7467d4b717762eeaf652d77f1486dd11ffb1ff1f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-10-09 08:20:59 +00:00
parent e52655b4dc
commit 0abdbe5a7d
1547 changed files with 93792 additions and 47893 deletions

View File

@@ -207,6 +207,9 @@ class Bockbuild:
elif not os.path.exists(package.build_artifact):
package.request_build('No artifact')
elif is_expired(package.build_artifact, config.artifact_lifespan_days):
package.request_build('Artifact expired (older than %d days)' % config.artifact_lifespan_days)
elif is_changed(package.buildstring, package.buildstring_file):
package.request_build('Updated')

View File

@@ -207,6 +207,9 @@ class Bockbuild:
elif not os.path.exists(package.build_artifact):
package.request_build('No artifact')
elif is_expired(package.build_artifact, config.artifact_lifespan_days):
package.request_build('Artifact expired (older than %d days)' % config.artifact_lifespan_days)
elif is_changed(package.buildstring, package.buildstring_file):
package.request_build('Updated')

View File

@@ -122,11 +122,11 @@ class DarwinProfile (UnixProfile):
self.gcc_flags.extend(['-O0', '-ggdb3'])
if os.getenv('BOCKBUILD_USE_CCACHE') is None:
self.env.set('CC', 'xcrun gcc')
self.env.set('CXX', 'xcrun g++')
self.env.set('CC', 'xcrun clang')
self.env.set('CXX', 'xcrun clang++')
else:
self.env.set('CC', 'ccache xcrun gcc')
self.env.set('CXX', 'ccache xcrun g++')
self.env.set('CC', 'ccache xcrun clang')
self.env.set('CXX', 'ccache xcrun clang++')
if self.bockbuild.cmd_options.arch == 'default':
self.bockbuild.cmd_options.arch = 'darwin-32'
@@ -139,7 +139,7 @@ class DarwinProfile (UnixProfile):
package.local_ld_flags = ['-arch i386', '-m32']
package.local_gcc_flags = ['-arch i386', '-m32']
package.local_configure_flags = [
'--build=i386-apple-darwin11.2.0', '--disable-dependency-tracking']
'--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
elif arch == 'darwin-64':
package.local_ld_flags = ['-arch x86_64 -m64']
package.local_gcc_flags = ['-arch x86_64 -m64']

View File

@@ -11,6 +11,7 @@ import shutil
import tarfile
import hashlib
import stat
from datetime import datetime,timedelta
import functools
# from
@@ -44,6 +45,7 @@ class config:
absolute_root = None # there is no file resolution beneath this path. Displayed paths are shortened by omitting this segment.
state_root = None
exit_code = exit_codes.NOTSET
artifact_lifespan_days = 7
class CommandException (Exception): # shell command failure
@@ -298,6 +300,9 @@ def is_changed(new, file, show_diff=True):
else:
return False
def is_expired (path, age_cutoff_days):
artifact_age_days = (datetime.utcnow() - datetime.utcfromtimestamp(os.path.getmtime(path))).days
return artifact_age_days > age_cutoff_days
def get_filetype(path):
# the env variables are to work around a issue with OS X and 'file':

View File

@@ -18,7 +18,7 @@ class Autoconf (GnuPackage):
elif arch == 'darwin-32':
self.local_ld_flags = ['-arch i386', '-m32']
self.local_gcc_flags = ['-arch i386', '-m32']
self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
self.local_configure_flags = ['--build=i386-apple-darwin13.0.0']
elif arch == 'darwin-64':
self.local_ld_flags = ['-arch x86_64 -m64']
self.local_gcc_flags = ['-arch x86_64 -m64']

View File

@@ -13,7 +13,7 @@ class Automake (GnuPackage):
elif arch == 'darwin-32':
self.local_ld_flags = ['-arch i386', '-m32']
self.local_gcc_flags = ['-arch i386', '-m32']
self.local_configure_flags = ['--build=i386-apple-darwin11.2.0']
self.local_configure_flags = ['--build=i386-apple-darwin13.0.0']
elif arch == 'darwin-64':
self.local_ld_flags = ['-arch x86_64 -m64']
self.local_gcc_flags = ['-arch x86_64 -m64']

View File

@@ -1,13 +1,34 @@
diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c
index 195899b13b..844128e0b2 100644
index 195899b13b..67e3f8ee17 100644
--- a/gdk/quartz/gdkevents-quartz.c
+++ b/gdk/quartz/gdkevents-quartz.c
@@ -748,7 +748,7 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
@@ -729,7 +729,7 @@ _gdk_quartz_events_send_map_event (GdkWindow *window)
}
static NSView *
-find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
+find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y, bool dont_recurse)
{
NSView *view = impl->view;
guint n_subviews;
@@ -748,7 +748,10 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y)
if (r.origin.x <= x && r.origin.x + r.size.width >= x &&
r.origin.y <= y && r.origin.y + r.size.height >= y)
{
- NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y);
+ NSView* child = find_nsview_at_pos (sv, x - r.origin.x, y - r.origin.y);
+ if (dont_recurse)
+ return sv;
+
+ NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y, TRUE);
if (child != NULL)
return child;
else
@@ -932,7 +935,7 @@ find_window_for_ns_event (NSEvent *nsevent,
toplevel_private = (GdkWindowObject *)toplevel;
toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl;
- subview = find_nsview_at_pos (toplevel_impl, *x, *y);
+ subview = find_nsview_at_pos (toplevel_impl, *x, *y, FALSE);
if (subview != NULL && ![subview isKindOfClass:[GdkQuartzView class]]) {
g_signal_emit_by_name (toplevel, "native-child-event",
subview, nsevent);