From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnDdc-0007Rs-CP for garchives@archives.gentoo.org; Sat, 30 Jul 2011 17:47:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1647E21C040; Sat, 30 Jul 2011 17:47:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C184021C040 for ; Sat, 30 Jul 2011 17:47:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D54A1B401D for ; Sat, 30 Jul 2011 17:47:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 649F38003D for ; Sat, 30 Jul 2011 17:47:37 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <64b69bd9afeaa5f6a3d9237657dff143fe8f5953.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/gjs/, dev-libs/gjs/files/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch dev-libs/gjs/gjs-1.29.15-r1.ebuild dev-libs/gjs/gjs-1.29.15.ebuild X-VCS-Directories: dev-libs/gjs/ dev-libs/gjs/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 64b69bd9afeaa5f6a3d9237657dff143fe8f5953 Date: Sat, 30 Jul 2011 17:47:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0b21220c2ce38586fed99852d4bb8cb3 commit: 64b69bd9afeaa5f6a3d9237657dff143fe8f5953 Author: Alexandre Rostovtsev gmail com> AuthorDate: Sat Jul 30 17:22:35 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sat Jul 30 17:46:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D64b69bd9 dev-libs/gjs: 1.29.15 =E2=86=92 1.29.15-r1, install gi headers again Add a patch from upstream git to install gi/ headers again, making it theoretically possible to build libpeas with gjs support (however, libpeas-1.1.1 will still need some configure and makefile patching before its gjs support can be re-enabled). --- .../gjs/files/gjs-1.29.15-install-gi-headers.patch | 60 ++++++++++++++= ++++++ .../{gjs-1.29.15.ebuild =3D> gjs-1.29.15-r1.ebuild} | 4 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch b/de= v-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch new file mode 100644 index 0000000..6536122 --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.29.15-install-gi-headers.patch @@ -0,0 +1,60 @@ +From 4217cb5e07519ea41fdff9b906b93ce6946c109e Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 30 Jul 2011 15:40:25 +0000 +Subject: Install gi/ headers again + +libpeas currently requires these; we were installing them before, and +since we export almost all of our internals in for gjs-module.pc, might +as well keep doing these for now. + +https://bugzilla.gnome.org/show_bug.cgi?id=3D655482 +--- +diff --git a/Makefile.am b/Makefile.am +index edf0c25..b088289 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -36,7 +36,20 @@ nobase_gjs_module_include_HEADERS =3D \ + gjs/importer.h \ + gjs/jsapi-util.h \ + gjs/mem.h \ +- gjs/native.h ++ gjs/native.h \ ++ gi/ns.h \ ++ gi/object.h \ ++ gi/foreign.h \ ++ gi/param.h \ ++ gi/repo.h \ ++ gi/union.h \ ++ gi/value.h \ ++ gi/arg.h \ ++ gi/boxed.h \ ++ gi/closure.h \ ++ gi/enumeration.h \ ++ gi/function.h \ ++ gi/keep-alive.h=09 +=20 + noinst_HEADERS +=3D \ + gjs/jsapi-private.h \ +@@ -108,20 +121,7 @@ libgjs_la_SOURCES =3D \ +=20 + # For historical reasons, some files live in gi/ + libgjs_la_SOURCES +=3D \ +- gi/arg.h \ +- gi/boxed.h \ +- gi/closure.h \ +- gi/enumeration.h \ +- gi/function.h \ +- gi/keep-alive.h \ + gi/gjs_gi_trace.h \ +- gi/ns.h \ +- gi/object.h \ +- gi/foreign.h \ +- gi/param.h \ +- gi/repo.h \ +- gi/union.h \ +- gi/value.h \ + gi/arg.c \ + gi/boxed.c \ + gi/closure.c \ +-- +cgit v0.9 diff --git a/dev-libs/gjs/gjs-1.29.15.ebuild b/dev-libs/gjs/gjs-1.29.15-r= 1.ebuild similarity index 94% rename from dev-libs/gjs/gjs-1.29.15.ebuild rename to dev-libs/gjs/gjs-1.29.15-r1.ebuild index 9bd562c..1a2fc2d 100644 --- a/dev-libs/gjs/gjs-1.29.15.ebuild +++ b/dev-libs/gjs/gjs-1.29.15-r1.ebuild @@ -63,6 +63,10 @@ src_prepare() { # Make spidermonkey detection non-automagic # https://bugzilla.gnome.org/show_bug.cgi?id=3D655479 epatch "${FILESDIR}/${P}-automagic-spidermonkey.patch" + + # Install gi/ headers again, help unbreak libpeas; will be in next rele= ase + epatch "${FILESDIR}/${P}-install-gi-headers.patch" + [[ ${PV} !=3D 9999 ]] && eautoreconf =20 gnome2_src_prepare