Date: Saturday, April 29, 2017 @ 11:35:08 Author: bgyorgy Revision: 226227
upgpkg: variety 0.6.4-1 Update to new version Added: variety/trunk/fix-vauleerror.patch Modified: variety/trunk/PKGBUILD Deleted: variety/trunk/fix-popup-menu.patch ----------------------+ PKGBUILD | 24 ++++++++++++------------ fix-popup-menu.patch | 47 ----------------------------------------------- fix-vauleerror.patch | 12 ++++++++++++ 3 files changed, 24 insertions(+), 59 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-29 10:09:47 UTC (rev 226226) +++ PKGBUILD 2017-04-29 11:35:08 UTC (rev 226227) @@ -3,25 +3,25 @@ # Contributor: Martin Wimpress <[email protected]> pkgname=variety -pkgver=0.6.3 -pkgrel=3 +pkgver=0.6.4 +_pkgver2=0-589-201704290523 +pkgrel=1 pkgdesc='Changes the wallpaper on a regular interval using user-specified or automatically downloaded images.' arch=('any') url="http://peterlevi.com/variety/"; license=('GPL3') -depends=('gtk3' 'imagemagick' 'libnotify' 'python2-beautifulsoup4' - 'python2-cairo' 'python2-configobj' 'python2-dbus' 'python2-exiv2' - 'python2-gobject' 'python2-httplib2' 'python2-pillow' 'python2-lxml' - 'python2-pycurl' 'python2-requests') +depends=('gtk3' 'imagemagick' 'libgexiv2' 'libnotify' 'python2-beautifulsoup4' 'python2-cairo' + 'python2-configobj' 'python2-dbus' 'python2-gobject' 'python2-httplib2' 'python2-pillow' + 'python2-lxml' 'python2-pycurl' 'python2-requests') makedepends=('python2-distutils-extra') -source=(https://launchpad.net/variety/trunk/${pkgver}/+download/${pkgname}_${pkgver}-0-581-201611011859-ubuntu16.04.1.tar.gz{,.asc} +source=(https://launchpad.net/variety/trunk/${pkgver}/+download/${pkgname}_${pkgver}-${_pkgver2}.tar.gz{,.asc} disable-panoramio.patch - fix-popup-menu.patch) + fix-vauleerror.patch) validpgpkeys=('53A44FA64701571F59CD8C9BA7FAEF1B4791406E') # Peter Levi -sha256sums=('30f82e606a090dfab463f29500ec9dd9ad78fcfcd5a96c5f0f5d0b2bd9ce79eb' +sha256sums=('b7f056afdd6da9547f8ca2ca3bbebf083e24cbab0b706cef976a6b3f1f05adc3' 'SKIP' '011d4f19a17fd59a175f6fa36e282c82c333ce0e849673aeea678f2ee56db743' - 'bd19cbd82d19cf653e92390e71d749dc9878c73c8ba25f7d64d96a8bd9228559') + 'b16842754013398eb85499137b4b2ea36748505e65eef46864847f7bb8606264') prepare() { cd "${srcdir}"/$pkgname-$pkgver @@ -29,8 +29,8 @@ # Disable Panoramio support (removes webkitgtk dependency) patch -Np1 -i ../disable-panoramio.patch - # Fix popup menu positions - patch -Np1 -i ../fix-popup-menu.patch + # Fix error when appindicator is missing + patch -Np1 -i ../fix-vauleerror.patch } package() { Deleted: fix-popup-menu.patch =================================================================== --- fix-popup-menu.patch 2017-04-29 10:09:47 UTC (rev 226226) +++ fix-popup-menu.patch 2017-04-29 11:35:08 UTC (rev 226227) @@ -1,47 +0,0 @@ -diff -Naur variety-0.6.3.orig/variety/indicator.py variety-0.6.3/variety/indicator.py ---- variety-0.6.3.orig/variety/indicator.py 2016-11-01 19:59:39.000000000 +0100 -+++ variety-0.6.3/variety/indicator.py 2017-01-27 17:09:16.537550484 +0100 -@@ -316,8 +316,8 @@ - self.status_icon = None - self.visible = True - -- def pos(menu, icon): -- return Gtk.StatusIcon.position_menu(self.menu, icon) -+ def pos(menu, x, y, icon): -+ return Gtk.StatusIcon.position_menu(self.menu, x, y, icon) - - def right_click_event(icon, button, time): - self.menu.popup(None, None, pos, self.status_icon, 0, time) -diff -Naur variety-0.6.3.orig/variety/PreferencesVarietyDialog.py variety-0.6.3/variety/PreferencesVarietyDialog.py ---- variety-0.6.3.orig/variety/PreferencesVarietyDialog.py 2016-11-01 19:59:39.000000000 +0100 -+++ variety-0.6.3/variety/PreferencesVarietyDialog.py 2017-01-27 17:18:14.865800288 +0100 -@@ -357,7 +357,7 @@ - timer.start() - - def on_add_button_clicked(self, widget=None): -- def position(x, y): -+ def position(menu, x, y, icon): - button_alloc = self.ui.add_button.get_allocation() - window_pos = self.ui.add_button.get_window().get_position() - return button_alloc.x + window_pos[0], button_alloc.y + button_alloc.height + window_pos[1], True -@@ -365,7 +365,7 @@ - self.add_menu.popup(None, self.ui.add_button, position, None, 0, Gtk.get_current_event_time()) - - def on_remove_sources_clicked(self, widget=None): -- def position(x, y): -+ def position(menu, x, y, icon): - button_alloc = self.ui.remove_sources.get_allocation() - window_pos = self.ui.remove_sources.get_window().get_position() - return button_alloc.x + window_pos[0], button_alloc.y + button_alloc.height + window_pos[1], True -diff -Naur variety-0.6.3.orig/variety/ThumbsManager.py variety-0.6.3/variety/ThumbsManager.py ---- variety-0.6.3.orig/variety/ThumbsManager.py 2016-11-01 19:59:39.000000000 +0100 -+++ variety-0.6.3/variety/ThumbsManager.py 2017-01-27 17:24:33.175557472 +0100 -@@ -268,7 +268,7 @@ - _resume_scrolling() - else: - menu = self.create_menu(file) -- def _compute_position(a, b, event=event): -+ def _compute_position(menu, x, y, icon): - x, y = event.get_root_coords()[0], event.get_root_coords()[1] - h = menu.get_preferred_height()[1] - return x, y - h if y - h >= 40 else y, True Added: fix-vauleerror.patch =================================================================== --- fix-vauleerror.patch (rev 0) +++ fix-vauleerror.patch 2017-04-29 11:35:08 UTC (rev 226227) @@ -0,0 +1,12 @@ +diff -Naur variety-0.6.4.orig/variety/indicator.py variety-0.6.4/variety/indicator.py +--- variety-0.6.4.orig/variety/indicator.py 2017-04-29 07:23:37.000000000 +0200 ++++ variety-0.6.4/variety/indicator.py 2017-04-29 13:30:24.341703536 +0200 +@@ -33,6 +33,8 @@ + use_appindicator = True + except ImportError: + use_appindicator = False ++except ValueError: ++ use_appindicator = False + + from variety_lib import varietyconfig +
