[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/files/, gnome-extra/zenity/
commit: c612d41780544f11f1224f0e32043e4327df9189 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 28 11:36:56 2024 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 28 11:45:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c612d417 gnome-extra/zenity: drop 3.99.2, 3.99.90, 3.99.91 Signed-off-by: Pacho Ramos gentoo.org> gnome-extra/zenity/Manifest| 3 -- 2-Make-help2man-depend-on-manpage-option.patch | 28 --- gnome-extra/zenity/zenity-3.99.2.ebuild| 54 -- gnome-extra/zenity/zenity-3.99.90.ebuild | 50 gnome-extra/zenity/zenity-3.99.91.ebuild | 50 5 files changed, 185 deletions(-) diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest index 8530e0935b67..4b2bb44755e8 100644 --- a/gnome-extra/zenity/Manifest +++ b/gnome-extra/zenity/Manifest @@ -1,6 +1,3 @@ DIST zenity-3.44.2.tar.xz 3095752 BLAKE2B 07d5b9aa673ae1e719bbd8d2ff85394ce19b9e77c36c3b6cf73d6b806dbcb0ab6322d13e66a715ebf5aefc14fa289a31367d0f0abd6ceaa9df7e3d7d12049492 SHA512 60f139b18db9ddf95a9c3481b08a3b99dd56ce457a49d99dc33f59570837e8498e8819bdd130c915a08e40042b2f3af583bd0fe4498adb8152632bd044137f2f -DIST zenity-3.99.2.tar.xz 3084880 BLAKE2B a6ae2a465516f2e019ad5bec5a4f5bad42dc499f85e5f293804d18c572a3f2dd69224ceb6dfc62156aaff587d8a4e78549e8cc88493c842a6ad056ce58c85920 SHA512 6130c01e34e74bd6d068cbd6d3c1e208fce73cbce61851482e0dbc5c24322953899b6de7859ed86fe89850a1650ad28f8815cf709c152c02a685725350260afb -DIST zenity-3.99.90.tar.xz 3086228 BLAKE2B 7254447125019b309ef3466fd6f7fc935968395dbd4d506b69a8b80ea4e8150620f6e0647265dcb2023f9f28bb59a84d174d8563f4a9ba0a3598489931070e79 SHA512 7f1dbf9baa6960059eb7e973b175a2b4411b695d211fb3fc290bd393a75cdb201a440adb05fbe7f6a1d162d3b80a409c3b64573abb037b047a9a8c27c981e9a1 -DIST zenity-3.99.91.tar.xz 3086032 BLAKE2B fc1bddfbf0462768438a52ab738a921603054a78a139b12fb516e8c9640d1039776614cef266092843b8c14bb856f3d704414dd5e07abe686bf7dbfbf08e4a7a SHA512 face2f4ca11dd9b3ab56995efe6db7bd209494019d1454eab8813a537971eb5b229103374a85e7324229357b7f1723508a0a1e263ec05ac4a99c7c0eb3a9 DIST zenity-4.0.0.tar.xz 3092552 BLAKE2B b9a7f4421fdba9c6d10a7cf0bbdf227c424a144f13efca8472fb6a76d8dbdfaf4603fcdd896f2a7ce086c453ae0aeb275253c3728a844932ec3a308b07fbc2ab SHA512 ae7709e5e8a7d76210e17512bd3509ff7273af59c29b3d9b8210b0a00c538e126b0689adfee1d63775affa8df8480d5c3b75deb8c130e4d596710e9aee51ab9e DIST zenity-4.0.1.tar.xz 3093476 BLAKE2B 47ea26adc69bd302e8c59d2fae9c5647fbbadbfd9c61870d6ab5e85cf2bc62af415236cef782ae6f790a756c265113bb23e5be449447270dc0ec41cae23506a5 SHA512 f84e14fd66dbe6bd21d030c1879d8d44250bc8c0661c5ccb6cad7fe8d257e4b01427ce27894cf5a5c27566113587f6b34adc9051826e870e44b836b5c63fb11f diff --git a/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch b/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch deleted file mode 100644 index 8c9de5f67290.. --- a/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://gitlab.gnome.org/GNOME/zenity/-/commit/8a76b35828b7354f042684afa65ea696c7349af7 -https://gitlab.gnome.org/GNOME/zenity/-/merge_requests/33 - -From 8a76b35828b7354f042684afa65ea696c7349af7 Mon Sep 17 00:00:00 2001 -From: Guillermo Joandet -Date: Wed, 13 Sep 2023 17:17:51 + -Subject: [PATCH] build: Make building manpage dependent upon manpage option. - - data/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/meson.build b/data/meson.build -index 41b94add..9042de80 100644 a/data/meson.build -+++ b/data/meson.build -@@ -27,7 +27,7 @@ endif - help2man = find_program('help2man', required: get_option('manpage')) - # 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() -+if help2man.found() and not meson.is_cross_build() and get_option('manpage') - help2man_opts = [ - '--no-info', - '--section=1', --- -2.42.0 - diff --git a/gnome-extra/zenity/zenity-3.99.2.ebuild b/gnome-extra/zenity/zenity-3.99.2.ebuild deleted file mode 100644 index c02ca7307a24.. --- a/gnome-extra/zenity/zenity-3.99.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2023 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="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="man webkit" - -# TODO: X11 dependency is automagically enabled -RDEPEND=" - >=gui-libs/libadwaita-1.2:1 - webk
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/files/, gnome-extra/zenity/
commit: db7998f698dde28a39ec944fe9e563c0aab4 Author: Guillermo Joandet gmail com> AuthorDate: Thu Sep 7 18:52:47 2023 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 8 11:51:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db7998f6 gnome-extra/zenity: Version bump to 3.99.2 Signed-off-by: Guillermo Joandet gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32676 Signed-off-by: Pacho Ramos gentoo.org> gnome-extra/zenity/Manifest| 1 + 2-Make-help2man-depend-on-manpage-option.patch | 28 +++ gnome-extra/zenity/zenity-3.99.2.ebuild| 54 ++ 3 files changed, 83 insertions(+) diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest index 4edef81b711c..3b54b5f83663 100644 --- a/gnome-extra/zenity/Manifest +++ b/gnome-extra/zenity/Manifest @@ -1,2 +1,3 @@ DIST zenity-3.44.2.tar.xz 3095752 BLAKE2B 07d5b9aa673ae1e719bbd8d2ff85394ce19b9e77c36c3b6cf73d6b806dbcb0ab6322d13e66a715ebf5aefc14fa289a31367d0f0abd6ceaa9df7e3d7d12049492 SHA512 60f139b18db9ddf95a9c3481b08a3b99dd56ce457a49d99dc33f59570837e8498e8819bdd130c915a08e40042b2f3af583bd0fe4498adb8152632bd044137f2f DIST zenity-3.99.1.tar.xz 3086092 BLAKE2B cf43be455f97e1ecf0539339d515415c9f875a5a0ac961f11b6e2fe463362eae400633628132ed67c67c01dd61a39cba2dc247ad3b82449d51867a9d93bda2c1 SHA512 4be34682da266b79e05e56a862e698bd93bb2187b4395b699be8ba63053dac07a0f9598bba411fb1f06dc2fffab78829a791f797e5ada23d1eac3463b3a8 +DIST zenity-3.99.2.tar.xz 3084880 BLAKE2B a6ae2a465516f2e019ad5bec5a4f5bad42dc499f85e5f293804d18c572a3f2dd69224ceb6dfc62156aaff587d8a4e78549e8cc88493c842a6ad056ce58c85920 SHA512 6130c01e34e74bd6d068cbd6d3c1e208fce73cbce61851482e0dbc5c24322953899b6de7859ed86fe89850a1650ad28f8815cf709c152c02a685725350260afb diff --git a/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch b/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch new file mode 100644 index ..8c9de5f67290 --- /dev/null +++ b/gnome-extra/zenity/files/3.99.2-Make-help2man-depend-on-manpage-option.patch @@ -0,0 +1,28 @@ +https://gitlab.gnome.org/GNOME/zenity/-/commit/8a76b35828b7354f042684afa65ea696c7349af7 +https://gitlab.gnome.org/GNOME/zenity/-/merge_requests/33 + +From 8a76b35828b7354f042684afa65ea696c7349af7 Mon Sep 17 00:00:00 2001 +From: Guillermo Joandet +Date: Wed, 13 Sep 2023 17:17:51 + +Subject: [PATCH] build: Make building manpage dependent upon manpage option. + +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 41b94add..9042de80 100644 +--- a/data/meson.build b/data/meson.build +@@ -27,7 +27,7 @@ endif + help2man = find_program('help2man', required: get_option('manpage')) + # 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() ++if help2man.found() and not meson.is_cross_build() and get_option('manpage') + help2man_opts = [ + '--no-info', + '--section=1', +-- +2.42.0 + diff --git a/gnome-extra/zenity/zenity-3.99.2.ebuild b/gnome-extra/zenity/zenity-3.99.2.ebuild new file mode 100644 index ..b940b30e3a79 --- /dev/null +++ b/gnome-extra/zenity/zenity-3.99.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2023 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="man webkit" + +# TODO: X11 dependency is automagically enabled +RDEPEND=" + >=gui-libs/libadwaita-1.2:1 + webkit? ( >=net-libs/webkit-gtk-2.40.1:6 ) + man? ( sys-apps/help2man ) + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/itstool + >=sys-devel/gettext-0.19.4 + virtual/pkgconfig +" + +PATCHES=( +"${FILESDIR}"/${PV}-Make-help2man-depend-on-manpage-option.patch +) + +src_configure() { + local emesonargs=( + $(meson_use webkit webkitgtk) + $(meson_use man manpage) + ) + meson_src_configure +} + +src_install() { + meson_src_install +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +}
[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zenity/files/, gnome-extra/zenity/
commit: 73566fc8e1d522ea0be06ea0ca9aff9fdf96612e Author: Matt Turner gentoo org> AuthorDate: Mon Jun 19 15:10:46 2023 + Commit: Matt Turner gentoo org> CommitDate: Mon Jun 19 15:29:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73566fc8 gnome-extra/zenity: Drop old versions 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 deletions(-) diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest index 55998161f7ea..bcbd2c92b7d9 100644 --- a/gnome-extra/zenity/Manifest +++ b/gnome-extra/zenity/Manifest @@ -1,3 +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 DIST zenity-3.99.0.tar.xz 3084896 BLAKE2B 71a6848cb2684e71eb8bb8b5ca57ad0c602b58326f2426542774e4806f4ea9929880810f3e4cd43e938554a9905d3381712b62f2cb2b0bfb137d6a47bb004904 SHA512 65820dd9f5e60dad14867dc584ac4a2d43f6c259c4eccd021c76f2deb4206a29de17db4eb8a911fff12243a594b624c1aa3781087bcd41308c4ea6c0dc919633 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 deleted file mode 100644 index 67568d7482a1.. --- a/gnome-extra/zenity/files/zenity-3.92.0-manpage-generation-changes.patch +++ /dev/null @@ -1,597 +0,0 @@ -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') -d