diff options
| author | root <root@rshg054.dnsready.net> | 2011-09-02 23:14:49 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-09-02 23:14:49 +0000 |
| commit | b37ee9de1a430956d9e5958ebd9d7e0dbfc79327 (patch) | |
| tree | 087dd7d26bea36f9b3b7c485f9e8e8251cbe0423 /extra/gtk2 | |
| parent | eb3d40c72c9dd19f6a5ef79b41e9d8ba73ccd928 (diff) | |
Fri Sep 2 23:14:49 UTC 2011
Diffstat (limited to 'extra/gtk2')
| -rw-r--r-- | extra/gtk2/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/gtk2/gtk2-dont-ellipsize-filters.diff | 28 |
2 files changed, 37 insertions, 4 deletions
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index b059338a4..7449d6d04 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136649 2011-08-31 11:03:18Z jgc $ +# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,13 +12,17 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch) + xid-collision-debug.patch + gtk2-dont-ellipsize-filters.diff) sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8') build() { cd "${srcdir}/gtk+-${pkgver}" patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + #https://bugzilla.gnome.org/show_bug.cgi?id=657949 + patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -30,6 +34,7 @@ build() { make } + package_gtk2() { pkgdesc="The GTK+ Toolkit (v2)" install=gtk2.install diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff new file mode 100644 index 000000000..ff8dff6ef --- /dev/null +++ b/extra/gtk2/gtk2-dont-ellipsize-filters.diff @@ -0,0 +1,28 @@ +diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c +index 2ee7903..37d9e8d 100644 +--- a/gtk/gtkfilechooserdefault.c ++++ b/gtk/gtkfilechooserdefault.c +@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText *cell_renderer_text, + static GtkWidget * + filter_create (GtkFileChooserDefault *impl) + { +- GtkCellRenderer *cell; +- GList *cells; +- + impl->filter_combo = gtk_combo_box_text_new (); + gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE); + +- /* Get the combo's text renderer and set ellipsize parameters */ +- cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo)); +- g_assert (cells); +- cell = cells->data; +- +- g_object_set (G_OBJECT (cell), +- "ellipsize", PANGO_ELLIPSIZE_END, +- NULL); +- +- g_list_free (cells); +- + g_signal_connect (impl->filter_combo, "changed", + G_CALLBACK (filter_combo_changed), impl); + |