Date: Wednesday, April 3, 2013 @ 00:25:55 Author: heftig Revision: 181286
js17 Added: libpeas/trunk/js17.patch Modified: libpeas/trunk/PKGBUILD ------------+ PKGBUILD | 9 ++++++--- js17.patch | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-02 22:11:51 UTC (rev 181285) +++ PKGBUILD 2013-04-02 22:25:55 UTC (rev 181286) @@ -3,7 +3,7 @@ pkgname=libpeas pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A GObject-based plugins engine" arch=(i686 x86_64) url="http://www.gtk.org/"; @@ -14,11 +14,14 @@ '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=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz + js17.patch) +sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' + '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') build() { cd $pkgname-$pkgver + patch -Np1 -i ../js17.patch ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var make Added: js17.patch =================================================================== --- js17.patch (rev 0) +++ js17.patch 2013-04-02 22:25:55 UTC (rev 181286) @@ -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) ||
