Date: Friday, October 2, 2015 @ 10:36:20 Author: fyan Revision: 142740
archrelease: copy trunk to community-i686, community-x86_64 Added: python-deepin-vte/repos/community-i686/ python-deepin-vte/repos/community-i686/PKGBUILD (from rev 142739, python-deepin-vte/trunk/PKGBUILD) python-deepin-vte/repos/community-i686/make_alt_work.patch (from rev 142739, python-deepin-vte/trunk/make_alt_work.patch) python-deepin-vte/repos/community-x86_64/ python-deepin-vte/repos/community-x86_64/PKGBUILD (from rev 142739, python-deepin-vte/trunk/PKGBUILD) python-deepin-vte/repos/community-x86_64/make_alt_work.patch (from rev 142739, python-deepin-vte/trunk/make_alt_work.patch) --------------------------------------+ community-i686/PKGBUILD | 41 +++++++++++++++++++++++++++ community-i686/make_alt_work.patch | 50 +++++++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 41 +++++++++++++++++++++++++++ community-x86_64/make_alt_work.patch | 50 +++++++++++++++++++++++++++++++++ 4 files changed, 182 insertions(+) Copied: python-deepin-vte/repos/community-i686/PKGBUILD (from rev 142739, python-deepin-vte/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-10-02 08:36:20 UTC (rev 142740) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgbase=python-deepin-vte +pkgname=python2-deepin-vte +pkgver=0.28.2.20130904 +_commit=02cee65aeb952e3298f12be2008fce00b924c32b +pkgrel=1 +pkgdesc="Python VTE module patched for deepin" +arch=('i686' 'x86_64') +url=("https://github.com/linuxdeepin/deepin-vte") +license=('GPL') +depends=('pygtk') +makedepends=('git' 'intltool' 'pygobject2-devel' 'gobject-introspection') +source=("git+https://github.com/felixonmars/python-vte.git#commit=$_commit" + make_alt_work.patch) +md5sums=('SKIP' + '17da7295eb41faf0a6b74e805165b5ee') + +prepare() { + cd python-vte + patch -Np1 -i ../make_alt_work.patch + rm -r doc/reference/html +} + +build() { + cd python-vte + export CFLAGS="$CFLAGS -fno-strict-aliasing" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/vte \ + --localstatedir=/var --disable-static \ + --enable-introspection --with-gtk=2.0 --disable-gnome-pty-helper + make +} + +package_python2-deepin-vte() { + cd python-vte + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: python-deepin-vte/repos/community-i686/make_alt_work.patch (from rev 142739, python-deepin-vte/trunk/make_alt_work.patch) =================================================================== --- community-i686/make_alt_work.patch (rev 0) +++ community-i686/make_alt_work.patch 2015-10-02 08:36:20 UTC (rev 142740) @@ -0,0 +1,50 @@ +From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001 +From: Christian Persch <c...@gnome.org> +Date: Sat, 12 May 2012 18:48:05 +0200 +Subject: [PATCH] keymap: Treat ALT as META + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/deepinvte.c | 23 ++++++++++++++--------- + 1 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/deepinvte.c b/src/deepinvte.c +index dd27e9a..0657921 100644 +--- a/src/deepinvte.c ++++ b/src/deepinvte.c +@@ -5170,19 +5170,24 @@ static void + deepinvte_terminal_read_modifiers (DeepinvteTerminal *terminal, + GdkEvent *event) + { ++ GdkKeymap *keymap; + GdkModifierType modifiers; + + /* Read the modifiers. */ +- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) { +- GdkKeymap *keymap; +-#if GTK_CHECK_VERSION (2, 90, 8) +- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); +-#else +- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window)); ++ if (!gdk_event_get_state((GdkEvent*)event, &modifiers)) ++ return; ++ ++ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); ++ ++ gdk_keymap_add_virtual_modifiers (keymap, &modifiers); ++ ++#if 1 ++ /* HACK! Treat ALT as META; see bug #663779. */ ++ if (modifiers & GDK_MOD1_MASK) ++ modifiers |= DEEPINVTE_META_MASK; + #endif +- gdk_keymap_add_virtual_modifiers (keymap, &modifiers); +- terminal->pvt->modifiers = modifiers; +- } ++ ++ terminal->pvt->modifiers = modifiers; + } + + /* Read and handle a keypress event. */ +-- +1.7.5.1.217.g4e3aa.dirty \ No newline at end of file Copied: python-deepin-vte/repos/community-x86_64/PKGBUILD (from rev 142739, python-deepin-vte/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-10-02 08:36:20 UTC (rev 142740) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgbase=python-deepin-vte +pkgname=python2-deepin-vte +pkgver=0.28.2.20130904 +_commit=02cee65aeb952e3298f12be2008fce00b924c32b +pkgrel=1 +pkgdesc="Python VTE module patched for deepin" +arch=('i686' 'x86_64') +url=("https://github.com/linuxdeepin/deepin-vte") +license=('GPL') +depends=('pygtk') +makedepends=('git' 'intltool' 'pygobject2-devel' 'gobject-introspection') +source=("git+https://github.com/felixonmars/python-vte.git#commit=$_commit" + make_alt_work.patch) +md5sums=('SKIP' + '17da7295eb41faf0a6b74e805165b5ee') + +prepare() { + cd python-vte + patch -Np1 -i ../make_alt_work.patch + rm -r doc/reference/html +} + +build() { + cd python-vte + export CFLAGS="$CFLAGS -fno-strict-aliasing" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/vte \ + --localstatedir=/var --disable-static \ + --enable-introspection --with-gtk=2.0 --disable-gnome-pty-helper + make +} + +package_python2-deepin-vte() { + cd python-vte + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: python-deepin-vte/repos/community-x86_64/make_alt_work.patch (from rev 142739, python-deepin-vte/trunk/make_alt_work.patch) =================================================================== --- community-x86_64/make_alt_work.patch (rev 0) +++ community-x86_64/make_alt_work.patch 2015-10-02 08:36:20 UTC (rev 142740) @@ -0,0 +1,50 @@ +From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001 +From: Christian Persch <c...@gnome.org> +Date: Sat, 12 May 2012 18:48:05 +0200 +Subject: [PATCH] keymap: Treat ALT as META + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/deepinvte.c | 23 ++++++++++++++--------- + 1 files changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/deepinvte.c b/src/deepinvte.c +index dd27e9a..0657921 100644 +--- a/src/deepinvte.c ++++ b/src/deepinvte.c +@@ -5170,19 +5170,24 @@ static void + deepinvte_terminal_read_modifiers (DeepinvteTerminal *terminal, + GdkEvent *event) + { ++ GdkKeymap *keymap; + GdkModifierType modifiers; + + /* Read the modifiers. */ +- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) { +- GdkKeymap *keymap; +-#if GTK_CHECK_VERSION (2, 90, 8) +- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); +-#else +- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window)); ++ if (!gdk_event_get_state((GdkEvent*)event, &modifiers)) ++ return; ++ ++ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window)); ++ ++ gdk_keymap_add_virtual_modifiers (keymap, &modifiers); ++ ++#if 1 ++ /* HACK! Treat ALT as META; see bug #663779. */ ++ if (modifiers & GDK_MOD1_MASK) ++ modifiers |= DEEPINVTE_META_MASK; + #endif +- gdk_keymap_add_virtual_modifiers (keymap, &modifiers); +- terminal->pvt->modifiers = modifiers; +- } ++ ++ terminal->pvt->modifiers = modifiers; + } + + /* Read and handle a keypress event. */ +-- +1.7.5.1.217.g4e3aa.dirty \ No newline at end of file