You've already forked linux-packaging-mono
Imported Upstream version 5.4.0.167
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
parent
e49d6f06c0
commit
536cd135cc
@@ -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)
|
||||
|
23
external/bockbuild/packages/patches/gtk/get-ascii-capable-keyboard-input-source.patch
vendored
Normal file
23
external/bockbuild/packages/patches/gtk/get-ascii-capable-keyboard-input-source.patch
vendored
Normal 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
|
23
external/bockbuild/packages/patches/gtk/gtk-add-new-osx-versions.patch
vendored
Normal file
23
external/bockbuild/packages/patches/gtk/gtk-add-new-osx-versions.patch
vendored
Normal 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;
|
||||
|
36
external/bockbuild/packages/patches/gtk/gtk-new-screen-updates-api.patch
vendored
Normal file
36
external/bockbuild/packages/patches/gtk/gtk-new-screen-updates-api.patch
vendored
Normal 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
|
@@ -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
|
Reference in New Issue
Block a user