Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -198,8 +198,8 @@ class Bockbuild:
delete(package.log)
package.source_dir_name = expand_macros(package.source_dir_name, package)
dest = os.path.join(self.build_root, package.source_dir_name)
package.fetch(dest)
workspace_path = os.path.join(self.build_root, package.source_dir_name)
package.fetch(workspace_path)
if self.full_rebuild:
package.request_build('Full rebuild')

View File

@@ -198,8 +198,8 @@ class Bockbuild:
delete(package.log)
package.source_dir_name = expand_macros(package.source_dir_name, package)
dest = os.path.join(self.build_root, package.source_dir_name)
package.fetch(dest)
workspace_path = os.path.join(self.build_root, package.source_dir_name)
package.fetch(workspace_path)
if self.full_rebuild:
package.request_build('Full rebuild')

View File

@@ -49,8 +49,6 @@ class DarwinProfile (UnixProfile):
'libtool',
'xz',
'tar',
'gtk-osx-docbook',
'gtk-doc',
# needed to autogen gtk+
'gtk-osx-docbook',
@@ -77,6 +75,7 @@ class DarwinProfile (UnixProfile):
UnixProfile.attach (self, bockbuild)
bockbuild.toolchain = list (DarwinProfile.default_toolchain)
self.name = 'darwin'
self.debug_info = []
xcode_version = self.use_Xcode ()
@@ -120,8 +119,6 @@ class DarwinProfile (UnixProfile):
self.env.set('CC', 'ccache xcrun gcc')
self.env.set('CXX', 'ccache xcrun g++')
self.debug_info = []
if self.bockbuild.cmd_options.arch == 'default':
self.bockbuild.cmd_options.arch = 'darwin-32'

View File

@@ -492,11 +492,11 @@ class Package:
self.shadow_copy(workspace_x86, workspace_x64)
self.link(workspace_x86, workspace)
package_stage = self.do_build(
stagedir_x32 = self.do_build(
'darwin-32', os.path.join(self.profile.bockbuild.scratch, self.name + '-x86.install'))
self.link(workspace_x64, workspace)
stagedir_x64 = self.do_build(
package_stage = self.do_build(
'darwin-64', os.path.join(self.profile.bockbuild.scratch, self.name + '-x64.install'))
delete(workspace)
@@ -504,9 +504,9 @@ class Package:
print 'lipo', self.name
self.lipo_dirs(stagedir_x64, package_stage, 'lib')
self.lipo_dirs(stagedir_x32, package_stage, 'lib')
self.copy_side_by_side(
stagedir_x64, package_stage, 'bin', '64', '32')
stagedir_x32, package_stage, 'bin', '32', '64')
elif arch == 'toolchain':
package_stage = self.do_build('darwin-64')
elif self.m32_only:
@@ -864,15 +864,18 @@ class Package:
dest_orig_file = os.path.join(dest_dir, reldir, filename)
if not os.path.exists(dest_orig_file):
error('lipo: %s exists in %s but not in %s' %
warn('lipo: %s exists in %s but not in %s' %
(relpath, src_dir, dest_dir))
if orig_suffix is not None:
elif orig_suffix is not None:
suffixed = os.path.join(
dest_dir, reldir, add_suffix(filename, orig_suffix))
trace(suffixed)
shutil.move(dest_orig_file, suffixed)
os.symlink(os.path.basename(suffixed), dest_orig_file)
if not os.path.exists(os.path.dirname(dest_file)):
os.makedirs(os.path.dirname(dest_file))
shutil.copy2(path, dest_file)
def arch_build(self, arch):

View File

@@ -41,10 +41,11 @@ class GlibPackage (GnomeXzPackage):
'patch --ignore-whitespace -p1 < %{local_sources[' + str(p) + ']}')
def arch_build(self, arch):
Package.profile.arch_build(arch, self)
if arch == 'darwin-universal': # multi-arch build pass
self.local_ld_flags = ['-arch i386', '-arch x86_64']
self.local_gcc_flags = ['-arch i386', '-arch x86_64', '-Os']
self.local_configure_flags = ['--disable-dependency-tracking']
self.local_configure_flags.extend(['--disable-dependency-tracking'])
else:
Package.arch_build(self, arch)

View File

@@ -195,7 +195,14 @@ class GtkPackage (GnomeGitPackage):
# https://bugzilla.xamarin.com/show_bug.cgi?id=51382
# https://bugzilla.xamarin.com/show_bug.cgi?id=51375
'patches/gtk/recompute-viewport-allocation-for-overlay-scrollbars.patch'
'patches/gtk/recompute-viewport-allocation-for-overlay-scrollbars.patch',
'patches/gtk/0001-A11y-Make-GtkTable-emit-the-container-add-signal.patch',
'patches/gtk/gtk-add-new-osx-versions.patch',
# 'patches/gtk/gtk-new-screen-updates-api.patch',
# https://bugzilla.xamarin.com/show_bug.cgi?id=5162
'patches/gtk/get-ascii-capable-keyboard-input-source.patch'
])
def prep(self):

View File

@@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
Package.__init__(self, 'gtk-sharp',
sources=['git://github.com/mono/gtk-sharp.git'],
git_branch='gtk-sharp-2-12-branch',
revision='e0ce4b3210ad6a910453b25e7b49b3f249fdce9c',
revision='43d38a806de8efe62a09a3284178880f2ae36a56',
override_properties={
'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
}

View File

@@ -10,17 +10,4 @@ class LibTiffPackage (Package):
self.needs_lipo = True
if Package.profile.name == 'darwin':
self.sources.extend([
# Fix Snow Leopard build
# http://jira.freeswitch.org/secure/attachment/17487/tiff-4.0.2-macosx-2.patch
'patches/tiff-4.0.2-macosx-2.patch'
])
def prep(self):
Package.prep(self)
if Package.profile.name == 'darwin':
for p in range(1, len(self.local_sources)):
self.sh('patch -p1 < "%{local_sources[' + str(p) + ']}"')
LibTiffPackage()

View File

@@ -0,0 +1,35 @@
From 3a4459bea72508236d9c0c4af77c39a15c4e03fd Mon Sep 17 00:00:00 2001
From: iain holmes <iain@xamarin.com>
Date: Thu, 25 May 2017 18:21:09 +0100
Subject: [PATCH] [A11y] Make GtkTable emit the container::add signal
---
gtk/gtktable.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index 22a283836..ba017f327 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -597,6 +597,7 @@ gtk_table_attach (GtkTable *table,
table->children = g_list_prepend (table->children, table_child);
gtk_widget_set_parent (child, GTK_WIDGET (table));
+ g_signal_emit_by_name (G_OBJECT (table), "add", child);
}
void
@@ -880,6 +881,10 @@ static void
gtk_table_add (GtkContainer *container,
GtkWidget *widget)
{
+ /* Protect against the signal emission in gtk_tabel_attach */
+ if (widget->parent == container) {
+ return;
+ }
gtk_table_attach_defaults (GTK_TABLE (container), widget, 0, 1, 0, 1);
}
--
2.11.0 (Apple Git-81)

View File

@@ -0,0 +1,23 @@
commit 2ebbf21fcd13d810bb7a2e6adde011f19033e9b7
Author: Cody Russell <cody@jhu.edu>
Date: Sat Jul 8 15:17:28 2017 -0500
[Mac] Use TISCopyCurrentASCIICapableKeyboardInputSource()
Instead of TISCopyCurrentKeyboardLayoutInputSource(). This seems
to fix issues with some Cyrillic keyboard layouts not being able to
type shortcuts like Cmd-A, Cmd-S, etc.
diff --git a/gdk/quartz/gdkkeys-quartz.c b/gdk/quartz/gdkkeys-quartz.c
index 523aaf7e50..7d3e03c2b7 100644
--- a/gdk/quartz/gdkkeys-quartz.c
+++ b/gdk/quartz/gdkkeys-quartz.c
@@ -272,7 +272,7 @@ update_keymap (void)
* 64-bit.
*/
#ifdef __LP64__
- TISInputSourceRef new_layout = TISCopyCurrentKeyboardLayoutInputSource ();
+ TISInputSourceRef new_layout = TISCopyCurrentASCIICapableKeyboardInputSource();
CFDataRef layout_data_ref;
#else

View File

@@ -0,0 +1,23 @@
commit 96e0c97b316b7f05fe3da1d9a535f23de9e8a031
Author: Cody Russell <cody@jhu.edu>
Date: Sun Jul 9 13:24:25 2017 -0500
[Mac] Add additional OSX version numbers to Sierra
diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 558c53535..8677663ed 100644
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -48,7 +48,11 @@ typedef enum
GDK_OSX_SNOW_LEOPARD = 6,
GDK_OSX_LION = 7,
GDK_OSX_MOUNTAIN_LION = 8,
- GDK_OSX_CURRENT = 8,
+ GDK_OSX_MAVERICKS = 9,
+ GDK_OSX_YOSEMITE = 10,
+ GDK_OSX_EL_CAPITAN = 11,
+ GDK_OSX_SIERRA = 12,
+ GDK_OSX_CURRENT = 12,
GDK_OSX_NEW = 99
} GdkOSXVersion;

View File

@@ -0,0 +1,36 @@
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 35450a0c5..b4973d199 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -461,7 +461,14 @@ _gdk_windowing_before_process_all_updates (void)
{
in_process_all_updates = TRUE;
- NSDisableScreenUpdates ();
+ if (gdk_quartz_osx_version () >= GDK_OSX_EL_CAPITAN)
+ {
+ [NSAnimationContext endGrouping];
+ }
+ else
+ {
+ NSDisableScreenUpdates ();
+ }
}
void
@@ -491,7 +498,14 @@ _gdk_windowing_after_process_all_updates (void)
in_process_all_updates = FALSE;
- NSEnableScreenUpdates ();
+ if (gdk_quartz_osx_version() >= GDK_OSX_EL_CAPITAN)
+ {
+ [NSAnimationContext beginGrouping];
+ }
+ else
+ {
+ NSEnableScreenUpdates ();
+ }
}
static void

View File

@@ -1,22 +0,0 @@
diff --git a/libs/tiff-4.0.2/tools/tiffgt.c b/libs/tiff-4.0.2/tools/tiffgt.c
index de42039..4c8e509 100644
--- a/tools/tiffgt.c
+++ b/tools/tiffgt.c
@@ -31,11 +31,16 @@
#include <string.h>
#include <unistd.h>
-#if HAVE_APPLE_OPENGL_FRAMEWORK
+#if HAVE_OPENGL_GL_H
# include <OpenGL/gl.h>
+#endif
+#if HAVE_GLUT_GLUT_H
# include <GLUT/glut.h>
-#else
+#endif
+#if HAVE_GL_GL_H
# include <GL/gl.h>
+#endif
+#if HAVE_GL_GLUT_H
# include <GL/glut.h>
#endif