[SCM] vlc/master: Fix zsh completion

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Feb 4 19:57:38 UTC 2016


The following commit has been merged in the master branch:
commit 1982e21133c1dfe8e2bbed6d7314e046fcd30e45
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Feb 4 20:30:21 2016 +0100

    Fix zsh completion

diff --git a/debian/patches/series b/debian/patches/series
index 63e90b5..3342b02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 frenchtv-links.patch
+zsh-completion.patch
diff --git a/debian/patches/zsh-completion.patch b/debian/patches/zsh-completion.patch
new file mode 100644
index 0000000..1a6c6b5
--- /dev/null
+++ b/debian/patches/zsh-completion.patch
@@ -0,0 +1,29 @@
+Description: Fix zsh completion
+Origin: upstream,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=32796b8960efb2421fdb79a46834dad5af1eadc0,
+ https://git.videolan.org/?p=vlc.git;a=commit;h=c85a2dd8a43e5036614a6a1998a9cddb6c28ca05
+
+--- vlc-2.2.2.orig/extras/analyser/zsh.cpp
++++ vlc-2.2.2/extras/analyser/zsh.cpp
+@@ -221,7 +221,7 @@ static void ParseModule(const module_t *
+ 
+ int main(int argc, const char **argv)
+ {
+-    libvlc_instance_t *libvlc = libvlc_new(argc, argv);
++    libvlc_instance_t *libvlc = libvlc_new(argc - 1, argv + 1);
+     if (!libvlc)
+         return 1;
+ 
+@@ -235,9 +235,9 @@ int main(int argc, const char **argv)
+     module_t **max = &mod_list[modules];
+ 
+     puts("#compdef vlc cvlc rvlc svlc mvlc qvlc nvlc\n"
+-           "#This file is autogenerated by zsh.cpp"
+-           "typeset -A opt_args"
+-           "local context state line ret=1"
++           "#This file is autogenerated by zsh.cpp\n"
++           "typeset -A opt_args\n"
++           "local context state line ret=1\n"
+            "local modules\n");
+ 
+     printf("vlc_modules=\"");

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list