[arch-commits] Commit in zenity/trunk (0001-fix-dialog-size.patch PKGBUILD)

[Jan de Groot]

    Date: Tuesday, August 5, 2014 @ 14:15:40
  Author: jgc
Revision: 219325

upgpkg: zenity 3.12.1-2

Fix dialog size (FS#34164)

Added:
  zenity/trunk/0001-fix-dialog-size.patch
Modified:
  zenity/trunk/PKGBUILD

----------------------------+
 0001-fix-dialog-size.patch |   48 +++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                   |   13 ++++++++---
 2 files changed, 58 insertions(+), 3 deletions(-)

Added: 0001-fix-dialog-size.patch
===================================================================
--- 0001-fix-dialog-size.patch	                        (rev 0)
+++ 0001-fix-dialog-size.patch	2014-08-05 12:15:40 UTC (rev 219325)
@@ -0,0 +1,48 @@
+From c75c9e877a28e3246eb2f234fea01eb6f1638b6d Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jgc at archlinux.org>
+Date: Tue, 5 Aug 2014 12:10:14 +0000
+Subject: [PATCH] Fix dialog size
+
+Backport of e5eb127e9779b9a58e53b1a7d268b81284ebd241
+---
+ src/msg.c | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/msg.c b/src/msg.c
+index f4d5e7a..fe9f1c1 100644
+--- a/src/msg.c
++++ b/src/msg.c
+@@ -27,7 +27,7 @@
+ #include "util.h"
+ 
+ static void zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data);
+-
++static void zenity_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data);
+ static void
+ zenity_msg_construct_question_dialog (GtkWidget *dialog, ZenityMsgData *msg_data, ZenityData *data)
+ {
+@@ -159,6 +159,8 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
+       gtk_label_set_markup (GTK_LABEL (text), g_strcompress (msg_data->dialog_text));
+   }
+ 
++  g_signal_connect_after (G_OBJECT (text), "size-allocate", G_CALLBACK (zenity_text_size_allocate), data);
++
+   if (msg_data->dialog_icon)
+     gtk_image_set_from_icon_name (GTK_IMAGE (image), msg_data->dialog_icon, GTK_ICON_SIZE_DIALOG);
+  
+@@ -177,6 +179,12 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
+ }
+ 
+ static void
++zenity_text_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
++{
++  gtk_widget_set_size_request (widget, allocation->width, -1);
++}
++
++static void
+ zenity_msg_dialog_response (GtkWidget *widget, int response, gpointer data)
+ {
+   ZenityData *zen_data = data;
+-- 
+2.0.4
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-05 11:08:13 UTC (rev 219324)
+++ PKGBUILD	2014-08-05 12:15:40 UTC (rev 219325)
@@ -3,7 +3,7 @@
 
 pkgname=zenity
 pkgver=3.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Display graphical dialog boxes from shell scripts"
 arch=(i686 x86_64)
 license=(LGPL)
@@ -10,9 +10,16 @@
 depends=(gtk3 libnotify)
 makedepends=(intltool gtk-doc itstool docbook-xsl yelp-tools)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        0001-fix-dialog-size.patch)
+sha256sums=('a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11'
+            '8978914ecea3a3f643f4aec4c465e12e62ccbfe3384de4fe6a7d0e281ecd43a3')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-fix-dialog-size.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \