Date: Tuesday, April 2, 2013 @ 02:38:52
Author: bgyorgy
Revision: 87511
upgpkg: ubuntuone-client 4.2.0-1
Update to version 4.2.0
Modified:
ubuntuone-client/trunk/PKGBUILD
ubuntuone-client/trunk/fix-notify-hint.patch
Deleted:
ubuntuone-client/trunk/1339_1338.diff
ubuntuone-client/trunk/lp1093111.patch
-----------------------+
1339_1338.diff | 57 ------------------------------------------------
PKGBUILD | 37 ++++++++++++++-----------------
fix-notify-hint.patch | 27 ++++++++++------------
lp1093111.patch | 10 --------
4 files changed, 30 insertions(+), 101 deletions(-)
Deleted: 1339_1338.diff
===================================================================
--- 1339_1338.diff 2013-04-02 00:31:11 UTC (rev 87510)
+++ 1339_1338.diff 2013-04-02 00:38:52 UTC (rev 87511)
@@ -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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-02 00:31:11 UTC (rev 87510)
+++ PKGBUILD 2013-04-02 00:38:52 UTC (rev 87511)
@@ -2,40 +2,33 @@
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.2.0
+pkgrel=1
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')
+license=('GPL' 'CCPL:cc-by-sa')
+depends=('dbus-glib' 'python2-configglue' 'python2-distribute'
'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client'
'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('intltool' 'imake' 'python2-distutils-extra')
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')
+source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+
https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz
+ fix-notify-hint.patch)
+md5sums=('37d2de5c6e795e75f447682ee1c3bacc'
+ 'd3c445a9957a80471a84f323f24e8f84'
+ 'c38cb043e3241f12610ed6eb9ae0f087')
build() {
cd "$srcdir/$pkgname-$pkgver"
+
+ # Python2 fix
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
@@ -47,6 +40,10 @@
make DESTDIR="$pkgdir/" install
+ # Install data
+ cd "$srcdir/$pkgname-data-$pkgver"
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+
# We don't have Apport in Arch Linux
rm -r "$pkgdir"/{etc/apport,usr/share/apport}
}
Modified: fix-notify-hint.patch
===================================================================
--- fix-notify-hint.patch 2013-04-02 00:31:11 UTC (rev 87510)
+++ fix-notify-hint.patch 2013-04-02 00:38:52 UTC (rev 87511)
@@ -1,20 +1,19 @@
-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 @@
+diff -Naur
ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py
ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py
+--- ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py
2013-04-01 16:37:48.530956424 +0000
++++ ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py
2013-04-01 16:38:32.333945773 +0000
+@@ -32,7 +32,7 @@
+ USE_NOTIFY = False
- 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 @@
+ try:
+- from gi.repository import Notify
++ from gi.repository import GLib, Notify
+ USE_NOTIFY = True
+ except ImportError:
+ pass
+@@ -67,5 +67,5 @@
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.set_hint('transient', GLib.Variant.new_boolean(1))
self.notification.show()
Deleted: lp1093111.patch
===================================================================
--- lp1093111.patch 2013-04-02 00:31:11 UTC (rev 87510)
+++ lp1093111.patch 2013-04-02 00:38:52 UTC (rev 87511)
@@ -1,10 +0,0 @@
---- 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()
