Fix svgicon-endlessloop patch build
Also use consistent patch naming and numbering and fix a typo in the explanatory comment.
This commit is contained in:
parent
e35aea8f00
commit
fd6aba6f21
|
@ -6,7 +6,7 @@ diff -up kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than kdelibs-3.5.10
|
|||
}
|
||||
|
||||
- if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
|
||||
+ if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9')) || *ptr == '.'
|
||||
+ if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9') || *ptr == '.')
|
||||
{
|
||||
// there are still coords in this command
|
||||
if(command == 'M')
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue