1 |
commit: ac25cee782648d514f76e22b53665fda14b37bad |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 22 01:42:11 2012 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Mar 22 01:42:11 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac25cee7 |
7 |
|
8 |
x11-libs/vte: 0.31.0 → 0.32.0 |
9 |
|
10 |
Patch was applied upstream. |
11 |
|
12 |
--- |
13 |
.../vte/files/vte-0.31.0-gdk_scroll_mask.patch | 20 -------------------- |
14 |
.../vte/{vte-0.31.0.ebuild => vte-0.32.0.ebuild} | 5 +---- |
15 |
x11-libs/vte/vte-9999.ebuild | 2 +- |
16 |
3 files changed, 2 insertions(+), 25 deletions(-) |
17 |
|
18 |
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 |
19 |
deleted file mode 100644 |
20 |
index 246f525..0000000 |
21 |
--- a/x11-libs/vte/files/vte-0.31.0-gdk_scroll_mask.patch |
22 |
+++ /dev/null |
23 |
@@ -1,20 +0,0 @@ |
24 |
-commit f4db3875fd08d246bf337d048845bd9b54c325f8 |
25 |
-Author: Gert Michael Kulyk <gkulyk@klio> |
26 |
-Date: Sun Mar 4 13:03:53 2012 +0100 |
27 |
- |
28 |
- Explicitly set GDK_SCROLL_MASK as recent gtk+ versions require it for scrolling to work |
29 |
- |
30 |
- Bug #671305. |
31 |
- |
32 |
-diff --git a/src/vte.c b/src/vte.c |
33 |
-index 271309e..f99fc00 100644 |
34 |
---- a/src/vte.c |
35 |
-+++ b/src/vte.c |
36 |
-@@ -9075,6 +9075,7 @@ vte_terminal_realize(GtkWidget *widget) |
37 |
- GDK_EXPOSURE_MASK | |
38 |
- GDK_VISIBILITY_NOTIFY_MASK | |
39 |
- GDK_FOCUS_CHANGE_MASK | |
40 |
-+ GDK_SCROLL_MASK | |
41 |
- GDK_BUTTON_PRESS_MASK | |
42 |
- GDK_BUTTON_RELEASE_MASK | |
43 |
- GDK_POINTER_MOTION_MASK | |
44 |
|
45 |
diff --git a/x11-libs/vte/vte-0.31.0.ebuild b/x11-libs/vte/vte-0.32.0.ebuild |
46 |
similarity index 92% |
47 |
rename from x11-libs/vte/vte-0.31.0.ebuild |
48 |
rename to x11-libs/vte/vte-0.32.0.ebuild |
49 |
index 519954a..6dbf0da 100644 |
50 |
--- a/x11-libs/vte/vte-0.31.0.ebuild |
51 |
+++ b/x11-libs/vte/vte-0.32.0.ebuild |
52 |
@@ -25,7 +25,7 @@ fi |
53 |
IUSE="debug doc glade +introspection" |
54 |
|
55 |
PDEPEND="x11-libs/gnome-pty-helper" |
56 |
-RDEPEND=">=dev-libs/glib-2.26:2 |
57 |
+RDEPEND=">=dev-libs/glib-2.31.13:2 |
58 |
>=x11-libs/gtk+-3.1.9:3[introspection?] |
59 |
>=x11-libs/pango-1.22.0 |
60 |
|
61 |
@@ -58,9 +58,6 @@ src_prepare() { |
62 |
# https://bugzilla.gnome.org/show_bug.cgi?id=663779 |
63 |
epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch" |
64 |
|
65 |
- # Fix scrolling with gtk+-3.3.18, in next release |
66 |
- epatch "${FILESDIR}/${P}-gdk_scroll_mask.patch" |
67 |
- |
68 |
gnome2_src_prepare |
69 |
} |
70 |
|
71 |
|
72 |
diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild |
73 |
index 0da7b3f..6dbf0da 100644 |
74 |
--- a/x11-libs/vte/vte-9999.ebuild |
75 |
+++ b/x11-libs/vte/vte-9999.ebuild |
76 |
@@ -25,7 +25,7 @@ fi |
77 |
IUSE="debug doc glade +introspection" |
78 |
|
79 |
PDEPEND="x11-libs/gnome-pty-helper" |
80 |
-RDEPEND=">=dev-libs/glib-2.26:2 |
81 |
+RDEPEND=">=dev-libs/glib-2.31.13:2 |
82 |
>=x11-libs/gtk+-3.1.9:3[introspection?] |
83 |
>=x11-libs/pango-1.22.0 |