Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/gtk/
Date: Sat, 01 May 2021 03:39:50
Message-Id: 1619840143.48403d1dcd09eaea89414e640b04d5e6224309c8.mattst88@gentoo
1 commit: 48403d1dcd09eaea89414e640b04d5e6224309c8
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 03:34:29 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 03:35:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48403d1d
7
8 gui-libs/gtk: Apply suggested improvements
9
10 Bug: https://bugs.gentoo.org/764266
11 Suggested-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 gui-libs/gtk/gtk-4.2.0.ebuild | 22 +++++++++++-----------
15 1 file changed, 11 insertions(+), 11 deletions(-)
16
17 diff --git a/gui-libs/gtk/gtk-4.2.0.ebuild b/gui-libs/gtk/gtk-4.2.0.ebuild
18 index da0781e043d..c08b1a24df1 100644
19 --- a/gui-libs/gtk/gtk-4.2.0.ebuild
20 +++ b/gui-libs/gtk/gtk-4.2.0.ebuild
21 @@ -5,8 +5,8 @@ EAPI=7
22
23 inherit gnome.org gnome2-utils meson virtualx xdg
24
25 -DESCRIPTION="Gimp ToolKit +"
26 -HOMEPAGE="https://www.gtk.org/"
27 +DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
28 +HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
29
30 LICENSE="LGPL-2+"
31 SLOT="4"
32 @@ -61,19 +61,11 @@ COMMON_DEPEND="
33 )
34 "
35 DEPEND="${COMMON_DEPEND}
36 - >=sys-devel/gettext-0.19.7
37 sysprof? ( >=dev-util/sysprof-capture-3.38:4 )
38 - test? (
39 - media-fonts/font-misc-misc
40 - media-fonts/font-cursor-misc
41 - )
42 X? ( x11-base/xorg-proto )
43 "
44 -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
45 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
46 RDEPEND="${COMMON_DEPEND}
47 >=dev-util/gtk-update-icon-cache-3
48 - !<x11-libs/vte-0.31.0:2.90
49 "
50 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
51 PDEPEND="
52 @@ -89,11 +81,19 @@ BDEPEND="
53 >=dev-util/gdbus-codegen-2.48
54 dev-util/glib-utils
55 >=dev-util/gtk-doc-am-1.20
56 + >=sys-devel/gettext-0.19.7
57 virtual/pkgconfig
58 gtk-doc? (
59 app-text/docbook-xml-dtd:4.3
60 >=dev-util/gtk-doc-1.33
61 )
62 + test? (
63 + dev-libs/glib:2
64 + wayland? ( dev-libs/weston )
65 +
66 + media-fonts/font-misc-misc
67 + media-fonts/font-cursor-misc
68 + )
69 "
70
71 src_configure() {
72 @@ -136,7 +136,7 @@ src_configure() {
73 }
74
75 src_test() {
76 - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
77 + "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
78
79 if use X; then
80 einfo "Running tests under X"