no more submodule
This commit is contained in:
@@ -0,0 +1,59 @@
|
||||
diff -Naur gtk+-3.22.1.orig/gtk/gtktreemodel.c gtk+-3.22.1/gtk/gtktreemodel.c
|
||||
--- gtk+-3.22.1.orig/gtk/gtktreemodel.c 2016-08-29 18:20:43.000000000 +0100
|
||||
+++ gtk+-3.22.1/gtk/gtktreemodel.c 2016-10-17 13:57:41.204889300 +0100
|
||||
@@ -395,14 +395,15 @@
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, row_inserted_marshal);
|
||||
tree_model_signals[ROW_INSERTED] =
|
||||
- g_signal_newv (I_("row-inserted"),
|
||||
+ g_signal_new (I_("row-inserted"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
- closure,
|
||||
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
|
||||
NULL, NULL,
|
||||
_gtk_marshal_VOID__BOXED_BOXED,
|
||||
G_TYPE_NONE, 2,
|
||||
- row_inserted_params);
|
||||
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
|
||||
+ GTK_TYPE_TREE_ITER);
|
||||
|
||||
/**
|
||||
* GtkTreeModel::row-has-child-toggled:
|
||||
@@ -441,14 +442,14 @@
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, row_deleted_marshal);
|
||||
tree_model_signals[ROW_DELETED] =
|
||||
- g_signal_newv (I_("row-deleted"),
|
||||
+ g_signal_new (I_("row-deleted"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
- closure,
|
||||
+ G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
|
||||
NULL, NULL,
|
||||
NULL,
|
||||
G_TYPE_NONE, 1,
|
||||
- row_deleted_params);
|
||||
+ GTK_TYPE_TREE_PATH);
|
||||
|
||||
/**
|
||||
* GtkTreeModel::rows-reordered: (skip)
|
||||
@@ -471,14 +472,15 @@
|
||||
closure = g_closure_new_simple (sizeof (GClosure), NULL);
|
||||
g_closure_set_marshal (closure, rows_reordered_marshal);
|
||||
tree_model_signals[ROWS_REORDERED] =
|
||||
- g_signal_newv (I_("rows-reordered"),
|
||||
+ g_signal_new (I_("rows-reordered"),
|
||||
GTK_TYPE_TREE_MODEL,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
- closure,
|
||||
+ G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
|
||||
NULL, NULL,
|
||||
_gtk_marshal_VOID__BOXED_BOXED_POINTER,
|
||||
G_TYPE_NONE, 3,
|
||||
- rows_reordered_params);
|
||||
+ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE,
|
||||
+ GTK_TYPE_TREE_ITER, G_TYPE_POINTER);
|
||||
initialized = TRUE;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
--- gtk+-3.18.2.orig/gtk/gtktextattributes.h 2015-11-09 13:28:27.852084380 +0100
|
||||
+++ gtk+-3.18.2/gtk/gtktextattributes.h 2015-11-09 13:29:14.424084380 +0100
|
||||
@@ -112,26 +112,7 @@
|
||||
guint inside_selection : 1;
|
||||
guint is_text : 1;
|
||||
|
||||
- /* For the sad story of this bit of code, see
|
||||
- * https://bugzilla.gnome.org/show_bug.cgi?id=711158
|
||||
- */
|
||||
-#ifdef __GI_SCANNER__
|
||||
- /* The scanner should only see the transparent union, so that its
|
||||
- * content does not vary across architectures.
|
||||
- */
|
||||
- union {
|
||||
- GdkRGBA *rgba[2];
|
||||
- /*< private >*/
|
||||
- guint padding[4];
|
||||
- };
|
||||
-#else
|
||||
GdkRGBA *rgba[2];
|
||||
-#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
|
||||
- /* unusable, just for ABI compat */
|
||||
- /*< private >*/
|
||||
- guint padding[2];
|
||||
-#endif
|
||||
-#endif
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -207,23 +188,7 @@
|
||||
/*< public >*/
|
||||
gint letter_spacing;
|
||||
|
||||
-#ifdef __GI_SCANNER__
|
||||
- /* The scanner should only see the transparent union, so that its
|
||||
- * content does not vary across architectures.
|
||||
- */
|
||||
- union {
|
||||
- gchar *font_features;
|
||||
- /*< private >*/
|
||||
- guint padding[2];
|
||||
- };
|
||||
-#else
|
||||
gchar *font_features;
|
||||
-#if (defined(__SIZEOF_INT__) && defined(__SIZEOF_POINTER__)) && (__SIZEOF_INT__ == __SIZEOF_POINTER__)
|
||||
- /* unusable, just for ABI compat */
|
||||
- /*< private >*/
|
||||
- guint padding[1];
|
||||
-#endif
|
||||
-#endif
|
||||
};
|
||||
|
||||
GDK_AVAILABLE_IN_ALL
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -Nur glib-2.50.2.orig/gio/gwin32registrykey.h glib-2.50.2/gio/gwin32registrykey.h
|
||||
--- glib-2.50.2.orig/gio/gwin32registrykey.h 2016-10-22 07:18:19.000000000 +0200
|
||||
+++ glib-2.50.2/gio/gwin32registrykey.h 2017-01-20 10:00:20.512880131 +0100
|
||||
@@ -37,18 +37,12 @@
|
||||
G_WIN32_REGISTRY_VALUE_BINARY = 1,
|
||||
G_WIN32_REGISTRY_VALUE_UINT32LE = 2,
|
||||
G_WIN32_REGISTRY_VALUE_UINT32BE = 3,
|
||||
-#if G_BYTE_ORDER == G_BIG_ENDIAN
|
||||
- G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32BE,
|
||||
-#else
|
||||
- G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32LE,
|
||||
-#endif
|
||||
+ G_WIN32_REGISTRY_VALUE_UINT32 = 2,
|
||||
G_WIN32_REGISTRY_VALUE_EXPAND_STR = 4,
|
||||
G_WIN32_REGISTRY_VALUE_LINK = 5,
|
||||
G_WIN32_REGISTRY_VALUE_MULTI_STR = 6,
|
||||
G_WIN32_REGISTRY_VALUE_UINT64LE = 7,
|
||||
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
- G_WIN32_REGISTRY_VALUE_UINT64 = G_WIN32_REGISTRY_VALUE_UINT64LE,
|
||||
-#endif
|
||||
+ G_WIN32_REGISTRY_VALUE_UINT64 = 7,
|
||||
G_WIN32_REGISTRY_VALUE_STR = 8
|
||||
} GWin32RegistryValueType;
|
||||
|
||||
Reference in New Issue
Block a user