summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/ksplasher/ChangeLog11
-rw-r--r--kde-misc/ksplasher/files/ksplasher-pillow.patch13
-rw-r--r--kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild (renamed from kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild)5
3 files changed, 24 insertions, 5 deletions
diff --git a/kde-misc/ksplasher/ChangeLog b/kde-misc/ksplasher/ChangeLog
index f017d1ed4481..f1f6b49bd76e 100644
--- a/kde-misc/ksplasher/ChangeLog
+++ b/kde-misc/ksplasher/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for kde-misc/ksplasher
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ChangeLog,v 1.3 2011/02/13 20:07:58 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ChangeLog,v 1.4 2013/09/09 04:20:15 floppym Exp $
+
+*ksplasher-2.0_beta2-r2 (09 Sep 2013)
+
+ 09 Sep 2013; Mike Gilbert <floppym@gentoo.org> +files/ksplasher-pillow.patch,
+ +ksplasher-2.0_beta2-r2.ebuild, -ksplasher-2.0_beta2-r1.ebuild:
+ Fix PIL imports, bug 471520.
13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
-ksplasher-2.0_beta2.ebuild:
@@ -17,4 +23,3 @@
11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+ksplasher-2.0_beta2.ebuild:
Initial commit wrt #233801, thanks to Matija Suklje for reporting.
-
diff --git a/kde-misc/ksplasher/files/ksplasher-pillow.patch b/kde-misc/ksplasher/files/ksplasher-pillow.patch
new file mode 100644
index 000000000000..467c60c4e991
--- /dev/null
+++ b/kde-misc/ksplasher/files/ksplasher-pillow.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471520
+--- a/src/modules/filters.py
++++ b/src/modules/filters.py
+@@ -9,7 +9,8 @@
+ #
+
+ from __future__ import division
+-import sys, os, getopt, Image, ImageFile, ImageEnhance
++import sys, os, getopt
++from PIL import Image, ImageFile, ImageEnhance
+
+
+ def blink(srcfile1,destfile):
diff --git a/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild b/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild
index ce703da7ddde..e1aef86be81a 100644
--- a/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild
+++ b/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild,v 1.1 2010/08/21 15:12:38 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild,v 1.1 2013/09/09 04:20:15 floppym Exp $
EAPI=2
PYTHON_DEPEND="2"
@@ -25,6 +25,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/${PN}-pillow.patch"
python_convert_shebangs -r 2 .
# ksplasherx is a bash script which calls 'python foo'. We fix it here.
sed -i -e 's:python:/usr/bin/env python2:g' ksplasherx || die