[arch-commits] Commit in gnome-user-share/repos (6 files)

[Ionut Biru]

    Date: Monday, March 7, 2011 @ 04:18:18
  Author: ibiru
Revision: 112854

libnotify 0.7 rebuild

Added:
  gnome-user-share/repos/staging-i686/
  gnome-user-share/repos/staging-i686/gnome-user-share-2.30.1-libnotify-0.7.patch
  gnome-user-share/repos/staging-x86_64/
  gnome-user-share/repos/staging-x86_64/gnome-user-share-2.30.1-libnotify-0.7.patch
Modified:
  gnome-user-share/repos/staging-i686/PKGBUILD
  gnome-user-share/repos/staging-x86_64/PKGBUILD

------------------------------------------------------------+
 PKGBUILD                                                   |   22 ++++---
 staging-i686/gnome-user-share-2.30.1-libnotify-0.7.patch   |   31 +++++++++++
 staging-x86_64/gnome-user-share-2.30.1-libnotify-0.7.patch |   31 +++++++++++
 3 files changed, 76 insertions(+), 8 deletions(-)

Modified: staging-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 09:08:52 UTC (rev 112853)
+++ staging-i686/PKGBUILD	2011-03-07 09:18:18 UTC (rev 112854)
@@ -3,20 +3,23 @@
 
 pkgname=gnome-user-share
 pkgver=2.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd>=0.6-3' 'gconf>=2.32.0' 'hicolor-icon-theme' 'libnotify>=0.4.5' 'gnome-bluetooth>=2.31.90' 'libcanberra>=0.25')
+depends=('mod_dnssd>=0.6-3' 'gconf>=2.32.0' 'hicolor-icon-theme' 'libnotify>=0.7.1' 'gnome-bluetooth>=2.31.90' 'libcanberra>=0.25')
 makedepends=('intltool' 'gnome-doc-utils>=0.20.1' 'nautilus')
 options=('!emptydirs' '!libtool')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+        gnome-user-share-2.30.1-libnotify-0.7.patch)
+sha256sums=('30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe'
+            '60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gnome-user-share-2.30.1-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-user-share \
       --localstatedir=/var

Added: staging-i686/gnome-user-share-2.30.1-libnotify-0.7.patch
===================================================================
--- staging-i686/gnome-user-share-2.30.1-libnotify-0.7.patch	                        (rev 0)
+++ staging-i686/gnome-user-share-2.30.1-libnotify-0.7.patch	2011-03-07 09:18:18 UTC (rev 112854)
@@ -0,0 +1,31 @@
+http://pkgs.fedoraproject.org/gitweb/?p=gnome-user-share.git;a=blob;f=notify.patch;hb=HEAD
+
+--- src/obexpush.c
++++ src/obexpush.c
+@@ -139,10 +139,9 @@ show_notification (const char *filename)
+ 	/* Translators: %s is the name of the filename received */
+ 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
+ 	g_free (display);
+-	notification = notify_notification_new_with_status_icon (_("You received a file"),
+-								 notification_text,
+-								 "dialog-information",
+-								 GTK_STATUS_ICON (statusicon));
++	notification = notify_notification_new (_("You received a file"),
++					         notification_text,
++					         "dialog-information");
+ 
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
+ 		char *device_path;
+ 		GHashTable *props;
+ 
+-		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
++		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
+ 
+ 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
+-						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
++						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+ 
+ 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+ 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,

Modified: staging-x86_64/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-03-07 09:08:52 UTC (rev 112853)
+++ staging-x86_64/PKGBUILD	2011-03-07 09:18:18 UTC (rev 112854)
@@ -3,20 +3,23 @@
 
 pkgname=gnome-user-share
 pkgver=2.30.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy to use user-level file sharing for GNOME."
 arch=('i686' 'x86_64')
 url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
-depends=('mod_dnssd>=0.6-3' 'gconf>=2.32.0' 'hicolor-icon-theme' 'libnotify>=0.4.5' 'gnome-bluetooth>=2.31.90' 'libcanberra>=0.25')
+depends=('mod_dnssd>=0.6-3' 'gconf>=2.32.0' 'hicolor-icon-theme' 'libnotify>=0.7.1' 'gnome-bluetooth>=2.31.90' 'libcanberra>=0.25')
 makedepends=('intltool' 'gnome-doc-utils>=0.20.1' 'nautilus')
 options=('!emptydirs' '!libtool')
 install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+        gnome-user-share-2.30.1-libnotify-0.7.patch)
+sha256sums=('30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe'
+            '60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/gnome-user-share-2.30.1-libnotify-0.7.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gnome-user-share \
       --localstatedir=/var

Added: staging-x86_64/gnome-user-share-2.30.1-libnotify-0.7.patch
===================================================================
--- staging-x86_64/gnome-user-share-2.30.1-libnotify-0.7.patch	                        (rev 0)
+++ staging-x86_64/gnome-user-share-2.30.1-libnotify-0.7.patch	2011-03-07 09:18:18 UTC (rev 112854)
@@ -0,0 +1,31 @@
+http://pkgs.fedoraproject.org/gitweb/?p=gnome-user-share.git;a=blob;f=notify.patch;hb=HEAD
+
+--- src/obexpush.c
++++ src/obexpush.c
+@@ -139,10 +139,9 @@ show_notification (const char *filename)
+ 	/* Translators: %s is the name of the filename received */
+ 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
+ 	g_free (display);
+-	notification = notify_notification_new_with_status_icon (_("You received a file"),
+-								 notification_text,
+-								 "dialog-information",
+-								 GTK_STATUS_ICON (statusicon));
++	notification = notify_notification_new (_("You received a file"),
++					         notification_text,
++					         "dialog-information");
+ 
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
+ 		char *device_path;
+ 		GHashTable *props;
+ 
+-		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
++		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
+ 
+ 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
+-						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
++						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+ 
+ 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+ 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,