vte .28.2

2 files changed, 27 insertions, 75 deletions

diff --git a/abs/extra/vte/PKGBUILD b/abs/extra/vte/PKGBUILD
index 6b2f79e..d35c20c 100644
--- a/abs/extra/vte/PKGBUILD
+++ b/abs/extra/vte/PKGBUILD
@@ -1,24 +1,38 @@
-# $Id: PKGBUILD 99488 2010-11-14 20:01:04Z ibiru $
+# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vte
-pkgver=0.26.2
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator library"
+pkgver=0.28.2
+pkgrel=3
+pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
 arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('gtk2>=2.22.0')
-options=('!libtool')
-makedepends=('pygtk>=2.22.0' 'intltool' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+depends=('gtk2' 'vte-common')
+makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.26/vte-${pkgver}.tar.bz2)
-sha256sums=('f02c350340266c9515a98b8f69c72b4bdc53b352cd053624a63a7cb97ddec9bd')
+source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz
+make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199)
+sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae'
+            '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3')
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  cd "$srcdir/$pkgname-$pkgver"
+  #warning: type-punning to incomplete type might break strict-aliasing rules
+  export CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+  patch -Np1 -R -i "$srcdir/make_alt_work.patch"
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vte \
       --localstatedir=/var --disable-static \
-      --enable-introspection
+      --enable-introspection --with-gtk=2.0
   make
-  make DESTDIR="${pkgdir}" install
+}
+
+package(){
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  rm "$pkgdir/usr/lib/vte/gnome-pty-helper"
 }
diff --git a/abs/extra/vte/vte-0.16.0-reaper-python-bindings.patch b/abs/extra/vte/vte-0.16.0-reaper-python-bindings.patch
deleted file mode 100644
index 47d6ce6..0000000
--- a/abs/extra/vte/vte-0.16.0-reaper-python-bindings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -NarU 3 vte-0.16.0.orig/python/vte.defs vte-0.16.0/python/vte.defs
---- vte-0.16.0.orig/python/vte.defs	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vte.defs	2007-03-14 20:44:55.000000000 +0100
-@@ -7,6 +7,14 @@
-   (gtype-id "VTE_TYPE_TERMINAL")
- )
- 
-+(define-object Reaper
-+  (in-module "Vte")
-+  (parent "GObject")
-+  (c-name "VteReaper")
-+  (gtype-id "VTE_TYPE_REAPER")
-+)
-+
-+
- ;; Enumerations and flags ...
- 
- (define-enum TerminalEraseBinding
-@@ -701,4 +709,14 @@
-   (return-type "const-char*")
- )
- 
-+;; From ../src/reaper.h
-+(define-function vte_reaper_get_type
-+  (c-name "vte_reaper_get_type")
-+  (return-type "GtkType")
-+)
-+
-+(define-function reaper_get
-+  (c-name "vte_reaper_get")
-+  (return-type "VteReaper*")
-+)
- 
-diff -NarU 3 vte-0.16.0.orig/python/vte.override vte-0.16.0/python/vte.override
---- vte-0.16.0.orig/python/vte.override	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vte.override	2007-03-14 20:46:12.000000000 +0100
-@@ -7,12 +7,14 @@
- #include <pygobject.h>
- #include <gtk/gtk.h>
- #include "../src/vte.h"
-+#include "../src/reaper.h"
- %%
- modulename vte
- %%
- import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
- import gtk.MenuShell as PyGtkMenuShell_Type
- import gtk.Widget as PyGtkWidget_Type
-+import gobject.GObject as PyGObject_Type
- %%
- override vte_terminal_feed kwargs
- static PyObject *
-diff -NarU 3 vte-0.16.0.orig/python/vtemodule.c vte-0.16.0/python/vtemodule.c
---- vte-0.16.0.orig/python/vtemodule.c	2007-02-26 22:05:02.000000000 +0100
-+++ vte-0.16.0/python/vtemodule.c	2007-03-14 20:47:12.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <pygobject.h>
- #include <pygtk/pygtk.h>
- #include "../src/vte.h"
-+#include "../src/reaper.h"
- 
- extern void pyvte_register_classes(PyObject * d);
- extern PyMethodDef pyvte_functions[];