[arch-commits] Commit in powerline/trunk (PKGBUILD fail-on-binary-error.patch)

[Jiachen Yang]

    Date: Wednesday, September 12, 2018 @ 10:12:15
  Author: farseerfc
Revision: 379783

upgpkg: powerline 2.7-2

powerline explicitly fail when building binary has error

Added:
  powerline/trunk/fail-on-binary-error.patch
Modified:
  powerline/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   10 +++++++---
 fail-on-binary-error.patch |   15 +++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-12 07:15:07 UTC (rev 379782)
+++ PKGBUILD	2018-09-12 10:12:15 UTC (rev 379783)
@@ -10,7 +10,7 @@
 pkgname=("powerline" "powerline2" "python-powerline" "python2-powerline" "powerline-common" "powerline-vim" "powerline-fonts")
 pkgdesc='Statusline plugin for vim, and provides statuslines and prompts for several other applications, including zsh, bash, tmux, IPython, Awesome, i3 and Qtile'
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 url="https://github.com/${_pkgname}/${_pkgname}"
 license=('MIT')
 arch=('x86_64')
@@ -23,8 +23,10 @@
     'python-pexpect'
     'python2-pexpect'
 )
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz")
-sha512sums=('a61715a2af9b3b5e26bd7ff4717cba41e6b5ad8c8328132154c88dc161d3fab902432dfe94da9c2d87c32e9fa69c9a758fb90168fbd18b3dc47c0d0073fd6623')
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz"
+        "fail-on-binary-error.patch")
+sha512sums=('a61715a2af9b3b5e26bd7ff4717cba41e6b5ad8c8328132154c88dc161d3fab902432dfe94da9c2d87c32e9fa69c9a758fb90168fbd18b3dc47c0d0073fd6623'
+            'd8f77a55d6056353e05556b283840e65bc0411890b5906deaf7f041843a17b08b6975ec399810e10d333384d840e66c1125f6851559e4806a850502c685a6621')
 
 
 
@@ -34,6 +36,8 @@
     find scripts -type f -iname "powerline-*" -print0 | xargs -0 sed -i "1s/env //"
     find ${_pkgname}/bindings -type f -iname "*.py" -print0 | xargs -0 sed -i "1s/env //"
 
+    # explicitly fail if building binary usr/bin/powerline has any error
+    patch -N <../fail-on-binary-error.patch
 
     cp -r ${srcdir}/${_pkgname}-${pkgver}{,-py2}
     # prepare python2 scripts

Added: fail-on-binary-error.patch
===================================================================
--- fail-on-binary-error.patch	                        (rev 0)
+++ fail-on-binary-error.patch	2018-09-12 10:12:15 UTC (rev 379783)
@@ -0,0 +1,15 @@
+diff --git a/a/setup.py b/b/setup.py
+index 30bcddb..6b37d3b 100644
+--- a/a/setup.py
++++ b/b/setup.py
+@@ -118,8 +118,8 @@ setup(
+ 		'scripts/powerline-daemon',
+ 		'scripts/powerline-render',
+ 		'scripts/powerline-config',
+-	] + (['scripts/powerline'] if can_use_scripts else []),
+-	data_files=(None if can_use_scripts else (('bin', ['scripts/powerline']),)),
++	],
++	data_files=(('bin', ['scripts/powerline']),),
+ 	keywords='',
+ 	packages=find_packages(exclude=('tests', 'tests.*')),
+ 	include_package_data=True,