pull in upstream 4.14 branch fixes

This commit is contained in:
Rex Dieter 2017-07-31 10:53:23 -05:00
parent da837f11a3
commit d0d3b2ed23
3 changed files with 9 additions and 0 deletions

2
.gitignore vendored
View File

@ -1 +1,3 @@
/kdelibs-4.14.34.tar.xz
/0001-Support-SVG-too.patch
/0002-cmake-De-duplicate-else-to-fix-build-with-cmake-3.9.patch

View File

@ -201,6 +201,8 @@ Patch67: kdelibs-4.14.17-gcc6_narrowing_hack.patch
## upstream
# 4.14 branch (lookaside cache)
Patch101: 0001-Support-SVG-too.patch
Patch102: 0002-cmake-De-duplicate-else-to-fix-build-with-cmake-3.9.patch
## security fix
@ -495,6 +497,9 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch67 -p1 -b .gcc6_narrowing_hack
# upstream patches
%patch101 -p1 -b .0001
%patch102 -p1 -b .0002
# security fixes

View File

@ -1 +1,3 @@
SHA512 (kdelibs-4.14.34.tar.xz) = 57ba1591e6996af79f03e8a3d4d0c278c027ad65c717fcbdb857df68a3df47ddec6b7c34dfd682d590bfa9ed6800974b53ff29aa7ab73522caebc9897cbd81c0
SHA512 (0001-Support-SVG-too.patch) = 909420048caa5b6e8c4ae713c4a058b75fc0708d4f7cf2edbb9090952e087198f1b4192fccc4e7cd5f92497ae3adf9d33686cdf223bdb6342b4e599b94d75d66
SHA512 (0002-cmake-De-duplicate-else-to-fix-build-with-cmake-3.9.patch) = 9ad6930537990196fc8ef94eab712adb74fb5e463f2462bdbe43231230c55467456d1da6e117b4ee7827cd734cd34af3c772d4678f861e960a984b21e5af3600