[arch-commits] Commit in variety/repos/community-any (5 files)

Balló György bgyorgy at archlinux.org
Fri Jan 27 16:43:24 UTC 2017


    Date: Friday, January 27, 2017 @ 16:43:24
  Author: bgyorgy
Revision: 209262

archrelease: copy trunk to community-any

Added:
  variety/repos/community-any/PKGBUILD
    (from rev 209261, variety/trunk/PKGBUILD)
  variety/repos/community-any/disable-panoramio.patch
    (from rev 209261, variety/trunk/disable-panoramio.patch)
  variety/repos/community-any/fix-popup-menu.patch
    (from rev 209261, variety/trunk/fix-popup-menu.patch)
Deleted:
  variety/repos/community-any/PKGBUILD
  variety/repos/community-any/disable-panoramio.patch

-------------------------+
 PKGBUILD                |   78 ++++++++++++++++++++-------------------
 disable-panoramio.patch |   92 +++++++++++++++++++++++-----------------------
 fix-popup-menu.patch    |   47 +++++++++++++++++++++++
 3 files changed, 134 insertions(+), 83 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-27 16:43:17 UTC (rev 209261)
+++ PKGBUILD	2017-01-27 16:43:24 UTC (rev 209262)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Martin Wimpress <code at flexion.org>
-
-pkgname=variety
-pkgver=0.6.3
-pkgrel=2
-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=('desktop-file-utils' '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')
-optdepends=('yelp: for reading help documents')
-makedepends=('python2-distutils-extra')
-source=(https://launchpad.net/variety/trunk/${pkgver}/+download/${pkgname}_${pkgver}-0-581-201611011859-ubuntu16.04.1.tar.gz{,.asc}
-        disable-panoramio.patch)
-validpgpkeys=('53A44FA64701571F59CD8C9BA7FAEF1B4791406E') # Peter Levi
-sha256sums=('30f82e606a090dfab463f29500ec9dd9ad78fcfcd5a96c5f0f5d0b2bd9ce79eb'
-            'SKIP'
-            '011d4f19a17fd59a175f6fa36e282c82c333ce0e849673aeea678f2ee56db743')
-
-prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  # Disable Panoramio support (removes webkitgtk dependency)
-  patch -Np1 -i ../disable-panoramio.patch
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  export XDG_RUNTIME_DIR="/tmp/${pkgname}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-}

Copied: variety/repos/community-any/PKGBUILD (from rev 209261, variety/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-01-27 16:43:24 UTC (rev 209262)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Martin Wimpress <code at flexion.org>
+
+pkgname=variety
+pkgver=0.6.3
+pkgrel=3
+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')
+makedepends=('python2-distutils-extra')
+source=(https://launchpad.net/variety/trunk/${pkgver}/+download/${pkgname}_${pkgver}-0-581-201611011859-ubuntu16.04.1.tar.gz{,.asc}
+        disable-panoramio.patch
+        fix-popup-menu.patch)
+validpgpkeys=('53A44FA64701571F59CD8C9BA7FAEF1B4791406E') # Peter Levi
+sha256sums=('30f82e606a090dfab463f29500ec9dd9ad78fcfcd5a96c5f0f5d0b2bd9ce79eb'
+            'SKIP'
+            '011d4f19a17fd59a175f6fa36e282c82c333ce0e849673aeea678f2ee56db743'
+            'bd19cbd82d19cf653e92390e71d749dc9878c73c8ba25f7d64d96a8bd9228559')
+
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  # Disable Panoramio support (removes webkitgtk dependency)
+  patch -Np1 -i ../disable-panoramio.patch
+
+  # Fix popup menu positions
+  patch -Np1 -i ../fix-popup-menu.patch
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  export XDG_RUNTIME_DIR="/tmp/${pkgname}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+}

Deleted: disable-panoramio.patch
===================================================================
--- disable-panoramio.patch	2017-01-27 16:43:17 UTC (rev 209261)
+++ disable-panoramio.patch	2017-01-27 16:43:24 UTC (rev 209262)
@@ -1,46 +0,0 @@
-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-25 21:53:29.419376574 +0100
-@@ -32,7 +32,6 @@
- from variety.AddFlickrDialog import AddFlickrDialog
- from variety.AddMediaRssDialog import AddMediaRssDialog
- from variety.AddRedditDialog import AddRedditDialog
--from variety.AddPanoramioDialog import AddPanoramioDialog
- from variety.EditFavoriteOperationsDialog import EditFavoriteOperationsDialog
- from variety.SmartFeaturesConfirmationDialog import SmartFeaturesConfirmationDialog
- from variety.LoginOrRegisterDialog import LoginOrRegisterDialog
-@@ -64,7 +63,6 @@
- EDITABLE_TYPES = [
-     Options.SourceType.FLICKR,
-     Options.SourceType.MEDIA_RSS,
--    Options.SourceType.PANORAMIO,
-     Options.SourceType.WALLHAVEN,
-     Options.SourceType.REDDIT,
- ]
-@@ -381,7 +379,6 @@
-             '-',
-             (_("Flickr"), self.on_add_flickr_clicked),
-             (_("Wallhaven.cc"), self.on_add_wallhaven_clicked),
--            (_("Panoramio"), self.on_add_panoramio_clicked),
-             (_("Reddit"), self.on_add_reddit_clicked),
-             (_("Media RSS"), self.on_add_mediarss_clicked),
-         ]
-@@ -672,8 +669,6 @@
-                 self.dialog = AddRedditDialog()
-             elif type == Options.SourceType.MEDIA_RSS:
-                 self.dialog = AddMediaRssDialog()
--            elif type == Options.SourceType.PANORAMIO:
--                self.dialog = AddPanoramioDialog()
- 
-             self.dialog.set_edited_row(edited_row)
-             self.show_dialog(self.dialog)
-@@ -786,9 +781,6 @@
-     def on_add_wallhaven_clicked(self, widget=None):
-         self.show_dialog(AddWallhavenDialog())
- 
--    def on_add_panoramio_clicked(self, widget=None):
--        self.show_dialog(AddPanoramioDialog())
--
-     def show_dialog(self, dialog):
-         self.dialog = dialog
-         self.dialog.parent = self

Copied: variety/repos/community-any/disable-panoramio.patch (from rev 209261, variety/trunk/disable-panoramio.patch)
===================================================================
--- disable-panoramio.patch	                        (rev 0)
+++ disable-panoramio.patch	2017-01-27 16:43:24 UTC (rev 209262)
@@ -0,0 +1,46 @@
+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-25 21:53:29.419376574 +0100
+@@ -32,7 +32,6 @@
+ from variety.AddFlickrDialog import AddFlickrDialog
+ from variety.AddMediaRssDialog import AddMediaRssDialog
+ from variety.AddRedditDialog import AddRedditDialog
+-from variety.AddPanoramioDialog import AddPanoramioDialog
+ from variety.EditFavoriteOperationsDialog import EditFavoriteOperationsDialog
+ from variety.SmartFeaturesConfirmationDialog import SmartFeaturesConfirmationDialog
+ from variety.LoginOrRegisterDialog import LoginOrRegisterDialog
+@@ -64,7 +63,6 @@
+ EDITABLE_TYPES = [
+     Options.SourceType.FLICKR,
+     Options.SourceType.MEDIA_RSS,
+-    Options.SourceType.PANORAMIO,
+     Options.SourceType.WALLHAVEN,
+     Options.SourceType.REDDIT,
+ ]
+@@ -381,7 +379,6 @@
+             '-',
+             (_("Flickr"), self.on_add_flickr_clicked),
+             (_("Wallhaven.cc"), self.on_add_wallhaven_clicked),
+-            (_("Panoramio"), self.on_add_panoramio_clicked),
+             (_("Reddit"), self.on_add_reddit_clicked),
+             (_("Media RSS"), self.on_add_mediarss_clicked),
+         ]
+@@ -672,8 +669,6 @@
+                 self.dialog = AddRedditDialog()
+             elif type == Options.SourceType.MEDIA_RSS:
+                 self.dialog = AddMediaRssDialog()
+-            elif type == Options.SourceType.PANORAMIO:
+-                self.dialog = AddPanoramioDialog()
+ 
+             self.dialog.set_edited_row(edited_row)
+             self.show_dialog(self.dialog)
+@@ -786,9 +781,6 @@
+     def on_add_wallhaven_clicked(self, widget=None):
+         self.show_dialog(AddWallhavenDialog())
+ 
+-    def on_add_panoramio_clicked(self, widget=None):
+-        self.show_dialog(AddPanoramioDialog())
+-
+     def show_dialog(self, dialog):
+         self.dialog = dialog
+         self.dialog.parent = self

Copied: variety/repos/community-any/fix-popup-menu.patch (from rev 209261, variety/trunk/fix-popup-menu.patch)
===================================================================
--- fix-popup-menu.patch	                        (rev 0)
+++ fix-popup-menu.patch	2017-01-27 16:43:24 UTC (rev 209262)
@@ -0,0 +1,47 @@
+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



More information about the arch-commits mailing list