Require gjs not gjs-gi

This commit is contained in:
Bastien Nocera 2011-08-03 18:12:47 +01:00
parent 2a6208fa2d
commit 876263105b
2 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,37 @@
From 8a7a8ea7611dd91df5c4ddb30632e4ec55a0b0c9 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 3 Aug 2011 18:09:56 +0100
Subject: [PATCH] Update requirements for newer gjs
libgjs-gi was merged into libgjs.
---
configure.ac | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4a012b6..0be02eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 gjs-1.0],
[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-1.0`
+ GJS_LIBS=`$PKG_CONFIG --libs gjs-internals-1.0 gjs-1.0`
AC_SUBST(GJS_CFLAGS)
AC_SUBST(GJS_LIBS)
--
1.7.6

View File

@ -22,6 +22,10 @@ BuildRequires: glade3-libgladeui-devel
# For the girepository-1.0 directory
Requires: gobject-introspection
# For newer gjs
Patch0: 0001-Update-requirements-for-newer-gjs.patch
BuildRequires: autoconf automake
%description
libpeas is a convenience library making adding plug-ins support
to GTK+ and glib-based applications.
@ -40,6 +44,10 @@ that are needed to write applications that use libpeas.
%prep
%setup -q
# For newer gjs
%patch0 -p1 -b .newer-gjs
autoreconf -f
%build
%configure