[arch-commits] Commit in libpeas/repos (10 files)

Jan Steffens heftig at nymeria.archlinux.org
Tue Apr 2 22:26:44 UTC 2013


    Date: Wednesday, April 3, 2013 @ 00:26:44
  Author: heftig
Revision: 181287

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  libpeas/repos/gnome-unstable-i686/PKGBUILD
    (from rev 181286, libpeas/trunk/PKGBUILD)
  libpeas/repos/gnome-unstable-i686/js17.patch
    (from rev 181286, libpeas/trunk/js17.patch)
  libpeas/repos/gnome-unstable-i686/libpeas.install
    (from rev 181286, libpeas/trunk/libpeas.install)
  libpeas/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 181286, libpeas/trunk/PKGBUILD)
  libpeas/repos/gnome-unstable-x86_64/js17.patch
    (from rev 181286, libpeas/trunk/js17.patch)
  libpeas/repos/gnome-unstable-x86_64/libpeas.install
    (from rev 181286, libpeas/trunk/libpeas.install)
Deleted:
  libpeas/repos/gnome-unstable-i686/PKGBUILD
  libpeas/repos/gnome-unstable-i686/libpeas.install
  libpeas/repos/gnome-unstable-x86_64/PKGBUILD
  libpeas/repos/gnome-unstable-x86_64/libpeas.install

---------------------------------------+
 /PKGBUILD                             |   70 ++++++++++++++++++++++++++++++++
 /libpeas.install                      |   22 ++++++++++
 gnome-unstable-i686/PKGBUILD          |   32 --------------
 gnome-unstable-i686/js17.patch        |   24 ++++++++++
 gnome-unstable-i686/libpeas.install   |   11 -----
 gnome-unstable-x86_64/PKGBUILD        |   32 --------------
 gnome-unstable-x86_64/js17.patch      |   24 ++++++++++
 gnome-unstable-x86_64/libpeas.install |   11 -----
 8 files changed, 140 insertions(+), 86 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2013-04-02 22:25:55 UTC (rev 181286)
+++ gnome-unstable-i686/PKGBUILD	2013-04-02 22:26:44 UTC (rev 181287)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=libpeas
-pkgver=1.8.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')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe')
-
-build() {
-  cd $pkgname-$pkgver
-  ./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/gnome-unstable-i686/PKGBUILD (from rev 181286, libpeas/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2013-04-02 22:26:44 UTC (rev 181287)
@@ -0,0 +1,35 @@
+# $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/gnome-unstable-i686/js17.patch (from rev 181286, libpeas/trunk/js17.patch)
===================================================================
--- gnome-unstable-i686/js17.patch	                        (rev 0)
+++ gnome-unstable-i686/js17.patch	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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) ||

Deleted: gnome-unstable-i686/libpeas.install
===================================================================
--- gnome-unstable-i686/libpeas.install	2013-04-02 22:25:55 UTC (rev 181286)
+++ gnome-unstable-i686/libpeas.install	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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/gnome-unstable-i686/libpeas.install (from rev 181286, libpeas/trunk/libpeas.install)
===================================================================
--- gnome-unstable-i686/libpeas.install	                        (rev 0)
+++ gnome-unstable-i686/libpeas.install	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2013-04-02 22:25:55 UTC (rev 181286)
+++ gnome-unstable-x86_64/PKGBUILD	2013-04-02 22:26:44 UTC (rev 181287)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=libpeas
-pkgver=1.8.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')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe')
-
-build() {
-  cd $pkgname-$pkgver
-  ./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/gnome-unstable-x86_64/PKGBUILD (from rev 181286, libpeas/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2013-04-02 22:26:44 UTC (rev 181287)
@@ -0,0 +1,35 @@
+# $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/gnome-unstable-x86_64/js17.patch (from rev 181286, libpeas/trunk/js17.patch)
===================================================================
--- gnome-unstable-x86_64/js17.patch	                        (rev 0)
+++ gnome-unstable-x86_64/js17.patch	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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) ||

Deleted: gnome-unstable-x86_64/libpeas.install
===================================================================
--- gnome-unstable-x86_64/libpeas.install	2013-04-02 22:25:55 UTC (rev 181286)
+++ gnome-unstable-x86_64/libpeas.install	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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/gnome-unstable-x86_64/libpeas.install (from rev 181286, libpeas/trunk/libpeas.install)
===================================================================
--- gnome-unstable-x86_64/libpeas.install	                        (rev 0)
+++ gnome-unstable-x86_64/libpeas.install	2013-04-02 22:26:44 UTC (rev 181287)
@@ -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