Wed Nov 2 13:41:53 UTC 2011

11 files changed, 0 insertions, 424 deletions

diff --git a/extra/conky/current-power.patch b/extra/conky/current-power.patch
deleted file mode 100644
index 1e7cf5a23..000000000
--- a/extra/conky/current-power.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/src/linux.c new/src/linux.c
---- old/src/linux.c	2010-10-05 23:29:36.000000000 +0200
-+++ new/src/linux.c	2010-12-06 22:18:59.346667183 +0100
-@@ -1671,6 +1671,8 @@
-  			the tradition! */
-  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
-  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
-+ 			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
-+ 				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
-  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
-  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
-  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
diff --git a/extra/gdm/check-for-shell.patch b/extra/gdm/check-for-shell.patch
deleted file mode 100644
index f3ac9cf9a..000000000
--- a/extra/gdm/check-for-shell.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
-From: György Balló <ballogy@freestart.hu>
-Date: Fri, 30 Sep 2011 21:48:40 +0000
-Subject: data: add back check for gnome-shell before running gdm-shell session
-
-Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
-
-This commit does a quick check to make sure gnome-shell is
-installed, and supports --gdm-mode. If either of those fail,
-then fall back to the old greeter.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=660409
----
-diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
-index 3d408c3..496cc10 100644
---- a/data/gdm-shell.session.in
-+++ b/data/gdm-shell.session.in
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
- FallbackSession=gdm-fallback
---
-cgit v0.9.0.2
diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch
deleted file mode 100644
index 24602100f..000000000
--- a/extra/gnome-settings-daemon/fix_color_crash.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 08:52:06 +0000
-Subject: color: Fix a crash if ~/.local is deleted at runtime
-
-Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664
----
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index d325162..3dde406 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store,
- 
-         /* check we're not in a loop */
-         helper = gcm_profile_store_find_directory (profile_store, path);
-+        if (helper == NULL)
-+                goto out;
-         if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) {
-                 g_warning ("recursing more than %i levels deep is insane",
-                            GCM_PROFILE_STORE_MAX_RECURSION_LEVELS);
---
-cgit v0.9.0.2
-From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 03 Oct 2011 10:02:56 +0000
-Subject: color: Simplify gcm_profile_store_mkdir_with_parents()
-
-No need to check for the path existing,
-g_file_make_directory_with_parents() will do that for us.
----
-(limited to 'plugins/color/gcm-profile-store.c')
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 3dde406..d705604 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -419,19 +419,12 @@ static gboolean
- gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
- {
-         gboolean ret;
--        GFile *file = NULL;
- 
-         /* ensure destination exists */
--        ret = g_file_test (filename, G_FILE_TEST_EXISTS);
--        if (!ret) {
--                file = g_file_new_for_path (filename);
--                ret = g_file_make_directory_with_parents (file, NULL, error);
--                if (!ret)
--                        goto out;
--        }
--out:
--        if (file != NULL)
--                g_object_unref (file);
-+        file = g_file_new_for_path (filename);
-+        ret = g_file_make_directory_with_parents (file, NULL, error);
-+        g_object_unref (file);
-+
-         return ret;
- }
- 
---
-cgit v0.9.0.2
-From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 10:38:36 +0000
-Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile
-
----
-(limited to 'plugins/color/gcm-profile-store.c')
-
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index d705604..0b3cfa0 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -419,6 +419,7 @@ static gboolean
- gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
- {
-         gboolean ret;
-+        GFile *file;
- 
-         /* ensure destination exists */
-         file = g_file_new_for_path (filename);
---
-cgit v0.9.0.2
-From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Mon, 03 Oct 2011 10:34:04 +0000
-Subject: color: Cancel any in-progress directory searching on plugin unload
-
----
-diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c
-index 0b3cfa0..bcb7adc 100644
---- a/plugins/color/gcm-profile-store.c
-+++ b/plugins/color/gcm-profile-store.c
-@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate
- {
-         GPtrArray                       *filename_array;
-         GPtrArray                       *directory_array;
-+        GCancellable                    *cancellable;
- };
- 
- enum {
-@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object,
-         g_file_enumerator_next_files_async  (enumerator,
-                                              5,
-                                              G_PRIORITY_LOW,
--                                             NULL,
-+                                             profile_store->priv->cancellable,
-                                              gcm_profile_store_next_files_cb,
-                                              user_data);
- 
-@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
-         gchar *path = NULL;
-         GError *error = NULL;
-         GFileEnumerator *enumerator;
-+        GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data);
- 
-         enumerator = g_file_enumerate_children_finish (G_FILE (source_object),
-                                                        res,
-@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object,
-         g_file_enumerator_next_files_async (enumerator,
-                                             5,
-                                             G_PRIORITY_LOW,
--                                            NULL,
-+                                            profile_store->priv->cancellable,
-                                             gcm_profile_store_next_files_cb,
-                                             user_data);
-         g_object_unref (enumerator);
-@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path
-                                          G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                          G_PRIORITY_LOW,
--                                         NULL,
-+                                         profile_store->priv->cancellable,
-                                          gcm_profile_store_enumerate_children_cb,
-                                          profile_store);
- out:
-@@ -416,14 +418,16 @@ out:
- }
- 
- static gboolean
--gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error)
-+gcm_profile_store_mkdir_with_parents (const gchar *filename,
-+                                      GCancellable *cancellable,
-+                                      GError **error)
- {
-         gboolean ret;
-         GFile *file;
- 
-         /* ensure destination exists */
-         file = g_file_new_for_path (filename);
--        ret = g_file_make_directory_with_parents (file, NULL, error);
-+        ret = g_file_make_directory_with_parents (file, cancellable, error);
-         g_object_unref (file);
- 
-         return ret;
-@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store)
- 
-         /* get Linux per-user profiles */
-         path = g_build_filename (g_get_user_data_dir (), "icc", NULL);
--        ret = gcm_profile_store_mkdir_with_parents (path, &error);
-+        ret = gcm_profile_store_mkdir_with_parents (path,
-+                                                    profile_store->priv->cancellable,
-+                                                    &error);
-         if (!ret) {
-                 g_warning ("failed to create directory on startup: %s", error->message);
-                 g_error_free (error);
-@@ -480,6 +486,7 @@ static void
- gcm_profile_store_init (GcmProfileStore *profile_store)
- {
-         profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store);
-+        profile_store->priv->cancellable = g_cancellable_new ();
-         profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free);
-         profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free);
- }
-@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object)
-         GcmProfileStore *profile_store = GCM_PROFILE_STORE (object);
-         GcmProfileStorePrivate *priv = profile_store->priv;
- 
-+        g_cancellable_cancel (profile_store->priv->cancellable);
-+        g_object_unref (profile_store->priv->cancellable);
-         g_ptr_array_unref (priv->filename_array);
-         g_ptr_array_unref (priv->directory_array);
- 
---
-cgit v0.9.0.2
diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff
deleted file mode 100644
index 8324b5a58..000000000
--- a/extra/gnutls/addGNU-stack.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Prevent executable stack
-Author: Andreas Metzler <ametzler@debian.org>
-
---- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s
-+++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s
-@@ -38,3 +38,7 @@ is_padlock_nano:
- 	xorl	%eax,%eax
-         ret
- .size	is_padlock_nano,.-is_padlock_nano
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff
deleted file mode 100644
index ff8dff6ef..000000000
--- a/extra/gtk2/gtk2-dont-ellipsize-filters.diff
+++ /dev/null
@@ -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);
- 
diff --git a/extra/hplip/hplip-cups-1.5.0-compatibility.patch b/extra/hplip/hplip-cups-1.5.0-compatibility.patch
deleted file mode 100644
index a4039e6c9..000000000
--- a/extra/hplip/hplip-cups-1.5.0-compatibility.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hplip-3.11.7~/prnt/hpps/hppsfilter.c	2011-07-24 18:58:05.000000000 +0000
-+++ hplip-3.11.7/prnt/hpps/hppsfilter.c	2011-08-09 20:51:54.150214165 +0000
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
diff --git a/extra/htop/htop.c.patch b/extra/htop/htop.c.patch
deleted file mode 100644
index 41a2dd377..000000000
--- a/extra/htop/htop.c.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Roman Kosenko <madkite@gmail.com>
-Date: Thu, 10 Mar 2011 16:23:53 +0200
-Subject: [PATCH] Fix stupid bug with --sort-key
-
---- htop.c.old	2010-11-24 20:45:38.000000000 +0200
-+++ htop.c	2011-03-10 16:32:18.473716667 +0200
-@@ -282,7 +282,7 @@
-             printVersionFlag();
-             break;
-          case 's':
--            if (strcmp(optarg, "help")) {
-+            if (!strcmp(optarg, "help")) {
-                for (int j = 1; j < LAST_PROCESSFIELD; j++)
-                   printf ("%s\n", Process_fieldNames[j]);
-                exit(0);
diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
deleted file mode 100644
index de4b126d0..000000000
--- a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-============================================================
---- libpurple/protocols/silc/ops.c	30ab18780af11a53b6564a44c4e8ebfc1a296d78
-+++ libpurple/protocols/silc/ops.c	80bd9a7d3faf9e5ef28438647159fe19847e9839
-@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, 
- 	}
- 
- 	if (flags & SILC_MESSAGE_FLAG_UTF8) {
--		tmp = g_markup_escape_text((const char *)message, -1);
-+		const char *msg = (const char *)message;
-+		char *salvaged = NULL;
-+		if (!g_utf8_validate((const char *)message, -1, NULL)) {
-+			salvaged = purple_utf8_salvage((const char *)message);
-+			msg = salvaged;
-+		}
-+		tmp = g_markup_escape_text(msg, -1);
- 		/* Send to Purple */
- 		serv_got_im(gc, sender->nickname, tmp, 0, time(NULL));
-+		g_free(salvaged);
- 		g_free(tmp);
- 	}
- }
diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch
deleted file mode 100644
index 915e3baec..000000000
--- a/extra/pulseaudio/dont-require-dbus.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f
-Author: Tanu Kaskinen <tanuk@iki.fi>
-Date:   Thu Oct 6 23:28:37 2011 +0300
-
-    daemon: Don't treat it as a fatal error if we can't connect to the session bus
-    
-    http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
-
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index e2e4a81..c32f7c7 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
- 
- #ifdef HAVE_DBUS
-     if (!conf->system_instance) {
--        if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
--            goto finish;
--        if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
--            goto finish;
-+        if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
-+            if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
-+                goto finish;
-+        }
-     }
- 
--    if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
--        goto finish;
-+    if (start_server)
-+        server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
- #endif
- 
- #ifdef HAVE_FORK
-diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
-index 45796e7..9bdc699 100644
---- a/src/daemon/server-lookup.c
-+++ b/src/daemon/server-lookup.c
-@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
-     sl->path_registered = FALSE;
- 
-     if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
--        pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
-+        pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
-         goto fail;
-     }
- 
diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch
deleted file mode 100644
index 473b252a9..000000000
--- a/extra/pulseaudio/version-number.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
-Author: Colin Guthrie <colin@mageia.org>
-Date:   Sat Oct 1 12:03:44 2011 +0100
-
-    libpulse: Always return a three part version number in API calls.
-    
-    For both the headers and the library we should provide clean, three part
-    strings as this has been what we've previously done in the past
-    and some external systems apparently rely on this format. While it's not
-    something we've officially commented on before, there is no real advantage
-    to us to change it so let's not try to tidy things up too much
-    considering some third party apps (e.g. Skype) seem to dislike a two
-    part version string.
-
-diff --git a/src/pulse/context.c b/src/pulse/context.c
-index 25d04a1..af144aa 100644
---- a/src/pulse/context.c
-+++ b/src/pulse/context.c
-@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
- }
- 
- const char* pa_get_library_version(void) {
--    return PACKAGE_VERSION;
-+    return pa_get_headers_version();
- }
- 
- const char* pa_context_get_server(pa_context *c) {
-diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
-index 7e00c5e..1be4c75 100644
---- a/src/pulse/version.h.in
-+++ b/src/pulse/version.h.in
-@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
- /** Return the version of the header files. Keep in mind that this is
- a macro and not a function, so it is impossible to get the pointer of
- it. */
--#define pa_get_headers_version() ("@PACKAGE_VERSION@")
-+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
- 
- /** Return the version of the library the current application is
-  * linked to. */
diff --git a/extra/silc-toolkit/PKGBUILD b/extra/silc-toolkit/PKGBUILD
deleted file mode 100644
index a74d067fa..000000000
--- a/extra/silc-toolkit/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Ionut Biru <ionut@archlinux.ro>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-
-pkgname=silc-toolkit
-pkgver=1.1.10
-pkgrel=1
-pkgdesc="Toolkit for Secure Internet Live Conferencing"
-url="http://www.silcnet.org"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc' 'perl' 'libidn')
-source=(http://www.silcnet.org/download/toolkit/sources/$pkgname-$pkgver.tar.bz2)
-options=(!libtool)
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-    ./configure --prefix=/usr --with-etcdir=/etc/silc \
-        --enable-ipv6 --with-perl=yes \
-        --with-simdir=/usr/lib/silc/modules
-
-    make || return 1
-    make DESTDIR=$pkgdir install
-
-    # remove the crapload of html docs (26MB!)
-    rm -rf $pkgdir/usr/share/doc/$pkgname/toolkit
-}
-sha256sums=('a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76')