Date: Monday, February 22, 2021 @ 15:39:16 Author: grazzolini Revision: 868727
archrelease: copy trunk to community-any Added: terminator/repos/community-any/0001-fixed-validate-module-import-for-newer-version-of-co.patch (from rev 868726, terminator/trunk/0001-fixed-validate-module-import-for-newer-version-of-co.patch) terminator/repos/community-any/PKGBUILD (from rev 868726, terminator/trunk/PKGBUILD) Deleted: terminator/repos/community-any/0001-fixed-validate-module-import-for-newer-version-of-co.patch terminator/repos/community-any/PKGBUILD -----------------------------------------------------------------+ 0001-fixed-validate-module-import-for-newer-version-of-co.patch | 56 ++--- PKGBUILD | 94 +++++----- 2 files changed, 75 insertions(+), 75 deletions(-) Deleted: 0001-fixed-validate-module-import-for-newer-version-of-co.patch =================================================================== --- 0001-fixed-validate-module-import-for-newer-version-of-co.patch 2021-02-22 15:38:30 UTC (rev 868726) +++ 0001-fixed-validate-module-import-for-newer-version-of-co.patch 2021-02-22 15:39:16 UTC (rev 868727) @@ -1,28 +0,0 @@ -From a65eb174adaa08cce0029ac38c5bc58ff8adaa7b Mon Sep 17 00:00:00 2001 -From: Ken <k...@kenh.fr> -Date: Mon, 21 Dec 2020 19:43:06 +0100 -Subject: [PATCH] fixed 'validate' module import for newer version of configobj - ---- - terminatorlib/config.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/terminatorlib/config.py b/terminatorlib/config.py -index ec7a2a2e..ff37597d 100644 ---- a/terminatorlib/config.py -+++ b/terminatorlib/config.py -@@ -74,7 +74,10 @@ import os - import shutil - from copy import copy - from configobj import ConfigObj, flatten_errors --from validate import Validator -+try: -+ from validate import Validator -+except ModuleNotFoundError: -+ from configobj.validate import Validator - from .borg import Borg - from .util import dbg, err, DEBUG, get_system_config_dir, get_config_dir, dict_diff - --- -2.29.2 - Copied: terminator/repos/community-any/0001-fixed-validate-module-import-for-newer-version-of-co.patch (from rev 868726, terminator/trunk/0001-fixed-validate-module-import-for-newer-version-of-co.patch) =================================================================== --- 0001-fixed-validate-module-import-for-newer-version-of-co.patch (rev 0) +++ 0001-fixed-validate-module-import-for-newer-version-of-co.patch 2021-02-22 15:39:16 UTC (rev 868727) @@ -0,0 +1,28 @@ +From a65eb174adaa08cce0029ac38c5bc58ff8adaa7b Mon Sep 17 00:00:00 2001 +From: Ken <k...@kenh.fr> +Date: Mon, 21 Dec 2020 19:43:06 +0100 +Subject: [PATCH] fixed 'validate' module import for newer version of configobj + +--- + terminatorlib/config.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/terminatorlib/config.py b/terminatorlib/config.py +index ec7a2a2e..ff37597d 100644 +--- a/terminatorlib/config.py ++++ b/terminatorlib/config.py +@@ -74,7 +74,10 @@ import os + import shutil + from copy import copy + from configobj import ConfigObj, flatten_errors +-from validate import Validator ++try: ++ from validate import Validator ++except ModuleNotFoundError: ++ from configobj.validate import Validator + from .borg import Borg + from .util import dbg, err, DEBUG, get_system_config_dir, get_config_dir, dict_diff + +-- +2.29.2 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-02-22 15:38:30 UTC (rev 868726) +++ PKGBUILD 2021-02-22 15:39:16 UTC (rev 868727) @@ -1,47 +0,0 @@ -# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> -# Contributor: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: fancris3 <fancris3 at gmail.com> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=terminator -pkgver=2.0.1 -pkgrel=1 -pkgdesc='Terminal emulator that supports tabs and grids' -arch=('any') -url='https://github.com/gnome-terminator/terminator' -license=('GPL2') -depends=('gsettings-desktop-schemas' 'libkeybinder3' 'libnotify' 'python-cairo' 'python-configobj' - 'python-dbus' 'python-psutil' 'python-gobject' 'vte3' 'xdg-utils') -makedepends=('intltool' 'python-pip' 'python-setuptools' 'python-wheel') -source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc} - 0001-fixed-validate-module-import-for-newer-version-of-co.patch) - -validpgpkeys=('6FBDB41587919A0F4BA96EBA9A358BAB04A4ED27' #Markus Frosch <mar...@lazyfrosch.de> - 'D11A7596F61705480C711598F2FAC7C7BAE930A5') #Matt Rose <mattr...@folkwolf.net> -md5sums=('080d3e2c7628aa4e8d7844ad6fd77473' - 'SKIP' - '585159c653affe58d99bb4858360f21b') -sha512sums=('bc8094944952bec96b6dc92ca25453fe19076daa23f0b672edc664e9ecdf83a58c5a2a161a26c1a44280a01601827cb728766ec9d20bc3d303072ae040ea2352' - 'SKIP' - 'da609bbb1f2fce64bd345ec43c05f6b8d76046cfbd1be764d6fcd555d306dfca1dd5786b0fc65c0984e49a85454c9eeabf5a1f8c960412c14a97c5350912f8a9') - -prepare () { - cd "${srcdir}/${pkgname}-${pkgver}" - - #Fix for python configobj validate - patch -Np1 < $srcdir/0001-fixed-validate-module-import-for-newer-version-of-co.patch -} -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - python setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - python setup.py install --skip-build --root="${pkgdir}" --optimize=1 - - rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache" -} Copied: terminator/repos/community-any/PKGBUILD (from rev 868726, terminator/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-02-22 15:39:16 UTC (rev 868727) @@ -0,0 +1,47 @@ +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> +# Contributor: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: fancris3 <fancris3 at gmail.com> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=terminator +pkgver=2.1.0 +pkgrel=1 +pkgdesc='Terminal emulator that supports tabs and grids' +arch=('any') +url='https://github.com/gnome-terminator/terminator' +license=('GPL2') +depends=('gsettings-desktop-schemas' 'libkeybinder3' 'libnotify' 'python-cairo' 'python-configobj' + 'python-dbus' 'python-psutil' 'python-gobject' 'vte3' 'xdg-utils') +makedepends=('intltool' 'python-pip' 'python-setuptools' 'python-wheel') +source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc} + 0001-fixed-validate-module-import-for-newer-version-of-co.patch) + +validpgpkeys=('6FBDB41587919A0F4BA96EBA9A358BAB04A4ED27' #Markus Frosch <mar...@lazyfrosch.de> + 'D11A7596F61705480C711598F2FAC7C7BAE930A5') #Matt Rose <mattr...@folkwolf.net> +md5sums=('b1f4e4dd6ddcca8bc7433c69f2745446' + 'SKIP' + '585159c653affe58d99bb4858360f21b') +sha512sums=('0406b0542d5b4498084968b4e49a5ae3ff10db394907930923ad76ac5edf459c976a0a5b8617fd3a14dcde464b563ae137beb33e04b5b82ae856c497abf3fd04' + 'SKIP' + 'da609bbb1f2fce64bd345ec43c05f6b8d76046cfbd1be764d6fcd555d306dfca1dd5786b0fc65c0984e49a85454c9eeabf5a1f8c960412c14a97c5350912f8a9') + +prepare () { + cd "${srcdir}/${pkgname}-${pkgver}" + + #Fix for python configobj validate + patch -Np1 < $srcdir/0001-fixed-validate-module-import-for-newer-version-of-co.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + python setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + python setup.py install --skip-build --root="${pkgdir}" --optimize=1 + + rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache" +}