[arch-commits] Commit in bash-completion/trunk (2 files)

2016-05-01 Thread Dave Reisner
Date: Sunday, May 1, 2016 @ 15:44:38
  Author: dreisner
Revision: 266731

upgpkg: bash-completion 2.3-4

- dont install mpv symlink (FS#49121)

Added:
  bash-completion/trunk/mpv-dont-install-symlink.patch
Modified:
  bash-completion/trunk/PKGBUILD

+
 PKGBUILD   |9 ++---
 mpv-dont-install-symlink.patch |   23 +++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-01 11:42:25 UTC (rev 266730)
+++ PKGBUILD2016-05-01 13:44:38 UTC (rev 266731)
@@ -3,7 +3,7 @@
 
 pkgname=bash-completion
 pkgver=2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Programmable completion for the bash shell"
 arch=('any')
 url="https://github.com/scop/bash-completion;
@@ -11,13 +11,16 @@
 depends=('bash')
 options=('!emptydirs' '!makeflags')
 
source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz;
-'bash-4.3.patch')
+'bash-4.3.patch'
+'mpv-dont-install-symlink.patch')
 sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
-  'd2a01350990c1221bd53d55edf31210c74d02bca')
+  'd2a01350990c1221bd53d55edf31210c74d02bca'
+  '6bee621dc456190d629df108350925982d432bb5')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../bash-4.3.patch
+  patch -p1 -i ../mpv-dont-install-symlink.patch
 }
 
 build() {

Added: mpv-dont-install-symlink.patch
===
--- mpv-dont-install-symlink.patch  (rev 0)
+++ mpv-dont-install-symlink.patch  2016-05-01 13:44:38 UTC (rev 266731)
@@ -0,0 +1,23 @@
+From 0382773bbfc21dc1fb5467c1c0426ea3c984b6ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= 
+Date: Sat, 9 Apr 2016 20:06:57 +0300
+Subject: [PATCH] mpv: Don't install symlink for it, fixes #24
+
+This was a leftover from 00abd48e5b1d5d79fff46b7f791b2b90d1d6953b
+---
+ completions/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/Makefile.am b/completions/Makefile.am
+index 99c283c..5558d50 100644
+--- a/completions/Makefile.am
 b/completions/Makefile.am
+@@ -802,7 +802,7 @@ symlinks: $(targetdir) $(DATA)
+   rm -f $(targetdir)/$$file && \
+   $(LN_S) mcrypt $(targetdir)/$$file ; \
+   done
+-  for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++  for file in mplayer2 mencoder gmplayer kplayer ; do \
+   rm -f $(targetdir)/$$file && \
+   $(LN_S) mplayer $(targetdir)/$$file ; \
+   done


[arch-commits] Commit in bash-completion/trunk (2 files)

2014-04-22 Thread Eric BĂ©langer
Date: Wednesday, April 23, 2014 @ 03:12:31
  Author: eric
Revision: 211665

upgpkg: bash-completion 2.1-5

Fix completion with bash 4.3 (close FS#39142)

Added:
  bash-completion/trunk/words_bad_array_subscript.patch
Modified:
  bash-completion/trunk/PKGBUILD

-+
 PKGBUILD|   14 --
 words_bad_array_subscript.patch |   13 +
 2 files changed, 21 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-22 23:43:54 UTC (rev 211664)
+++ PKGBUILD2014-04-23 01:12:31 UTC (rev 211665)
@@ -3,7 +3,7 @@
 
 pkgname=bash-completion
 pkgver=2.1
-pkgrel=4
+pkgrel=5
 pkgdesc=Programmable completion for the bash shell
 arch=('any')
 url=http://bash-completion.alioth.debian.org/;
@@ -10,12 +10,13 @@
 license=('GPL')
 depends=('bash')
 options=('!emptydirs' '!makeflags')
+#http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
 
source=('http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=snapshot;h=867282a7341ccfff9a0e8a8ef6bba6e781b66afb;sf=tgz'
-#http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2
-bash-4.3.patch bash-completion-lz4.patch)
-md5sums=('3b0ea5f328c228c570ee391b4faed06a'
- 'f964553680d88a89dbe8a7275e94bd3b'
- '54a801a7a2b7aaae6ad7b3b6419003fe')
+bash-4.3.patch bash-completion-lz4.patch 
words_bad_array_subscript.patch)
+sha1sums=('153a8d056d0f5cdc22477ebfa13c1a461ff95556'
+  'd2a01350990c1221bd53d55edf31210c74d02bca'
+  'a8cdbadacdce845ec69575e1046c197d54e64074'
+  'ae1d9a334e4908464b339f929dd5874c2af11bd2')
 
 prepare() {
   rm -rf ${pkgname}-${pkgver}
@@ -23,6 +24,7 @@
   cd ${pkgname}-${pkgver}
   patch -p1 -i ../bash-4.3.patch
   patch -p0 -i ../bash-completion-lz4.patch
+  patch -p1 -i ../words_bad_array_subscript.patch
   autoreconf --install
 }
 

Added: words_bad_array_subscript.patch
===
--- words_bad_array_subscript.patch (rev 0)
+++ words_bad_array_subscript.patch 2014-04-23 01:12:31 UTC (rev 211665)
@@ -0,0 +1,13 @@
+diff --git a/bash_completion b/bash_completion
+index 66d36b1..ce469d0 100644
+--- a/bash_completion
 b/bash_completion
+@@ -707,7 +707,7 @@ _init_completion()
+ fi
+ done
+ 
+-[[ $cword -eq 0 ]]  return 1
++[[ $cword -le 0 ]]  return 1
+ prev=${words[cword-1]}
+ 
+ [[ ${split-} ]]  _split_longopt  split=true