Compare commits

...

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/zenity-4.0.1.tar.xz
SOURCES/zenity-3.32.0.tar.xz

@ -1 +1 @@
55bcaa0cc12bbc5a4d978953df761d8c993df163 SOURCES/zenity-4.0.1.tar.xz
cb210b751b513fe800ffd7ab61d473476561ea36 SOURCES/zenity-3.32.0.tar.xz

@ -0,0 +1,92 @@
From 1fd887b793bead92b018498625bda041a6c1601d Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Mon, 25 Apr 2022 13:42:41 +0100
Subject: [PATCH 1/2] msg: Fix maximum width to 60 characters
Commit 3b64d05e8a1aae1581d2bec7288d80ac4699e1b1 mentioned that labels in
message dialogs were set to a maximum width of 60 characters, with
inspiration from GtkMessageDialog, but in fact a typo meant that they
were set to both a width and maximum width of just 10 characters. This
lead to text layout problems, which can be fixed by using the intended
maximum of 60 characters.
https://bugzilla.redhat.com/show_bug.cgi?id=2053530
---
src/msg.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/msg.c b/src/msg.c
index ca14d86..9265152 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -202,12 +202,10 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) {
if (data->width > -1)
gtk_widget_set_size_request (GTK_WIDGET (text), data->width, -1);
else if (!msg_data->ellipsize && !msg_data->no_wrap) {
- // the magic number 60 is picked from gtk+/gtk/ui/gtkmessagedialog.ui
- // however, 60 would increase the distance between the icon and the
- // text,
- // decreasing to 10 fix it.
- gtk_label_set_width_chars (text, 10);
- gtk_label_set_max_width_chars (text, 10);
+ /* The magic number 60 is taken from gtk+/gtk/ui/gtkmessagedialog.ui
+ with 10 as a minimum width. */
+ gtk_label_set_width_chars (GTK_LABEL (text), 10);
+ gtk_label_set_max_width_chars (GTK_LABEL (text), 60);
}
if (data->modal)
--
2.36.1
From ca21da303b468744540c1a7e803850c656415dd0 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Tue, 26 Apr 2022 08:18:18 +0100
Subject: [PATCH 2/2] zenity.ui: make message dialogs non-resizable
Use the approach of GtkMessageDialog, to avoid problems with narrow
labels when the dialog text is long.
---
src/zenity.ui | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/zenity.ui b/src/zenity.ui
index 1359442..546a622 100644
--- a/src/zenity.ui
+++ b/src/zenity.ui
@@ -465,6 +465,7 @@
<property name="title" translatable="yes">Error</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox7">
@@ -681,6 +682,7 @@
<property name="title" translatable="yes">Information</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox9">
@@ -882,6 +884,7 @@
<property name="title" translatable="yes">Question</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
@@ -1064,6 +1067,7 @@
<property name="title" translatable="yes">Warning</property>
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="resizable">false</property>
<signal name="destroy" handler="gtk_main_quit" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
--
2.36.1

@ -1,24 +1,22 @@
Name: zenity
Version: 4.0.1
Release: 5%{?dist}
Version: 3.32.0
Release: 8%{?dist}
Summary: Display dialog boxes from shell scripts
License: LGPL-2.1-or-later
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Zenity
Source: https://download.gnome.org/sources/%{name}/4.0/%{name}-%{version}.tar.xz
BuildRequires: pkgconfig(libadwaita-1) >= 1.2
BuildRequires: /usr/bin/help2man
BuildRequires: desktop-file-utils
BuildRequires: gcc
Source: https://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=2078712
Patch0: zenity-3.32.0-msgdialog-label.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
BuildRequires: pkgconfig(libnotify) >= 0.6.1
BuildRequires: which
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: meson
BuildRequires: which
# Tests
BuildRequires: xwayland-run
BuildRequires: mutter
BuildRequires: mesa-dri-drivers
%description
Zenity lets you display Gtk+ dialog boxes from the command line and through
@ -30,126 +28,37 @@ from the same family as dialog, Xdialog, and cdialog.
%build
%meson
# Man page generation requires running the in-tree zenity command.
%{shrink:xwfb-run -c mutter -w 10 -- %meson_build}
%configure --disable-webkitgtk
make V=1 %{?_smp_mflags}
%install
%meson_install
%make_install
# we don't want a perl dependency just for this
rm -f %{buildroot}/%{_bindir}/gdialog
rm $RPM_BUILD_ROOT%{_bindir}/gdialog
%find_lang zenity --with-gnome
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Zenity.desktop
%files -f zenity.lang
%license COPYING
%doc AUTHORS NEWS README.md
%doc AUTHORS NEWS THANKS README
%{_bindir}/zenity
%{_datadir}/applications/org.gnome.Zenity.desktop
%{_datadir}/icons/hicolor/48*48/apps/zenity.png
%{_datadir}/zenity
%{_mandir}/man1/zenity.1*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.0.1-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.0.1-4
- Rebuilt for MSVSphere 10
* Mon Jul 15 2024 David King <amigadave@amigadave.com> - 4.0.1-4
- Remove xvfb dependency (RHEL-36645)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0.1-3
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 11 2024 Kalev Lember <klember@redhat.com> - 4.0.1-1
- Update to 4.0.1
* Sat Dec 09 2023 Kalev Lember <klember@redhat.com> - 4.0.0-1
- Update to 4.0.0
* Wed Dec 06 2023 Kalev Lember <klember@redhat.com> - 3.99.91-1
- Update to 3.99.91
* Wed Nov 22 2023 Kalev Lember <klember@redhat.com> - 3.99.90-1
- Update to 3.99.90
* Thu Sep 21 2023 Kalev Lember <klember@redhat.com> - 3.99.2-1
- Update to 3.99.2
* Mon Aug 14 2023 Kalev Lember <klember@redhat.com> - 3.99.1-1
- Update to 3.99.1
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.99.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 19 2023 Kalev Lember <klember@redhat.com> - 3.99.0-1
- Update to 3.99.0
* Mon May 08 2023 Adam Williamson <awilliam@redhat.com> - 3.92.0-2
- Backport two patches from upstream to hopefully really fix crashes (#2177287)
* Tue May 02 2023 David King <amigadave@amigadave.com> - 3.92.0-1
- Update to 3.92.0
* Thu Apr 20 2023 Adam Williamson <awilliam@redhat.com> - 3.91.0-3
- Backport MRs #26 and #27 to fix bugs in tree views (#2184783)
- Backport MR #28 to fix some console error spam
* Thu Apr 20 2023 Adam Williamson <awilliam@redhat.com> - 3.91.0-2
- Backport MR #25 for crash when --no-cancel and/or --auto-close are used (#2177287)
* Tue Mar 07 2023 David King <amigadave@amigadave.com> - 3.91.0-1
- Update to 3.91.0
* Mon Feb 06 2023 David King <amigadave@amigadave.com> - 3.90.0-1
- Update to 3.90.0
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.43.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.43.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jul 17 2022 Honore Doktorr <hdfssk@gmail.com> - 3.43.0-2
- Add missing BuildRequires for pkgconfig(libnotify)
- enable libnotify option for meson build
* Thu Jul 07 2022 David King <amigadave@amigadave.com> - 3.43.0-1
- Update to 3.43.0
* Wed Apr 27 2022 David King <amigadave@amigadave.com> - 3.42.1-1
- Update to 3.42.1
* Fri Apr 01 2022 David King <amigadave@amigadave.com> - 3.42.0-1
- Update to 3.42.0
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.41.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Oct 06 2021 Kalev Lember <klember@redhat.com> - 3.41.0-2
- Fix eln build
* Mon Aug 23 2021 Kalev Lember <klember@redhat.com> - 3.41.0-1
- Update to 3.41.0
- Switch to meson build system
* Wed May 11 2022 David King <amigadave@amigadave.com> - 3.32.0-8
- Fix message dialog label layout (#2078712)
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.32.0-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Mar 04 2021 David King <amigadave@amigadave.com> - 3.32.0-6
- Use make macros
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.32.0-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save