[arch-commits] Commit in ubuntuone-client/repos (18 files)
bgyorgy at nymeria.archlinux.org
bgyorgy at nymeria.archlinux.org
Wed Jan 23 12:42:21 UTC 2013
Date: Wednesday, January 23, 2013 @ 13:42:21
Author: bgyorgy
Revision: 82715
archrelease: copy trunk to community-i686, community-x86_64
Added:
ubuntuone-client/repos/community-i686/1339_1338.diff
(from rev 82714, ubuntuone-client/trunk/1339_1338.diff)
ubuntuone-client/repos/community-i686/PKGBUILD
(from rev 82714, ubuntuone-client/trunk/PKGBUILD)
ubuntuone-client/repos/community-i686/fix-notify-hint.patch
(from rev 82714, ubuntuone-client/trunk/fix-notify-hint.patch)
ubuntuone-client/repos/community-i686/lp1093111.patch
(from rev 82714, ubuntuone-client/trunk/lp1093111.patch)
ubuntuone-client/repos/community-i686/ubuntuone-client.install
(from rev 82714, ubuntuone-client/trunk/ubuntuone-client.install)
ubuntuone-client/repos/community-x86_64/1339_1338.diff
(from rev 82714, ubuntuone-client/trunk/1339_1338.diff)
ubuntuone-client/repos/community-x86_64/PKGBUILD
(from rev 82714, ubuntuone-client/trunk/PKGBUILD)
ubuntuone-client/repos/community-x86_64/fix-notify-hint.patch
(from rev 82714, ubuntuone-client/trunk/fix-notify-hint.patch)
ubuntuone-client/repos/community-x86_64/lp1093111.patch
(from rev 82714, ubuntuone-client/trunk/lp1093111.patch)
ubuntuone-client/repos/community-x86_64/ubuntuone-client.install
(from rev 82714, ubuntuone-client/trunk/ubuntuone-client.install)
Deleted:
ubuntuone-client/repos/community-i686/1339_1338.diff
ubuntuone-client/repos/community-i686/PKGBUILD
ubuntuone-client/repos/community-i686/fix-notify-hint.patch
ubuntuone-client/repos/community-i686/ubuntuone-client.install
ubuntuone-client/repos/community-x86_64/1339_1338.diff
ubuntuone-client/repos/community-x86_64/PKGBUILD
ubuntuone-client/repos/community-x86_64/fix-notify-hint.patch
ubuntuone-client/repos/community-x86_64/ubuntuone-client.install
-------------------------------------------+
community-i686/1339_1338.diff | 114 ++++++++++++++--------------
community-i686/PKGBUILD | 98 ++++++++++++------------
community-i686/fix-notify-hint.patch | 40 ++++-----
community-i686/lp1093111.patch | 10 ++
community-i686/ubuntuone-client.install | 22 ++---
community-x86_64/1339_1338.diff | 114 ++++++++++++++--------------
community-x86_64/PKGBUILD | 98 ++++++++++++------------
community-x86_64/fix-notify-hint.patch | 40 ++++-----
community-x86_64/lp1093111.patch | 10 ++
community-x86_64/ubuntuone-client.install | 22 ++---
10 files changed, 300 insertions(+), 268 deletions(-)
Deleted: community-i686/1339_1338.diff
===================================================================
--- community-i686/1339_1338.diff 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-i686/1339_1338.diff 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,57 +0,0 @@
-=== modified file 'tests/platform/sync_menu/test_linux.py'
---- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000
-+++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000
-@@ -124,6 +124,7 @@
- """Check that the dummy has the proper methods required by the API."""
- dummy = linux.DummySyncMenu('random', 'args')
- self.assertIsInstance(dummy.update_transfers, Callable)
-+ self.assertIsInstance(dummy.sync_status_changed, Callable)
-
-
- class SyncMenuTestCase(TestCase):
-
-=== modified file 'ubuntuone/platform/sync_menu/linux.py'
---- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000
-+++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000
-@@ -183,7 +183,7 @@
- self.timer.addCallback(self._timeout)
-
-
--class TransfersMenu(Dbusmenu.Menuitem):
-+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
- """Menu that handles the recent and current transfers."""
-
- def __init__(self, status_frontend):
-@@ -227,7 +227,7 @@
- items_added = 0
- remove = []
- for item in self._uploading_items:
-- if item in uploading_data:
-+ if item in uploading_data.keys():
- size, written = uploading_data[item]
- percentage = written * 100 / size
- upload_item = self._uploading_items[item]
-@@ -243,7 +243,7 @@
- for item in remove:
- self._uploading_items.pop(item)
- if items_added < 5:
-- for item in uploading_data:
-+ for item in uploading_data.keys():
- if item not in self._uploading_items and items_added < 5:
- size, written = uploading_data[item]
- percentage = written * 100 / size
-@@ -270,4 +270,12 @@
- def update_transfers(self):
- """Do nothing."""
-
--UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
-+ def sync_status_changed(self):
-+ """Do nothing."""
-+
-+
-+if use_syncmenu:
-+ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-+else:
-+ UbuntuOneSyncMenu = DummySyncMenu
-+ TransfersMenu = None
-
Copied: ubuntuone-client/repos/community-i686/1339_1338.diff (from rev 82714, ubuntuone-client/trunk/1339_1338.diff)
===================================================================
--- community-i686/1339_1338.diff (rev 0)
+++ community-i686/1339_1338.diff 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,57 @@
+=== modified file 'tests/platform/sync_menu/test_linux.py'
+--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000
++++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000
+@@ -124,6 +124,7 @@
+ """Check that the dummy has the proper methods required by the API."""
+ dummy = linux.DummySyncMenu('random', 'args')
+ self.assertIsInstance(dummy.update_transfers, Callable)
++ self.assertIsInstance(dummy.sync_status_changed, Callable)
+
+
+ class SyncMenuTestCase(TestCase):
+
+=== modified file 'ubuntuone/platform/sync_menu/linux.py'
+--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000
++++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000
+@@ -183,7 +183,7 @@
+ self.timer.addCallback(self._timeout)
+
+
+-class TransfersMenu(Dbusmenu.Menuitem):
++class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
+ """Menu that handles the recent and current transfers."""
+
+ def __init__(self, status_frontend):
+@@ -227,7 +227,7 @@
+ items_added = 0
+ remove = []
+ for item in self._uploading_items:
+- if item in uploading_data:
++ if item in uploading_data.keys():
+ size, written = uploading_data[item]
+ percentage = written * 100 / size
+ upload_item = self._uploading_items[item]
+@@ -243,7 +243,7 @@
+ for item in remove:
+ self._uploading_items.pop(item)
+ if items_added < 5:
+- for item in uploading_data:
++ for item in uploading_data.keys():
+ if item not in self._uploading_items and items_added < 5:
+ size, written = uploading_data[item]
+ percentage = written * 100 / size
+@@ -270,4 +270,12 @@
+ def update_transfers(self):
+ """Do nothing."""
+
+-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
++ def sync_status_changed(self):
++ """Do nothing."""
++
++
++if use_syncmenu:
++ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
++else:
++ UbuntuOneSyncMenu = DummySyncMenu
++ TransfersMenu = None
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-i686/PKGBUILD 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=3
-pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
- 1339_1338.diff
- fix-notify-hint.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
- 'e82e80c229de06692988c1f938a34fb9'
- '54dfeb2be011f0a12ea7cfa0f0c19bec')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
- # Improve TransfersMenu declaration to avoid problems
- patch -Np0 -i "$srcdir/1339_1338.diff"
-
- # Workaround for crash in notification-daemon
- # https://bugzilla.gnome.org/show_bug.cgi?id=665166
- patch -Np1 -i "$srcdir/fix-notify-hint.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static \
- PYTHON=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- # We don't have Apport in Arch Linux
- rm -r "$pkgdir"/{etc/apport,usr/share/apport}
-}
Copied: ubuntuone-client/repos/community-i686/PKGBUILD (from rev 82714, ubuntuone-client/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ubuntuone-client
+pkgver=4.0.0
+pkgrel=4
+pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/ubuntuone-client"
+license=('GPL')
+depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ 1339_1338.diff
+ fix-notify-hint.patch
+ lp1093111.patch)
+md5sums=('738039703d4dcf54518a725f8ffbc4de'
+ 'e82e80c229de06692988c1f938a34fb9'
+ '54dfeb2be011f0a12ea7cfa0f0c19bec'
+ 'ca79cb558231639e28be7276017ae91c')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
+
+ # Improve TransfersMenu declaration to avoid problems
+ patch -Np0 -i "$srcdir/1339_1338.diff"
+
+ # Workaround for crash in notification-daemon
+ # https://bugzilla.gnome.org/show_bug.cgi?id=665166
+ patch -Np1 -i "$srcdir/fix-notify-hint.patch"
+
+ # Fix compatibility with glibc 2.17
+ # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111
+ patch -Np1 -i "$srcdir/lp1093111.patch"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-static \
+ PYTHON=python2
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+
+ # We don't have Apport in Arch Linux
+ rm -r "$pkgdir"/{etc/apport,usr/share/apport}
+}
Deleted: community-i686/fix-notify-hint.patch
===================================================================
--- community-i686/fix-notify-hint.patch 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-i686/fix-notify-hint.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,20 +0,0 @@
-diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200
-+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200
-@@ -40,7 +40,7 @@
-
- if 'gi' in sys.modules and sys.modules['gi'] is not None:
- try:
-- from gi.repository import Notify
-+ from gi.repository import GLib, Notify
- Notify # pyflakes
- NOTIFY_MODULE = 'gi'
- except ImportError:
-@@ -85,5 +85,6 @@
- if append:
- self.notification.set_hint_string('x-canonical-append', '')
-
-- self.notification.set_hint_int32('transient', int(True))
-+ if NOTIFY_MODULE == 'gi':
-+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
- self.notification.show()
Copied: ubuntuone-client/repos/community-i686/fix-notify-hint.patch (from rev 82714, ubuntuone-client/trunk/fix-notify-hint.patch)
===================================================================
--- community-i686/fix-notify-hint.patch (rev 0)
+++ community-i686/fix-notify-hint.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,20 @@
+diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
+--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200
++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200
+@@ -40,7 +40,7 @@
+
+ if 'gi' in sys.modules and sys.modules['gi'] is not None:
+ try:
+- from gi.repository import Notify
++ from gi.repository import GLib, Notify
+ Notify # pyflakes
+ NOTIFY_MODULE = 'gi'
+ except ImportError:
+@@ -85,5 +85,6 @@
+ if append:
+ self.notification.set_hint_string('x-canonical-append', '')
+
+- self.notification.set_hint_int32('transient', int(True))
++ if NOTIFY_MODULE == 'gi':
++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
+ self.notification.show()
Copied: ubuntuone-client/repos/community-i686/lp1093111.patch (from rev 82714, ubuntuone-client/trunk/lp1093111.patch)
===================================================================
--- community-i686/lp1093111.patch (rev 0)
+++ community-i686/lp1093111.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,10 @@
+--- a/ubuntuone/syncdaemon/tritcask.py 2013-01-18 18:27:41.809017000 +0200
++++ b/ubuntuone/syncdaemon/tritcask.py 2013-01-22 15:08:15.015987671 +0200
+@@ -300,6 +300,7 @@
+ self.fd.seek(0, os.SEEK_END)
+ self.fd.write(crc32 + header)
+ self.fd.write(key)
++ self.fd.flush()
+ value_pos = self.fd.tell()
+ self.fd.write(value)
+ self.fd.flush()
Deleted: community-i686/ubuntuone-client.install
===================================================================
--- community-i686/ubuntuone-client.install 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-i686/ubuntuone-client.install 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: ubuntuone-client/repos/community-i686/ubuntuone-client.install (from rev 82714, ubuntuone-client/trunk/ubuntuone-client.install)
===================================================================
--- community-i686/ubuntuone-client.install (rev 0)
+++ community-i686/ubuntuone-client.install 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-x86_64/1339_1338.diff
===================================================================
--- community-x86_64/1339_1338.diff 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-x86_64/1339_1338.diff 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,57 +0,0 @@
-=== modified file 'tests/platform/sync_menu/test_linux.py'
---- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000
-+++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000
-@@ -124,6 +124,7 @@
- """Check that the dummy has the proper methods required by the API."""
- dummy = linux.DummySyncMenu('random', 'args')
- self.assertIsInstance(dummy.update_transfers, Callable)
-+ self.assertIsInstance(dummy.sync_status_changed, Callable)
-
-
- class SyncMenuTestCase(TestCase):
-
-=== modified file 'ubuntuone/platform/sync_menu/linux.py'
---- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000
-+++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000
-@@ -183,7 +183,7 @@
- self.timer.addCallback(self._timeout)
-
-
--class TransfersMenu(Dbusmenu.Menuitem):
-+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
- """Menu that handles the recent and current transfers."""
-
- def __init__(self, status_frontend):
-@@ -227,7 +227,7 @@
- items_added = 0
- remove = []
- for item in self._uploading_items:
-- if item in uploading_data:
-+ if item in uploading_data.keys():
- size, written = uploading_data[item]
- percentage = written * 100 / size
- upload_item = self._uploading_items[item]
-@@ -243,7 +243,7 @@
- for item in remove:
- self._uploading_items.pop(item)
- if items_added < 5:
-- for item in uploading_data:
-+ for item in uploading_data.keys():
- if item not in self._uploading_items and items_added < 5:
- size, written = uploading_data[item]
- percentage = written * 100 / size
-@@ -270,4 +270,12 @@
- def update_transfers(self):
- """Do nothing."""
-
--UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
-+ def sync_status_changed(self):
-+ """Do nothing."""
-+
-+
-+if use_syncmenu:
-+ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-+else:
-+ UbuntuOneSyncMenu = DummySyncMenu
-+ TransfersMenu = None
-
Copied: ubuntuone-client/repos/community-x86_64/1339_1338.diff (from rev 82714, ubuntuone-client/trunk/1339_1338.diff)
===================================================================
--- community-x86_64/1339_1338.diff (rev 0)
+++ community-x86_64/1339_1338.diff 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,57 @@
+=== modified file 'tests/platform/sync_menu/test_linux.py'
+--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000
++++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000
+@@ -124,6 +124,7 @@
+ """Check that the dummy has the proper methods required by the API."""
+ dummy = linux.DummySyncMenu('random', 'args')
+ self.assertIsInstance(dummy.update_transfers, Callable)
++ self.assertIsInstance(dummy.sync_status_changed, Callable)
+
+
+ class SyncMenuTestCase(TestCase):
+
+=== modified file 'ubuntuone/platform/sync_menu/linux.py'
+--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000
++++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000
+@@ -183,7 +183,7 @@
+ self.timer.addCallback(self._timeout)
+
+
+-class TransfersMenu(Dbusmenu.Menuitem):
++class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
+ """Menu that handles the recent and current transfers."""
+
+ def __init__(self, status_frontend):
+@@ -227,7 +227,7 @@
+ items_added = 0
+ remove = []
+ for item in self._uploading_items:
+- if item in uploading_data:
++ if item in uploading_data.keys():
+ size, written = uploading_data[item]
+ percentage = written * 100 / size
+ upload_item = self._uploading_items[item]
+@@ -243,7 +243,7 @@
+ for item in remove:
+ self._uploading_items.pop(item)
+ if items_added < 5:
+- for item in uploading_data:
++ for item in uploading_data.keys():
+ if item not in self._uploading_items and items_added < 5:
+ size, written = uploading_data[item]
+ percentage = written * 100 / size
+@@ -270,4 +270,12 @@
+ def update_transfers(self):
+ """Do nothing."""
+
+-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
++ def sync_status_changed(self):
++ """Do nothing."""
++
++
++if use_syncmenu:
++ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
++else:
++ UbuntuOneSyncMenu = DummySyncMenu
++ TransfersMenu = None
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-x86_64/PKGBUILD 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=3
-pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
- 1339_1338.diff
- fix-notify-hint.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
- 'e82e80c229de06692988c1f938a34fb9'
- '54dfeb2be011f0a12ea7cfa0f0c19bec')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
- # Improve TransfersMenu declaration to avoid problems
- patch -Np0 -i "$srcdir/1339_1338.diff"
-
- # Workaround for crash in notification-daemon
- # https://bugzilla.gnome.org/show_bug.cgi?id=665166
- patch -Np1 -i "$srcdir/fix-notify-hint.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static \
- PYTHON=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- # We don't have Apport in Arch Linux
- rm -r "$pkgdir"/{etc/apport,usr/share/apport}
-}
Copied: ubuntuone-client/repos/community-x86_64/PKGBUILD (from rev 82714, ubuntuone-client/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=ubuntuone-client
+pkgver=4.0.0
+pkgrel=4
+pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/ubuntuone-client"
+license=('GPL')
+depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ 1339_1338.diff
+ fix-notify-hint.patch
+ lp1093111.patch)
+md5sums=('738039703d4dcf54518a725f8ffbc4de'
+ 'e82e80c229de06692988c1f938a34fb9'
+ '54dfeb2be011f0a12ea7cfa0f0c19bec'
+ 'ca79cb558231639e28be7276017ae91c')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
+
+ # Improve TransfersMenu declaration to avoid problems
+ patch -Np0 -i "$srcdir/1339_1338.diff"
+
+ # Workaround for crash in notification-daemon
+ # https://bugzilla.gnome.org/show_bug.cgi?id=665166
+ patch -Np1 -i "$srcdir/fix-notify-hint.patch"
+
+ # Fix compatibility with glibc 2.17
+ # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111
+ patch -Np1 -i "$srcdir/lp1093111.patch"
+
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-static \
+ PYTHON=python2
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+
+ # We don't have Apport in Arch Linux
+ rm -r "$pkgdir"/{etc/apport,usr/share/apport}
+}
Deleted: community-x86_64/fix-notify-hint.patch
===================================================================
--- community-x86_64/fix-notify-hint.patch 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-x86_64/fix-notify-hint.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,20 +0,0 @@
-diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200
-+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200
-@@ -40,7 +40,7 @@
-
- if 'gi' in sys.modules and sys.modules['gi'] is not None:
- try:
-- from gi.repository import Notify
-+ from gi.repository import GLib, Notify
- Notify # pyflakes
- NOTIFY_MODULE = 'gi'
- except ImportError:
-@@ -85,5 +85,6 @@
- if append:
- self.notification.set_hint_string('x-canonical-append', '')
-
-- self.notification.set_hint_int32('transient', int(True))
-+ if NOTIFY_MODULE == 'gi':
-+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
- self.notification.show()
Copied: ubuntuone-client/repos/community-x86_64/fix-notify-hint.patch (from rev 82714, ubuntuone-client/trunk/fix-notify-hint.patch)
===================================================================
--- community-x86_64/fix-notify-hint.patch (rev 0)
+++ community-x86_64/fix-notify-hint.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,20 @@
+diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
+--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200
++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200
+@@ -40,7 +40,7 @@
+
+ if 'gi' in sys.modules and sys.modules['gi'] is not None:
+ try:
+- from gi.repository import Notify
++ from gi.repository import GLib, Notify
+ Notify # pyflakes
+ NOTIFY_MODULE = 'gi'
+ except ImportError:
+@@ -85,5 +85,6 @@
+ if append:
+ self.notification.set_hint_string('x-canonical-append', '')
+
+- self.notification.set_hint_int32('transient', int(True))
++ if NOTIFY_MODULE == 'gi':
++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
+ self.notification.show()
Copied: ubuntuone-client/repos/community-x86_64/lp1093111.patch (from rev 82714, ubuntuone-client/trunk/lp1093111.patch)
===================================================================
--- community-x86_64/lp1093111.patch (rev 0)
+++ community-x86_64/lp1093111.patch 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,10 @@
+--- a/ubuntuone/syncdaemon/tritcask.py 2013-01-18 18:27:41.809017000 +0200
++++ b/ubuntuone/syncdaemon/tritcask.py 2013-01-22 15:08:15.015987671 +0200
+@@ -300,6 +300,7 @@
+ self.fd.seek(0, os.SEEK_END)
+ self.fd.write(crc32 + header)
+ self.fd.write(key)
++ self.fd.flush()
+ value_pos = self.fd.tell()
+ self.fd.write(value)
+ self.fd.flush()
Deleted: community-x86_64/ubuntuone-client.install
===================================================================
--- community-x86_64/ubuntuone-client.install 2013-01-23 12:42:08 UTC (rev 82714)
+++ community-x86_64/ubuntuone-client.install 2013-01-23 12:42:21 UTC (rev 82715)
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: ubuntuone-client/repos/community-x86_64/ubuntuone-client.install (from rev 82714, ubuntuone-client/trunk/ubuntuone-client.install)
===================================================================
--- community-x86_64/ubuntuone-client.install (rev 0)
+++ community-x86_64/ubuntuone-client.install 2013-01-23 12:42:21 UTC (rev 82715)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list