From fd6aba6f21721e945c4c501d0e06cb6b4c438acf Mon Sep 17 00:00:00 2001
From: Kevin Kofler <Kevin@tigcc.ticalc.org>
Date: Sep 28 2016 16:16:05 +0000
Subject: Fix svgicon-endlessloop patch build


Also use consistent patch naming and numbering and fix a typo in the
explanatory comment.

---

diff --git a/kdelibs-3.5.10-svgicon-endlessloop.patch b/kdelibs-3.5.10-svgicon-endlessloop.patch
new file mode 100644
index 0000000..2bdb861
--- /dev/null
+++ b/kdelibs-3.5.10-svgicon-endlessloop.patch
@@ -0,0 +1,12 @@
+diff -up kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp
+--- kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than	2016-09-28 16:58:47.881217306 +0200
++++ kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp	2016-09-28 16:59:20.518989958 +0200
+@@ -2208,7 +2208,7 @@ void KSVGIconPainter::drawPath(const QSt
+ 				break;
+ 		}
+ 
+-		if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
++		if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9') || *ptr == '.')
+ 		{
+ 			// there are still coords in this command
+ 			if(command == 'M')
diff --git a/kdelibs3-svgicon-endlessloop.patch b/kdelibs3-svgicon-endlessloop.patch
deleted file mode 100644
index 74487ea..0000000
--- a/kdelibs3-svgicon-endlessloop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp
---- kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than	2016-09-28 16:58:47.881217306 +0200
-+++ kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp	2016-09-28 16:59:20.518989958 +0200
-@@ -2208,7 +2208,7 @@ void KSVGIconPainter::drawPath(const QSt
- 				break;
- 		}
- 
--		if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
-+		if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9')) || *ptr == '.'
- 		{
- 			// there are still coords in this command
- 			if(command == 'M')
diff --git a/kdelibs3.spec b/kdelibs3.spec
index e5db24b..23c1030 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -66,6 +66,8 @@ Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
 # fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks
 Patch58: kdelibs-3.5.10-cups20.patch
 Patch59: kdelibs-3.5.10-gcc6.patch
+# fix endless loop in svgicon
+Patch60: kdelibs-3.5.10-svgicon-endlessloop.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -124,9 +126,6 @@ Patch301: kde3-automake-version.patch
 # also add --force-missing to get aarch64 support (#925029/#925627)
 Patch302: kde3-automake-add-missing.patch
 
-# fix enless loop in svgicon
-Patch303: kdelibs3-svgicon-endlessloop.patch
-
 Requires: hicolor-icon-theme
 Requires: kde-settings >= 3.5
 Requires: kde-filesystem
@@ -263,6 +262,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
 %patch57 -p1 -b .cups-util
 %patch58 -p1 -b .cups20
 %patch59 -p1 -b .gcc6
+%patch60 -p1 -b .endless-loop
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -292,7 +292,6 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
 %patch300 -p1 -b .acinclude
 %patch301 -p1 -b .automake-version
 %patch302 -p1 -b .automake-add-missing
-%patch303 -p1 -b .endless-loop
 
 make -f admin/Makefile.common cvs