[SCM] smplayer/master: Modify URL parsing patch to handle some corner cases (Closes: #626324)
lucidfox-guest at users.alioth.debian.org
lucidfox-guest at users.alioth.debian.org
Thu May 12 14:19:39 UTC 2011
The following commit has been merged in the master branch:
commit fa323db37db92d152a37d10fae987f741fd7385d
Author: Maia Kozheva <sikon at ubuntu.com>
Date: Thu May 12 20:18:37 2011 +0700
Modify URL parsing patch to handle some corner cases (Closes: #626324)
diff --git a/debian/patches/handle_local_urls.diff b/debian/patches/handle_local_urls.diff
index ed942bb..f13a563 100644
--- a/debian/patches/handle_local_urls.diff
+++ b/debian/patches/handle_local_urls.diff
@@ -8,9 +8,10 @@ Bug-Debian: http://bugs.debian.org/583398
Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3294481&group_id=185512&atid=913575
Last-Update: 2011-04-28
---
-diff -ur smplayer-0.6.9-orig/src/smplayer.cpp smplayer-0.6.9/src/smplayer.cpp
---- smplayer-0.6.9-orig/src/smplayer.cpp 2010-01-21 03:52:42.000000000 +0300
-+++ smplayer-0.6.9/src/smplayer.cpp 2011-01-04 20:34:36.000000000 +0300
+Index: smplayer-git/src/smplayer.cpp
+===================================================================
+--- smplayer-git.orig/src/smplayer.cpp 2011-04-29 01:07:42.000000000 +0700
++++ smplayer-git/src/smplayer.cpp 2011-05-12 20:16:40.615284813 +0700
@@ -30,6 +30,7 @@
#include <QDir>
@@ -19,17 +20,16 @@ diff -ur smplayer-0.6.9-orig/src/smplayer.cpp smplayer-0.6.9/src/smplayer.cpp
#include <stdio.h>
-@@ -242,6 +243,13 @@
+@@ -242,6 +243,12 @@
}
else {
// File
-+ QUrl fUrl;
-+ QByteArray baUrl;
-+ baUrl.append( argument );
-+ fUrl.setEncodedUrl( baUrl );
-+ if (fUrl.isValid()) {
++ QUrl fUrl = QUrl::fromUserInput(argument);
++
++ if (fUrl.isValid() && fUrl.scheme().toLower() == "file") {
+ argument = fUrl.toLocalFile();
+ }
++
if (QFile::exists( argument )) {
argument = QFileInfo(argument).absoluteFilePath();
}
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list