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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

2 files changed, 18 insertions, 23 deletions

diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 66ddf3f2d..47cfe0b7b 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 54886 2011-08-27 12:46:49Z jconder $
+# $Id: PKGBUILD 56110 2011-10-01 19:01:59Z ibiru $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
 pkgname=$_pkgname-updates
-pkgver=3.0.3
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
-depends=('gnome-packagekit' "$_pkgname" 'upower')
-makedepends=('intltool' 'gtk-doc')
+depends=('gnome-packagekit' "$_pkgname")
+makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
 options=('!emptydirs' '!libtool')
 install=$_pkgname.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
         'arch.patch')
-sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03'
-            '91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134')
+sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b'
+            'e5029915c423f72256c4170f917363c385b6fcd180b87ceba0d7bb11a841d7e9')
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
@@ -24,9 +24,10 @@ build() {
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
 	      --localstatedir=/var \
-	      --libexecdir=/usr/bin \
+	      --libexecdir=/usr/lib/gnome-settings-daemon \
 	      --disable-static \
-	      --enable-pulse
+	      --enable-pulse \
+	      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
   #https://bugzilla.gnome.org/show_bug.cgi?id=656231
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make -s
diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch
index d5a5382fa..f405d7593 100644
--- a/community/gnome-settings-daemon-updates/arch.patch
+++ b/community/gnome-settings-daemon-updates/arch.patch
@@ -1,5 +1,5 @@
 diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-index 67c551e..7f9f5ba 100644
+index c09096a..3fa4159 100644
 --- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
 +++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
 @@ -31,7 +31,7 @@
@@ -8,8 +8,8 @@ index 67c551e..7f9f5ba 100644
      <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
 -      <default>'security'</default>
 +      <default>'none'</default>
-       <_summary>Automatically update these types of updates</_summary>
-       <_description>Automatically update these types of updates.</_description>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
      </key>
 @@ -56,7 +56,7 @@
        <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
@@ -36,7 +36,7 @@ index 9510c65..191092d 100644
  libupdates_la_CPPFLAGS = \
  	-I$(top_srcdir)/gnome-settings-daemon \
 diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 64373bd..275c171 100644
+index 90ea246..d79455c 100644
 --- a/plugins/updates/gsd-updates-manager.c
 +++ b/plugins/updates/gsd-updates-manager.c
 @@ -32,6 +32,7 @@
@@ -47,7 +47,7 @@ index 64373bd..275c171 100644
  #include "gsd-updates-common.h"
  #include "gnome-settings-profile.h"
  
-@@ -44,6 +45,7 @@ struct GsdUpdatesManagerPrivate
+@@ -46,6 +47,7 @@ struct GsdUpdatesManagerPrivate
          GCancellable            *cancellable;
          GsdUpdatesRefresh       *refresh;
          GsdUpdatesFirmware      *firmware;
@@ -65,7 +65,7 @@ index 64373bd..275c171 100644
          /* get http settings */
          manager->priv->settings_http = g_settings_new ("org.gnome.system.proxy.http");
          g_signal_connect (manager->priv->settings_http, "changed",
-@@ -1467,6 +1472,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
+@@ -1464,6 +1469,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
                  g_object_unref (manager->priv->firmware);
                  manager->priv->firmware = NULL;
          }
@@ -78,10 +78,10 @@ index 64373bd..275c171 100644
                  manager->priv->proxy_session = NULL;
 diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
 new file mode 100644
-index 0000000..cbc3794
+index 0000000..892acad
 --- /dev/null
 +++ b/plugins/updates/gsd-updates-watch.c
-@@ -0,0 +1,185 @@
+@@ -0,0 +1,179 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
 + *
 + * Copyright (C) 2007-2011 Richard Hughes <richard@hughsie.com>
@@ -149,21 +149,15 @@ index 0000000..cbc3794
 +
 +	/* display a notification */
 +        notification = notify_notification_new (title, message, NULL);
-+        if (notification == NULL) {
-+                g_warning ("failed to create notification");
-+                goto out;
-+        }
-+
++	notify_notification_set_app_name (notification, _("Software Updates"));
 +        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 +        notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
 +
 +        if (!notify_notification_show (notification, &error)) {
 +                g_warning ("error: %s", error->message);
 +                g_error_free (error);
-+		goto out;
 +        }
 +
-+out:
 +	g_free (details);
 +}
 +