Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

external/bockbuild/packages/gtk+.py

@@ -188,7 +188,14 @@ class GtkPackage (GnomeGitPackage):
 
                 'patches/gtk/emit-container-add.patch',
                 'patches/gtk/create-accessibility-object.patch',
-                'patches/gtk/make-gtkpaned-emit-signals.patch'
+
+                'patches/gtk/make-gtkpaned-emit-signals.patch',
+                'patches/gtk/0001-A11y-Fix-dialog-accessibility.patch',
+                'patches/gtk/0001-A11y-Emit-the-container-add-signal-when-inserting-a-.patch',
+
+                # 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'
             ])
 
     def prep(self):

external/bockbuild/packages/gtk-sharp.py

@@ -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='f092864bce996c4ac51a13281069067d1e7e6d4b',
+                         revision='e0ce4b3210ad6a910453b25e7b49b3f249fdce9c',
                          override_properties={
                              'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
                          }

external/bockbuild/packages/libjpeg.py

@@ -1,8 +1,18 @@
 class LibJpegPackage (Package):
 
     def __init__(self):
-        Package.__init__(self, 'libjpeg', '8', sources=[
-                         'http://www.ijg.org/files/jpegsrc.v8.tar.gz'])
+        Package.__init__(
+            self,
+            'libjpeg',
+            '8',
+            sources=[
+                'http://www.ijg.org/files/jpegsrc.v8.tar.gz',
+                'patches/libjpeg8.patch'])
         self.source_dir_name = 'jpeg-8'
 
+    def prep(self):
+        Package.prep(self)
+        for p in range(1, len(self.local_sources)):
+            self.sh('patch -p1 < "%{local_sources[' + str(p) + ']}"')
+
 LibJpegPackage()

external/bockbuild/packages/libtiff.py

@@ -1,7 +1,7 @@
 class LibTiffPackage (Package):
 
     def __init__(self):
-        Package.__init__(self, 'tiff', '4.0.3',
+        Package.__init__(self, 'tiff', '4.0.8',
                          configure_flags=[
                          ],
                          sources=[

external/bockbuild/packages/patches/gtk/0001-A11y-Emit-the-container-add-signal-when-inserting-a-.patch

@@ -0,0 +1,38 @@
+From c0198befd34288a1c2c6ae6f2523076b8bd8b0d4 Mon Sep 17 00:00:00 2001
+From: iain holmes <iain@xamarin.com>
+Date: Tue, 24 Jan 2017 10:53:39 +0000
+Subject: [PATCH 1/1] [A11y] Emit the container::add signal when inserting a
+ menu
+
+---
+ gtk/gtkmenushell.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
+index a7ad7b5..cd170fe 100644
+--- a/gtk/gtkmenushell.c
++++ b/gtk/gtkmenushell.c
+@@ -521,6 +521,9 @@ gtk_menu_shell_real_insert (GtkMenuShell *menu_shell,
+   menu_shell->children = g_list_insert (menu_shell->children, child, position);
+ 
+   gtk_widget_set_parent (child, GTK_WIDGET (menu_shell));
++
++  // Emit the container::add signal so the accessibility system can pick it up
++  g_signal_emit_by_name (G_OBJECT (menu_shell), "add", child);
+ }
+ 
+ void
+@@ -1039,6 +1042,10 @@ static void
+ gtk_menu_shell_add (GtkContainer *container,
+ 		    GtkWidget    *widget)
+ {
++  if (widget->parent == container) {
++    return;
++  }
++
+   gtk_menu_shell_append (GTK_MENU_SHELL (container), widget);
+ }
+ 
+-- 
+2.10.1 (Apple Git-78)
+

external/bockbuild/packages/patches/gtk/0001-A11y-Fix-dialog-accessibility.patch

@@ -0,0 +1,33 @@
+From 3d3ee2f91bbcb364891e82b99e932d918c605658 Mon Sep 17 00:00:00 2001
+From: iain holmes <iain@xamarin.com>
+Date: Thu, 24 Nov 2016 11:30:23 +0000
+Subject: [PATCH] [A11y] Fix dialog accessibility
+
+Composite widgets like the dialog need to have their accessibility element
+created before they start building themselves.
+---
+ gtk/gtkdialog.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
+index a2756f6..41fc9b1 100644
+--- a/gtk/gtkdialog.c
++++ b/gtk/gtkdialog.c
+@@ -275,6 +275,14 @@ gtk_dialog_init (GtkDialog *dialog)
+   priv = GET_PRIVATE (dialog);
+   priv->ignore_separator = FALSE;
+ 
++  /* If we don't create the accessible now, then the accessibility subsystem
++   * will never know about vbox being added. This is a bit of a hack as
++   * every composite widget that builds itself in _init will need to do this
++   * or else it will be inaccessible, but I can't think of a better way at
++   * present
++   */
++  gtk_widget_get_accessible (GTK_WIDGET (dialog));
++
+   /* To avoid breaking old code that prevents destroy on delete event
+    * by connecting a handler, we have to have the FIRST signal
+    * connection on the dialog.
+-- 
+2.9.3 (Apple Git-75)
+

external/bockbuild/packages/patches/gtk/recompute-viewport-allocation-for-overlay-scrollbars.patch

@@ -0,0 +1,31 @@
+commit 391fcf5868dac9aa28992cd62fae9cb104364835
+Author: Cody Russell <cody@jhu.edu>
+Date:   Sat Jan 14 14:49:14 2017 -0600
+
+    Recompute viewport allocation when updating overlay scrollbars
+    
+    https://bugzilla.xamarin.com/show_bug.cgi?id=51375
+    https://bugzilla.xamarin.com/show_bug.cgi?id=51382
+
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index 3999d7d..0a2cb67 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -270,6 +270,8 @@ static void      gtk_scrolled_window_get_scroll_areas  (GtkScrolledWindow *scrol
+                                                         GdkRectangle      *hslider_rect);
+ static void  gtk_scrolled_window_update_scrollbars (GtkScrolledWindow *scrolled_window);
+ 
++static void  gtk_scrolled_window_compute_viewport_allocation (GtkScrolledWindow *scrolled_window);
++
+ static void gtk_scrolled_window_overlay_scrollbars_changed (GtkSettings *settings,
+                                                             GParamSpec  *arg,
+                                                             gpointer     user_data);
+@@ -1391,6 +1393,8 @@ gtk_scrolled_window_update_scrollbars (GtkScrolledWindow *scrolled_window)
+   if (!priv->overlay_scrollbars || !gtk_widget_get_realized (widget))
+     return;
+ 
++  gtk_scrolled_window_compute_viewport_allocation (scrolled_window);
++
+   window = gtk_widget_get_window (gtk_widget_get_toplevel (widget));
+   window_height = gdk_window_get_height (window);
+ 

external/bockbuild/packages/patches/libjpeg8.patch

@@ -0,0 +1,49 @@
+diff --git a/jdmarker.c b/jdmarker.c
+index f2a9cc4..2edebc2 100644
+--- a/jdmarker.c
++++ b/jdmarker.c
+@@ -305,7 +305,7 @@ get_sos (j_decompress_ptr cinfo)
+ /* Process a SOS marker */
+ {
+   INT32 length;
+-  int i, ci, n, c, cc;
++  int i, j, ci, n, c, cc;
+   jpeg_component_info * compptr;
+   INPUT_VARS(cinfo);
+ 
+@@ -340,7 +340,11 @@ get_sos (j_decompress_ptr cinfo)
+     ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
+ 
+   id_found:
+-
++    for (j = 0; j < i; j++) {
++      if (cinfo->cur_comp_info[j] == compptr) {
++        ERREXIT1(cinfo, JERR_DUP_COMPONENT_ID, cc);
++      }
++    }
+     cinfo->cur_comp_info[i] = compptr;
+     compptr->dc_tbl_no = (c >> 4) & 15;
+     compptr->ac_tbl_no = (c     ) & 15;
+@@ -480,7 +484,9 @@ get_dht (j_decompress_ptr cinfo)
+       *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
+   
+     MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
+-    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));
++    MEMCOPY((*htblptr)->huffval, huffval, count);
++
++    MEMZERO((*htblptr)->huffval + count, SIZEOF( (*htblptr)->huffval) - count);
+   }
+ 
+   if (length != 0)
+diff --git a/jerror.h b/jerror.h
+index 1cfb2b1..4007c49 100644
+--- a/jerror.h
++++ b/jerror.h
+@@ -77,6 +77,7 @@ JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
+ JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
+ JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
+ JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
++JMESSAGE(JERR_DUP_COMPONENT_ID, "Duplicate component ID")
+ JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
+ JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
+ JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")

external/bockbuild/packages/xz.py

@@ -1,4 +1,3 @@
 Package('xz', '5.0.4', sources=[
-    'http://tukaani.org/xz/xz-%{version}.tar.bz2'],
-    override_properties={'build_dependency': True}
-)
+    'http://tukaani.org/xz/xz-%{version}.tar.bz2'], configure_flags = ['--disable-nls'])
+