diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-10 18:55:01 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-10 18:55:01 +0800 |
| commit | b32226a94b894d24226340daa3ca66fd0b542c11 (patch) | |
| tree | 902a325740aef5c33666ed0983306439eac0b31d | |
| parent | bff9bf1be5652705cff654ae29074ee6f2be48f1 (diff) | |
| download | marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar.gz marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar.bz2 marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar.lz marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar.xz marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.tar.zst marcuscom-ports-b32226a94b894d24226340daa3ca66fd0b542c11.zip | |
Back port a fix from gtk+ gtk, branch gtk-2-22. So evolution[data-server] can build.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14232 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk_drag-context | 43 |
2 files changed, 45 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 43be9f8e9..c6897e4c6 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,12 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.193 2010/05/27 23:14:47 kwm Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.194 2010/06/05 13:56:20 kwm Exp $ # PORTNAME= gtk PORTVERSION= 2.21.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtk20/files/patch-gdk_drag-context b/x11-toolkits/gtk20/files/patch-gdk_drag-context new file mode 100644 index 000000000..5e2e8967c --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gdk_drag-context @@ -0,0 +1,43 @@ +--- gdk/gdk.symbols.orig 2010-05-30 08:52:43.000000000 +0200 ++++ gdk/gdk.symbols 2010-06-10 12:33:53.000000000 +0200 +@@ -535,8 +535,8 @@ gdk_drop_reply + + #if IN_HEADER(__GDK_DND_H__) + #if IN_FILE(__GDK_DND_C__) +-gdk_drag_context_get_action + gdk_drag_context_get_actions ++gdk_drag_context_get_selected_action + gdk_drag_context_get_suggested_action + gdk_drag_context_list_targets + gdk_drag_find_window +--- gdk/gdkdnd.h.orig 2010-05-30 08:52:43.000000000 +0200 ++++ gdk/gdkdnd.h 2010-06-10 12:33:53.000000000 +0200 +@@ -109,7 +109,7 @@ GdkDragContext * gdk_drag_context_new + GList *gdk_drag_context_list_targets (GdkDragContext *context); + GdkDragAction gdk_drag_context_get_actions (GdkDragContext *context); + GdkDragAction gdk_drag_context_get_suggested_action (GdkDragContext *context); +-GdkDragAction gdk_drag_context_get_action (GdkDragContext *context); ++GdkDragAction gdk_drag_context_get_selected_action (GdkDragContext *context); + + #ifndef GDK_DISABLE_DEPRECATED + void gdk_drag_context_ref (GdkDragContext *context); +--- gdk/gdkdnd.c.orig 2010-05-30 08:18:44.000000000 +0200 ++++ gdk/gdkdnd.c 2010-06-10 12:33:53.000000000 +0200 +@@ -133,7 +133,7 @@ gdk_drag_context_get_suggested_action (G + } + + /** +- * gdk_drag_context_get_action: ++ * gdk_drag_context_selected_get_action: + * @context: a #GdkDragContext + * + * Determines the action chosen by the drag destination. +@@ -143,7 +143,7 @@ gdk_drag_context_get_suggested_action (G + * Since: 2.22 + **/ + GdkDragAction +-gdk_drag_context_get_action (GdkDragContext *context) ++gdk_drag_context_get_selected_action (GdkDragContext *context) + { + g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), 0); + |