ports/176963: commit references a PR

[dfilter service]

The following reply was made to PR ports/176963; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/176963: commit references a PR
Date: Fri, 15 Mar 2013 21:39:30 +0000 (UTC)

 Author: kwm
 Date: Fri Mar 15 21:39:16 2013
 New Revision: 314323
 URL: http://svnweb.freebsd.org/changeset/ports/314323
 
 Log:
   Restore alt keys after gtk20 update.
   While here convert to OptionsNG.
   
   PR:		ports/176963
   Submitted by:	Lawrence Chen <beastie at tardisi.com>
   Obtained from:	upstream git / Gnome bug 663779
 
 Added:
   head/x11-toolkits/vte/files/patch-src_vte.c   (contents, props changed)
 Modified:
   head/x11-toolkits/vte/Makefile   (contents, props changed)
 
 Modified: head/x11-toolkits/vte/Makefile
 ==============================================================================
 --- head/x11-toolkits/vte/Makefile	Fri Mar 15 21:03:16 2013	(r314322)
 +++ head/x11-toolkits/vte/Makefile	Fri Mar 15 21:39:16 2013	(r314323)
 @@ -4,7 +4,7 @@
  
  PORTNAME=	vte
  PORTVERSION=	0.26.2
 -PORTREVISION?=	3
 +PORTREVISION?=	4
  CATEGORIES=	x11-toolkits gnome
  MASTER_SITES=	GNOME
  DIST_SUBDIR=	gnome2
 @@ -30,7 +30,15 @@ CONFIGURE_ARGS?=--disable-python \
  		--disable-freetypetest
  
  .if !defined(MASTERDIR)
 -OPTIONS=	GLX	"Enable support for DRI/GLX rendering" off
 +OPTIONS_DEFINE=	GLX
 +GLX_DESC=	Support for DRI/GLX rendering
 +.endif
 +
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MGLX} && !defined(MASTERDIR)
 +CONFIGURE_ARGS+=	--with-glX
 +USE_GL=			yes
  .endif
  
  .include <bsd.port.pre.mk>
 @@ -39,11 +47,6 @@ OPTIONS=	GLX	"Enable support for DRI/GLX
  EXTRA_PATCHES+=		${FILESDIR}/extra-patch-gnome-pty-helper_gnome-utmp.c
  .endif
  
 -.if defined(WITH_GLX) && !defined(MASTERDIR)
 -CONFIGURE_ARGS+=	--with-glX
 -USE_GL=			yes
 -.endif
 -
  .include <bsd.port.post.mk>
  
  .endif
 
 Added: head/x11-toolkits/vte/files/patch-src_vte.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/x11-toolkits/vte/files/patch-src_vte.c	Fri Mar 15 21:39:16 2013	(r314323)
 @@ -0,0 +1,33 @@
 +--- src/vte.c.orig	2010-11-13 06:18:41.000000000 -0600
 ++++ src/vte.c	2013-03-14 15:59:37.761401135 -0500
 +@@ -4914,16 +4914,23 @@
 + vte_terminal_read_modifiers (VteTerminal *terminal,
 + 			     GdkEvent    *event)
 + {
 ++	GdkKeymap *keymap;
 + 	GdkModifierType modifiers;
 + 
 + 	/* Read the modifiers. */
 +-	if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
 +-		GdkKeymap *keymap;
 +-		keymap = gdk_keymap_get_for_display (
 +-				gdk_drawable_get_display (((GdkEventAny *)event)->window));
 +-		gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
 +-		terminal->pvt->modifiers = modifiers;
 +-	}
 ++	if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
 ++		return;
 ++
 ++	keymap = gdk_keymap_get_for_display (
 ++			gdk_window_get_display (((GdkEventAny*)event)->window));
 ++
 ++	gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
 ++
 ++	/* HACK! Treat ALT as META; see bug #663779. */
 ++	if (modifiers & GDK_MOD1_MASK)
 ++		modifiers |= VTE_META_MASK;
 ++
 ++	terminal->pvt->modifiers = modifiers;
 + }
 + 
 + /* Read and handle a keypress event. */
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"