Hello community, here is the log from the commit of package libpeas for openSUSE:Factory checked in at Mon Aug 1 16:02:40 CEST 2011.
-------- --- libpeas/libpeas.changes 2011-07-01 16:35:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/libpeas/libpeas.changes 2011-08-01 10:08:44.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Aug 1 09:43:57 CEST 2011 - [email protected] + +- Add libpeas-new-gjs.patch: fix build with gjs 1.29.16, which + merges gjs-gi with gjs. +- Remove pkgconfig(gjs-gi-1.0) BuildRequires thanks to the patch. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + needed by the patch. + +------------------------------------------------------------------- +Mon Jul 25 21:49:07 CEST 2011 - [email protected] + +- Update to version 1.1.1: + + PeasExtension has been deprecated + + Ability to use C plugins without GObject-Introspection. + + The plugin manager's disable plugins dialog will no longer show + hidden plugins. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libpeas-1.1.0.tar.bz2 New: ---- libpeas-1.1.1.tar.bz2 libpeas-new-gjs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpeas.spec ++++++ --- /var/tmp/diff_new_pack.quPQ39/_old 2011-08-01 16:02:08.000000000 +0200 +++ /var/tmp/diff_new_pack.quPQ39/_new 2011-08-01 16:02:08.000000000 +0200 @@ -18,16 +18,19 @@ Name: libpeas -Version: 1.1.0 +Version: 1.1.1 Release: 1 License: LGPLv2+ Summary: GObject-based Plugin Engine Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/libpeas/1.1/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM libpeas-new-gjs.patch bgo#655475 [email protected] -- Fix build with gjs 1.29.16 +Patch0: libpeas-new-gjs.patch +# Needed for patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: libseed-gtk3-devel BuildRequires: python-devel -BuildRequires: pkgconfig(gjs-gi-1.0) BuildRequires: pkgconfig(gjs-internals-1.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -123,8 +126,11 @@ %lang_package %prep %setup -q +%patch0 -p1 %build +# Needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure make %{?_smp_flag} V=1 ++++++ libpeas-1.1.0.tar.bz2 -> libpeas-1.1.1.tar.bz2 ++++++ ++++ 24228 lines of diff (skipped) ++++++ libpeas-new-gjs.patch ++++++ commit c711ba77abde3463d05f045ffb6c4d532fb1a19c Author: Vincent Untz <[email protected]> Date: Mon Aug 1 09:16:46 2011 +0200 Adapt to and require gjs 1.29.16 gjs-gi was merged in gjs, so update the build system as well as path to headers. https://bugzilla.gnome.org/show_bug.cgi?id=655475 diff --git a/configure.ac b/configure.ac index 269c1fa..4a6f176 100644 --- a/configure.ac +++ b/configure.ac @@ -257,7 +257,7 @@ dnl ================================================================ dnl GJS Javascript Engine dnl ================================================================ -GJS_REQUIRED=0.7.8 +GJS_REQUIRED=1.29.16 AC_ARG_ENABLE(gjs, AS_HELP_STRING([--enable-gjs],[Enable GJS support]), @@ -269,7 +269,7 @@ AC_MSG_CHECKING([for GJS JS availability.]) if test "x$enable_gjs" = "xno"; then found_gjs="no (disabled, use --enable-gjs to enable)" else - PKG_CHECK_EXISTS([gjs-internals-1.0 >= $GJS_REQUIRED gjs-gi-1.0], + PKG_CHECK_EXISTS([gjs-internals-1.0 >= $GJS_REQUIRED], [found_gjs=yes], [found_gjs=no]) fi @@ -280,8 +280,8 @@ fi AC_MSG_RESULT([$found_gjs]) if test "$found_gjs" = "yes"; then - GJS_CFLAGS=`$PKG_CONFIG --cflags gjs-internals-1.0 gjs-gi-1.0` - GJS_LIBS=`$PKG_CONFIG --libs gjs-internals-1.0 gjs-gi-1.0` + GJS_CFLAGS=`$PKG_CONFIG --cflags gjs-internals-1.0` + GJS_LIBS=`$PKG_CONFIG --libs gjs-internals-1.0` AC_SUBST(GJS_CFLAGS) AC_SUBST(GJS_LIBS) diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c index 1d600f5..d8cc578 100644 --- a/loaders/gjs/peas-extension-gjs.c +++ b/loaders/gjs/peas-extension-gjs.c @@ -26,8 +26,8 @@ #include <string.h> #include <girepository.h> -#include <gjs/gi/arg.h> -#include <gjs/gi/value.h> +#include <gi/arg.h> +#include <gi/value.h> #include <libpeas/peas-introspection.h> #include <libpeas/peas-extension-subclasses.h> diff --git a/loaders/gjs/peas-plugin-loader-gjs.c b/loaders/gjs/peas-plugin-loader-gjs.c index 30a3a2c..b19f7ac 100644 --- a/loaders/gjs/peas-plugin-loader-gjs.c +++ b/loaders/gjs/peas-plugin-loader-gjs.c @@ -24,9 +24,9 @@ #endif #include <gjs/gjs-module.h> -#include <gjs/gi/object.h> -#include <gjs/gi/repo.h> -#include <gjs/gi/value.h> +#include <gi/object.h> +#include <gi/repo.h> +#include <gi/value.h> #include "peas-plugin-loader-gjs.h" #include "peas-extension-gjs.h" diff --git a/tests/libpeas/extension-gjs.c b/tests/libpeas/extension-gjs.c index 9d69235..1a5f846 100644 --- a/tests/libpeas/extension-gjs.c +++ b/tests/libpeas/extension-gjs.c @@ -23,7 +23,7 @@ #include <config.h> #endif -#include <gjs/gi/value.h> +#include <gi/value.h> #include "loaders/gjs/peas-extension-gjs.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
