Date: Thursday, March 23, 2017 @ 17:06:32 Author: grazzolini Revision: 218544
archrelease: copy trunk to community-any Added: terminator/repos/community-any/0001-wayland-fix.patch (from rev 218543, terminator/trunk/0001-wayland-fix.patch) terminator/repos/community-any/PKGBUILD (from rev 218543, terminator/trunk/PKGBUILD) Deleted: terminator/repos/community-any/0001-wayland-fix.patch terminator/repos/community-any/PKGBUILD ------------------------+ 0001-wayland-fix.patch | 70 ++++++++++++++--------------- PKGBUILD | 112 +++++++++++++++++++++++------------------------ 2 files changed, 91 insertions(+), 91 deletions(-) Deleted: 0001-wayland-fix.patch =================================================================== --- 0001-wayland-fix.patch 2017-03-23 17:05:45 UTC (rev 218543) +++ 0001-wayland-fix.patch 2017-03-23 17:06:32 UTC (rev 218544) @@ -1,35 +0,0 @@ -=== modified file 'terminatorlib/terminator.py' ---- terminatorlib/terminator.py 2017-02-26 16:15:11 +0000 -+++ terminatorlib/terminator.py 2017-02-28 16:04:37 +0000 -@@ -401,7 +401,7 @@ - window.grab_focus() - try: - t = GdkX11.x11_get_server_time(window.get_window()) -- except AttributeError: -+ except (TypeError, AttributeError): - t = 0 - window.get_window().focus(t) - -@@ -417,7 +417,7 @@ - window.grab_focus() - try: - t = GdkX11.x11_get_server_time(window.get_window()) -- except AttributeError: -+ except (TypeError, AttributeError): - t = 0 - window.get_window().focus(t) - - -=== modified file 'terminatorlib/window.py' ---- terminatorlib/window.py 2017-02-13 16:30:37 +0000 -+++ terminatorlib/window.py 2017-02-28 16:07:28 +0000 -@@ -311,7 +311,7 @@ - self.grab_focus() - try: - t = GdkX11.x11_get_server_time(self.get_window()) -- except AttributeError: -+ except (TypeError, AttributeError): - t = 0 - self.get_window().focus(t) - else: - Copied: terminator/repos/community-any/0001-wayland-fix.patch (from rev 218543, terminator/trunk/0001-wayland-fix.patch) =================================================================== --- 0001-wayland-fix.patch (rev 0) +++ 0001-wayland-fix.patch 2017-03-23 17:06:32 UTC (rev 218544) @@ -0,0 +1,35 @@ +=== modified file 'terminatorlib/terminator.py' +--- terminatorlib/terminator.py 2017-02-26 16:15:11 +0000 ++++ terminatorlib/terminator.py 2017-02-28 16:04:37 +0000 +@@ -401,7 +401,7 @@ + window.grab_focus() + try: + t = GdkX11.x11_get_server_time(window.get_window()) +- except AttributeError: ++ except (TypeError, AttributeError): + t = 0 + window.get_window().focus(t) + +@@ -417,7 +417,7 @@ + window.grab_focus() + try: + t = GdkX11.x11_get_server_time(window.get_window()) +- except AttributeError: ++ except (TypeError, AttributeError): + t = 0 + window.get_window().focus(t) + + +=== modified file 'terminatorlib/window.py' +--- terminatorlib/window.py 2017-02-13 16:30:37 +0000 ++++ terminatorlib/window.py 2017-02-28 16:07:28 +0000 +@@ -311,7 +311,7 @@ + self.grab_focus() + try: + t = GdkX11.x11_get_server_time(self.get_window()) +- except AttributeError: ++ except (TypeError, AttributeError): + t = 0 + self.get_window().focus(t) + else: + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-03-23 17:05:45 UTC (rev 218543) +++ PKGBUILD 2017-03-23 17:06:32 UTC (rev 218544) @@ -1,56 +0,0 @@ -# $Id$ -# 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=1.91 -pkgrel=3 -pkgdesc='Terminal emulator that supports tabs and grids' -arch=('any') -url='https://gnometerminator.blogspot.com/p/introduction.html' -license=('GPL2') -depends=('libkeybinder3' 'libnotify' 'python2-cairo' 'python2-dbus' 'python2-psutil' 'python2-gobject' 'vte3' 'xdg-utils') -makedepends=('intltool') -source=("https://launchpad.net/terminator/gtk3/${pkgver}/+download/${pkgname^}-${pkgver}.tar.gz" - "https://launchpad.net/terminator/gtk3/${pkgver}/+download/${pkgname^}-${pkgver}.tar.gz.asc" - "0001-wayland-fix.patch::https://launchpadlibrarian.net/309178299/wayland_fix.diff") -md5sums=('44e6be581abc9b52fe2e665cbb572201' - 'SKIP' - '32281658b0cacef023c8020106952b31') -sha512sums=('7037077680475164011e19bb5ff16b55a5b4f0b71941d6bfb2ba00af8289eff6f9bf62dded3a6f4f21f199e9e070d0731b19a4ac60fdd429815d708e7fdc3edd' - 'SKIP' - '66db2930bd2c1eafcd0e6e33be9478137d08643205ffb3ff12ad07318e2f465a889d894b6d580d3d4480ea263caca69d7174b6627c52296ab94a42fb6cda1a27') -validpgpkeys=('FE67C001C72200A71DE9EFA5DB69E1780B95EF32') - -prepare() { - cd "${srcdir}/${pkgname^}-${pkgver}" - - # python2 fix - for file in terminatorlib/{,plugins/}*.py; do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - # fix run without gconf - sed -i 's/except ImportError:/except ValueError:/' terminatorlib/config.py - - # Fix for https://bugs.archlinux.org/task/53106 - patch -Np0 -i "$srcdir/0001-wayland-fix.patch" -} - -build() { - cd "${srcdir}/${pkgname^}-${pkgver}" - - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname^}-${pkgver}" - - python2 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 218543, terminator/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-03-23 17:06:32 UTC (rev 218544) @@ -0,0 +1,56 @@ +# $Id$ +# 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=1.91 +pkgrel=4 +pkgdesc='Terminal emulator that supports tabs and grids' +arch=('any') +url='https://gnometerminator.blogspot.com/p/introduction.html' +license=('GPL2') +depends=('gsettings-desktop-schemas' 'libkeybinder3' 'libnotify' 'python2-cairo' 'python2-dbus' 'python2-psutil' 'python2-gobject' 'vte3' 'xdg-utils') +makedepends=('intltool') +source=("https://launchpad.net/terminator/gtk3/${pkgver}/+download/${pkgname^}-${pkgver}.tar.gz" + "https://launchpad.net/terminator/gtk3/${pkgver}/+download/${pkgname^}-${pkgver}.tar.gz.asc" + "0001-wayland-fix.patch::https://launchpadlibrarian.net/309178299/wayland_fix.diff") +md5sums=('44e6be581abc9b52fe2e665cbb572201' + 'SKIP' + '32281658b0cacef023c8020106952b31') +sha512sums=('7037077680475164011e19bb5ff16b55a5b4f0b71941d6bfb2ba00af8289eff6f9bf62dded3a6f4f21f199e9e070d0731b19a4ac60fdd429815d708e7fdc3edd' + 'SKIP' + '66db2930bd2c1eafcd0e6e33be9478137d08643205ffb3ff12ad07318e2f465a889d894b6d580d3d4480ea263caca69d7174b6627c52296ab94a42fb6cda1a27') +validpgpkeys=('FE67C001C72200A71DE9EFA5DB69E1780B95EF32') + +prepare() { + cd "${srcdir}/${pkgname^}-${pkgver}" + + # python2 fix + for file in terminatorlib/{,plugins/}*.py; do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + # fix run without gconf + sed -i 's/except ImportError:/except ValueError:/' terminatorlib/config.py + + # Fix for https://bugs.archlinux.org/task/53106 + patch -Np0 -i "$srcdir/0001-wayland-fix.patch" +} + +build() { + cd "${srcdir}/${pkgname^}-${pkgver}" + + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname^}-${pkgver}" + + python2 setup.py install --skip-build --root="${pkgdir}" --optimize=1 + + rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache" +}