Use upstream bz patch
This commit is contained in:
Bastien Nocera
parent
962d9e4b0b
commit
f96d409c15
@ -1,37 +0,0 @@
|
||||
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
|
||||
|
||||
@ -22,8 +22,8 @@ BuildRequires: glade3-libgladeui-devel
|
||||
# For the girepository-1.0 directory
|
||||
Requires: gobject-introspection
|
||||
|
||||
# For newer gjs
|
||||
Patch0: 0001-Update-requirements-for-newer-gjs.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=655475
|
||||
Patch0: newer-gjs.patch
|
||||
BuildRequires: autoconf automake gnome-common
|
||||
|
||||
%description
|
||||
|
||||
96
newer-gjs.patch
Normal file
96
newer-gjs.patch
Normal file
@ -0,0 +1,96 @@
|
||||
From c711ba77abde3463d05f045ffb6c4d532fb1a19c Mon Sep 17 00:00:00 2001
|
||||
From: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Mon, 1 Aug 2011 09:16:46 +0200
|
||||
Subject: [PATCH] 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
|
||||
---
|
||||
configure.ac | 8 ++++----
|
||||
loaders/gjs/peas-extension-gjs.c | 4 ++--
|
||||
loaders/gjs/peas-plugin-loader-gjs.c | 6 +++---
|
||||
tests/libpeas/extension-gjs.c | 2 +-
|
||||
4 files changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
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"
|
||||
|
||||
--
|
||||
1.7.6
|
||||
Loading…
Reference in New Issue
Block a user