[SCM] smplayer/master: Remove debian/patches/handle_local_urls.diff, merged upstream.
lucidfox-guest at users.alioth.debian.org
lucidfox-guest at users.alioth.debian.org
Mon Apr 9 06:50:23 UTC 2012
The following commit has been merged in the master branch:
commit bdc44d5706c9902421df45246689aad3d6d3a417
Author: Maia Kozheva <sikon at ubuntu.com>
Date: Mon Apr 9 13:47:20 2012 +0700
Remove debian/patches/handle_local_urls.diff, merged upstream.
diff --git a/debian/patches/handle_local_urls.diff b/debian/patches/handle_local_urls.diff
deleted file mode 100644
index f64c71d..0000000
--- a/debian/patches/handle_local_urls.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-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: https://sourceforge.net/tracker/?func=detail&aid=3294481&group_id=185512&atid=913575
-Last-Update: 2011-04-28
----
----
- src/smplayer.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- smplayer.orig/src/smplayer.cpp
-+++ smplayer/src/smplayer.cpp
-@@ -30,6 +30,7 @@
-
- #include <QDir>
- #include <QApplication>
-+#include <QUrl>
-
- #include <stdio.h>
-
-@@ -241,6 +242,12 @@ SMPlayer::ExitCode SMPlayer::processArgs
- }
- else {
- // File
-+ QUrl fUrl = QUrl::fromUserInput(argument);
-+
-+ if (fUrl.isValid() && fUrl.scheme().toLower() == "file") {
-+ argument = fUrl.toLocalFile();
-+ }
-+
- if (QFile::exists( argument )) {
- argument = QFileInfo(argument).absoluteFilePath();
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 95c4ce6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-handle_local_urls.diff
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list