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 1SWMQx-00076N-Rf for garchives@archives.gentoo.org; Mon, 21 May 2012 06:49:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02686E07AB; Mon, 21 May 2012 06:49:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B4549E07AB for ; Mon, 21 May 2012 06:49:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A023E1B4047 for ; Mon, 21 May 2012 06:49:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 39E47E542A for ; Mon, 21 May 2012 06:49:19 +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: <1337582930.314eec5e8cf58b7a84ca715088cbc6e119029c49.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-1.patch gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so-link-2.patch gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 314eec5e8cf58b7a84ca715088cbc6e119029c49 X-VCS-Branch: master Date: Mon, 21 May 2012 06:49:19 +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: 6ea4ae60-6280-4dfb-9f01-ec182961eca4 X-Archives-Hash: 05d3229a6a0e17108344b10414afd255 commit: 314eec5e8cf58b7a84ca715088cbc6e119029c49 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon May 21 06:47:58 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon May 21 06:48:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D314eec5e gnome-base/gnome-shell: moved to gx86, sync 9999 with gx86 --- ...e-shell-3.4.0-libgnome-shell-js.so-link-1.patch | 30 --- ...e-shell-3.4.0-libgnome-shell-js.so-link-2.patch | 43 ----- gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild | 200 --------------= ------ gnome-base/gnome-shell/gnome-shell-9999.ebuild | 18 +- 4 files changed, 10 insertions(+), 281 deletions(-) diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shel= l-js.so-link-1.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-lib= gnome-shell-js.so-link-1.patch deleted file mode 100644 index 9f07884..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so= -link-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 73f565d27166420bbf4a7bb49a30ea5bf5d98566 Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Wed, 4 Apr 2012 17:48:47 -0400 -Subject: [PATCH] Link the gnome-shell binary to libgnome-shell-js.so - -Depending on the exact linker options and versions, rpath's written -into the binary may, or may not, be honored by dlopen(). Work around -this by simply linking the gnome-shell binary to gnome-shell-js, since -then dlopen() doesn't need to search paths. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D670477 ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 95f1a41..7bafb6a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -187,7 +187,7 @@ libgnome_shell_la_gir_sources =3D \ - gnome_shell_real_SOURCES =3D \ - main.c - gnome_shell_real_CPPFLAGS =3D $(gnome_shell_cflags) --gnome_shell_real_LDADD =3D libgnome-shell.la $(libgnome_shell_la_LIBADD= ) -+gnome_shell_real_LDADD =3D libgnome-shell.la libgnome-shell-js.la $(lib= gnome_shell_la_LIBADD) - gnome_shell_real_DEPENDENCIES =3D libgnome-shell.la -=20 - EXTRA_DIST +=3D test-gapplication.js ---=20 -1.7.9.3 \ No newline at end of file diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shel= l-js.so-link-2.patch b/gnome-base/gnome-shell/files/gnome-shell-3.4.0-lib= gnome-shell-js.so-link-2.patch deleted file mode 100644 index 718eb30..0000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.4.0-libgnome-shell-js.so= -link-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6fa762baaee77c9d1a8aacc758ab5c3c3c33df43 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 6 Apr 2012 14:00:48 -0400 -Subject: [PATCH] Prevent the link to libgnome-shell-js.so from being rem= oved - -Add a dummy call to shell_js_add_extension_importer() to ensure that the -link to libgnome-shell-js.so is not removed when using -Wl,--as-needed, -which is the default on many distros. ---- - src/main.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/src/main.c b/src/main.c -index bac9524..c11c8d7 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -24,6 +24,7 @@ - #include "shell-a11y.h" - #include "shell-global.h" - #include "shell-global-private.h" -+#include "shell-js.h" - #include "shell-perf-log.h" - #include "st.h" -=20 -@@ -342,3 +343,15 @@ main (int argc, char **argv) -=20 - return ecode; - } -+ -+/* HACK: -+ Add a dummy function that calls into libgnome-shell-js.so to ensure = it's -+ linked to /usr/bin/gnome-shell even when linking with --as-needed. -+ This function is never actually called. -+ https://bugzilla.gnome.org/show_bug.cgi?id=3D670477 -+*/ -+ -+void _shell_link_to_shell_js(void) { -+ shell_js_add_extension_importer (NULL, NULL, NULL, NULL); -+} -+ ---=20 -1.7.8.5 - diff --git a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild b/gnome-base= /gnome-shell/gnome-shell-3.4.1.ebuild deleted file mode 100644 index 8924168..0000000 --- a/gnome-base/gnome-shell/gnome-shell-3.4.1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"4" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" -PYTHON_DEPEND=3D"2:2.5" - -inherit autotools eutils gnome2 multilib pax-utils python -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE=3D"http://live.gnome.org/GnomeShell" - -LICENSE=3D"GPL-2" -SLOT=3D"0" -IUSE=3D"+bluetooth +networkmanager" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" -else - KEYWORDS=3D"~amd64 ~x86" -fi - -# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome= -desktop -# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=3D= 360057 -# libXfixes-5.0 needed for pointer barriers -COMMON_DEPEND=3D">=3Dapp-crypt/gcr-3.3.90 - >=3Ddev-libs/glib-2.31.6:2 - >=3Ddev-libs/gjs-1.31.22 - >=3Ddev-libs/gobject-introspection-0.10.1 - >=3Dx11-libs/gtk+-3.3.9:3[introspection] - >=3Dmedia-libs/clutter-1.9.16:1.0[introspection] - >=3Ddev-libs/folks-0.5.2 - >=3Ddev-libs/json-glib-0.13.2 - >=3Ddev-libs/libcroco-0.6.2:0.6 - >=3Dgnome-base/gnome-desktop-2.91.2:3 - >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 - >=3Dgnome-base/gnome-keyring-3.3.90 - >=3Dgnome-base/gnome-menus-2.29.10:3[introspection] - gnome-base/libgnome-keyring - >=3Dgnome-extra/evolution-data-server-2.91.6 - >=3Dmedia-libs/gstreamer-0.10.16:0.10 - >=3Dmedia-libs/gst-plugins-base-0.10.16:0.10 - >=3Dnet-im/telepathy-logger-0.2.4[introspection] - >=3Dnet-libs/telepathy-glib-0.17.5[introspection] - >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-libs/libXfixes-5.0 - >=3Dx11-wm/mutter-3.4.1[introspection] - >=3Dx11-libs/startup-notification-0.11 - - app-misc/ca-certificates - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra - media-libs/mesa - media-sound/pulseaudio - net-libs/libsoup:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/pango[introspection] - x11-apps/mesa-progs - - bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] ) - networkmanager? ( >=3Dnet-misc/networkmanager-0.8.999[introspection] ) -" -# Runtime-only deps are probably incomplete and approximate. -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff + dconf needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fas= t -# user switching with gdm-3.1.x) -# 6. caribou needed for on-screen keyboard -# 7. xdg-utils needed for xdg-open, used by extension tool -# 8. gnome-icon-theme-symbolic neeed for various icons -# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-prov= iders.c -RDEPEND=3D"${COMMON_DEPEND} - >=3Dsys-auth/polkit-0.101[introspection] - - >=3Dgnome-base/dconf-0.4.1 - >=3Dgnome-base/libgnomekbd-2.91.4[introspection] - sys-power/upower[introspection] - - >=3Dgnome-base/gnome-session-2.91.91 - - >=3Dgnome-base/gnome-settings-daemon-2.91 - >=3Dgnome-base/gnome-control-center-2.91.92-r1 - - >=3Dsys-apps/accountsservice-0.6.14 - - >=3Dapp-accessibility/caribou-0.3 - - x11-misc/xdg-utils - - x11-themes/gnome-icon-theme-symbolic - - networkmanager? ( - net-misc/mobile-broadband-provider-info - sys-libs/timezone-data ) -" -DEPEND=3D"${COMMON_DEPEND} - >=3Dsys-devel/gettext-0.17 - >=3Ddev-util/intltool-0.40 - gnome-base/gnome-common - virtual/pkgconfig - !!=3Ddev-lang/spidermonkey-1.8.2*" -# libmozjs.so is picked up from /usr/lib while compiling, so block at bu= ild-time -# https://bugs.gentoo.org/show_bug.cgi?id=3D360413 - -pkg_setup() { - DOCS=3D"AUTHORS NEWS README" - # Don't error out on warnings - G2CONF=3D"${G2CONF} - --enable-compile-warnings=3Dmaximum - --disable-schemas-compile - --disable-jhbuild-wrapper-script - $(use_with bluetooth) - $(use_enable networkmanager) - --with-ca-certificates=3D${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins - --without-systemd" - # TODO: systemd support - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch" - - # Make networkmanager optional, bug #398593 - epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch" - - # Force /usr/bin/gnome-shell to link to libgnome-shell-js; fixes extens= ions - # https://bugzilla.gnome.org/show_bug.cgi?id=3D670477 - epatch "${FILESDIR}/${PN}-3.4.0-libgnome-shell-js.so-link"-{1,2}.patch - - [[ ${PV} !=3D 9999 ]] && eautoreconf - gnome2_src_prepare - - # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 - # Note: sed Makefile.in because it is generated from several Makefile.a= ms - sed -e 's/-DG_DISABLE_DEPRECATED//g' \ - -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}usr/bin/gnome-shell" -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version '>=3Dmedia-libs/gst-plugins-good-0.10.23' || \ - ! has_version 'media-plugins/gst-plugins-vp8'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility,= " - ewarn "you need to either install >=3Dmedia-libs/gst-plugins-good-0.10= .23" - ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=3Dx11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=3Dx11-base/xorg-server-1.11 to be able to make use= of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "=3Dapp-crypt/gcr-3.3.90 =20 bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( >=3Dnet-misc/networkmanager-0.8.999[introspection] ) + systemd? ( >=3Dsys-apps/systemd-31 ) " # Runtime-only deps are probably incomplete and approximate. # Each block: @@ -89,9 +90,9 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-session-2.91.91 =20 >=3Dgnome-base/gnome-settings-daemon-2.91 - >=3Dgnome-base/gnome-control-center-2.91.92-r1 + >=3Dgnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] =20 - >=3Dsys-apps/accountsservice-0.6.14 + >=3Dsys-apps/accountsservice-0.6.14[introspection] =20 >=3Dapp-accessibility/caribou-0.3 =20 @@ -102,6 +103,8 @@ RDEPEND=3D"${COMMON_DEPEND} networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) + + !systemd? ( sys-auth/consolekit ) " DEPEND=3D"${COMMON_DEPEND} >=3Dsys-devel/gettext-0.17 @@ -121,10 +124,9 @@ pkg_setup() { --disable-jhbuild-wrapper-script $(use_with bluetooth) $(use_enable networkmanager) + $(use_with systemd) --with-ca-certificates=3D${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins - --without-systemd" - # TODO: systemd support + BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" python_set_active_version 2 python_pkg_setup } @@ -147,7 +149,7 @@ src_prepare() { =20 src_install() { gnome2_src_install - python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool + python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" =20 # Required for gnome-shell on hardened/PaX, bug #398941 pax-mark mr "${ED}usr/bin/gnome-shell"