I don't understand gcc/PKGBUILD.mips64el

Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/addresses/PKGBUILD
	community/chmsee/PKGBUILD
	community/coin/PKGBUILD
	community/critterding/PKGBUILD
	community/distcc/PKGBUILD
	community/djview4/PKGBUILD
	community/freedroid/PKGBUILD
	community/gnumail/PKGBUILD
	community/gyachi/PKGBUILD
	community/java-oracle/PKGBUILD
	community/liboop/PKGBUILD
	community/ltris/PKGBUILD
	community/nepim/PKGBUILD
	community/pantomime/PKGBUILD
	community/pyxattr/PKGBUILD
	community/soqt/PKGBUILD
	community/tilda/PKGBUILD
	community/unrealircd/PKGBUILD
	community/uqm/PKGBUILD
	core/dnsutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	core/vpnc/PKGBUILD
	extra/apache/PKGBUILD
	extra/bind/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/ccache/PKGBUILD
	extra/claws-mail-extra-plugins/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/cups/PKGBUILD
	extra/doxygen/PKGBUILD
	extra/fam/PKGBUILD
	extra/fcitx/PKGBUILD
	extra/gdk-pixbuf2/PKGBUILD
	extra/geoip/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libfwbuilder/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt/PKGBUILD
	extra/samba/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib-testing/lib32-keyutils/PKGBUILD
	multilib-testing/lib32-udev/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-keyutils/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	testing/dash/PKGBUILD
	testing/libssh2/PKGBUILD

3 files changed, 37 insertions, 62 deletions

diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 7a3a36e81..7337b409c 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134153 2011-08-02 11:48:33Z ibiru $
+# $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.5
-pkgrel=3
+pkgver=2.24.6
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -13,15 +13,16 @@ options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
         xid-collision-debug.patch
-        gdk_Make_background_changes_queue_a_repaint.patch)
-sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3'
+        gtk2-dont-ellipsize-filters.diff)
+sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93')
+            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-    patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.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 \
@@ -33,6 +34,7 @@ build() {
 
     make
 }
+
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install
diff --git a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
deleted file mode 100644
index 40aa187e6..000000000
--- a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Thu, 09 Jun 2011 04:29:45 +0000
-Subject: gdk: Make background changes queue a repaint
-
-For client-side windows, we need to queue a repaint when the background
-changes. For native windows, the windowing system does take care of it,
-but client-side windows are our own, so we gotta do it manually.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=652102
----
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index f058570..10d83ab 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow      *window,
-     }
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
--      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--      impl_iface->set_background (window, &private->bg_color);
-+      if (gdk_window_has_impl (private))
-+        {
-+          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+          impl_iface->set_background (window, &private->bg_color);
-+        }
-+      else
-+        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-     }
- }
- 
-@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window,
-     private->bg_pixmap = GDK_NO_BG;
- 
-   if (!GDK_WINDOW_DESTROYED (window) &&
--      gdk_window_has_impl (private) &&
-       !private->input_only)
-     {
--      impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
--      impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+      if (gdk_window_has_impl (private))
-+        {
-+          impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl);
-+          impl_iface->set_back_pixmap (window, private->bg_pixmap);
-+        }
-+      else
-+        gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL);
-     }
- }
- 
---
-cgit v0.9
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);
+