Date: Friday, March 15, 2019 @ 07:50:51 Author: felixonmars Revision: 441812
archrelease: copy trunk to community-x86_64 Added: libcontentaction/repos/community-x86_64/PKGBUILD (from rev 441811, libcontentaction/trunk/PKGBUILD) libcontentaction/repos/community-x86_64/py3.patch (from rev 441811, libcontentaction/trunk/py3.patch) Deleted: libcontentaction/repos/community-x86_64/PKGBUILD libcontentaction/repos/community-x86_64/py3.patch -----------+ PKGBUILD | 72 +++++++++++++++++++++++++++++----------------------------- py3.patch | 74 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 73 insertions(+), 73 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-03-15 07:50:32 UTC (rev 441811) +++ PKGBUILD 2019-03-15 07:50:51 UTC (rev 441812) @@ -1,36 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=libcontentaction -pkgver=0.3.8 -pkgrel=1 -pkgdesc="Library for associating content with actions" -arch=('x86_64') -url="https://git.merproject.org/mer-core/libcontentaction" -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=('4f0cec2eb42776ba1eeb41ac3597b771ea575f8b33b298f64e6d2c2057c501014a87d82c20219406ec2e8bbc1fe83313a5d68165159e9edf2295cfcb2e5ae862' - 'dc808f1e5ab507ca222556b2f199df59120e8cf7810bcec6a74e7b4e5292a4a5ceaff958f6893aa3ce4dc752b3adf0e92b759a8e9ee4045a0701a71f012c8d79') - -prepare() { - cd libcontentaction-$pkgver - patch -p1 -i ../py3.patch -} - -build() { - cd libcontentaction-$pkgver - - qmake-qt5 - make -} - -package() { - cd libcontentaction-$pkgver - - make INSTALL_ROOT="$pkgdir" install - - # Remove tests - rm -r "$pkgdir/opt" -} Copied: libcontentaction/repos/community-x86_64/PKGBUILD (from rev 441811, libcontentaction/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-03-15 07:50:51 UTC (rev 441812) @@ -0,0 +1,36 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=libcontentaction +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Library for associating content with actions" +arch=('x86_64') +url="https://git.merproject.org/mer-core/libcontentaction" +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') + +prepare() { + cd libcontentaction-$pkgver + patch -p1 -i ../py3.patch +} + +build() { + cd libcontentaction-$pkgver + + qmake-qt5 + make +} + +package() { + cd libcontentaction-$pkgver + + make INSTALL_ROOT="$pkgdir" install + + # Remove tests + rm -r "$pkgdir/opt" +} Deleted: py3.patch =================================================================== --- py3.patch 2019-03-15 07:50:32 UTC (rev 441811) +++ py3.patch 2019-03-15 07:50:51 UTC (rev 441812) @@ -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 Copied: libcontentaction/repos/community-x86_64/py3.patch (from rev 441811, libcontentaction/trunk/py3.patch) =================================================================== --- py3.patch (rev 0) +++ py3.patch 2019-03-15 07:50:51 UTC (rev 441812) @@ -0,0 +1,37 @@ +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