[arch-commits] Commit in libpeas/trunk (PKGBUILD js17.patch)

[Jan de Groot]

    Date: Tuesday, April 1, 2014 @ 11:02:24
  Author: jgc
Revision: 209678

upgpkg: libpeas 1.10.0-1

Modified:
  libpeas/trunk/PKGBUILD
Deleted:
  libpeas/trunk/js17.patch

------------+
 PKGBUILD   |   13 ++++++-------
 js17.patch |   46 ----------------------------------------------
 2 files changed, 6 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-01 08:54:16 UTC (rev 209677)
+++ PKGBUILD	2014-04-01 09:02:24 UTC (rev 209678)
@@ -2,19 +2,18 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=libpeas
-pkgver=1.9.0
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
 pkgdesc="A GObject-based plugins engine"
 arch=(i686 x86_64)
 url="http://www.gtk.org/"
 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')
+makedepends=(gtk-doc intltool python-gobject python2-gobject seed glade)
+optdepends=('seed: gobject-based plugin engine - seed runtime loader')
 install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47')
 
 
 build() {

Deleted: js17.patch
===================================================================
--- js17.patch	2014-04-01 08:54:16 UTC (rev 209677)
+++ js17.patch	2014-04-01 09:02:24 UTC (rev 209678)
@@ -1,46 +0,0 @@
-From 8c54d0ee9c929d9141f74a0c047fed2e28347aa3 Mon Sep 17 00:00:00 2001
-From: Garrett Regier <garrettregier at gmail.com>
-Date: Sat, 27 Apr 2013 11:36:13 +0000
-Subject: Fix Gjs plugin loader
-
-The garbage collection now takes a runtime instead of a contex
-so just use Gjs's gc method to do the right thing and jsvals
-cannot be compared anymore.
----
-diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c
-index 2a71ff8..0ec418c 100644
---- a/loaders/gjs/peas-extension-gjs.c
-+++ b/loaders/gjs/peas-extension-gjs.c
-@@ -362,7 +362,7 @@ peas_extension_gjs_call (PeasExtensionWrapper *exten,
- 
-           if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval),
-                               nth_out_arg++, &js_value) ||
--              js_value == JSVAL_VOID)
-+              JSVAL_IS_VOID (js_value))
-             {
-               g_warning ("Error failed to get out argument %i", nth_out_arg);
-               return FALSE;
-diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c
-index d9acfdf..8cea724 100644
---- a/loaders/gjs/peas-plugin-loader-gjs.c
-+++ b/loaders/gjs/peas-plugin-loader-gjs.c
-@@ -279,7 +279,7 @@ peas_plugin_loader_gjs_create_extension (PeasPluginLoader *loader,
- 
-       if (!JS_GetPropertyById (js_context, ginfo->extensions,
-                                prop_name_id, &prop_extension_ctor) ||
--          prop_extension_ctor != extension_ctor)
-+          JSVAL_TO_OBJECT (prop_extension_ctor) != JSVAL_TO_OBJECT (extension_ctor))
-         continue;
- 
-       if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) ||
-@@ -327,7 +327,7 @@ static void
- garbage_collect (PeasPluginInfo *info,
-                  GjsInfo        *ginfo)
- {
--  JS_GC (gjs_context_get_native_context (ginfo->context));
-+  gjs_context_gc (ginfo->context);
- }
- 
- static void
---
-cgit v0.9.2