[arch-commits] Commit in libpeas/repos (8 files)
Jan Steffens
heftig at nymeria.archlinux.org
Mon Mar 17 22:08:35 UTC 2014
Date: Monday, March 17, 2014 @ 23:08:35
Author: heftig
Revision: 208100
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libpeas/repos/staging-i686/
libpeas/repos/staging-i686/PKGBUILD
(from rev 208099, libpeas/trunk/PKGBUILD)
libpeas/repos/staging-i686/js17.patch
(from rev 208099, libpeas/trunk/js17.patch)
libpeas/repos/staging-i686/libpeas.install
(from rev 208099, libpeas/trunk/libpeas.install)
libpeas/repos/staging-x86_64/
libpeas/repos/staging-x86_64/PKGBUILD
(from rev 208099, libpeas/trunk/PKGBUILD)
libpeas/repos/staging-x86_64/js17.patch
(from rev 208099, libpeas/trunk/js17.patch)
libpeas/repos/staging-x86_64/libpeas.install
(from rev 208099, libpeas/trunk/libpeas.install)
--------------------------------+
staging-i686/PKGBUILD | 40 +++++++++++++++++++++++++++++++++
staging-i686/js17.patch | 46 +++++++++++++++++++++++++++++++++++++++
staging-i686/libpeas.install | 11 +++++++++
staging-x86_64/PKGBUILD | 40 +++++++++++++++++++++++++++++++++
staging-x86_64/js17.patch | 46 +++++++++++++++++++++++++++++++++++++++
staging-x86_64/libpeas.install | 11 +++++++++
6 files changed, 194 insertions(+)
Copied: libpeas/repos/staging-i686/PKGBUILD (from rev 208099, libpeas/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=libpeas
+pkgver=1.9.0
+pkgrel=2
+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')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
+
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libpeas/repos/staging-i686/js17.patch (from rev 208099, libpeas/trunk/js17.patch)
===================================================================
--- staging-i686/js17.patch (rev 0)
+++ staging-i686/js17.patch 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,46 @@
+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
Copied: libpeas/repos/staging-i686/libpeas.install (from rev 208099, libpeas/trunk/libpeas.install)
===================================================================
--- staging-i686/libpeas.install (rev 0)
+++ staging-i686/libpeas.install 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: libpeas/repos/staging-x86_64/PKGBUILD (from rev 208099, libpeas/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=libpeas
+pkgver=1.9.0
+pkgrel=2
+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')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
+sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
+
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libpeas/repos/staging-x86_64/js17.patch (from rev 208099, libpeas/trunk/js17.patch)
===================================================================
--- staging-x86_64/js17.patch (rev 0)
+++ staging-x86_64/js17.patch 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,46 @@
+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
Copied: libpeas/repos/staging-x86_64/libpeas.install (from rev 208099, libpeas/trunk/libpeas.install)
===================================================================
--- staging-x86_64/libpeas.install (rev 0)
+++ staging-x86_64/libpeas.install 2014-03-17 22:08:35 UTC (rev 208100)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list