[arch-commits] Commit in libpeas/repos (12 files)
Jan Steffens
heftig at nymeria.archlinux.org
Tue Jun 18 13:46:21 UTC 2013
Date: Tuesday, June 18, 2013 @ 15:46:20
Author: heftig
Revision: 188712
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libpeas/repos/extra-i686/PKGBUILD
(from rev 188711, libpeas/trunk/PKGBUILD)
libpeas/repos/extra-i686/js17.patch
(from rev 188711, libpeas/trunk/js17.patch)
libpeas/repos/extra-i686/libpeas.install
(from rev 188711, libpeas/trunk/libpeas.install)
libpeas/repos/extra-x86_64/PKGBUILD
(from rev 188711, libpeas/trunk/PKGBUILD)
libpeas/repos/extra-x86_64/js17.patch
(from rev 188711, libpeas/trunk/js17.patch)
libpeas/repos/extra-x86_64/libpeas.install
(from rev 188711, libpeas/trunk/libpeas.install)
Deleted:
libpeas/repos/extra-i686/PKGBUILD
libpeas/repos/extra-i686/js17.patch
libpeas/repos/extra-i686/libpeas.install
libpeas/repos/extra-x86_64/PKGBUILD
libpeas/repos/extra-x86_64/js17.patch
libpeas/repos/extra-x86_64/libpeas.install
------------------------------+
/PKGBUILD | 94 +++++++++++++++++++++++++++++++++++++++++
/js17.patch | 92 ++++++++++++++++++++++++++++++++++++++++
/libpeas.install | 22 +++++++++
extra-i686/PKGBUILD | 35 ---------------
extra-i686/js17.patch | 24 ----------
extra-i686/libpeas.install | 11 ----
extra-x86_64/PKGBUILD | 35 ---------------
extra-x86_64/js17.patch | 24 ----------
extra-x86_64/libpeas.install | 11 ----
9 files changed, 208 insertions(+), 140 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-i686/PKGBUILD 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=libpeas
-pkgver=1.8.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')
-options=('!libtool')
-install=libpeas.install
-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
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: libpeas/repos/extra-i686/PKGBUILD (from rev 188711, libpeas/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-06-18 13:46:20 UTC (rev 188712)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=libpeas
+pkgver=1.8.1
+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')
+options=('!libtool')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
+ js17.patch)
+sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d'
+ '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../js17.patch
+}
+
+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:
Deleted: extra-i686/js17.patch
===================================================================
--- extra-i686/js17.patch 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-i686/js17.patch 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,24 +0,0 @@
-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) ||
Copied: libpeas/repos/extra-i686/js17.patch (from rev 188711, libpeas/trunk/js17.patch)
===================================================================
--- extra-i686/js17.patch (rev 0)
+++ extra-i686/js17.patch 2013-06-18 13:46:20 UTC (rev 188712)
@@ -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
Deleted: extra-i686/libpeas.install
===================================================================
--- extra-i686/libpeas.install 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-i686/libpeas.install 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libpeas/repos/extra-i686/libpeas.install (from rev 188711, libpeas/trunk/libpeas.install)
===================================================================
--- extra-i686/libpeas.install (rev 0)
+++ extra-i686/libpeas.install 2013-06-18 13:46:20 UTC (rev 188712)
@@ -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
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-x86_64/PKGBUILD 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=libpeas
-pkgver=1.8.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')
-options=('!libtool')
-install=libpeas.install
-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
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: libpeas/repos/extra-x86_64/PKGBUILD (from rev 188711, libpeas/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-06-18 13:46:20 UTC (rev 188712)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=libpeas
+pkgver=1.8.1
+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')
+options=('!libtool')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz
+ js17.patch)
+sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d'
+ '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../js17.patch
+}
+
+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:
Deleted: extra-x86_64/js17.patch
===================================================================
--- extra-x86_64/js17.patch 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-x86_64/js17.patch 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,24 +0,0 @@
-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) ||
Copied: libpeas/repos/extra-x86_64/js17.patch (from rev 188711, libpeas/trunk/js17.patch)
===================================================================
--- extra-x86_64/js17.patch (rev 0)
+++ extra-x86_64/js17.patch 2013-06-18 13:46:20 UTC (rev 188712)
@@ -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
Deleted: extra-x86_64/libpeas.install
===================================================================
--- extra-x86_64/libpeas.install 2013-06-18 13:45:00 UTC (rev 188711)
+++ extra-x86_64/libpeas.install 2013-06-18 13:46:20 UTC (rev 188712)
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: libpeas/repos/extra-x86_64/libpeas.install (from rev 188711, libpeas/trunk/libpeas.install)
===================================================================
--- extra-x86_64/libpeas.install (rev 0)
+++ extra-x86_64/libpeas.install 2013-06-18 13:46:20 UTC (rev 188712)
@@ -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