| 1 |
commit: 64b69bd9afeaa5f6a3d9237657dff143fe8f5953 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 30 17:22:35 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Jul 30 17:46:57 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=64b69bd9 |
| 7 |
|
| 8 |
dev-libs/gjs: 1.29.15 → 1.29.15-r1, install gi headers again |
| 9 |
|
| 10 |
Add a patch from upstream git to install gi/ headers again, making it |
| 11 |
theoretically possible to build libpeas with gjs support (however, |
| 12 |
libpeas-1.1.1 will still need some configure and makefile patching |
| 13 |
before its gjs support can be re-enabled). |
| 14 |
|
| 15 |
--- |
| 16 |
.../gjs/files/gjs-1.29.15-install-gi-headers.patch | 60 ++++++++++++++++++++ |
| 17 |
.../{gjs-1.29.15.ebuild => gjs-1.29.15-r1.ebuild} | 4 + |
| 18 |
2 files changed, 64 insertions(+), 0 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..6536122 |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch |
| 25 |
@@ -0,0 +1,60 @@ |
| 26 |
+From 4217cb5e07519ea41fdff9b906b93ce6946c109e Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Colin Walters <walters@××××××.org> |
| 28 |
+Date: Sat, 30 Jul 2011 15:40:25 +0000 |
| 29 |
+Subject: Install gi/ headers again |
| 30 |
+ |
| 31 |
+libpeas currently requires these; we were installing them before, and |
| 32 |
+since we export almost all of our internals in for gjs-module.pc, might |
| 33 |
+as well keep doing these for now. |
| 34 |
+ |
| 35 |
+https://bugzilla.gnome.org/show_bug.cgi?id=655482 |
| 36 |
+--- |
| 37 |
+diff --git a/Makefile.am b/Makefile.am |
| 38 |
+index edf0c25..b088289 100644 |
| 39 |
+--- a/Makefile.am |
| 40 |
++++ b/Makefile.am |
| 41 |
+@@ -36,7 +36,20 @@ nobase_gjs_module_include_HEADERS = \ |
| 42 |
+ gjs/importer.h \ |
| 43 |
+ gjs/jsapi-util.h \ |
| 44 |
+ gjs/mem.h \ |
| 45 |
+- gjs/native.h |
| 46 |
++ gjs/native.h \ |
| 47 |
++ gi/ns.h \ |
| 48 |
++ gi/object.h \ |
| 49 |
++ gi/foreign.h \ |
| 50 |
++ gi/param.h \ |
| 51 |
++ gi/repo.h \ |
| 52 |
++ gi/union.h \ |
| 53 |
++ gi/value.h \ |
| 54 |
++ gi/arg.h \ |
| 55 |
++ gi/boxed.h \ |
| 56 |
++ gi/closure.h \ |
| 57 |
++ gi/enumeration.h \ |
| 58 |
++ gi/function.h \ |
| 59 |
++ gi/keep-alive.h |
| 60 |
+ |
| 61 |
+ noinst_HEADERS += \ |
| 62 |
+ gjs/jsapi-private.h \ |
| 63 |
+@@ -108,20 +121,7 @@ libgjs_la_SOURCES = \ |
| 64 |
+ |
| 65 |
+ # For historical reasons, some files live in gi/ |
| 66 |
+ libgjs_la_SOURCES += \ |
| 67 |
+- gi/arg.h \ |
| 68 |
+- gi/boxed.h \ |
| 69 |
+- gi/closure.h \ |
| 70 |
+- gi/enumeration.h \ |
| 71 |
+- gi/function.h \ |
| 72 |
+- gi/keep-alive.h \ |
| 73 |
+ gi/gjs_gi_trace.h \ |
| 74 |
+- gi/ns.h \ |
| 75 |
+- gi/object.h \ |
| 76 |
+- gi/foreign.h \ |
| 77 |
+- gi/param.h \ |
| 78 |
+- gi/repo.h \ |
| 79 |
+- gi/union.h \ |
| 80 |
+- gi/value.h \ |
| 81 |
+ gi/arg.c \ |
| 82 |
+ gi/boxed.c \ |
| 83 |
+ gi/closure.c \ |
| 84 |
+-- |
| 85 |
+cgit v0.9 |
| 86 |
|
| 87 |
diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15-r1.ebuild |
| 88 |
similarity index 94% |
| 89 |
rename from dev-libs/gjs/gjs-1.29.15.ebuild |
| 90 |
rename to dev-libs/gjs/gjs-1.29.15-r1.ebuild |
| 91 |
index 9bd562c..1a2fc2d 100644 |
| 92 |
--- a/dev-libs/gjs/gjs-1.29.15.ebuild |
| 93 |
+++ b/dev-libs/gjs/gjs-1.29.15-r1.ebuild |
| 94 |
@@ -63,6 +63,10 @@ src_prepare() { |
| 95 |
# Make spidermonkey detection non-automagic |
| 96 |
# https://bugzilla.gnome.org/show_bug.cgi?id=655479 |
| 97 |
epatch "${FILESDIR}/${P}-automagic-spidermonkey.patch" |
| 98 |
+ |
| 99 |
+ # Install gi/ headers again, help unbreak libpeas; will be in next release |
| 100 |
+ epatch "${FILESDIR}/${P}-install-gi-headers.patch" |
| 101 |
+ |
| 102 |
[[ ${PV} != 9999 ]] && eautoreconf |
| 103 |
|
| 104 |
gnome2_src_prepare |
Archives