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 1RpyRy-0005iE-70 for garchives@archives.gentoo.org; Wed, 25 Jan 2012 08:43:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D785E07A8; Wed, 25 Jan 2012 08:43:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0FD78E07A8 for ; Wed, 25 Jan 2012 08:43:18 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 253741B402E for ; Wed, 25 Jan 2012 08:43:18 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2306) id F16DC2004B; Wed, 25 Jan 2012 08:43:16 +0000 (UTC) From: "Alexandre Rostovtsev (tetromino)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, tetromino@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-1.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog cinnamon-1.2.ebuild X-VCS-Directories: gnome-extra/cinnamon X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev Content-Type: text/plain; charset=utf8 Message-Id: <20120125084316.F16DC2004B@flycatcher.gentoo.org> Date: Wed, 25 Jan 2012 08:43:16 +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: f839af0d-91b5-4c2b-b060-ea3a2df7021b X-Archives-Hash: 621fe9d02e436e338efa875b72489e18 tetromino 12/01/25 08:43:16 Modified: ChangeLog Added: cinnamon-1.2.ebuild Log: Version bump. Adds support for applets and desktop effects. Cinnamon no= w uses its own window manager (muffin) and is incompatible with gnome-she= ll themes. Synced with gnome-shell ebuild for optional networkmanager pat= ch and hardened/PaX marking. =20 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) Revision Changes Path 1.3 gnome-extra/cinnamon/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnam= on/ChangeLog?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnam= on/ChangeLog?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnam= on/ChangeLog?r1=3D1.2&r2=3D1.3 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 10 Jan 2012 05:53:59 -0000 1.2 +++ ChangeLog 25 Jan 2012 08:43:16 -0000 1.3 @@ -1,6 +1,15 @@ # ChangeLog for gnome-extra/cinnamon # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.2 = 2012/01/10 05:53:59 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.3 = 2012/01/25 08:43:16 tetromino Exp $ + +*cinnamon-1.2 (25 Jan 2012) + + 25 Jan 2012; Alexandre Rostovtsev + +cinnamon-1.2.ebuild, +files/cinnamon-1.2-optional-networkmanager.patc= h: + Version bump. Adds support for applets and desktop effects. Cinnamon n= ow uses + its own window manager (muffin) and is incompatible with gnome-shell t= hemes. + Synced with gnome-shell ebuild for optional networkmanager patch and + hardened/PaX marking. =20 10 Jan 2012; Alexandre Rostovtsev cinnamon-1.1.3.ebuild: 1.1 gnome-extra/cinnamon/cinnamon-1.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnam= on/cinnamon-1.2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnam= on/cinnamon-1.2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: cinnamon-1.2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-1.2.ebui= ld,v 1.1 2012/01/25 08:43:16 tetromino Exp $ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.5" inherit autotools eutils gnome2 pax-utils python DESCRIPTION=3D"A fork of GNOME Shell with layout similar to GNOME 2" HOMEPAGE=3D"http://cinnamon.linuxmint.com/" SRC_URI=3D"https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.ta= r.gz" LICENSE=3D"GPL-2" SLOT=3D"0" IUSE=3D"+bluetooth +networkmanager" KEYWORDS=3D"~amd64 ~x86" # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-= desktop # latest gsettings-desktop-schemas is needed due to commit 602fa1c6 # 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 # gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome COMMON_DEPEND=3D">=3Ddev-libs/glib-2.29.10:2 >=3Ddev-libs/gjs-1.29.18 >=3Ddev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=3Dx11-libs/gtk+-3.0.0:3[introspection] >=3Dmedia-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=3Ddev-libs/folks-0.5.2 >=3Ddev-libs/json-glib-0.13.2 >=3Dgnome-base/gnome-desktop-2.91.2:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 >=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] net-libs/libsoup:2.4[introspection] >=3Dnet-libs/telepathy-glib-0.15.5[introspection] >=3Dnet-misc/networkmanager-0.8.999[introspection] >=3Dsys-auth/polkit-0.100[introspection] >=3Dx11-wm/muffin-1.0.0[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=3Ddev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=3Dgnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=3Dx11-libs/startup-notification-0.11 x11-libs/libX11 >=3Dx11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=3Dnet-misc/networkmanager-0.8.999[introspection] )" # Runtime-only deps are probably incomplete and approximate. # Each block: # 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 fast # 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 RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=3Dgnome-base/gnome-session-3.2.1-r1 >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91.92-r1 >=3Dsys-apps/accountsservice-0.6.14[introspection] >=3Dapp-accessibility/caribou-0.3 x11-misc/xdg-utils networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )" DEPEND=3D"${COMMON_DEPEND} >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 >=3Ddev-util/intltool-0.40 gnome-base/gnome-common !!=3Ddev-lang/spidermonkey-1.8.2*" # libmozjs.so is picked up from /usr/lib while compiling, so block at bui= ld-time # https://bugs.gentoo.org/show_bug.cgi?id=3D360413 S=3D"${WORKDIR}/linuxmint-Cinnamon-185383f" 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" python_set_active_version 2 python_pkg_setup } src_prepare() { # Fix automagic gnome-bluetooth dep, bug #398145 epatch "${FILESDIR}/${PN}-1.1.3-automagic-gnome-bluetooth.patch" # Make networkmanager optional, bug #398593 epatch "${FILESDIR}/${PN}-1.2-optional-networkmanager.patch" # Do not depend on libgnome (patch from gnome-shell 3.3.x) epatch "${FILESDIR}/${PN}-1.1.3-extensionjs_path.patch" epatch "${FILESDIR}/${PN}-1.1.3-xdg-open.patch" # Gentoo uses /usr/libexec sed -e "s:/usr/lib/gnome-session/gnome-session-check-accelerated:${EPREF= IX}/usr/libexec/gnome-session-check-accelerated:" \ -i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "se= d 1 failed" 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.am= s sed -e 's/-DG_DISABLE_DEPRECATED//g' \ -i src/Makefile.in browser-plugin/Makefile.in || die "sed 2 failed" } src_install() { gnome2_src_install python_convert_shebangs 2 "${D}"/usr/bin/cinnamon-extension-tool # Required for gnome-shell on hardened/PaX, bug #398941 pax-mark mr "${ED}usr/bin/cinnamon" } 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 Cinnamon'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 change= " 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 "