[61955] trunk/dports/x11/gtk2
nox at macports.org
nox at macports.org
Fri Dec 25 08:43:23 PST 2009
Revision: 61955
http://trac.macports.org/changeset/61955
Author: nox at macports.org
Date: 2009-12-25 08:43:20 -0800 (Fri, 25 Dec 2009)
Log Message:
-----------
Remove outdated gtk2 patch (closes #23026)
Modified Paths:
--------------
trunk/dports/x11/gtk2/Portfile
Removed Paths:
-------------
trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff
Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile 2009-12-25 10:54:44 UTC (rev 61954)
+++ trunk/dports/x11/gtk2/Portfile 2009-12-25 16:43:20 UTC (rev 61955)
@@ -187,7 +187,6 @@
}
variant quartz requires no_x11 conflicts x11 description {Enable Quartz rendering} {
- patchfiles-append patch-gnome-bug-531599.diff
configure.args-append --with-gdktarget=quartz
}
Deleted: trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff
===================================================================
--- trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff 2009-12-25 10:54:44 UTC (rev 61954)
+++ trunk/dports/x11/gtk2/files/patch-gnome-bug-531599.diff 2009-12-25 16:43:20 UTC (rev 61955)
@@ -1,69 +0,0 @@
-Taken from http://bugzilla.gnome.org/show_bug.cgi?id=531599
-Updated for gtk+-2.16.6
-
-Index: gtk/gtkaccelgroup.c
-===================================================================
---- gtk/gtkaccelgroup.c (revision 20074)
-+++ gtk/gtkaccelgroup.c (working copy)
-@@ -1299,5 +1298,23 @@ gtk_accelerator_get_default_mod_mask (vo
- return default_accel_mod_mask;
- }
-
-+/**
-+ * gtk_accelerator_get_input_mod_mask:
-+ * @returns: the accelerator input modifier mask
-+ *
-+ * Gets the modifiers that are allowed in both accelerators and as input
-+ * modifiers. This is backend specific: on X11, Win32 and DirectFB it is
-+ * Shift, on Quartz it is Shift and Alt.
-+ */
-+guint
-+gtk_accelerator_get_input_mod_mask (void)
-+{
-+#ifndef GDK_WINDOWING_QUARTZ
-+ return GDK_SHIFT_MASK;
-+#else
-+ return GDK_SHIFT_MASK | GDK_MOD1_MASK;
-+#endif
-+}
-+
- #define __GTK_ACCEL_GROUP_C__
- #include "gtkaliasdef.c"
-Index: gtk/gtkaccelgroup.h
-===================================================================
---- gtk/gtkaccelgroup.h (revision 20074)
-+++ gtk/gtkaccelgroup.h (working copy)
-@@ -152,6 +152,7 @@ gchar* gtk_accelerator_get_label
- GdkModifierType accelerator_mods);
- void gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask);
- guint gtk_accelerator_get_default_mod_mask (void);
-+guint gtk_accelerator_get_input_mod_mask (void);
-
-
- /* --- internal --- */
-Index: gtk/gtkimcontextsimple.c
-===================================================================
---- gtk/gtkimcontextsimple.c (revision 20074)
-+++ gtk/gtkimcontextsimple.c (working copy)
-@@ -763,7 +763,7 @@ gtk_im_context_simple_filter_keypress (G
- (context_simple->in_hex_sequence && !hex_keyval &&
- !is_hex_start && !is_hex_end && !is_escape && !is_backspace))
- {
-- if (event->state & (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK) ||
-+ if (event->state & (gtk_accelerator_get_default_mod_mask () & ~gtk_accelerator_get_input_mod_mask ()) ||
- (context_simple->in_hex_sequence && context_simple->modifiers_dropped &&
- (event->keyval == GDK_Return ||
- event->keyval == GDK_ISO_Enter ||
-Index: gtk/gtkfilechooserdefault.c
-===================================================================
---- gtk/gtkfilechooserdefault.c.orig 2009-09-03 15:37:08.000000000 +0200
-+++ gtk/gtkfilechooserdefault.c 2009-09-03 15:42:12.000000000 +0200
-@@ -4092,7 +4092,7 @@
- #ifdef G_OS_UNIX
- || event->keyval == GDK_asciitilde
- #endif
-- ) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
-+ ) && ! (event->state & (~gtk_accelerator_get_input_mod_mask () & modifiers)))
- {
- location_popup_handler (impl, event->string);
- return TRUE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091225/5a19f91d/attachment.html>
More information about the macports-changes
mailing list