[arch-commits] Commit in screenlets-pack-basic/repos (4 files)

Sun Sep 15 14:21:15 UTC 2013

Date: Sunday, September 15, 2013 @ 16:21:15
  Author: bgyorgy
Revision: 97230

archrelease: copy trunk to community-staging-any

Added:
  screenlets-pack-basic/repos/community-staging-any/
  screenlets-pack-basic/repos/community-staging-any/PKGBUILD
    (from rev 97229, screenlets-pack-basic/trunk/PKGBUILD)
  screenlets-pack-basic/repos/community-staging-any/drop-gnomevfs.patch
    (from rev 97229, screenlets-pack-basic/trunk/drop-gnomevfs.patch)
  screenlets-pack-basic/repos/community-staging-any/screenlets-pack-basic-pillow.patch
    (from rev 97229, screenlets-pack-basic/trunk/screenlets-pack-basic-pillow.patch)

------------------------------------+
 PKGBUILD                           |   56 +++++++++++++++++++++++++++++++++++
 drop-gnomevfs.patch                |   56 +++++++++++++++++++++++++++++++++++
 screenlets-pack-basic-pillow.patch |   36 ++++++++++++++++++++++
 3 files changed, 148 insertions(+)

Copied: screenlets-pack-basic/repos/community-staging-any/PKGBUILD (from rev 97229, screenlets-pack-basic/trunk/PKGBUILD)
===================================================================

--- community-staging-any/PKGBUILD	                        (rev 0)
+++ community-staging-any/PKGBUILD	2013-09-15 14:21:15 UTC (rev 97230)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=screenlets-pack-basic
+_pkgname=indiv-screenlets
+pkgver=0.1.6
+pkgrel=3
+pkgdesc="Desktop widgets for Screenlets"
+arch=('any')
+url="http://screenlets.org/"
+license=('GPL3')
+depends=('screenlets')
+makedepends=('dos2unix')
+optdepends=('python2-feedparser: Clear Rss Screenlet'
+            'python2-pytz: Freemeteo Weather Screenlet'
+            'python2-pillow: Lipik, Lyrics Screenlets'
+            'python2-numpy: Lipik Screenlet')
+source=(https://launchpad.net/indiv-screenlets/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2
+        drop-gnomevfs.patch
+        screenlets-pack-basic-pillow.patch)
+md5sums=('d908308a60eecbee13a21917d36b10bc'
+         '0ee366b0eafea6b646a7a5f02df2a65c'
+         '4e30b2ad949e05f2a32770c95f95cd8f')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Remove python2-gnomevfs dependency
+  # https://code.launchpad.net/~ballogy/indiv-screenlets/lyrics-replace-gnomevfs/+merge/104175
+  patch -Np1 -i "$srcdir/drop-gnomevfs.patch"
+
+  # Port to Pillow
+  patch -Np1 -i "$srcdir/screenlets-pack-basic-pillow.patch"
+
+  # Some files are distributed in DOS format...
+  find . -name \*.py -exec dos2unix -q '{}' \;
+
+  # Python2 fix
+  find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \;
+  sed -i 's@^#.*python$@#!/usr/bin/python2@' src/Lyrics/gui/{ls_widget,afv_widgets}
+  sed -i 's/python -u/python2 -u/' setup.py
+
+  # Fix desktop files
+  sed -i 's/desktop_file % (podir, packname, podir, podir)/desktop_file % (podir, normal_packname, podir, podir)/' setup.py
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+
+  # Remove screenlets-pack-all, because a lot of them are broken
+  rm "$pkgdir"/usr/lib/python2.7/site-packages/screenlets_pack_all-$pkgver-py2.7.egg-info
+  rm -r "$pkgdir"/usr/share/applications/screenlets_pack_all
+  rm -r "$pkgdir"/usr/share/screenlets/screenlets-pack-all
+}

Copied: screenlets-pack-basic/repos/community-staging-any/drop-gnomevfs.patch (from rev 97229, screenlets-pack-basic/trunk/drop-gnomevfs.patch)
===================================================================
--- community-staging-any/drop-gnomevfs.patch	                        (rev 0)
+++ community-staging-any/drop-gnomevfs.patch	2013-09-15 14:21:15 UTC (rev 97230)
@@ -0,0 +1,56 @@
+diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/LyricsPanel.py indiv-screenlets-0.1.6/src/Lyrics/LyricsPanel.py
+--- indiv-screenlets-0.1.6.orig/src/Lyrics/LyricsPanel.py	2011-08-22 08:54:04.000000000 +0200
++++ indiv-screenlets-0.1.6/src/Lyrics/LyricsPanel.py	2012-04-30 18:24:17.030184345 +0200
+@@ -942,9 +942,10 @@
+ 		content = sel_data.get_text()
+ 		print content
+ 		if content.startswith("file:///"):
+-			import gnomevfs
++			import gio
+ 			print content
+-			path = gnomevfs.get_local_path_from_uri(content)
++			giof = gio.File(content)
++			path = giof.get_path()
+ 			print path
+ 			f = open(path.strip(), "r")
+ 			lyrics = f.read()
+diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/players/RhythmboxPlayer.py indiv-screenlets-0.1.6/src/Lyrics/players/RhythmboxPlayer.py
+--- indiv-screenlets-0.1.6.orig/src/Lyrics/players/RhythmboxPlayer.py	2011-08-22 08:54:04.000000000 +0200
++++ indiv-screenlets-0.1.6/src/Lyrics/players/RhythmboxPlayer.py	2012-04-30 18:02:39.264279698 +0200
+@@ -16,7 +16,6 @@
+ 
+ 
+ import screenlets
+-#import gnomevfs
+ import utils
+ from screenlets.plugins import Rhythmbox
+ from player import PlayerEvents
+diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/players/utils.py indiv-screenlets-0.1.6/src/Lyrics/players/utils.py
+--- indiv-screenlets-0.1.6.orig/src/Lyrics/players/utils.py	2011-08-22 08:54:04.000000000 +0200
++++ indiv-screenlets-0.1.6/src/Lyrics/players/utils.py	2012-04-30 18:25:15.818682939 +0200
+@@ -15,12 +15,13 @@
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ 
+-import gnomevfs
++import gio
+ 
+ def get_local_path_from_uri(uri):
+ 	if uri != None and uri != "":
+ 		try:			
+-			local_path = gnomevfs.get_local_path_from_uri(uri)
++			f = gio.File(uri)
++			local_path = f.get_path()
+ 			#print "converting URI to local_path"
+ 			return local_path
+ 		except Exception, e:
+@@ -29,7 +30,8 @@
+ 			print "URI calss: %s" % uri.__class__
+ 			try:
+ 				unicodeUri = unicode(str(uri), 'utf-8')
+-				local_path = gnomevfs.get_local_path_from_uri(uri)
++				f = gio.File(uri)
++				local_path = f.get_path()
+ 				return local_path
+ 			except Exception, e:
+ 				print e

Copied: screenlets-pack-basic/repos/community-staging-any/screenlets-pack-basic-pillow.patch (from rev 97229, screenlets-pack-basic/trunk/screenlets-pack-basic-pillow.patch)
===================================================================
--- community-staging-any/screenlets-pack-basic-pillow.patch	                        (rev 0)
+++ community-staging-any/screenlets-pack-basic-pillow.patch	2013-09-15 14:21:15 UTC (rev 97230)
@@ -0,0 +1,36 @@
+diff -Naur indiv-screenlets-0.1.6.orig/src/dayNight/dayNightScreenlet.py indiv-screenlets-0.1.6/src/dayNight/dayNightScreenlet.py
+--- indiv-screenlets-0.1.6.orig/src/dayNight/dayNightScreenlet.py	2012-01-27 22:51:45.000000000 +0100
++++ indiv-screenlets-0.1.6/src/dayNight/dayNightScreenlet.py	2013-09-15 16:12:07.698782839 +0200
+@@ -32,7 +32,7 @@
+ import pango
+ import math
+ import os
+-import Image
++from PIL import Image
+ import time
+ import datetime
+ import Sun
+diff -Naur indiv-screenlets-0.1.6.orig/src/Lipik/LipikScreenlet.py indiv-screenlets-0.1.6/src/Lipik/LipikScreenlet.py
+--- indiv-screenlets-0.1.6.orig/src/Lipik/LipikScreenlet.py	2012-01-27 22:51:45.000000000 +0100
++++ indiv-screenlets-0.1.6/src/Lipik/LipikScreenlet.py	2013-09-15 16:12:07.695449426 +0200
+@@ -33,7 +33,7 @@
+ from screenlets.options import FontOption, ColorOption
+ 
+ import gtk
+-import Image
++from PIL import Image
+ import os
+ from gtk import gdk
+ import cairo
+diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/gui/utils.py indiv-screenlets-0.1.6/src/Lyrics/gui/utils.py
+--- indiv-screenlets-0.1.6.orig/src/Lyrics/gui/utils.py	2011-08-22 08:54:04.000000000 +0200
++++ indiv-screenlets-0.1.6/src/Lyrics/gui/utils.py	2013-09-15 16:12:07.698782839 +0200
+@@ -127,7 +127,7 @@
+     except:
+         pass
+ """
+-import Image
++from PIL import Image
+ def thumbnail(path):
+     image = Image.open(path)
+     print dir(image)


