[SCM] smplayer/master: Add handle_local_urls patch (closes: #583398)
lucidfox-guest at users.alioth.debian.org
lucidfox-guest at users.alioth.debian.org
Thu Apr 28 17:52:54 UTC 2011
The following commit has been merged in the master branch:
commit af84ae3036fecb623ca1eca79b030057de91664f
Author: Maia Kozheva <sikon at ubuntu.com>
Date: Thu Apr 28 23:11:32 2011 +0700
Add handle_local_urls patch (closes: #583398)
diff --git a/debian/patches/handle_local_urls.diff b/debian/patches/handle_local_urls.diff
new file mode 100644
index 0000000..11cef9e
--- /dev/null
+++ b/debian/patches/handle_local_urls.diff
@@ -0,0 +1,34 @@
+Description: Correctly handle local URLs with urlencoded characters
+ This patch corrects the handling of URLs when smplayer attempts to open
+ a local URL (file://) when some characters are percent-encoded.
+ Without it, such paths fail to resolve.
+Author: Ibragimov Rinat <ibragimovrinat at mail.ru>
+Reviewed-by: Maia Kozheva <sikon at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/583398
+Forwarded: no
+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
+@@ -30,6 +30,7 @@
+
+ #include <QDir>
+ #include <QApplication>
++#include <QUrl>
+
+ #include <stdio.h>
+
+@@ -242,6 +243,13 @@
+ }
+ else {
+ // File
++ QUrl fUrl;
++ QByteArray baUrl;
++ baUrl.append( argument );
++ fUrl.setEncodedUrl( baUrl );
++ if (fUrl.isValid()) {
++ argument = fUrl.toLocalFile();
++ }
+ if (QFile::exists( argument )) {
+ argument = QFileInfo(argument).absoluteFilePath();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index d914ba5..ea20054 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
enable_ffodivxvdpau.diff
+handle_local_urls.diff
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list