From 429fa571c476bf8ffb8aa9994e63db0ef79efe23 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Mon, 24 Apr 2017 10:27:26 +0200
Subject: [PATCH] data/convert-icon: Support Pillow in addition to PIL

---
 data/convert-icon | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/convert-icon b/data/convert-icon
index ae1b068318..66ca7da527 100755
--- a/data/convert-icon
+++ b/data/convert-icon
@@ -23,8 +23,13 @@ import re
 try:
         import Image
 except ImportError:
-        print("WARNING: Could not update %s.  Please install the Python Imaging library." % sys.argv[2])
-        sys.exit(0)
+        try:
+                from PIL import Image
+        except ImportError:
+                print("WARNING: Could not update %s.  "
+                      "Please install the Python Imaging library or Pillow."
+                      % sys.argv[2])
+                sys.exit(0)
 
 
 def convert_image(filename, output_filename):