[arch-commits] Commit in bzr/repos (3 files)

Felix Yan felixonmars at archlinux.org
Fri Nov 9 22:30:25 UTC 2018


    Date: Friday, November 9, 2018 @ 22:30:24
  Author: felixonmars
Revision: 338683

archrelease: copy trunk to staging-x86_64

Added:
  bzr/repos/staging-x86_64/
  bzr/repos/staging-x86_64/PKGBUILD
    (from rev 338682, bzr/trunk/PKGBUILD)
  bzr/repos/staging-x86_64/bzr-lazy-regex.patch
    (from rev 338682, bzr/trunk/bzr-lazy-regex.patch)

----------------------+
 PKGBUILD             |   44 ++++++++++++++++++++++++++++++++++++++++++++
 bzr-lazy-regex.patch |   20 ++++++++++++++++++++
 2 files changed, 64 insertions(+)

Copied: bzr/repos/staging-x86_64/PKGBUILD (from rev 338682, bzr/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-11-09 22:30:24 UTC (rev 338683)
@@ -0,0 +1,44 @@
+# Maintainer : Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=bzr
+pkgver=2.7.0
+pkgrel=3
+pkgdesc='A decentralized revision control system (bazaar)'
+arch=('x86_64')
+url='https://bazaar.canonical.com/'
+license=('GPL')
+depends=('python2')
+optdepends=('python2-paramiko: SFTP support')
+source=("https://launchpad.net/bzr/${pkgver%.*}/${pkgver}/+download/bzr-${pkgver}.tar.gz"{,.sig}
+        'bzr-lazy-regex.patch')
+sha256sums=('0d451227b705a0dd21d8408353fe7e44d3a5069e6c4c26e5f146f1314b8fdab3'
+            'SKIP'
+            'b53c3dc8cba6f2c9758b61f0e9f40fc8452304e1fec15345e282dcd9d5657542')
+validpgpkeys=('84736900600FF95EF23513F52975A150DEF6218F') # Vincent Ladeuil
+
+prepare() {
+  cd bzr-${pkgver}
+
+  sed 's|man/man1|share/man/man1|' -i setup.py
+  sed 's|/usr/bin/env python|/usr/bin/env python2|' -i bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
+
+  patch -Np0 -i ../bzr-lazy-regex.patch
+}
+
+build() {
+  cd bzr-${pkgver}
+
+  python2 setup.py build
+}
+
+package() {
+  cd bzr-${pkgver}
+
+  python2 setup.py install --prefix='/usr' --root="${pkgdir}" --optimize='1'
+
+  install -dm 755 "${pkgdir}"/usr/share/bash-completion/completions
+  install -m 644 contrib/bash/bzr "${pkgdir}"/usr/share/bash-completion/completions/
+}
+
+# vim: ts=2 sw=2 et:

Copied: bzr/repos/staging-x86_64/bzr-lazy-regex.patch (from rev 338682, bzr/trunk/bzr-lazy-regex.patch)
===================================================================
--- staging-x86_64/bzr-lazy-regex.patch	                        (rev 0)
+++ staging-x86_64/bzr-lazy-regex.patch	2018-11-09 22:30:24 UTC (rev 338683)
@@ -0,0 +1,20 @@
+diff -u bzrlib/lazy_regex.py bzrlib/lazy_regex.py
+--- bzrlib/lazy_regex.py	2017-01-15 20:36:48 +0000
++++ bzrlib/lazy_regex.py	2017-01-30 09:08:25 +0000
+@@ -1,4 +1,4 @@
+-# Copyright (C) 2006 Canonical Ltd
++# Copyright (C) 2006, 2008-2011, 2017 Canonical Ltd
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -133,0 +134,10 @@
++
++
++# Some libraries calls re.finditer which fails it if receives a LazyRegex.
++if getattr(re, 'finditer', False):
++    def finditer_public(pattern, string, flags=0):
++        if isinstance(pattern, LazyRegex):
++            return pattern.finditer(string)
++        else:
++            return _real_re_compile(pattern, flags).finditer(string)
++    re.finditer = finditer_public


More information about the arch-commits mailing list