diff --git a/gio/Gio.metadata b/gio/Gio.metadata index 742c5bc9e..d080879db 100644 --- a/gio/Gio.metadata +++ b/gio/Gio.metadata @@ -147,6 +147,8 @@ 1 1 1 + 1 + 1 1 1 1 diff --git a/gio/gio-api.raw b/gio/gio-api.raw index 3232349e9..0330a2c99 100644 --- a/gio/gio-api.raw +++ b/gio/gio-api.raw @@ -10145,6 +10145,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13504,8 +13575,6 @@ - - diff --git a/sources/Makefile.am b/sources/Makefile.am index 653bb61d2..2b9e8bd63 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = \ sources.xml \ gtk_tree_model_signal_fix.patch -TARGET_GTK_VERSION=3.20.4 +TARGET_GTK_VERSION=3.20.6 TARGET_GTK_API=3.20 GTK_DOWNLOADS = \ @@ -24,8 +24,6 @@ get-source-code: patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h - patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtkselectionprivate.h < gtkselectionprivate-space.patch patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextattributes.h < gtktextattributes-gi-scanner.patch - patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktextview.h < gtk_text_view_public.patch patch -p0 glib-2.48.0/gio/gwin32registrykey.h < gwin32registrykey-little-endian.patch diff --git a/sources/gtk_text_view_public.patch b/sources/gtk_text_view_public.patch deleted file mode 100644 index 5363d5b08..000000000 --- a/sources/gtk_text_view_public.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-3.16.6.orig/gtk/gtktextview.h 2015-09-04 11:37:38.035020919 +0200 -+++ gtk+-3.16.6/gtk/gtktextview.h 2015-09-04 11:38:59.958096121 +0200 -@@ -155,8 +155,6 @@ - { - GtkContainerClass parent_class; - -- /*< public */ -- - void (* populate_popup) (GtkTextView *text_view, - GtkWidget *popup); - void (* move_cursor) (GtkTextView *text_view, diff --git a/sources/gtkselectionprivate-space.patch b/sources/gtkselectionprivate-space.patch deleted file mode 100644 index 6efdd70fc..000000000 --- a/sources/gtkselectionprivate-space.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-3.12.0.orig/gtk/gtkselectionprivate.h 2014-06-10 09:14:53.055629108 +0200 -+++ gtk+-3.12.0/gtk/gtkselectionprivate.h 2014-06-10 09:14:59.503650175 +0200 -@@ -52,7 +52,7 @@ - /*< private >*/ - GList *list; - guint ref_count; -- }; -+}; - - gboolean _gtk_selection_clear (GtkWidget *widget, - GdkEventSelection *event); diff --git a/sources/sources.xml b/sources/sources.xml index eb813d780..996b8fc66 100644 --- a/sources/sources.xml +++ b/sources/sources.xml @@ -78,8 +78,6 @@ gsettingsschema.h gsettingsschema-internal.h gtlsfiledatabase.h - gsimpleaction.h - gsimpleactiongroup.h gdtlsclientconnection.c gdtlsclientconnection.h gdtlsconnection.c @@ -142,12 +140,12 @@ - + gdkalias.h gdkwindowimpl.h keyname-table.h - + @@ -167,7 +165,7 @@ - + gtkalias.h gtkappchooseronline.h @@ -265,7 +263,7 @@ gtkcomposetable.c gtkcomposetable.h - +