[arch-commits] Commit in zenity/repos (6 files)
Jan de Groot
jgc at archlinux.org
Tue Aug 5 12:15:48 UTC 2014
Date: Tuesday, August 5, 2014 @ 14:15:46
Author: jgc
Revision: 219326
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
zenity/repos/extra-i686/0001-fix-dialog-size.patch
(from rev 219325, zenity/trunk/0001-fix-dialog-size.patch)
zenity/repos/extra-i686/PKGBUILD
(from rev 219325, zenity/trunk/PKGBUILD)
zenity/repos/extra-x86_64/0001-fix-dialog-size.patch
(from rev 219325, zenity/trunk/0001-fix-dialog-size.patch)
zenity/repos/extra-x86_64/PKGBUILD
(from rev 219325, zenity/trunk/PKGBUILD)
Deleted:
zenity/repos/extra-i686/PKGBUILD
zenity/repos/extra-x86_64/PKGBUILD
-----------------------------------------+
/PKGBUILD | 66 ++++++++++++++++++++++++++++++
extra-i686/0001-fix-dialog-size.patch | 48 +++++++++++++++++++++
extra-i686/PKGBUILD | 26 -----------
extra-x86_64/0001-fix-dialog-size.patch | 48 +++++++++++++++++++++
extra-x86_64/PKGBUILD | 26 -----------
5 files changed, 162 insertions(+), 52 deletions(-)
Copied: zenity/repos/extra-i686/0001-fix-dialog-size.patch (from rev 219325, zenity/trunk/0001-fix-dialog-size.patch)
===================================================================
--- extra-i686/0001-fix-dialog-size.patch (rev 0)
+++ extra-i686/0001-fix-dialog-size.patch 2014-08-05 12:15:46 UTC (rev 219326)
@@ -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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-05 12:15:40 UTC (rev 219325)
+++ extra-i686/PKGBUILD 2014-08-05 12:15:46 UTC (rev 219326)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=zenity
-pkgver=3.12.1
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=(LGPL)
-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')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: zenity/repos/extra-i686/PKGBUILD (from rev 219325, zenity/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-05 12:15:46 UTC (rev 219326)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=zenity
+pkgver=3.12.1
+pkgrel=2
+pkgdesc="Display graphical dialog boxes from shell scripts"
+arch=(i686 x86_64)
+license=(LGPL)
+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: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 \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
Copied: zenity/repos/extra-x86_64/0001-fix-dialog-size.patch (from rev 219325, zenity/trunk/0001-fix-dialog-size.patch)
===================================================================
--- extra-x86_64/0001-fix-dialog-size.patch (rev 0)
+++ extra-x86_64/0001-fix-dialog-size.patch 2014-08-05 12:15:46 UTC (rev 219326)
@@ -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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-05 12:15:40 UTC (rev 219325)
+++ extra-x86_64/PKGBUILD 2014-08-05 12:15:46 UTC (rev 219326)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=zenity
-pkgver=3.12.1
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=(LGPL)
-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')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
Copied: zenity/repos/extra-x86_64/PKGBUILD (from rev 219325, zenity/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-05 12:15:46 UTC (rev 219326)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=zenity
+pkgver=3.12.1
+pkgrel=2
+pkgdesc="Display graphical dialog boxes from shell scripts"
+arch=(i686 x86_64)
+license=(LGPL)
+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: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 \
+ --localstatedir=/var
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
More information about the arch-commits
mailing list