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

Jaroslav Lichtblau jlichtblau at archlinux.org
Tue Sep 12 20:03:30 UTC 2017


    Date: Tuesday, September 12, 2017 @ 20:03:30
  Author: jlichtblau
Revision: 257178

archrelease: copy trunk to community-any

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

-------------------------+
 PKGBUILD                |   77 +++++++++++++++++++++-------------------------
 disable-panoramio.patch |   46 ---------------------------
 fix-vauleerror.patch    |   24 +++++++-------
 3 files changed, 48 insertions(+), 99 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-12 20:03:17 UTC (rev 257177)
+++ PKGBUILD	2017-09-12 20:03:30 UTC (rev 257178)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Martin Wimpress <code at flexion.org>
-
-pkgname=variety
-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' '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}-${_pkgver2}.tar.gz{,.asc}
-        disable-panoramio.patch
-        fix-vauleerror.patch)
-validpgpkeys=('53A44FA64701571F59CD8C9BA7FAEF1B4791406E') # Peter Levi
-sha256sums=('b7f056afdd6da9547f8ca2ca3bbebf083e24cbab0b706cef976a6b3f1f05adc3'
-            'SKIP'
-            '011d4f19a17fd59a175f6fa36e282c82c333ce0e849673aeea678f2ee56db743'
-            'b16842754013398eb85499137b4b2ea36748505e65eef46864847f7bb8606264')
-
-prepare() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  # Disable Panoramio support (removes webkitgtk dependency)
-  patch -Np1 -i ../disable-panoramio.patch
-
-  # Fix error when appindicator is missing
-  patch -Np1 -i ../fix-vauleerror.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 257177, variety/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-09-12 20:03:30 UTC (rev 257178)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Martin Wimpress <code at flexion.org>
+
+pkgname=variety
+pkgver=0.6.5
+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' '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}.tar.gz{,.asc}
+        fix-vauleerror.patch)
+#validpgpkeys=('53A44FA64701571F59CD8C9BA7FAEF1B4791406E') # Peter Levi
+validpgpkeys=('D5D568B2D34AB32A337944D22EC3F60DE71C0B9D') # James Lu <bitflip3 at gmail.com>
+sha256sums=('d3eeb5b800d881fc0e1055f5614e65b6b6f64e0f1eb5b72fdf2869ae50c51bcc'
+            'SKIP'
+            'b16842754013398eb85499137b4b2ea36748505e65eef46864847f7bb8606264')
+
+prepare() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  # Fix error when appindicator is missing
+  patch -Np1 -i ../fix-vauleerror.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-09-12 20:03:17 UTC (rev 257177)
+++ disable-panoramio.patch	2017-09-12 20:03:30 UTC (rev 257178)
@@ -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

Deleted: fix-vauleerror.patch
===================================================================
--- fix-vauleerror.patch	2017-09-12 20:03:17 UTC (rev 257177)
+++ fix-vauleerror.patch	2017-09-12 20:03:30 UTC (rev 257178)
@@ -1,12 +0,0 @@
-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
- 

Copied: variety/repos/community-any/fix-vauleerror.patch (from rev 257177, variety/trunk/fix-vauleerror.patch)
===================================================================
--- fix-vauleerror.patch	                        (rev 0)
+++ fix-vauleerror.patch	2017-09-12 20:03:30 UTC (rev 257178)
@@ -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
+ 



More information about the arch-commits mailing list