diff options
author | root <root@rshg054.dnsready.net> | 2013-04-23 01:16:16 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-04-23 01:16:16 -0700 |
commit | d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 (patch) | |
tree | da594e49962aa1b32a81dd8066423c4fd5fdcec6 /extra/libpeas | |
parent | a5f6ca5d4e1aa12dfec53c3061df6e0198126fb4 (diff) |
Tue Apr 23 01:16:16 PDT 2013
Diffstat (limited to 'extra/libpeas')
-rw-r--r-- | extra/libpeas/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/libpeas/js17.patch | 24 |
2 files changed, 37 insertions, 10 deletions
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 3d722c4b9..5ab3a569a 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 169954 2012-10-30 22:46:53Z heftig $ +# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.6.1 -pkgrel=1 +pkgver=1.8.0 +pkgrel=2 pkgdesc="A GObject-based plugins engine" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') -makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade') +license=(GPL2) +depends=(gtk3 hicolor-icon-theme gobject-introspection) +makedepends=(gtk-doc intltool python-gobject python2-gobject gjs seed glade) optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' 'seed: gobject-based plugin engine - seed runtime loader') options=('!libtool') install=libpeas.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz + js17.patch) +sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' + '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') build() { cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + patch -Np1 -i ../js17.patch + ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var make } diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch new file mode 100644 index 000000000..b0f7d041d --- /dev/null +++ b/extra/libpeas/js17.patch @@ -0,0 +1,24 @@ +diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c +--- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c 2013-01-05 20:32:04.000000000 +0100 ++++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c 2013-04-03 00:22:56.726029598 +0200 +@@ -362,7 +362,7 @@ + + if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval), + nth_out_arg++, &js_value) || +- js_value == JSVAL_VOID) ++ js_value.asBits == JSVAL_VOID.asBits) + { + g_warning ("Error failed to get out argument %i", nth_out_arg); + return FALSE; +diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c +--- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c 2012-08-15 12:40:31.000000000 +0200 ++++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c 2013-04-03 00:19:12.884403305 +0200 +@@ -279,7 +279,7 @@ + + if (!JS_GetPropertyById (js_context, ginfo->extensions, + prop_name_id, &prop_extension_ctor) || +- prop_extension_ctor != extension_ctor) ++ prop_extension_ctor.asBits != extension_ctor.asBits) + continue; + + if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) || |