pysolfc: update to 2.1.2.

Closes: #10595 [via git-merge-pr]
This commit is contained in:
maxice8 2018-01-08 20:18:34 -02:00 committed by Jürgen Buchmüller
parent cf36403e6b
commit 9137384295
2 changed files with 3 additions and 43 deletions

View file

@ -1,40 +0,0 @@
--- pysollib/mfxutil.py.orig
+++ pysollib/mfxutil.py
@@ -41,18 +41,18 @@ from settings import PACKAGE, TOOLKIT
Image = ImageTk = ImageOps = None
if TOOLKIT == 'tk':
try: # PIL
- import Image
- import ImageTk
- import ImageOps
+ from PIL import Image
+ from PIL import ImageTk
+ from PIL import ImageOps
except ImportError:
Image = None
else:
# for py2exe
- import GifImagePlugin
- import PngImagePlugin
- import JpegImagePlugin
- import BmpImagePlugin
- import PpmImagePlugin
+ from PIL import GifImagePlugin
+ from PIL import PngImagePlugin
+ from PIL import JpegImagePlugin
+ from PIL import BmpImagePlugin
+ from PIL import PpmImagePlugin
Image._initialized = 2
--- scripts/cardset_viewer.py.orig
+++ scripts/cardset_viewer.py
@@ -7,7 +7,7 @@ from glob import glob
from math import sqrt, sin, cos, pi
from Tkinter import *
try:
- import Image, ImageTk
+ from PIL import Image, ImageTk
except ImportError:
Image = None

View file

@ -1,7 +1,7 @@
# Template file for 'pysolfc' # Template file for 'pysolfc'
pkgname=pysolfc pkgname=pysolfc
version=2.0 version=2.1.2
revision=3 revision=1
noarch=yes noarch=yes
wrksrc="PySolFC-${version}" wrksrc="PySolFC-${version}"
build_style=python2-module build_style=python2-module
@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.eu>"
license="GPL-3" license="GPL-3"
homepage="http://pysolfc.sourceforge.net/" homepage="http://pysolfc.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/PySolFC-${version}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/PySolFC-${version}.tar.bz2"
checksum=dbcb8e7e6d0479c230745a2be91c0c9b9e8524407cd2075f2dae144e5d441b6c checksum=3f88052647479c01431f320f2601eaa4b7b7ccd52502f4ffdb387d7bd73365c7
post_install() { post_install() {
mv ${DESTDIR}/usr/bin/pysol{.py,} mv ${DESTDIR}/usr/bin/pysol{.py,}