diff --git a/gimp-2.6.11-pyslice.patch b/gimp-2.6.11-pyslice.patch new file mode 100644 index 0000000..2f37990 --- /dev/null +++ b/gimp-2.6.11-pyslice.patch @@ -0,0 +1,36 @@ +From 0b46212d99191b65a1dd2f723c9cf0250e69a448 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Wed, 2 Feb 2011 18:19:35 +0100 +Subject: [PATCH] patch: pyslice + +Squashed commit of the following: + +commit 0b91c365bc1d43a888ed9b78439930c1235b609c +Author: Nils Philippsen +Date: Wed Feb 2 17:11:28 2011 +0100 + + Bug 641259 - [abrt] gimp-2:2.6.11-1.fc14: py-slice.py:172:slice:TypeError: integer argument expected, got float + + py-slice: cast cellspacing to int in pyslice() to avoid tracebacks + (cherry picked from commit 0af966b63fcc55b36380d6538dfb30000f71fef9) +--- + plug-ins/pygimp/plug-ins/py-slice.py | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/plug-ins/pygimp/plug-ins/py-slice.py b/plug-ins/pygimp/plug-ins/py-slice.py +index 40743f3..ac35f23 100755 +--- a/plug-ins/pygimp/plug-ins/py-slice.py ++++ b/plug-ins/pygimp/plug-ins/py-slice.py +@@ -36,6 +36,9 @@ gettext.install("gimp20-python", gimp.locale_directory, unicode=True) + def pyslice(image, drawable, save_path, html_filename, + image_basename, image_extension, separate, + image_path, cellspacing, animate, skip_caps): ++ ++ cellspacing = int (cellspacing) ++ + if animate: + count = 0 + drw = [] +-- +1.7.4 + diff --git a/gimp.spec b/gimp.spec index 30fd9b7..97e1ece 100644 --- a/gimp.spec +++ b/gimp.spec @@ -31,7 +31,7 @@ Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 Version: 2.6.11 -Release: 5%{?dist} +Release: 6%{?dist} %define binver 2.6 %define gimp_lang_ver 20 %define interfacever 2.0 @@ -134,6 +134,9 @@ Patch4: gimp-2.6.10-script-fu-ipv6.patch # https://bugzilla.redhat.com/show_bug.cgi?id=651002 # avoid traceback in colorxhtml plugin, upstreamed Patch5: gimp-2.6.11-colorxhtml.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=667958 +# avoid traceback in pyslice plugin, upstreamed +Patch6: gimp-2.6.11-pyslice.patch # files changed by autoreconf after applying the above Patch10: gimp-2.6.11-1-autoreconf.patch.bz2 @@ -213,12 +216,15 @@ build ASCII art plugin %{with aalib} EOF %setup -q -n gimp-%{version} + %patch0 -p1 -b .xdg-open %patch1 -p1 -b .jpeg-units %patch2 -p1 -b .minimize-dialogs %patch3 -p1 -b .gold %patch4 -p1 -b .script-fu-ipv6 %patch5 -p1 -b .colorxhtml +%patch6 -p1 -b .pyslice + %patch10 -p1 -b .autoreconf %build @@ -482,6 +488,9 @@ fi %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser %changelog +* Wed Feb 02 2011 Nils Philippsen - 2:2.6.11-6 +- avoid traceback in pyslice plugin (#667958) + * Sat Jan 01 2011 Rex Dieter - 2:2.6.11-5 - rebuild (poppler)