[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/, gnome-extra/zenity/files/

2023-05-09 Thread Matt Turner
commit: ebec1b2dcb71c8ba0737e7a0df6aeb2647b05587
Author: Guillermo Joandet  gmail  com>
AuthorDate: Wed Mar 15 21:28:38 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue May  9 15:52:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebec1b2d

gnome-extra/zenity: Version bump to 3.92.0

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30251
Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/zenity/Manifest|   1 +
 .../zenity-3.92.0-manpage-generation-changes.patch | 597 +
 gnome-extra/zenity/zenity-3.92.0.ebuild|  53 ++
 3 files changed, 651 insertions(+)

diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index de96db934563..91d7dedb8b0c 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1 +1,2 @@
 DIST zenity-3.44.0.tar.xz 3096684 BLAKE2B 
bd6cb333e30ca675bd6d49a8117fc81a8d5ffe2870b9d78f897f292b827849cfaee7d92d36ebc9dc784041400b221cca715d40878be0bb2f5aa47ccbf9c10965
 SHA512 
806fff8f239dfa5da32e75bbc1fc3a6dc50b49ea8e6ca64cead9dd40adfe4741237c25ae5caaac1997ec7f274e9379b6607d254caf8a509aa01f3eba03cb3e7c
+DIST zenity-3.92.0.tar.xz 3081408 BLAKE2B 
1d7da29a52013104cee35e1ac95823e046c391653d71a30f287bc6f330edf4b5f9d1c1d4fddb67e1447750569cc46810c49871b7f263c88ec6d6b7209bfecc6b
 SHA512 
0e28b5fa60736210ee474ee483bd98b63f17c0d815dc6050532e82bda7d82b560f5227e4882fa6c969352d9e48d19c8addf5587acac8eac8f0fc9ac185edaf76

diff --git 
a/gnome-extra/zenity/files/zenity-3.92.0-manpage-generation-changes.patch 
b/gnome-extra/zenity/files/zenity-3.92.0-manpage-generation-changes.patch
new file mode 100644
index ..67568d7482a1
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.92.0-manpage-generation-changes.patch
@@ -0,0 +1,597 @@
+From db1ad8ee7c3db36a7cca6e998e86719293d37838 Mon Sep 17 00:00:00 2001
+From: Logan Rathbone 
+Date: Mon, 8 May 2023 14:39:53 -0400
+Subject: [PATCH] data: Manpage generation changes
+
+Don't automatically generate the manpage from help2man for now. This
+creates problems since a display manager is required to run `zenity
+--help-all` and `zenity --version` at this time. This should be fixed in
+the long term, but for now we're just going to avoid the issue
+altogether.
+
+Manual intervention will be required to update the manpage for now, but
+hopefully we can rectify this in the future. It is fine for now as the
+manpage should not need to be regenerated too frequently.
+
+Also, s/GTK+/GTK in the .roff boilerplate.
+---
+ data/README.manpage  |   6 +
+ data/generate-manpage.sh |   3 +
+ data/meson.build |  23 +-
+ data/zenity.1| 496 +++
+ data/zenity.roff |   2 +-
+ 5 files changed, 508 insertions(+), 22 deletions(-)
+ create mode 100644 data/README.manpage
+ create mode 100755 data/generate-manpage.sh
+ create mode 100644 data/zenity.1
+
+diff --git a/data/README.manpage b/data/README.manpage
+new file mode 100644
+index ..5ac64a35
+--- /dev/null
 b/data/README.manpage
+@@ -0,0 +1,6 @@
++In order to generate the manpage for zenity, run the script
++`generate-manpage.sh` after installing zenity.
++
++The `help2man` utility is required. When new command-line arguments are
++added or deleted, this script should be re-run manually and
++git-committed.
+diff --git a/data/generate-manpage.sh b/data/generate-manpage.sh
+new file mode 100755
+index ..84092c77
+--- /dev/null
 b/data/generate-manpage.sh
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++help2man --no-info --name='display GTK dialogs' --version-string=' ' 
--section=1 --help-option='--help-all' --include='zenity.roff' 
--output='zenity.1' zenity
+diff --git a/data/meson.build b/data/meson.build
+index 6cdfea58..04cfc15d 100644
+--- a/data/meson.build
 b/data/meson.build
+@@ -22,25 +22,6 @@ if desktop_file_validate_prg.found()
+   )
+ endif
+ 
+-# manpage -- generated from help2man
++# manpage
+ 
+-help2man = find_program('help2man', required: false)
+-# help2man has to run zenity to generate the man page, which it can't do if
+-# we're cross building. We also can't tell help2man what exe wrapper to use.
+-if help2man.found() and not meson.is_cross_build()
+-  help2man_opts = [
+-'--no-info',
+-'--section=1',
+-'--help-option=--help-all',
+-'--include=@INPUT@',
+-  ]
+-
+-  custom_target('zenity.1',
+-output: 'zenity.1',
+-input: 'zenity.roff',
+-command: [
+-  help2man, help2man_opts, '--output=@OUTPUT@', zenity
+-],
+-install: true,
+-install_dir: join_paths(zenity_mandir, 'man1'))
+-endif
++install_man('zenity.1')
+diff --git a/data/zenity.1 b/data/zenity.1
+new file mode 100644
+index ..9ddf02ff
+--- /dev/null
 b/data/zenity.1
+@@ -0,0 +1,496 @@
++.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.4

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/, gnome-extra/zenity/files/

2022-11-29 Thread Matt Turner
commit: ea0bb7cd3b47dd02d964a5c27c010eeaea8cc8b1
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Nov 29 16:51:46 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Nov 29 16:53:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0bb7cd

gnome-extra/zenity: Revbump to support webkit-gtk:4.1

Thanks to Vladislav Mikhailikov for the suggestion and the patch!

Closes: https://bugs.gentoo.org/881643
Signed-off-by: Matt Turner  gentoo.org>

 .../files/zenity-3.42.1-webkit-gtk-4.1.patch   | 12 +
 gnome-extra/zenity/zenity-3.42.1-r1.ebuild | 60 ++
 2 files changed, 72 insertions(+)

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
new file mode 100644
index ..ff7cbcb6b104
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.42.1-webkit-gtk-4.1.patch
@@ -0,0 +1,12 @@
+diff -Nurw a/meson.build b/meson.build
+--- a/meson.build  2022-04-27 04:33:34.670853100 +0300
 b/meson.build  2022-11-17 12:32:05.106347423 +0300
+@@ -70,7 +70,7 @@
+   endif
+ endif
+ 
+-webkitgtk = dependency('webkit2gtk-4.0', version: '>= 2.8.1', required: false)
++webkitgtk = dependency('webkit2gtk-4.1', version: '>= 2.8.1', required: false)
+ if get_option('webkitgtk')
+   if webkitgtk.found()
+ zenity_conf.set('HAVE_WEBKITGTK', true)

diff --git a/gnome-extra/zenity/zenity-3.42.1-r1.ebuild 
b/gnome-extra/zenity/zenity-3.42.1-r1.ebuild
new file mode 100644
index ..14be941b6398
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.42.1-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity";
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86 ~amd64-linux ~x86-linux"
+IUSE="libnotify webkit"
+
+# TODO: X11 dependency is automagically enabled
+RDEPEND="
+   >=x11-libs/gtk+-3.16.0:3[X]
+   >=dev-libs/glib-2.43.4:2
+   libnotify? ( >=x11-libs/libnotify-0.6.1:= )
+   webkit? ( >=net-libs/webkit-gtk-2.8.1:4.1 )
+   x11-libs/libX11
+
+   x11-libs/gdk-pixbuf:2
+   x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/itstool
+   >=sys-devel/gettext-0.19.4
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}/${P}-webkit-gtk-4.1.patch"
+)
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use libnotify)
+   $(meson_use webkit webkitgtk)
+   )
+   meson_src_configure
+}
+
+src_install() {
+   meson_src_install
+
+   # Not really needed and prevent us from needing perl
+   rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}