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

Conflicts:
	community/csfml/PKGBUILD
	community/evolution-rss/PKGBUILD
	community/inn/PKGBUILD
	community/libssh2/PKGBUILD
	community/perl-xml-dom/PKGBUILD
	community/php52/PKGBUILD
	community/python-pysfml/PKGBUILD
	community/skype-call-recorder/PKGBUILD
	extra/ipod-sharp/PKGBUILD
	extra/madwifi-utils/PKGBUILD
	extra/madwifi/PKGBUILD

26 files changed, 0 insertions, 1637 deletions

diff --git a/extra/bind/ChangeLog b/extra/bind/ChangeLog
deleted file mode 100644
index fac736994..000000000
--- a/extra/bind/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-
-2010-03-27  kevin  <kevin@archlinux.org>
-
-    * bind 9.7.0.P1-1
-    - Patch addresses excessive query traffic generated when there is a break
-      in the DNSSEC trust chain as a result of a configuration error
-
-2010-01-22  kevin  <kevin@archlinux.org>
-
-    * bind 9.6.1.P3-1
-    - Fix for CVE-2010-0097, VU#360341, BIND 9 DNSSEC validation code could
-      cause bogus NXDOMAIN responses
-    - Updated fix for CVE-2009-4022, VU#418861, BIND 9 Cache Update from
-      Additional Section
-
diff --git a/extra/gdm/fix_crasher_with_gtk307.patch b/extra/gdm/fix_crasher_with_gtk307.patch
deleted file mode 100644
index 3b8379ea3..000000000
--- a/extra/gdm/fix_crasher_with_gtk307.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 2 Apr 2011 04:10:09 +0200
-Subject: [PATCH] simple-greeter: Don't request an invalid size
-
-GTK widgets must at all times report a size they can handle. So it is
-not allowed to return 0 when not realized, because then size allocations
-break when GTK uses this size for its widget.
-In this case, GTK uses the pre-realize size to determine the size it
-should request when creating the greeter window - chicken and egg so to
-say.
-
-This patch just uses the default monitor (I guess the root window's
-monitor is the default monitor?) for determining the login window size.
-
-One thing this patch doesn't do is add a call to gtk_widget_queue_resize()
-from the realize callback or from monitor-changing signals, though
-that's probably technically necessary.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646498
----
- gui/simple-greeter/gdm-greeter-login-window.c |   28 +++++++++----------------
- 1 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index abd6707..3ec9a09 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         GtkAllocation   widget_allocation;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make width be at least 33% screen width */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MAX (min_size, .33 * area.width);
-         nat_size = MAX (nat_size, .33 * area.width);
-@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
-         min_size = MAX (min_size, widget_allocation.width);
-         nat_size = MAX (nat_size, widget_allocation.width);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
-@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make height be at most 80% of screen height */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MIN (min_size, .8 * area.height);
-         nat_size = MIN (nat_size, .8 * area.height);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
--- 
-1.7.4
\ No newline at end of file
diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch
deleted file mode 100644
index c5d83ef2c..000000000
--- a/extra/gnome-desktop/randr-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sun, 01 May 2011 00:48:03 +0000
-Subject: Don't fall over if RANDR is missing
-
-When RANDR is not present, the screen object never gets an info,
-and since screen_info_free asserts, we must not call it unconditionally
-in finalize.
-This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
----
-diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
-index 4a9d98e..eb3d735 100644
---- a/libgnome-desktop/gnome-rr.c
-+++ b/libgnome-desktop/gnome-rr.c
-@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
- 
-     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
- 
--    screen_info_free (screen->priv->info);
-+    if (screen->priv->info)
-+      screen_info_free (screen->priv->info);
- 
-     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
- }
---
-cgit v0.9
diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch
deleted file mode 100644
index b15fdf29c..000000000
--- a/extra/gnome-panel/fix-crasher-launchers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@malsain.org>
-Date: Mon, 11 Apr 2011 13:05:32 +0000
-Subject: panel: Fix crash when starting launcher
-
-Do not destroy a widget in its draw signal. This is bad. Really.
-
-This was happening in the animation that is being drawn after clicking a
-launcher.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=641325
----
-diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
-index 8465341..5acbf66 100644
---- a/gnome-panel/xstuff.c
-+++ b/gnome-panel/xstuff.c
-@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
- }
- 
- static gboolean
-+idle_destroy (gpointer data)
-+{
-+	gtk_widget_destroy (GTK_WIDGET (data));
-+
-+	return FALSE;
-+}
-+
-+static gboolean
- zoom_draw (GtkWidget *widget,
- 	   cairo_t   *cr,
-            gpointer    user_data)
-@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
- 
- 		g_slice_free (CompositedZoomData, zoom);
- 
--		gtk_widget_destroy (widget);
-+		g_idle_add (idle_destroy, widget);
- 	} else {
- 		GdkPixbuf *scaled;
- 		int width, height;
---
-cgit v0.9
diff --git a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch b/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
deleted file mode 100644
index c07627338..000000000
--- a/extra/gnome-shell/0001-Don-t-crash-when-removing-nameless-user.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8977ba4f23aef8754c0a912e7e1ec46f8da4776e Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Mon, 9 May 2011 13:03:17 -0700
-Subject: [PATCH] Don't crash when removing nameless user
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=647893
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- src/gdmuser/gdm-user-manager.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/src/gdmuser/gdm-user-manager.c b/src/gdmuser/gdm-user-manager.c
-index eba9da1..543fcc3 100644
---- a/src/gdmuser/gdm-user-manager.c
-+++ b/src/gdmuser/gdm-user-manager.c
-@@ -777,7 +777,10 @@ remove_user (GdmUserManager *manager,
-         if (gdm_user_get_object_path (user) != NULL) {
-                 g_hash_table_remove (manager->priv->users_by_object_path, gdm_user_get_object_path (user));
-         }
--        g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
-+
-+        if (gdm_user_get_user_name (user) != NULL) {
-+            g_hash_table_remove (manager->priv->users_by_name, gdm_user_get_user_name (user));
-+        }
- 
-         if (manager->priv->is_loaded) {
-                 g_signal_emit (manager, signals[USER_REMOVED], 0, user);
--- 
-1.7.5.1
-
diff --git a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch b/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
deleted file mode 100644
index 16453b0b9..000000000
--- a/extra/gnome-shell/network_fixes_up_to_5090a4ccce.patch
+++ /dev/null
@@ -1,814 +0,0 @@
-From d0780d16224d7bb2ad183542337c48324fdd2185 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Wed, 06 Apr 2011 16:11:23 +0000
-Subject: NetworkMenu: keep wirelesss networks in predictable order
-
-Adds a function that compares wireless networks and keeps them sorted
-at all times. Order is: first already configured connections, then
-first secure networks, then alphabtic. Also, the appearance of a new access
-point no longer causes the whole menu to be rebuilt (but it still linear
-searches for the position, I guess that could be skipped), which caused
-the addition of more code for tracking the active access point.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646580
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6fa5642..49cb3f0 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -42,6 +42,10 @@ const NM80211Mode = NetworkManager['80211Mode'];
- const NM80211ApFlags = NetworkManager['80211ApFlags'];
- const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
- 
-+// number of wireless networks that should be visible
-+// (the remaining are placed into More...)
-+const NUM_VISIBLE_NETWORKS = 5;
-+
- function macToArray(string) {
-     return string.split(':').map(function(el) {
-         return parseInt(el, 16);
-@@ -1036,6 +1040,7 @@ NMDeviceWireless.prototype = {
-                         item: null,
-                         accessPoints: [ ap ]
-                       };
-+                obj.ssidText = NetworkManager.utils_ssid_to_utf8(obj.ssid);
-                 this._networks.push(obj);
-             }
- 
-@@ -1048,6 +1053,14 @@ NMDeviceWireless.prototype = {
-                 }
-             }
-         }
-+        if (this.device.active_access_point) {
-+            this._activeNetwork = this._networks[this._findNetwork(this.device.active_access_point)];
-+        } else {
-+            this._activeNetwork = null;
-+        }
-+        this._networks.sort(this._networkSortFunction);
-+
-+        this._apChangedId = device.connect('notify::active-access-point', Lang.bind(this, this._activeApChanged));
-         this._apAddedId = device.connect('access-point-added', Lang.bind(this, this._accessPointAdded));
-         this._apRemovedId = device.connect('access-point-removed', Lang.bind(this, this._accessPointRemoved));
- 
-@@ -1055,8 +1068,13 @@ NMDeviceWireless.prototype = {
-     },
- 
-     destroy: function() {
--        if (this._apAddedId) {
-+        if (this._apChangedId) {
-             // see above for this HACK
-+            GObject.Object.prototype.disconnect.call(this.device, this._apChangedId);
-+            this._apChangedId = 0;
-+        }
-+
-+        if (this._apAddedId) {
-             GObject.Object.prototype.disconnect.call(this.device, this._apAddedId);
-             this._apAddedId = 0;
-         }
-@@ -1122,6 +1140,19 @@ NMDeviceWireless.prototype = {
-         }
-     },
- 
-+    _activeApChanged: function() {
-+        this._activeNetwork = null;
-+
-+        let activeAp = this.device.active_access_point;
-+
-+        if (activeAp) {
-+            let pos = this._findNetwork(activeAp);
-+            this._activeNetwork = this._networks[pos];
-+        }
-+
-+        // we don't refresh the view here, setActiveConnection will
-+    },
-+
-     _getApSecurityType: function(accessPoint) {
-         if (accessPoint._secType)
-             return accessPoint._secType;
-@@ -1151,6 +1182,32 @@ NMDeviceWireless.prototype = {
-         return type;
-     },
- 
-+    _networkSortFunction: function(one, two) {
-+        let oneHasConnection = one.connections.length != 0;
-+        let twoHasConnection = two.connections.length != 0;
-+
-+        // place known connections first
-+        // (-1 = good order, 1 = wrong order)
-+        if (oneHasConnection && !twoHasConnection)
-+            return -1;
-+        else if (!oneHasConnection && twoHasConnection)
-+            return 1;
-+
-+        let oneHasSecurity = one.security != NMAccessPointSecurity.NONE;
-+        let twoHasSecurity = two.security != NMAccessPointSecurity.NONE;
-+
-+        // place secure connections first
-+        // (we treat WEP/WPA/WPA2 the same as there is no way to
-+        // take them apart from the UI)
-+        if (oneHasSecurity && !twoHasSecurity)
-+            return -1;
-+        else if (!oneHasSecurity && twoHasSecurity)
-+            return 1;
-+
-+        // sort alphabetically
-+        return GLib.utf8_collate(one.ssidText, two.ssidText);
-+    },
-+
-     _networkCompare: function(network, accessPoint) {
-         if (!ssidCompare(network.ssid, accessPoint.get_ssid()))
-             return false;
-@@ -1173,6 +1230,8 @@ NMDeviceWireless.prototype = {
-     _accessPointAdded: function(device, accessPoint) {
-         let pos = this._findNetwork(accessPoint);
-         let apObj;
-+        let needsupdate = false;
-+
-         if (pos != -1) {
-             apObj = this._networks[pos];
-             if (apObj.accessPoints.indexOf(accessPoint) != -1) {
-@@ -1181,6 +1240,8 @@ NMDeviceWireless.prototype = {
-             }
- 
-             apObj.accessPoints.push(accessPoint);
-+            if (apObj.item)
-+                apObj.item.updateAccessPoints(apObj.accessPoints);
-         } else {
-             apObj = { ssid: accessPoint.get_ssid(),
-                       mode: accessPoint.mode,
-@@ -1189,7 +1250,8 @@ NMDeviceWireless.prototype = {
-                       item: null,
-                       accessPoints: [ accessPoint ]
-                     };
--            this._networks.push(apObj);
-+            apObj.ssidText = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
-+            needsupdate = true;
-         }
- 
-         // check if this enables new connections for this group
-@@ -1198,12 +1260,44 @@ NMDeviceWireless.prototype = {
-             if (this._connectionValidForAP(connection, accessPoint) &&
-                 apObj.connections.indexOf(connection) == -1) {
-                 apObj.connections.push(connection);
-+
-+                // this potentially changes the order
-+                needsupdate = true;
-             }
-         }
- 
--        // update everything
--        this._clearSection();
--        this._createSection();
-+        if (needsupdate) {
-+            if (apObj.item)
-+                apObj.item.destroy();
-+
-+            if (pos != -1)
-+                this._networks.splice(pos, 1);
-+
-+            if (this._networks.length == 0) {
-+                // only network in the list
-+                this._networks.push(apObj);
-+                this._clearSection();
-+                this._createSection();
-+                return;
-+            }
-+
-+            // skip networks that should appear earlier
-+            let menuPos = 0;
-+            for (pos = 0;
-+                 pos < this._networks.length &&
-+                 this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+                if (this._networks[pos] != this._activeNetwork)
-+                    menuPos++;
-+            }
-+
-+            // (re-)add the network
-+            this._networks.splice(pos, 0, apObj);
-+
-+            if (this._shouldShowConnectionList()) {
-+                menuPos += (this._activeConnectionItem ? 1 : 0);
-+                this._createNetworkItem(apObj, menuPos);
-+            }
-+        }
-     },
- 
-     _accessPointRemoved: function(device, accessPoint) {
-@@ -1315,6 +1409,12 @@ NMDeviceWireless.prototype = {
-                     // remove the connection from the access point group
-                     connections.splice(k);
-                     anyauto = connections.length == 0;
-+
-+                    if (anyauto) {
-+                        // this potentially changes the sorting order
-+                        forceupdate = true;
-+                        break;
-+                    }
-                     if (apObj.item) {
-                         if (apObj.item instanceof PopupMenu.PopupSubMenuMenuItem) {
-                             let items = apObj.item.menu.getMenuItems();
-@@ -1340,6 +1440,7 @@ NMDeviceWireless.prototype = {
-         }
- 
-         if (forceupdate || anyauto) {
-+            this._networks.sort(this._networkSortFunction);
-             this._clearSection();
-             this._createSection();
-         }
-@@ -1355,42 +1456,24 @@ NMDeviceWireless.prototype = {
-         this._connections.push(obj);
- 
-         // find an appropriate access point
--        let any = false, forceupdate = false;
-+        let forceupdate = false;
-         for (let i = 0; i < this._networks.length; i++) {
-             let apObj = this._networks[i];
- 
-             // Check if connection is valid for any of these access points
--            let any = false;
-             for (let k = 0; k < apObj.accessPoints.length; k++) {
-                 let ap = apObj.accessPoints[k];
-                 if (this._connectionValidForAP(connection, ap)) {
-                     apObj.connections.push(connection);
--                    any = true;
-+                    // this potentially changes the sorting order
-+                    forceupdate = true;
-                     break;
-                 }
-             }
--
--            if (any && this._shouldShowConnectionList()) {
--                // we need to show this connection
--                if (apObj.item && apObj.item.menu) {
--                    // We're already showing the submenu for this access point
--                    apObj.item.menu.addMenuItem(this._createAPItem(connection, apObj, true));
--                } else {
--                    if (apObj.item)
--                        apObj.item.destroy();
--                    if (apObj.connections.length == 1) {
--                        apObj.item = this._createAPItem(connection, apObj, false);
--                        this.section.addMenuItem(apObj.item);
--                    } else {
--                        apObj.item = null;
--                        // we need to force an update to create the submenu
--                        forceupdate = true;
--                    }
--                }
--            }
-         }
- 
-         if (forceupdate) {
-+            this._networks.sort(this._networkSortFunction);
-             this._clearSection();
-             this._createSection();
-         }
-@@ -1473,6 +1556,37 @@ NMDeviceWireless.prototype = {
-         return connection;
-     },
- 
-+    _createNetworkItem: function(apObj, position) {
-+        if(apObj.connections.length > 0) {
-+            if (apObj.connections.length == 1)
-+                apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
-+            else {
-+                let title = apObj.ssidText;
-+                apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
-+                apObj.item._apObj = apObj;
-+                for (let i = 0; i < apObj.connections.length; i++)
-+                    apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
-+            }
-+        } else {
-+            apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-+            apObj.item._apObj = apObj;
-+            apObj.item.connect('activate', Lang.bind(this, function() {
-+                let connection = this._createAutomaticConnection(apObj);
-+                let accessPoints = sortAccessPoints(apObj.accessPoints);
-+                this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+            }));
-+        }
-+        if (position < NUM_VISIBLE_NETWORKS)
-+            this.section.addMenuItem(apObj.item);
-+        else {
-+            if (!this._overflowItem) {
-+                this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
-+                this.section.addMenuItem(this._overflowItem);
-+            }
-+            this._overflowItem.menu.addMenuItem(apObj.item, position - NUM_VISIBLE_NETWORKS);
-+        }
-+    },
-+
-     _createSection: function() {
-         if (!this._shouldShowConnectionList())
-             return;
-@@ -1482,47 +1596,14 @@ NMDeviceWireless.prototype = {
-             this.section.addMenuItem(this._activeConnectionItem);
-         }
- 
--        let activeAp = this.device.active_access_point;
--        let activeApSsid = activeAp ? activeAp.get_ssid() : null;
--
--        // we want five access points in the menu, including the active one
--        let numItems = this._activeConnection ? 4 : 5;
-+        let activeOffset = this._activeConnectionItem ? 1 : 0;
- 
-         for(let j = 0; j < this._networks.length; j++) {
-             let apObj = this._networks[j];
--            if(activeAp && ssidCompare(apObj.ssid, activeApSsid))
-+            if (apObj == this._activeNetwork)
-                 continue;
- 
--            let menuItem;
--            if(apObj.connections.length > 0) {
--                if (apObj.connections.length == 1)
--                    apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
--                else {
--                    let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _("<unknown>");
--                    apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
--                    apObj.item._apObj = apObj;
--                    for (let i = 0; i < apObj.connections.length; i++)
--                        apObj.item.menu.addMenuItem(this._createAPItem(apObj.connections[i], apObj, true));
--                }
--            } else {
--                apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
--                apObj.item._apObj = apObj;
--                apObj.item.connect('activate', Lang.bind(this, function() {
--                    let connection = this._createAutomaticConnection(apObj);
--                    let accessPoints = sortAccessPoints(apObj.accessPoints);
--                    this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
--                }));
--            }
--
--            if (j < numItems)
--                this.section.addMenuItem(apObj.item);
--            else {
--                if (!this._overflowItem) {
--                    this._overflowItem = new PopupMenu.PopupSubMenuMenuItem(_("More..."));
--                    this.section.addMenuItem(this._overflowItem);
--                }
--                this._overflowItem.menu.addMenuItem(apObj.item);
--            }
-+            this._createNetworkItem(apObj, j + activeOffset);
-         }
-     },
- };
---
-cgit v0.9
-From 42a5531f1588ae3063e7d8ff7642e9f81c13afbd Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Wed, 27 Apr 2011 13:05:39 +0000
-Subject: network: fix a variable name
-
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 49cb3f0..d56c0b1 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -1285,7 +1285,7 @@ NMDeviceWireless.prototype = {
-             let menuPos = 0;
-             for (pos = 0;
-                  pos < this._networks.length &&
--                 this._networkSortFunction(this._networks[i], apObj) < 0; ++pos) {
-+                 this._networkSortFunction(this._networks[pos], apObj) < 0; ++pos) {
-                 if (this._networks[pos] != this._activeNetwork)
-                     menuPos++;
-             }
---
-cgit v0.9
-From c31109800b3267df433841bff08c9383a5d669cb Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 25 Apr 2011 22:13:12 +0000
-Subject: network: simplify connection sorting by using libnm-glib functions
-
-Instead of rolling our own code, use new libnm-glib functions to do
-the same thing.  Requires libnm-glib as of
-779215c742bbe29a2c66202ec7e2e6d43edeb8ff (which will be part of 0.9).
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648648
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index d56c0b1..bf8e272 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -505,7 +505,7 @@ NMDevice.prototype = {
-     },
- 
-     connectionValid: function(connection) {
--        throw new TypeError('Invoking pure virtual function NMDevice.connectionValid');
-+        return this.device.connection_valid(connection);
-     },
- 
-     setEnabled: function(enabled) {
-@@ -723,17 +723,6 @@ NMDeviceWired.prototype = {
-         NMDevice.prototype._init.call(this, client, device, connections);
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_WIRED_SETTING_NAME)
--            return false;
--
--        let ethernetSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRED_SETTING_NAME);
--        let fixedMac = ethernetSettings.get_mac_address();
--        if (fixedMac)
--            return macCompare(fixedMac, macToArray(this.device.perm_hw_address));
--        return true;
--    },
--
-     _createSection: function() {
-         NMDevice.prototype._createSection.call(this);
- 
-@@ -876,10 +865,6 @@ NMDeviceModem.prototype = {
-         NMDevice.prototype._clearSection.call(this);
-     },
- 
--    connectionValid: function(connection) {
--        return connection._type == this._connectionType;
--    },
--
-     _createAutomaticConnection: function() {
-         // FIXME: we need to summon the mobile wizard here
-         // or NM will not have the necessary parameters to complete the connection
-@@ -913,18 +898,6 @@ NMDeviceBluetooth.prototype = {
-         NMDevice.prototype._init.call(this, client, device, connections);
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_BLUETOOTH_SETTING_NAME)
--            return false;
--
--        let bluetoothSettings = connection.get_setting_by_name(NetworkManager.SETTING_BLUETOOTH_SETTING_NAME);
--        let fixedBdaddr = bluetoothSettings.get_bdaddr();
--        if (fixedBdaddr)
--            return macCompare(fixedBdaddr, macToArray(this.device.hw_address));
--
--        return true;
--    },
--
-     _createAutomaticConnection: function() {
-         let connection = new NetworkManager.Connection;
-         connection._uuid = NetworkManager.utils_uuid_generate();
-@@ -1047,7 +1020,7 @@ NMDeviceWireless.prototype = {
-             // Check if some connection is valid for this AP
-             for (let j = 0; j < validConnections.length; j++) {
-                 let connection = validConnections[j];
--                if (this._connectionValidForAP(connection, ap) &&
-+                if (ap.connection_valid(connection) &&
-                     obj.connections.indexOf(connection) == -1) {
-                     obj.connections.push(connection);
-                 }
-@@ -1121,7 +1094,7 @@ NMDeviceWireless.prototype = {
-         if (best) {
-             for (let i = 0; i < bestApObj.accessPoints.length; i++) {
-                 let ap = bestApObj.accessPoints[i];
--                if (this._connectionValidForAP(best, ap)) {
-+                if (ap.connection_valid(best)) {
-                     this._client.activate_connection(best, this.device, ap.dbus_path, null);
-                     break;
-                 }
-@@ -1257,7 +1230,7 @@ NMDeviceWireless.prototype = {
-         // check if this enables new connections for this group
-         for (let i = 0; i < this._connections.length; i++) {
-             let connection = this._connections[i].connection;
--            if (this._connectionValidForAP(connection, accessPoint) &&
-+            if (accessPoint.connection_valid(connection) &&
-                 apObj.connections.indexOf(connection) == -1) {
-                 apObj.connections.push(connection);
- 
-@@ -1337,7 +1310,7 @@ NMDeviceWireless.prototype = {
-         item.connect('activate', Lang.bind(this, function() {
-             let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
-             for (let i = 0; i < accessPoints.length; i++) {
--                if (this._connectionValidForAP(connection, accessPoints[i])) {
-+                if (accessPoints[i].connection_valid(connection)) {
-                     this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
-                     break;
-                 }
-@@ -1346,40 +1319,6 @@ NMDeviceWireless.prototype = {
-         return item;
-     },
- 
--    connectionValid: function(connection) {
--        if (connection._type != NetworkManager.SETTING_WIRELESS_SETTING_NAME)
--            return false;
--
--        let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
--        let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
--        let fixedMac = wirelessSettings.get_mac_address();
--        if (fixedMac && !macCompare(fixedMac, macToArray(this.device.perm_hw_address)))
--            return false;
--
--        if (wirelessSecuritySettings &&
--            wirelessSecuritySettings.key_mgmt != 'none' &&
--            wirelessSecuritySettings.key_mgmt != 'ieee8021x') {
--            let capabilities = this.device.wireless_capabilities;
--            if (!(capabilities & NetworkManager.DeviceWifiCapabilities.WPA) ||
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_TKIP))
--                return false;
--            if (wirelessSecuritySettings.get_num_protos() == 1 &&
--                wirelessSecuritySettings.get_proto(0) == 'rsn' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.RSN))
--                return false;
--            if (wirelessSecuritySettings.get_num_pairwise() == 1 &&
--                wirelessSecuritySettings.get_pairwise(0) == 'ccmp' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
--                return false;
--            if (wirelessSecuritySettings.get_num_groups() == 1 &&
--                wirelessSecuritySettings.get_group(0) == 'ccmp' &&
--                !(capabilities & NetworkManager.DeviceWifiCapabilities.CIPHER_CCMP))
--                return false;
--        }
--        return true;
--    },
--
-     _clearSection: function() {
-         NMDevice.prototype._clearSection.call(this);
- 
-@@ -1463,7 +1402,7 @@ NMDeviceWireless.prototype = {
-             // Check if connection is valid for any of these access points
-             for (let k = 0; k < apObj.accessPoints.length; k++) {
-                 let ap = apObj.accessPoints[k];
--                if (this._connectionValidForAP(connection, ap)) {
-+                if (ap.connection_valid(connection)) {
-                     apObj.connections.push(connection);
-                     // this potentially changes the sorting order
-                     forceupdate = true;
-@@ -1479,37 +1418,6 @@ NMDeviceWireless.prototype = {
-         }
-     },
- 
--    _connectionValidForAP: function(connection, ap) {
--        // copied and adapted from nm-applet
--        let wirelessSettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SETTING_NAME);
--        if (!ssidCompare(wirelessSettings.get_ssid(), ap.get_ssid()))
--            return false;
--
--        let wirelessSecuritySettings = connection.get_setting_by_name(NetworkManager.SETTING_WIRELESS_SECURITY_SETTING_NAME);
--
--        let fixedBssid = wirelessSettings.get_bssid();
--        if (fixedBssid && !macCompare(fixedBssid, macToArray(ap.hw_address)))
--            return false;
--
--        let fixedBand = wirelessSettings.band;
--        if (fixedBand) {
--            let freq = ap.frequency;
--            if (fixedBand == 'a' && (freq < 4915 || freq > 5825))
--                return false;
--            if (fixedBand == 'bg' && (freq < 2412 || freq > 2484))
--                return false;
--        }
--
--        let fixedChannel = wirelessSettings.channel;
--        if (fixedChannel && fixedChannel != NetworkManager.utils_wifi_freq_to_channel(ap.frequency))
--            return false;
--
--        if (!wirelessSecuritySettings)
--            return true;
--
--        return wirelessSettings.ap_security_compatible(wirelessSecuritySettings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode);
--    },
--
-     _createActiveConnectionItem: function() {
-         let activeAp = this.device.active_access_point;
-         let icon, title;
---
-cgit v0.9
-From 101a07a3d79223cc153a6c65f22acd76cbae4818 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 17:21:45 +0000
-Subject: network: fix handling of AP flags and enhance for 802.1x
-
-All WPA APs were getting set as WPA2 due to the check for privacy;
-WPA/WPA2 APs *must* set the Privacy bit according to the standard,
-so we'd never end up in the case for NMAccessPointSecurity.WPA.
-
-Fix that, and also add flags for WPA[2] Enterprise which we'll
-use a bit later for the first-time connect case for 802.1x enabled
-access points.
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index bf8e272..6f0cdac 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -33,8 +33,10 @@ const NMAccessPointSecurity = {
-     UNKNOWN: 0,
-     NONE: 1,
-     WEP: 2,
--    WPA: 3,
--    WPA2: 4
-+    WPA_PSK: 3,
-+    WPA2_PSK: 4,
-+    WPA_ENT: 5,
-+    WPA2_ENT: 6
- };
- 
- // small optimization, to avoid using [] all the time
-@@ -1129,26 +1131,28 @@ NMDeviceWireless.prototype = {
-     _getApSecurityType: function(accessPoint) {
-         if (accessPoint._secType)
-             return accessPoint._secType;
--        // XXX: have this checked by someone familiar with IEEE 802.1x
- 
-         let flags = accessPoint.flags;
-         let wpa_flags = accessPoint.wpa_flags;
-         let rsn_flags = accessPoint.rsn_flags;
-         let type;
--        if (  !(flags & NM80211ApFlags.PRIVACY)
--	      && (wpa_flags == NM80211ApSecurityFlags.NONE)
--	      && (rsn_flags == NM80211ApSecurityFlags.NONE))
--	    type = NMAccessPointSecurity.NONE;
--        else if (   (flags & NM80211ApFlags.PRIVACY)
--	            && (wpa_flags == NM80211ApSecurityFlags.NONE)
--	            && (rsn_flags == NM80211ApSecurityFlags.NONE))
--	    type = NMAccessPointSecurity.WEP;
--        else if (   !(flags & NM80211ApFlags.PRIVACY)
--	        &&  (wpa_flags != NM80211ApSecurity.NONE)
--	        &&  (rsn_flags != NM80211ApSecurity.NONE))
--	    type = NMAccessPointSecurity.WPA;
--        else
--            type = NMAccessPointSecurity.WPA2;
-+        if (rsn_flags != NM80211ApSecurityFlags.NONE) {
-+            /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */
-+            if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+	        type = NMAccessPointSecurity.WPA2_ENT;
-+	    else if (rsn_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+	        type = NMAccessPointSecurity.WPA2_PSK;
-+        } else if (wpa_flags != NM80211ApSecurityFlags.NONE) {
-+            if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_802_1X)
-+                type = NMAccessPointSecurity.WPA_ENT;
-+            else if (wpa_flags & NM80211ApSecurityFlags.KEY_MGMT_PSK)
-+	        type = NMAccessPointSecurity.WPA_PSK;
-+        } else {
-+            if (flags & NM80211ApFlags.PRIVACY)
-+                type = NMAccessPointSecurity.WEP;
-+            else
-+                type = NMAccessPointSecurity.NONE;
-+        }
- 
-         // cache the found value to avoid checking flags all the time
-         accessPoint._secType = type;
---
-cgit v0.9
-From ae0652d13fc2d7caa3d64f2b87d174253cae5901 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 18:31:45 +0000
-Subject: network: fix initial connections to WPA[2] Enterprise APs
-
-Call out to nm-applet to do the dirty work since the dialog of
-doom is pretty complicated and we don't have a JS equivalent
-of it for now.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=648171
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index 6f0cdac..ca4facf 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -48,6 +48,16 @@ const NM80211ApSecurityFlags = NetworkManager['80211ApSecurityFlags'];
- // (the remaining are placed into More...)
- const NUM_VISIBLE_NETWORKS = 5;
- 
-+const NMAppletHelperInterface = {
-+    name: 'org.gnome.network_manager_applet',
-+    methods: [
-+        { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
-+        { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
-+        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+    ],
-+};
-+const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-+
- function macToArray(string) {
-     return string.split(':').map(function(el) {
-         return parseInt(el, 16);
-@@ -991,6 +1001,10 @@ NMDeviceWireless.prototype = {
-         this._overflowItem = null;
-         this._networks = [ ];
- 
-+        this._applet_proxy = new NMAppletProxy(DBus.session,
-+                                               'org.gnome.network_manager_applet',
-+                                               '/org/gnome/network_manager_applet');
-+
-         // breaking the layers with this, but cannot call
-         // this.connectionValid until I have a device
-         this.device = device;
-@@ -1483,9 +1497,20 @@ NMDeviceWireless.prototype = {
-             apObj.item = new NMNetworkMenuItem(apObj.accessPoints);
-             apObj.item._apObj = apObj;
-             apObj.item.connect('activate', Lang.bind(this, function() {
--                let connection = this._createAutomaticConnection(apObj);
-                 let accessPoints = sortAccessPoints(apObj.accessPoints);
--                this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+                if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)
-+                    || (accessPoints[0]._secType == NMAccessPointSecurity.WPA_ENT)) {
-+                    // 802.1x-enabled APs get handled by nm-applet for now...
-+                    this._applet_proxy.ConnectTo8021xNetworkRemote(this.device.get_path(),
-+                                                                   accessPoints[0].dbus_path,
-+                                                                   Lang.bind(this, function(results, err) {
-+                                                                       if (err)
-+                                                                           log(err);
-+                                                                   }));
-+                } else {
-+                    let connection = this._createAutomaticConnection(apObj);
-+                    this._client.add_and_activate_connection(connection, this.device, accessPoints[0].dbus_path, null)
-+                }
-             }));
-         }
-         if (position < NUM_VISIBLE_NETWORKS)
---
-cgit v0.9
-From 5090a4ccce87643081138272fb8a2fe687f1ed0a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 03 May 2011 19:48:10 +0000
-Subject: network: request that nm-applet show the mobile broadband wizard
-
-Use nm-applet 0.8.999 API to call the mobile broadband wizard and
-activate the new connection.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=649318
----
-(limited to 'js/ui/status/network.js')
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index ca4facf..756b27f 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -53,7 +53,8 @@ const NMAppletHelperInterface = {
-     methods: [
-         { name: 'ConnectToHiddenNetwork', inSignature: '', outSignature: '' },
-         { name: 'CreateWifiNetwork', inSignature: '', outSignature: '' },
--        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' }
-+        { name: 'ConnectTo8021xNetwork', inSignature: 'oo', outSignature: '' },
-+        { name: 'ConnectTo3gNetwork', inSignature: 'o', outSignature: '' }
-     ],
- };
- const NMAppletProxy = DBus.makeProxyClass(NMAppletHelperInterface);
-@@ -440,7 +441,8 @@ NMDevice.prototype = {
-             this._client.activate_connection(this._connections[0].connection, this.device, null, null);
-         } else if (this._autoConnectionName) {
-             let connection = this._createAutomaticConnection();
--            this._client.add_and_activate_connection(connection, this.device, null, null);
-+            if (connection)
-+                this._client.add_and_activate_connection(connection, this.device, null, null);
-         }
-     },
- 
-@@ -620,7 +622,8 @@ NMDevice.prototype = {
-             this._autoConnectionItem = new PopupMenu.PopupMenuItem(this._autoConnectionName);
-             this._autoConnectionItem.connect('activate', Lang.bind(this, function() {
-                 let connection = this._createAutomaticConnection();
--                this._client.add_and_activate_connection(connection, this.device, null, null);
-+                if (connection)
-+                    this._client.add_and_activate_connection(connection, this.device, null, null);
-             }));
-             this.section.addMenuItem(this._autoConnectionItem);
-         }
-@@ -777,6 +780,10 @@ NMDeviceModem.prototype = {
-         this.mobileDevice = null;
-         this._connectionType = 'ppp';
- 
-+        this._applet_proxy = new NMAppletProxy(DBus.session,
-+                                               'org.gnome.network_manager_applet',
-+                                               '/org/gnome/network_manager_applet');
-+
-         this._capabilities = device.current_capabilities;
-         if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
-             is_wwan = true;
-@@ -878,19 +885,13 @@ NMDeviceModem.prototype = {
-     },
- 
-     _createAutomaticConnection: function() {
--        // FIXME: we need to summon the mobile wizard here
--        // or NM will not have the necessary parameters to complete the connection
--        // pending a DBus method on nm-applet
--
--        let connection = new NetworkManager.Connection;
--        connection._uuid = NetworkManager.utils_uuid_generate();
--        connection.add_setting(new NetworkManager.SettingConnection({
--            uuid: connection._uuid,
--            id: this._autoConnectionName,
--            type: this._connectionType,
--            autoconnect: false
--        }));
--        return connection;
-+        // Mobile wizard is handled by nm-applet for now...
-+        this._applet_proxy.ConnectTo3gNetworkRemote(this.device.get_path(),
-+                                                    Lang.bind(this, function(results, err) {
-+                                                        if (err)
-+                                                            log(err);
-+                                                    }));
-+        return null;
-     }
- };
- 
---
-cgit v0.9
diff --git a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch b/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
deleted file mode 100644
index 6a66c9384..000000000
--- a/extra/gnome-shell/shell-xfixes-cursor_missing_free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 88de26138a8b79d89884ff2eb6471c5a8e3b39ca Mon Sep 17 00:00:00 2001
-From: Maxim Ermilov <zaspire@rambler.ru>
-Date: Thu, 05 May 2011 10:06:05 +0000
-Subject: shell-xfixes-cursor: missing XFree
-
-memory returned by XFixesGetCursorImage should be freed after usage.
-https://bugzilla.gnome.org/show_bug.cgi?id=642652
----
-diff --git a/src/shell-xfixes-cursor.c b/src/shell-xfixes-cursor.c
-index 14d2b59..334503d 100644
---- a/src/shell-xfixes-cursor.c
-+++ b/src/shell-xfixes-cursor.c
-@@ -254,6 +254,7 @@ xfixes_cursor_reset_image (ShellXFixesCursor *xfixes_cursor)
-       xfixes_cursor->cursor_hot_y = cursor_image->yhot;
-       g_signal_emit (xfixes_cursor, signals[CURSOR_CHANGED], 0);
-     }
-+  XFree (cursor_image);
- }
- 
- static void
---
-cgit v0.9
diff --git a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch b/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
deleted file mode 100644
index d3f887c29..000000000
--- a/extra/gnome-shell/st-private_correct_fix_memory_leak.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c975740f9228b2c53d79ac08ad704fca5f1c5b6e Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 11 May 2011 15:21:18 +0000
-Subject: st-private: Correct fix for memory leak
-
-The previous fix in 72f9f482d was wrong; we need to keep around
-the buffer until cairo is done with the pattern.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649497
----
-diff --git a/src/st/st-private.c b/src/st/st-private.c
-index 51798a1..21ca09a 100644
---- a/src/st/st-private.c
-+++ b/src/st/st-private.c
-@@ -667,6 +667,7 @@ cairo_pattern_t *
- _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
-                                  cairo_pattern_t *src_pattern)
- {
-+  static cairo_user_data_key_t shadow_pattern_user_data;
-   cairo_t *cr;
-   cairo_surface_t *src_surface;
-   cairo_surface_t *surface_in;
-@@ -728,6 +729,8 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
-                                                      width_out,
-                                                      height_out,
-                                                      rowstride_out);
-+  cairo_surface_set_user_data (surface_out, &shadow_pattern_user_data,
-+                               pixels_out, (cairo_destroy_func_t) g_free);
- 
-   dst_pattern = cairo_pattern_create_for_surface (surface_out);
-   cairo_surface_destroy (surface_out);
-@@ -745,8 +748,7 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
-                               (width_out - width_in) / 2.0,
-                               (height_out - height_in) / 2.0);
-       cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
--
--      goto out;
-+      return dst_pattern;
-     }
- 
-   /* Read all the code from the cairo_pattern_set_matrix call
-@@ -784,8 +786,6 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
- 
-   cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
- 
-- out:
--  g_free (pixels_out);
-   return dst_pattern;
- }
- 
---
-cgit v0.9
diff --git a/extra/gnome-shell/st-private_fix_memory_leak.patch b/extra/gnome-shell/st-private_fix_memory_leak.patch
deleted file mode 100644
index 677a26531..000000000
--- a/extra/gnome-shell/st-private_fix_memory_leak.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 72f9f482d6f1bcb53ea2bd1606818af1f33a5a8c Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 19:21:58 +0000
-Subject: st-private: Fix memory leak
-
-==13810== 11,360 bytes in 1 blocks are definitely lost in loss record 18,574 of 18,765
-==13810==    at 0x4005447: calloc (vg_replace_malloc.c:467)
-==13810==    by 0x5191882: standard_calloc (gmem.c:107)
-==13810==    by 0x51920A7: g_malloc0 (gmem.c:196)
-==13810==    by 0x4056201: blur_pixels (st-private.c:466)
-==13810==    by 0x40573B4: _st_create_shadow_cairo_pattern (st-private.c:710)
-==13810==    by 0x4070746: st_theme_node_paint (st-theme-node-drawing.c:856)
-==13810==    by 0x3FEFFFFF: ???
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649497
----
-diff --git a/src/st/st-private.c b/src/st/st-private.c
-index d0aa89b..51798a1 100644
---- a/src/st/st-private.c
-+++ b/src/st/st-private.c
-@@ -746,7 +746,7 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
-                               (height_out - height_in) / 2.0);
-       cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
- 
--      return dst_pattern;
-+      goto out;
-     }
- 
-   /* Read all the code from the cairo_pattern_set_matrix call
-@@ -784,6 +784,8 @@ _st_create_shadow_cairo_pattern (StShadow        *shadow_spec,
- 
-   cairo_pattern_set_matrix (dst_pattern, &shadow_matrix);
- 
-+ out:
-+  g_free (pixels_out);
-   return dst_pattern;
- }
- 
---
-cgit v0.9
diff --git a/extra/inkscape/inkscape.install b/extra/inkscape/inkscape.install
deleted file mode 100644
index c4b2efa09..000000000
--- a/extra/inkscape/inkscape.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-
-post_remove() {
-  post_install
-}
diff --git a/extra/ipod-sharp/PKGBUILD b/extra/ipod-sharp/PKGBUILD
deleted file mode 100644
index 29ca26d97..000000000
--- a/extra/ipod-sharp/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 59294 2009-11-21 20:34:51Z jgc $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-
-pkgname=ipod-sharp
-pkgver=0.8.5
-pkgrel=1
-pkgdesc="C# bindings for libipoddevice"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://download.banshee-project.org/ipod-sharp/"
-depends=('podsleuth' 'ndesk-dbus-glib' 'gtk-sharp-2')
-options=(!makeflags)
-source=(http://download.banshee-project.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c5b02872c75a7d61662e266e6f7a2a1aae14f71d9820a59faef2813dcd825fd')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-docs || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  rm -fr "${MONO_SHARED_DIR}"
-}
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch
deleted file mode 100644
index 20ccd4d7d..000000000
--- a/extra/kdebase-workspace/nm-09.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~	2011-04-29 03:43:20.321994578 -0700
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt	2011-04-29 03:43:33.271995023 -0700
-@@ -17,7 +17,7 @@
-     add_subdirectory(networkmanager-0.6)
-   endif (NM_0_6)
- 
--  macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+  macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
-   if (NM_0_7)
-     message(STATUS "Will build networkmanager-0.7")
-     set(HAVE_NETWORKMANAGER TRUE)
---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~	2011-04-29 03:32:33.838644845 -0700
-+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp	2011-04-29 03:40:52.308657544 -0700
-@@ -118,16 +118,16 @@
-     uint deviceType = devIface.deviceType();
-     NMNetworkInterface * createdInterface = 0;
-     switch ( deviceType ) {
--        case DEVICE_TYPE_802_3_ETHERNET:
-+        case NM_DEVICE_TYPE_ETHERNET:
-             createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager
-             break;
--        case DEVICE_TYPE_802_11_WIRELESS:
-+        case NM_DEVICE_TYPE_WIFI:
-             createdInterface = new NMWirelessNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_GSM:
-+        case 3:
-             createdInterface = new NMGsmNetworkInterface(uni, this, 0);
-             break;
--        case DEVICE_TYPE_CDMA:
-+        case 4:
-             createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
-             break;
-             /*
diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch
deleted file mode 100644
index 52b875513..000000000
--- a/extra/kdeplasma-applets-networkmanagement/nm-09.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Lamarque V. Souza <lamarque@gmail.com>
-Date: Sun, 17 Apr 2011 00:09:43 +0000
-Subject: Fix compilation against NetworkManager-0.8.98.
-X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&amp;a=commitdiff&amp;h=e87ceccadc833e220f73d86352968655cedc0485
----
-Fix compilation against NetworkManager-0.8.98.
-
-BUG: 271101
----
-
-
---- a/backends/NetworkManager/nmdbussettingsservice.cpp
-+++ b/backends/NetworkManager/nmdbussettingsservice.cpp
-@@ -59,7 +59,7 @@ public:
-     QHash<QUuid, QDBusObjectPath> uuidToPath;
- };
- 
--const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
-+const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings");
- const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager");
- 
- NMDBusSettingsService::NMDBusSettingsService(QObject * parent)
-
---- a/backends/NetworkManager/settings/gsmdbus.cpp
-+++ b/backends/NetworkManager/settings/gsmdbus.cpp
-@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap 
-   if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
-     setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
-   } else {
--      setting->setNetworktype(NM_GSM_NETWORK_ANY);
-+      setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
-   }
-   if (map.contains("band")) {
-     setting->setBand(map.value("band").value<int>());
-@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap()
-       map.insert("apn", setting->apn());
-   if (!setting->networkid().isEmpty())
-       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
--  if (setting->networktype() != NM_GSM_NETWORK_ANY) {
-+  if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
-       map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
-   }
- 
-
diff --git a/extra/libgnome-keyring/fix_crash.patch b/extra/libgnome-keyring/fix_crash.patch
deleted file mode 100644
index 1e28cdb73..000000000
--- a/extra/libgnome-keyring/fix_crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 23 May 2011 08:58:49 +0000
-Subject: Fix crash from recent memleak fix (b49e32b)
-
-make_attribute_list_va() statically copies the caller's method arguments into
-the GnomeKeyringAttributeList, so we must only free the array itself, not the
-GnomeKeyringAttribute strings.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index dc271dd..4febf47 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType                  type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
-@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync  (GnomeKeyringItemType        type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items_sync (type, attributes, found);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
---
-cgit v0.9
diff --git a/extra/madwifi-utils/PKGBUILD b/extra/madwifi-utils/PKGBUILD
deleted file mode 100644
index ca961c3d0..000000000
--- a/extra/madwifi-utils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 70649 2010-02-27 18:41:30Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-pkgname=madwifi-utils
-pkgver=0.9.4.4119
-_kernver=2.6.33-ARCH
-pkgrel=1
-pkgdesc="Userspace tools of madwifi drivers for Atheros wireless chipsets."
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('wireless_tools')
-makedepends=('sharutils')
-provides=("madwifi-ng-utils")
-conflicts=("madwifi-ng-utils")
-replaces=("madwifi-ng-utils")
-# subversion source: svn checkout http://madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
-	#http://downloads.sourceforge.net/sourceforge/madwifi/madwifi-$pkgver.tar.gz
-	)
-
-build() {
-  [ "${CARCH}" == "i686" ] && export ARCH=i386
-
-  export KERNELPATH=/lib/modules/${_kernver}/build
-  #cd $startdir/src/madwifi-$pkgver
-  cd $startdir/src/madwifi
-  make tools|| return 1
-  make DESTDIR=$startdir/pkg \
-       BINDIR=/usr/bin \
-       MANDIR=/usr/share/man \
-       install-tools
-}
-md5sums=('a720a20264b312c0ff906b9888bb49ae')
diff --git a/extra/madwifi/PKGBUILD b/extra/madwifi/PKGBUILD
deleted file mode 100644
index 1075c1476..000000000
--- a/extra/madwifi/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 115939 2011-03-22 14:09:32Z tpowa $
-# Originally by kleptophobiac <kleptophobiac@gmail.com>
-# Modified by James Rayner for the repositories <iphitus@gmail.com>
-
-_kernver=2.6.38-ARCH
-
-pkgname=madwifi
-pkgver=0.9.4.4136
-pkgrel=2
-pkgdesc="Madwifi drivers for Atheros wireless chipsets. For stock arch 2.6 kernel"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://madwifi-project.org"
-depends=('madwifi-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39')
-makedepends=('kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39')
-makedepends=('sharutils')
-install=madwifi-ng.install
-# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi
-source=(ftp://ftp.archlinux.org/other/madwifi/madwifi-${pkgver}.tar.bz2
-	#http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz
-	)
-options=(!strip)
-
-build() {
-  [ "${CARCH}" = "i686" ] && export ARCH=i386
-
-  #cd $startdir/src/$pkgname-$pkgver
-  cd $startdir/src/$pkgname
-  sed -i -e 's/-Werror//g' Makefile.inc
-  make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules
-}
-
-package() {
-  cd $startdir/src/$pkgname
-  make KERNELPATH=/lib/modules/$_kernver/build KERNELRELEASE=$_kernver modules \
-       DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install-modules
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
-
-  # install to wireless kernel directory
-  mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
-  mv $startdir/pkg/lib/modules/$_kernver/net/* $startdir/pkg/lib/modules/$_kernver/kernel/drivers/net/wireless/madwifi
-  rm -r $startdir/pkg/lib/modules/$_kernver/net/
-  # gzip -9 modules
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-}
-md5sums=('f705acf5597ebe070efeaeb6c330748f')
diff --git a/extra/madwifi/kernel-2.6.30.patch b/extra/madwifi/kernel-2.6.30.patch
deleted file mode 100644
index f844668de..000000000
--- a/extra/madwifi/kernel-2.6.30.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ath/if_athvar.h~	2009-06-13 09:38:53.000000000 +0200
-+++ ath/if_athvar.h	2009-06-13 09:38:53.000000000 +0200
-@@ -103,11 +103,6 @@
- /*
-  * Guess how the interrupt handler should work.
-  */
--#if !defined(IRQ_NONE)
--typedef void irqreturn_t;
--#define	IRQ_NONE
--#define	IRQ_HANDLED
--#endif /* !defined(IRQ_NONE) */
- 
- #ifndef SET_MODULE_OWNER
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
diff --git a/extra/madwifi/madwifi-ng.install b/extra/madwifi/madwifi-ng.install
deleted file mode 100644
index 8681b53ed..000000000
--- a/extra/madwifi/madwifi-ng.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_upgrade() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
-
-post_remove() {
-  KERNEL_VERSION='2.6.38-ARCH'
-  depmod -ae $KERNEL_VERSION > /dev/null 2>&1
-}
diff --git a/extra/moc/ChangeLog b/extra/moc/ChangeLog
deleted file mode 100644
index d494c5280..000000000
--- a/extra/moc/ChangeLog
+++ /dev/null
@@ -1,32 +0,0 @@
-2010-02-25  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.5.0_alpha4-2
-	* Added wavpack and modplug support (close FS#18449)
-
-2010-01-24  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.5.0_alpha4-1
-	* Upstream update to unstable series
-	* Fixed aac support (close FS#13164)
-
-2009-11-07  Eric Belanger  <eric@archlinux.org>
-
-	* Fixed optdepends array syntax (close FS#16053)
-
-2009-03-21  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-3
-	* Added missing libid3tag depends (close FS#13819)
-
-2009-03-07  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-2
-	* Added patch to fix playback of WMA files
-
-2009-01-11  Eric Belanger  <eric@archlinux.org>
-
-	* moc 2.4.4-1
-	* Upstream update
-	* Added libtool depends
-	* Replaced install scriptlet by optdepends
-	* Added ChangeLog
diff --git a/extra/mutter/squash_some_leaks.patch b/extra/mutter/squash_some_leaks.patch
deleted file mode 100644
index 0e6b506bc..000000000
--- a/extra/mutter/squash_some_leaks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 65963748860aec8e3d7ee939b3b16876f4117904 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 20:11:02 +0000
-Subject: region-utils.c: Squash a memory leak
-
-"chunk" was an allocated but unused variable.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649504
----
-diff --git a/src/compositor/region-utils.c b/src/compositor/region-utils.c
-index b4071ca..cf3c64e 100644
---- a/src/compositor/region-utils.c
-+++ b/src/compositor/region-utils.c
-@@ -248,7 +248,6 @@ expand_region_inverse (cairo_region_t *region,
-   MetaRegionBuilder builder;
-   MetaRegionIterator iter;
-   cairo_rectangle_int_t extents;
--  cairo_region_t *chunk;
- 
-   int last_x;
- 
-@@ -268,16 +267,11 @@ expand_region_inverse (cairo_region_t *region,
-                      extents.x, extents.y + extents.height, extents.width, 1,
-                      x_amount, y_amount, flip);
- 
--  chunk = NULL;
--
-   last_x = extents.x;
-   for (meta_region_iterator_init (&iter, region);
-        !meta_region_iterator_at_end (&iter);
-        meta_region_iterator_next (&iter))
-     {
--      if (chunk == NULL)
--        chunk = cairo_region_create ();
--
-       if (iter.rectangle.x > last_x)
-         add_expanded_rect (&builder,
-                            last_x, iter.rectangle.y,
---
-cgit v0.9
-From d0414a3ea697738dcdf2641b6a8000df35215862 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 05 May 2011 20:46:00 +0000
-Subject: theme.c: Squash memory leak
-
-When converting a token to a different type, we need to free its
-string.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649500
----
-diff --git a/src/ui/theme.c b/src/ui/theme.c
-index 0077388..9305645 100644
---- a/src/ui/theme.c
-+++ b/src/ui/theme.c
-@@ -2639,11 +2639,13 @@ meta_theme_replace_constants (MetaTheme   *theme,
-         {
-           if (meta_theme_lookup_int_constant (theme, t->d.v.name, &ival))
-             {
-+              g_free (t->d.v.name);
-               t->type = POS_TOKEN_INT;
-               t->d.i.val = ival;
-             }
-           else if (meta_theme_lookup_float_constant (theme, t->d.v.name, &dval))
-             {
-+              g_free (t->d.v.name);
-               t->type = POS_TOKEN_DOUBLE;
-               t->d.d.val = dval;
-             }
---
-cgit v0.9
diff --git a/extra/neverball/ChangeLog b/extra/neverball/ChangeLog
deleted file mode 100644
index d4c6561ca..000000000
--- a/extra/neverball/ChangeLog
+++ /dev/null
@@ -1,50 +0,0 @@
-2010-01-18  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.4-2
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-09-20  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.4-1
-	* Upstream update
-
-2009-09-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.3-1
-	* Upstream update
-
-2009-08-16  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.2-1
-	* Upstream update
-	* Added physfs depends
-	* Fixed file permissions
-
-2009-08-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-2.1
-	* Built i686 package without sse (close FS#15849)
-
-2009-07-01  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-2
-	* Rebuilt against libjpeg 7
-
-2009-04-08  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.1-1
-	* Upstream update
-	* Removed sdl_image and sdl_mixer depends: not needed anymore
-	* Added libpng, libjpeg and libvorbis depends
-
-2009-02-03  Eric Belanger  <eric@archlinux.org>
-
-	* neverball 1.5.0-1
-	* Upstream update
-	* Updated url
-	* Added mesa makedepends
-	* Switched to upstream desktop file and icons
-	* Removed wrapper scripts
-	* Added mapc binary
-	* Added locales, man pages and docs
-	* Added ChangeLog
diff --git a/extra/rxvt-unicode/popup-menu-hang.diff b/extra/rxvt-unicode/popup-menu-hang.diff
deleted file mode 100644
index 09bb3c64b..000000000
--- a/extra/rxvt-unicode/popup-menu-hang.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/perl/urxvt-popup
-===================================================================
-RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v
-retrieving revision 1.15
-diff -u -r1.15 urxvt-popup
---- src/perl/urxvt-popup	24 Dec 2007 08:21:40 -0000	1.15
-+++ src/perl/urxvt-popup	2 Aug 2009 08:22:52 -0000
-@@ -120,7 +120,7 @@
-    $self->refresh;
- 
-    # might fail, but try anyways
--   $self->grab ($self->{data}{event}{time}, 1)
-+   $self->grab ($self->{data}{event}{time})
-       and $self->allow_events_async;
- 
-    on_button_press $self, $self->{data}{event} if $self->{data}{event}{button};
-@@ -132,7 +132,7 @@
-    my ($self, $event) = @_;
- 
-    # should definitely not fail
--   $self->grab ($self->{data}{event}{time}, 1)
-+   $self->grab ($self->{data}{event}{time})
-       and $self->allow_events_async;
- }
diff --git a/extra/scim/gcc45.patch b/extra/scim/gcc45.patch
deleted file mode 100644
index 267a2bbf6..000000000
--- a/extra/scim/gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur scim-1.4.9.orig//src/ltdl.cpp scim-1.4.9/src/ltdl.cpp
---- scim-1.4.9.orig//src/ltdl.cpp	2008-11-02 01:42:40.000000000 -0500
-+++ scim-1.4.9/src/ltdl.cpp	2010-07-04 00:19:58.924925581 -0500
-@@ -3361,7 +3361,7 @@
- {
-   lt_dlhandle	handle		= 0;
-   char *	tmp		= 0;
--  char *	ext		= 0;
-+  const char *	ext		= 0;
-   size_t	len;
-   int		errors		= 0;
- 
diff --git a/extra/scim/scim.install b/extra/scim/scim.install
deleted file mode 100644
index 1097ea400..000000000
--- a/extra/scim/scim.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  echo -n "updating gtk.immodules... "
-  /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-  echo "done."
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/vigra/libpng-1.4.patch b/extra/vigra/libpng-1.4.patch
deleted file mode 100644
index 3c69e8eb8..000000000
--- a/extra/vigra/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
---- vigra1.6.0-orig/src/impex/png.cxx	2010-01-20 19:46:57.000000000 -0500
-+++ vigra1.6.0/src/impex/png.cxx	2010-01-20 19:47:55.000000000 -0500
-@@ -270,8 +270,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/extra/xaw3d/ChangeLog b/extra/xaw3d/ChangeLog
deleted file mode 100644
index 077b24d3d..000000000
--- a/extra/xaw3d/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2009-05-10  Jan de Groot  <jgc@archlinux.org>
-
-	* xaw3d 1.5E-2
-	* Build without libxp (requires latest imake)
-	* Simplify PKGBUILD a bit
-	* Add extra patches from Fedora
-	* Fix URL
-
-2008-12-14  Eric Belanger  <eric@archlinux.org>
-
-	* xaw3d 1.5E-1
-	* Upstream update
-	* Updated url
-	* Added misc. patches
-	* Added ChangeLog