[arch-commits] Commit in terminator/trunk (3 files)

[Giancarlo Razzolini]

    Date: Tuesday, December 22, 2020 @ 19:07:28
  Author: grazzolini
Revision: 782783

upgpkg: terminator 2.0.1-1

Update terminator and also apply the patch for FS#69057

Added:
  terminator/trunk/0001-fixed-validate-module-import-for-newer-version-of-co.patch
Modified:
  terminator/trunk/PKGBUILD
Deleted:
  terminator/trunk/001-custom_commands.patch

-----------------------------------------------------------------+
 0001-fixed-validate-module-import-for-newer-version-of-co.patch |   28 ++++++++++
 001-custom_commands.patch                                       |   12 ----
 PKGBUILD                                                        |   26 ++++++---
 3 files changed, 47 insertions(+), 19 deletions(-)

Added: 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	2020-12-22 19:07:28 UTC (rev 782783)
@@ -0,0 +1,28 @@
+From a65eb174adaa08cce0029ac38c5bc58ff8adaa7b Mon Sep 17 00:00:00 2001
+From: Ken <ken at 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: 001-custom_commands.patch
===================================================================
--- 001-custom_commands.patch	2020-12-22 19:05:50 UTC (rev 782782)
+++ 001-custom_commands.patch	2020-12-22 19:07:28 UTC (rev 782783)
@@ -1,12 +0,0 @@
-diff -ura terminator-1.91.orig/terminatorlib/plugins/custom_commands.py terminator-1.91.new/terminatorlib/plugins/custom_commands.py
---- terminator-1.91.orig/terminatorlib/plugins/custom_commands.py	2017-02-26 14:45:29.000000000 -0300
-+++ terminator-1.91.new/terminatorlib/plugins/custom_commands.py	2018-04-10 18:22:55.566435800 -0300
-@@ -127,7 +127,7 @@
-       if command[-1] != '\n':
-         command = command + '\n'
-       for terminal in data['terminals']:
--        terminal.vte.feed_child(command,  len(command))
-+        terminal.vte.feed_child(command)
- 
-     def configure(self, widget, data = None):
-       ui = {}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-22 19:05:50 UTC (rev 782782)
+++ PKGBUILD	2020-12-22 19:07:28 UTC (rev 782783)
@@ -5,8 +5,8 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=terminator
-pkgver=1.92
-pkgrel=3
+pkgver=2.0.1
+pkgrel=1
 pkgdesc='Terminal emulator that supports tabs and grids'
 arch=('any')
 url='https://github.com/gnome-terminator/terminator'
@@ -13,11 +13,25 @@
 license=('GPL2')
 depends=('gsettings-desktop-schemas' 'libkeybinder3' 'libnotify' 'python-cairo' 'python-configobj'
          'python-dbus' 'python-psutil' 'python-gobject' 'vte3' 'xdg-utils')
-makedepends=('intltool')
-source=(${url}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz{,.asc})
+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 <markus at lazyfrosch.de>
+validpgpkeys=('6FBDB41587919A0F4BA96EBA9A358BAB04A4ED27'  #Markus Frosch <markus at lazyfrosch.de>
+              'D11A7596F61705480C711598F2FAC7C7BAE930A5') #Matt Rose <mattrose at 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}"
 
@@ -31,5 +45,3 @@
 
     rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
 }
-md5sums=('0d81338eda4a2e7e081f4ac8096376b9'
-         'SKIP')