* [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 2a537627704fc78d033912800dfbfa0c70d56a45
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 15:03:55 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 15:47:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2a537627
x11-libs/vte: 0.27.90 → 0.28.0
* Use -r300 for gtk3 version, don't use -r200 for gtk2 version
---
...gets.patch => vte-0.28.0-fix-gdk-targets.patch} | 4 ++--
.../{vte-0.27.90.ebuild => vte-0.28.0-r300.ebuild} | 7 +++----
.../{vte-0.27.90-r200.ebuild => vte-0.28.0.ebuild} | 0
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
similarity index 94%
rename from x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
rename to x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
index 1590b81..412baa0 100644
--- a/x11-libs/vte/files/vte-0.27.90-fix-gdk-targets.patch
+++ b/x11-libs/vte/files/vte-0.28.0-fix-gdk-targets.patch
@@ -5,17 +5,17 @@ no longer works. So, sort of hack around it for now?
--- configure.in
+++ configure.in
@@ -53,6 +53,7 @@
- VTE_SEAL_CFLAGS=
GTK_API_VERSION=2.0
GTK_REQUIRED=2.20.0
+ GLADE_API_VERSION=1.0
+ GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)
;;
3.0) VTE_API_VERSION=2.90
VTE_API_MAJOR_VERSION=2
@@ -62,6 +63,7 @@
- VTE_SEAL_CFLAGS="-DVTE_SEAL_ENABLE"
GTK_API_VERSION=3.0
GTK_REQUIRED=3.0.0
+ GLADE_API_VERSION=2.0
+ GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)
;;
esac
diff --git a/x11-libs/vte/vte-0.27.90.ebuild b/x11-libs/vte/vte-0.28.0-r300.ebuild
similarity index 87%
rename from x11-libs/vte/vte-0.27.90.ebuild
rename to x11-libs/vte/vte-0.28.0-r300.ebuild
index 14307b0..e6164b6 100644
--- a/x11-libs/vte/vte-0.27.90.ebuild
+++ b/x11-libs/vte/vte-0.28.0-r300.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
LICENSE="LGPL-2"
SLOT="2.90"
-IUSE="debug doc +introspection"
+IUSE="debug doc glade +introspection"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
@@ -41,20 +41,19 @@ DEPEND="${RDEPEND}
src_prepare() {
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
- # Glade is disabled because it needs gladeui-1.0 & gtk3 glade is gladeui-2.0
G2CONF="${G2CONF}
- --disable-glade-catalogue
--disable-gnome-pty-helper
--disable-deprecation
--disable-maintainer-mode
--disable-static
$(use_enable debug)
+ $(use_enable glade glade-catalogue)
$(use_enable introspection)
--with-html-dir=${ROOT}/usr/share/doc/${PF}/html
--with-gtk=3.0"
DOCS="AUTHORS ChangeLog HACKING NEWS README"
- epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch"
+ epatch "${FILESDIR}/${P}-fix-gdk-targets.patch"
[[ ${PV} != 9999 ]] && eautoreconf
diff --git a/x11-libs/vte/vte-0.27.90-r200.ebuild b/x11-libs/vte/vte-0.28.0.ebuild
similarity index 100%
rename from x11-libs/vte/vte-0.27.90-r200.ebuild
rename to x11-libs/vte/vte-0.28.0.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2012-03-14 4:48 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2012-03-14 4:48 UTC (permalink / raw
To: gentoo-commits
commit: e981337493618ab193fad8548174cc0c24bc185c
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 04:44:33 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Mar 14 04:44:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e9813374
x11-libs/vte: add 0.31.0 with gtk+-3.3.18 scrolling fix
Also, sync ebuilds with portage and use the correct live branch.
---
x11-libs/vte/files/vte-0.30.1-alt-meta.patch | 74 ++++++++++++++++++++
.../vte/files/vte-0.31.0-gdk_scroll_mask.patch | 20 +++++
.../vte/{vte-9999.ebuild => vte-0.31.0.ebuild} | 27 ++++++--
x11-libs/vte/vte-9999.ebuild | 24 +++++--
4 files changed, 133 insertions(+), 12 deletions(-)
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
new file mode 100644
index 0000000..bd364be
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c | 15 +++++++++++++--
+ src/keymap.h | 2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ {GDK_KEY (F35), _vte_keymap_GDK_F35},
+ };
+
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++ GdkModifierType mask)
++{
++ if (modifiers & VTE_META_MASK)
++ modifiers |= VTE_META_MASK;
++ return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+ * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ } else {
+ fkey_mode = fkey_default;
+ }
+- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+
+ /* Search for the conditions. */
+ for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ return;
+ }
+
+- switch (modifiers & significant_modifiers) {
++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ case 0:
+ modifier = 0;
+ break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+
+ G_BEGIN_DECLS
+
+-#define VTE_META_MASK GDK_META_MASK
++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK GDK_MOD2_MASK
+
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+--
+1.7.8.rc3
+
diff --git a/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch b/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch
new file mode 100644
index 0000000..246f525
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch
@@ -0,0 +1,20 @@
+commit f4db3875fd08d246bf337d048845bd9b54c325f8
+Author: Gert Michael Kulyk <gkulyk@klio>
+Date: Sun Mar 4 13:03:53 2012 +0100
+
+ Explicitly set GDK_SCROLL_MASK as recent gtk+ versions require it for scrolling to work
+
+ Bug #671305.
+
+diff --git a/src/vte.c b/src/vte.c
+index 271309e..f99fc00 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -9075,6 +9075,7 @@ vte_terminal_realize(GtkWidget *widget)
+ GDK_EXPOSURE_MASK |
+ GDK_VISIBILITY_NOTIFY_MASK |
+ GDK_FOCUS_CHANGE_MASK |
++ GDK_SCROLL_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK |
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-0.31.0.ebuild
similarity index 64%
copy from x11-libs/vte/vte-9999.ebuild
copy to x11-libs/vte/vte-0.31.0.ebuild
index a36cd5f..519954a 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-0.31.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.26.2.ebuild,v 1.1 2010/11/19 22:00:44 pacho Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
- EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-30"}
+ EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-32"}
inherit gnome2-live
fi
@@ -20,7 +20,7 @@ SLOT="2.90"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
fi
IUSE="debug doc glade +introspection"
@@ -44,8 +44,8 @@ DEPEND="${RDEPEND}
pkg_setup() {
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
G2CONF="${G2CONF}
- --disable-gnome-pty-helper
--disable-deprecation
--disable-static
$(use_enable debug)
@@ -53,3 +53,18 @@ pkg_setup() {
$(use_enable introspection)"
DOCS="AUTHORS ChangeLog HACKING NEWS README"
}
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+ # Fix scrolling with gtk+-3.3.18, in next release
+ epatch "${FILESDIR}/${P}-gdk_scroll_mask.patch"
+
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index a36cd5f..0da7b3f 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.26.2.ebuild,v 1.1 2010/11/19 22:00:44 pacho Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
- EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-30"}
+ EGIT_BRANCH=${EGIT_BRANCH:-"vte-0-32"}
inherit gnome2-live
fi
@@ -20,7 +20,7 @@ SLOT="2.90"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
fi
IUSE="debug doc glade +introspection"
@@ -44,8 +44,8 @@ DEPEND="${RDEPEND}
pkg_setup() {
# Python bindings are via gobject-introspection
# Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
G2CONF="${G2CONF}
- --disable-gnome-pty-helper
--disable-deprecation
--disable-static
$(use_enable debug)
@@ -53,3 +53,15 @@ pkg_setup() {
$(use_enable introspection)"
DOCS="AUTHORS ChangeLog HACKING NEWS README"
}
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/
@ 2012-03-22 1:46 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2012-03-22 1:46 UTC (permalink / raw
To: gentoo-commits
commit: ac25cee782648d514f76e22b53665fda14b37bad
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 01:42:11 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Mar 22 01:42:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac25cee7
x11-libs/vte: 0.31.0 → 0.32.0
Patch was applied upstream.
---
.../vte/files/vte-0.31.0-gdk_scroll_mask.patch | 20 --------------------
.../vte/{vte-0.31.0.ebuild => vte-0.32.0.ebuild} | 5 +----
x11-libs/vte/vte-9999.ebuild | 2 +-
3 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch b/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch
deleted file mode 100644
index 246f525..0000000
--- a/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit f4db3875fd08d246bf337d048845bd9b54c325f8
-Author: Gert Michael Kulyk <gkulyk@klio>
-Date: Sun Mar 4 13:03:53 2012 +0100
-
- Explicitly set GDK_SCROLL_MASK as recent gtk+ versions require it for scrolling to work
-
- Bug #671305.
-
-diff --git a/src/vte.c b/src/vte.c
-index 271309e..f99fc00 100644
---- a/src/vte.c
-+++ b/src/vte.c
-@@ -9075,6 +9075,7 @@ vte_terminal_realize(GtkWidget *widget)
- GDK_EXPOSURE_MASK |
- GDK_VISIBILITY_NOTIFY_MASK |
- GDK_FOCUS_CHANGE_MASK |
-+ GDK_SCROLL_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK |
diff --git a/x11-libs/vte/vte-0.31.0.ebuild b/x11-libs/vte/vte-0.32.0.ebuild
similarity index 92%
rename from x11-libs/vte/vte-0.31.0.ebuild
rename to x11-libs/vte/vte-0.32.0.ebuild
index 519954a..6dbf0da 100644
--- a/x11-libs/vte/vte-0.31.0.ebuild
+++ b/x11-libs/vte/vte-0.32.0.ebuild
@@ -25,7 +25,7 @@ fi
IUSE="debug doc glade +introspection"
PDEPEND="x11-libs/gnome-pty-helper"
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.31.13:2
>=x11-libs/gtk+-3.1.9:3[introspection?]
>=x11-libs/pango-1.22.0
@@ -58,9 +58,6 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=663779
epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
- # Fix scrolling with gtk+-3.3.18, in next release
- epatch "${FILESDIR}/${P}-gdk_scroll_mask.patch"
-
gnome2_src_prepare
}
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index 0da7b3f..6dbf0da 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -25,7 +25,7 @@ fi
IUSE="debug doc glade +introspection"
PDEPEND="x11-libs/gnome-pty-helper"
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.31.13:2
>=x11-libs/gtk+-3.1.9:3[introspection?]
>=x11-libs/pango-1.22.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-03-22 1:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-05 0:57 [gentoo-commits] proj/gnome:master commit in: x11-libs/vte/, x11-libs/vte/files/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 4:48 Alexandre Restovtsev
2012-03-22 1:46 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox