[arch-commits] Commit in gtk2/trunk (PKGBUILD gtk2-dont-ellipsize-filters.diff)

[Ionut Biru]

    Date: Tuesday, October 18, 2011 @ 02:13:14
  Author: ibiru
Revision: 140693

update to 2.24.7

Modified:
  gtk2/trunk/PKGBUILD
Deleted:
  gtk2/trunk/gtk2-dont-ellipsize-filters.diff

----------------------------------+
 PKGBUILD                         |   14 +++++---------
 gtk2-dont-ellipsize-filters.diff |   28 ----------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-18 03:46:14 UTC (rev 140692)
+++ PKGBUILD	2011-10-18 06:13:14 UTC (rev 140693)
@@ -3,8 +3,8 @@
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.6
-pkgrel=2
+pkgver=2.24.7
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,17 +12,13 @@
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk2-dont-ellipsize-filters.diff)
-sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
+        xid-collision-debug.patch)
+sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994'
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 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 \

Deleted: gtk2-dont-ellipsize-filters.diff
===================================================================
--- gtk2-dont-ellipsize-filters.diff	2011-10-18 03:46:14 UTC (rev 140692)
+++ gtk2-dont-ellipsize-filters.diff	2011-10-18 06:13:14 UTC (rev 140693)
@@ -1,28 +0,0 @@
-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);
-