rediffed patch

diff --git a/qt5-qtbase-system_cacerts.patch b/qt5-qtbase-system_cacerts.patch
index 22ceef7c1dfdf8ec36e556dca955f8836d3f245a..743326af4561b3783518a7d303982553f6602be1 100644 (file)
--- a/qt5-qtbase-system_cacerts.patch
+++ b/qt5-qtbase-system_cacerts.patch
@@ -1,9 +1,7 @@
 diff -urN qtbase-opensource-src-5.3.2.orig/src/network/ssl/qsslsocket_openssl.cpp qtbase-opensource-src-5.3.2/src/network/ssl/qsslsocket_openssl.cpp
 --- qtbase-opensource-src-5.3.2.orig/src/network/ssl/qsslsocket_openssl.cpp    2014-12-31 13:35:17.485983733 +0100
 +++ qtbase-opensource-src-5.3.2/src/network/ssl/qsslsocket_openssl.cpp 2014-12-31 13:36:25.965981516 +0100
-@@ -731,8 +731,9 @@
-         while (it.hasNext())
-             systemCerts.append(QSslCertificate::fromPath(it.next(), platformEncodingFormat));
+@@ -731,6 +731,7 @@
  # ifndef Q_OS_ANDROID
          systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva
          systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss