Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/, gnome-extra/zenity/files/
Date: Tue, 29 Nov 2022 16:53:40
Message-Id: 1669740801.ea0bb7cd3b47dd02d964a5c27c010eeaea8cc8b1.mattst88@gentoo
1 commit: ea0bb7cd3b47dd02d964a5c27c010eeaea8cc8b1
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 29 16:51:46 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 29 16:53:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0bb7cd
7
8 gnome-extra/zenity: Revbump to support webkit-gtk:4.1
9
10 Thanks to Vladislav Mikhailikov for the suggestion and the patch!
11
12 Closes: https://bugs.gentoo.org/881643
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 .../files/zenity-3.42.1-webkit-gtk-4.1.patch | 12 +++++
16 gnome-extra/zenity/zenity-3.42.1-r1.ebuild | 60 ++++++++++++++++++++++
17 2 files changed, 72 insertions(+)
18
19 diff --git a/gnome-extra/zenity/files/zenity-3.42.1-webkit-gtk-4.1.patch b/gnome-extra/zenity/files/zenity-3.42.1-webkit-gtk-4.1.patch
20 new file mode 100644
21 index 000000000000..ff7cbcb6b104
22 --- /dev/null
23 +++ b/gnome-extra/zenity/files/zenity-3.42.1-webkit-gtk-4.1.patch
24 @@ -0,0 +1,12 @@
25 +diff -Nurw a/meson.build b/meson.build
26 +--- a/meson.build 2022-04-27 04:33:34.670853100 +0300
27 ++++ b/meson.build 2022-11-17 12:32:05.106347423 +0300
28 +@@ -70,7 +70,7 @@
29 + endif
30 + endif
31 +
32 +-webkitgtk = dependency('webkit2gtk-4.0', version: '>= 2.8.1', required: false)
33 ++webkitgtk = dependency('webkit2gtk-4.1', version: '>= 2.8.1', required: false)
34 + if get_option('webkitgtk')
35 + if webkitgtk.found()
36 + zenity_conf.set('HAVE_WEBKITGTK', true)
37
38 diff --git a/gnome-extra/zenity/zenity-3.42.1-r1.ebuild b/gnome-extra/zenity/zenity-3.42.1-r1.ebuild
39 new file mode 100644
40 index 000000000000..14be941b6398
41 --- /dev/null
42 +++ b/gnome-extra/zenity/zenity-3.42.1-r1.ebuild
43 @@ -0,0 +1,60 @@
44 +# Copyright 1999-2022 Gentoo Authors
45 +# Distributed under the terms of the GNU General Public License v2
46 +
47 +EAPI=8
48 +inherit gnome.org gnome2-utils meson xdg
49 +
50 +DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
51 +HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
52 +
53 +LICENSE="LGPL-2+"
54 +SLOT="0"
55 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
56 +IUSE="libnotify webkit"
57 +
58 +# TODO: X11 dependency is automagically enabled
59 +RDEPEND="
60 + >=x11-libs/gtk+-3.16.0:3[X]
61 + >=dev-libs/glib-2.43.4:2
62 + libnotify? ( >=x11-libs/libnotify-0.6.1:= )
63 + webkit? ( >=net-libs/webkit-gtk-2.8.1:4.1 )
64 + x11-libs/libX11
65 +
66 + x11-libs/gdk-pixbuf:2
67 + x11-libs/pango
68 +"
69 +DEPEND="${RDEPEND}"
70 +BDEPEND="
71 + dev-util/itstool
72 + >=sys-devel/gettext-0.19.4
73 + virtual/pkgconfig
74 +"
75 +
76 +PATCHES=(
77 + "${FILESDIR}/${P}-webkit-gtk-4.1.patch"
78 +)
79 +
80 +src_configure() {
81 + local emesonargs=(
82 + $(meson_use libnotify)
83 + $(meson_use webkit webkitgtk)
84 + )
85 + meson_src_configure
86 +}
87 +
88 +src_install() {
89 + meson_src_install
90 +
91 + # Not really needed and prevent us from needing perl
92 + rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
93 +}
94 +
95 +pkg_postinst() {
96 + xdg_pkg_postinst
97 + gnome2_schemas_update
98 +}
99 +
100 +pkg_postrm() {
101 + xdg_pkg_postrm
102 + gnome2_schemas_update
103 +}