[qt] * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.0-0.21.rc1 - fix missing NULL check in t

[Kevin Kofler]

commit 26b43071c047aa4a24755863ab2d0e2cf7ea625b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Oct 27 23:55:33 2011 +0200

    * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.0-0.21.rc1
    - fix missing NULL check in the toLocalFile patch (fixes Digikam segfault)

 ...ere-opensource-src-4.8.0-QUrl_toLocalFile.patch |    2 +-
 qt.spec                                            |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch b/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
index a422766..1c666db 100644
--- a/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
+++ b/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
@@ -7,7 +7,7 @@ diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile
      // the call to isLocalFile() also ensures that we're parsed
 -    if (!isLocalFile())
 +    // Treat URLs with no scheme as local for backward compatibility
-+    if (!isLocalFile() && !d->scheme.isEmpty())
++    if (!isLocalFile() && (!d || !d->scheme.isEmpty()))
          return QString();
  
      QString tmp;
diff --git a/qt.spec b/qt.spec
index 96f65ed..9b5135d 100644
--- a/qt.spec
+++ b/qt.spec
@@ -11,7 +11,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.8.0
-Release: 0.20.rc1%{?dist}
+Release: 0.21.rc1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -1041,6 +1041,9 @@ fi
 
 
 %changelog
+* Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8.0-0.21.rc1
+- fix missing NULL check in the toLocalFile patch (fixes Digikam segfault)
+
 * Thu Oct 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-0.20.rc1
 - restore qt-4.7-compatible behavior to QUrl.toLocalFile (#749213)