From 4c712ce9b323ba6750d29c8ea324863d9b1087f6 Mon Sep 17 00:00:00 2001 From: kwm Date: Thu, 10 Jun 2010 10:56:54 +0000 Subject: Update to 2.31.3.1. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14233 df743ca5-7f9a-e211-a948-0013205c9059 --- databases/evolution-data-server/Makefile | 4 +-- databases/evolution-data-server/distinfo | 6 ++-- .../patch-libedataserverui_e-source-selector.c | 40 ---------------------- 3 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 34c0cfadf..b6a349319 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom$ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.196 2010/06/07 12:52:41 kwm Exp $ # PORTNAME= evolution-data-server -PORTVERSION= 2.31.3 +PORTVERSION= 2.31.3.1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index 1221291a7..2119ebf4b 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/evolution-data-server-2.31.3.tar.bz2) = 95200ede0421fc869a40e0381f0e7e1e -SHA256 (gnome2/evolution-data-server-2.31.3.tar.bz2) = ce467e05ba7fdca9aff176a23d3d995ac4dafeabe585b67745b1c47872c0f31a -SIZE (gnome2/evolution-data-server-2.31.3.tar.bz2) = 4127508 +MD5 (gnome2/evolution-data-server-2.31.3.1.tar.bz2) = 671d217d8b8ffb1f81b86f822cc1b7e1 +SHA256 (gnome2/evolution-data-server-2.31.3.1.tar.bz2) = 1e21edddea949fea6605a458e09ca0a79f3fe572879b77da99f1216aa849146a +SIZE (gnome2/evolution-data-server-2.31.3.1.tar.bz2) = 4128233 diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c deleted file mode 100644 index c40bec6b2..000000000 --- a/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c +++ /dev/null @@ -1,40 +0,0 @@ -Very very hacky patch. Seems GSEAL screws up somehow. -Review after next gtk (2.12.2) update. - ---- libedataserverui/e-source-selector.c.orig 2010-06-07 13:37:26.000000000 +0200 -+++ libedataserverui/e-source-selector.c 2010-06-07 14:06:35.000000000 +0200 -@@ -965,10 +965,12 @@ - pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE; - gtk_tree_view_set_drag_dest_row (tree_view, path, pos); - -- if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) -+/* if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) */ -+ if (context->_g_sealed__action & GDK_ACTION_MOVE) - action = GDK_ACTION_MOVE; - else -- action = gdk_drag_context_get_suggested_action (context); -+ action = context->_g_sealed__suggested_action; -+/* action = gdk_drag_context_get_suggested_action (context);*/ - - exit: - if (path != NULL) -@@ -1034,7 +1036,8 @@ - - tree_view = GTK_TREE_VIEW (widget); - model = gtk_tree_view_get_model (tree_view); -- delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE); -+/* delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE); */ -+ delete = (context->_g_sealed__action == GDK_ACTION_MOVE); - - if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) - goto exit; -@@ -1049,7 +1052,8 @@ - - g_signal_emit ( - widget, signals[DATA_DROPPED], 0, selection_data, -- object, gdk_drag_context_get_selected_action (context), -+/* object, gdk_drag_context_get_selected_action (context), */ -+ object, context->_g_sealed__action, - info, &success); - - exit: -- cgit v1.2.3