[arch-commits] Commit in qt/trunk (PKGBUILD fix-qurl.patch)

[Andrea Scarpino]

    Date: Wednesday, February 29, 2012 @ 13:43:45
  Author: andrea
Revision: 151652

upgpkg: qt 4.8.0-5

Duplicate patch

Modified:
  qt/trunk/PKGBUILD
Deleted:
  qt/trunk/fix-qurl.patch

----------------+
 PKGBUILD       |    6 +-----
 fix-qurl.patch |   13 -------------
 2 files changed, 1 insertion(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-29 16:49:07 UTC (rev 151651)
+++ PKGBUILD	2012-02-29 18:43:45 UTC (rev 151652)
@@ -18,7 +18,6 @@
 source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop'
-        'fix-qurl.patch'
         'fix-qgraphicsscene-regression.patch'
         'improved-filter-event.patch'
         'qurl-backward-compatibility.patch')
@@ -27,7 +26,6 @@
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         '7bc255a36733d0fbc80c1902ade4beca'
          'c2e91fc028250a590e76effe234468e2'
          '444ebeb716d7c7379835efb8aa88e6c8'
          '7bc255a36733d0fbc80c1902ade4beca')
@@ -35,11 +33,9 @@
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
-  # (FS#27757)
-  patch -p1 -i "${srcdir}"/fix-qurl.patch
   # (FS#28707)
   patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch
-  # (KDEBUG#275469)
+  # (FS#27757) (KDEBUG#275469)
   patch -p1 -i "${srcdir}"/improved-filter-event.patch
   patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch
 

Deleted: fix-qurl.patch
===================================================================
--- fix-qurl.patch	2012-02-29 16:49:07 UTC (rev 151651)
+++ fix-qurl.patch	2012-02-29 18:43:45 UTC (rev 151652)
@@ -1,13 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp
---- qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp.toLocalFile	2011-10-03 22:44:32.000000000 -0500
-+++ qt-everywhere-opensource-src-4.8.0/src/corelib/io/qurl.cpp	2011-10-27 12:58:35.706815049 -0500
-@@ -6158,7 +6158,8 @@ QUrl QUrl::fromLocalFile(const QString &
- QString QUrl::toLocalFile() const
- {
-     // 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 || !d->scheme.isEmpty()))
-         return QString();
- 
-     QString tmp;