[arch-commits] Commit in libcontentaction/trunk (PKGBUILD py3.patch)

[Felix Yan]

    Date: Tuesday, May 7, 2019 @ 14:29:07
  Author: felixonmars
Revision: 462168

upgpkg: libcontentaction 0.3.10-1

Modified:
  libcontentaction/trunk/PKGBUILD
Deleted:
  libcontentaction/trunk/py3.patch

-----------+
 PKGBUILD  |   13 +++----------
 py3.patch |   37 -------------------------------------
 2 files changed, 3 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-07 14:27:37 UTC (rev 462167)
+++ PKGBUILD	2019-05-07 14:29:07 UTC (rev 462168)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=libcontentaction
-pkgver=0.3.9
+pkgver=0.3.10
 pkgrel=1
 pkgdesc="Library for associating content with actions"
 arch=('x86_64')
@@ -9,16 +9,9 @@
 license=('LGPL')
 depends=('qt5-systems' 'mlite')
 makedepends=('python' 'qt5-tools')
-source=("https://git.merproject.org/mer-core/libcontentaction/-/archive/$pkgver/libcontentaction-$pkgver.tar.bz2"
-        py3.patch)
-sha512sums=('c12b2b3c35b487d61d5cbb13e8a720678149284abc330ef098e9299565f0c55121a974d72c01c71e2fb00a3a79ed2512c14b27c90dd891ffb4d344085904b1b7'
-            'dc808f1e5ab507ca222556b2f199df59120e8cf7810bcec6a74e7b4e5292a4a5ceaff958f6893aa3ce4dc752b3adf0e92b759a8e9ee4045a0701a71f012c8d79')
+source=("https://git.merproject.org/mer-core/libcontentaction/-/archive/$pkgver/libcontentaction-$pkgver.tar.bz2")
+sha512sums=('61a338f7a77d03c80ef6a7e334252dc786c1a06d0c674e116535b3884eaf7bc1d6700a3275ff924ae346a1a5327558a91af55285e0be56340389e6ce42f60705')
 
-prepare() {
-  cd libcontentaction-$pkgver
-  patch -p1 -i ../py3.patch
-}
-
 build() {
   cd libcontentaction-$pkgver
 

Deleted: py3.patch
===================================================================
--- py3.patch	2019-05-07 14:27:37 UTC (rev 462167)
+++ py3.patch	2019-05-07 14:29:07 UTC (rev 462168)
@@ -1,37 +0,0 @@
-diff --git a/data/gen-regexps b/data/gen-regexps
-index 7a8bfc0..f563794 100755
---- a/data/gen-regexps
-+++ b/data/gen-regexps
-@@ -49,8 +49,8 @@ def rx_opt (rx):
-     return rx_repeat (rx, 0, 1)
- 
- def rx_output (rx, name):
--    print "s/@%s@/%s/g\n" % (name,
--                             rx.replace('\\', '\\\\').replace('/', '\\/').replace('"', '\"').replace('&', '\&'))
-+    print("s/@%s@/%s/g\n" % (name,
-+                             rx.replace('\\', '\\\\').replace('/', '\\/').replace('"', '\"').replace('&', '\&')))
- 
- ## Phone numbers
- 
-diff --git a/data/regextest2.py b/data/regextest2.py
-index 35ad8b3..43b4a93 100644
---- a/data/regextest2.py
-+++ b/data/regextest2.py
-@@ -32,7 +32,7 @@ class LocalRegexTest (unittest.TestCase):
-         parts = self.__spec.split (self.__delimiter)
-         text = "".join (parts)
-         expected = [ parts[i] for i in range (1, len (parts), 2) ]
--        result = map (lambda m: m.group(0), re.finditer (self.__regex, text))
-+        result = list (map (lambda m: m.group(0), re.finditer (self.__regex, text)))
-         self.assertEquals (result, expected)
- 
- 
-@@ -96,7 +96,7 @@ def static_counter_gen ():
-     while True:
-         k += 1
-         yield k
--static_counter = static_counter_gen ().next
-+static_counter = lambda: next(static_counter_gen ())
- 
- 
- rxt_regex = None