[143400] trunk/dports/gnome/gtk2

[devans at macports.org]

Revision: 143400
          https://trac.macports.org/changeset/143400
Author:   devans at macports.org
Date:     2015-12-11 17:29:42 -0800 (Fri, 11 Dec 2015)
Log Message:
-----------
gtk2: update to version 2.24.29, remove temporary patch now included in release.

Modified Paths:
--------------
    trunk/dports/gnome/gtk2/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff

Property Changed:
----------------
    trunk/dports/gnome/gtk2/


Property changes on: trunk/dports/gnome/gtk2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk2:133112-136677
/users/rmstonecipher/gnome/gtk2:102363-103172
   + /users/devans/GNOME-3/stable/dports/gnome/gtk2:133112-143399

Modified: trunk/dports/gnome/gtk2/Portfile
===================================================================
--- trunk/dports/gnome/gtk2/Portfile	2015-12-12 01:26:33 UTC (rev 143399)
+++ trunk/dports/gnome/gtk2/Portfile	2015-12-12 01:29:42 UTC (rev 143400)
@@ -7,8 +7,7 @@
 PortGroup           xcodeversion 1.0
 
 name                gtk2
-version             2.24.28
-revision            1
+version             2.24.29
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome x11
 license             LGPL-2+
@@ -30,8 +29,8 @@
 
 minimum_xcodeversions {9 3.1}
 
-checksums           rmd160  6157ba437c3ea873cc28d38c8184be94fc253838 \
-                    sha256  b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
+checksums           rmd160  94e02e447afd9ab606fa1934cf7ff57d6223da18 \
+                    sha256  0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8
 
 depends_build       port:gtk-doc \
                     port:pkgconfig \
@@ -52,11 +51,6 @@
 patchfiles-append   patch-aliases.diff
 patchfiles-append   patch-gtk-builder-convert.diff
 
-# temporary patch before the next release
-# ticket #49090: "gtk2 crashing in 10.11"
-
-patchfiles-append   patch-modules_input_imquartz.diff
-
 # autoreconf to deal with stupid issues during install (install: .libs/libferret.lai: No such file or directory)
 use_autoreconf      yes
 autoreconf.args     -fvi

Deleted: trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff
===================================================================
--- trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff	2015-12-12 01:26:33 UTC (rev 143399)
+++ trunk/dports/gnome/gtk2/files/patch-modules_input_imquartz.diff	2015-12-12 01:29:42 UTC (rev 143400)
@@ -1,35 +0,0 @@
---- modules/input/imquartz.c.orig
-+++ modules/input/imquartz.c
-@@ -195,11 +195,7 @@ quartz_filter_keypress (GtkIMContext *context,
-     return FALSE;
- 
-   nsview = gdk_quartz_window_get_nsview (qc->client_window);
--  if (GDK_IS_WINDOW (nsview))
--       /* it gets GDK_WINDOW in some cases */
--    return gtk_im_context_filter_keypress (qc->slave, event);
--  else
--    win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
-+  win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
-   GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n",
- 			   qc->client_window, win, nsview));
- 
-@@ -251,9 +247,6 @@ discard_preedit (GtkIMContext *context)
-   if (!nsview)
-     return;
- 
--  if (GDK_IS_WINDOW (nsview))
--    return;
--
-   /* reset any partial input for this NSView */
-   [(GdkQuartzView *)nsview unmarkText];
-   NSInputManager *currentInputManager = [NSInputManager currentInputManager];
-@@ -334,9 +327,6 @@ quartz_set_cursor_location (GtkIMContext *context, GdkRectangle *area)
-   qc->cursor_rect->y = area->y + y;
- 
-   nsview = gdk_quartz_window_get_nsview (qc->client_window);
--  if (GDK_IS_WINDOW (nsview))
--    /* it returns GDK_WINDOW in some cases */
--    return;
- 
-   win = (GdkWindow *)[ (GdkQuartzView*)nsview gdkWindow];
-   g_object_set_data (G_OBJECT (win), GIC_CURSOR_RECT, qc->cursor_rect);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/6759cd5f/attachment.html>