From e31f0dd0a9c41e68dcc9adeb6b4f370e67214564 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 25 Jan 2012 08:43:16 +0000 Subject: Version bump. Adds support for applets and desktop effects. Cinnamon now uses its own window manager (muffin) and is incompatible with gnome-shell themes. Synced with gnome-shell ebuild for optional networkmanager patch and hardened/PaX marking. (Portage version: 2.2.0_alpha84/cvs/Linux x86_64) --- gnome-extra/cinnamon/ChangeLog | 11 +- gnome-extra/cinnamon/cinnamon-1.2.ebuild | 192 +++++++++++++++++++++ .../cinnamon-1.2-optional-networkmanager.patch | 186 ++++++++++++++++++++ 3 files changed, 388 insertions(+), 1 deletion(-) create mode 100644 gnome-extra/cinnamon/cinnamon-1.2.ebuild create mode 100644 gnome-extra/cinnamon/files/cinnamon-1.2-optional-networkmanager.patch (limited to 'gnome-extra') diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog index d7991625e29e..842ff4ffff9f 100644 --- a/gnome-extra/cinnamon/ChangeLog +++ b/gnome-extra/cinnamon/ChangeLog @@ -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.patch: + Version bump. Adds support for applets and desktop effects. Cinnamon now uses + its own window manager (muffin) and is incompatible with gnome-shell themes. + Synced with gnome-shell ebuild for optional networkmanager patch and + hardened/PaX marking. 10 Jan 2012; Alexandre Rostovtsev cinnamon-1.1.3.ebuild: diff --git a/gnome-extra/cinnamon/cinnamon-1.2.ebuild b/gnome-extra/cinnamon/cinnamon-1.2.ebuild new file mode 100644 index 000000000000..216865818989 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-1.2.ebuild @@ -0,0 +1,192 @@ +# 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.ebuild,v 1.1 2012/01/25 08:43:16 tetromino Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="2:2.5" + +inherit autotools eutils gnome2 pax-utils python + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="http://cinnamon.linuxmint.com/" + +SRC_URI="https://github.com/linuxmint/Cinnamon/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+bluetooth +networkmanager" +KEYWORDS="~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=360057 +# libXfixes-5.0 needed for pointer barriers +# gnome-menus-3.2.0.1-r1 needed for new 10-xdg-menu-gnome +COMMON_DEPEND=">=dev-libs/glib-2.29.10:2 + >=dev-libs/gjs-1.29.18 + >=dev-libs/gobject-introspection-0.10.1 + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.0.0:3[introspection] + >=media-libs/clutter-1.7.5:1.0[introspection] + app-misc/ca-certificates + >=dev-libs/folks-0.5.2 + >=dev-libs/json-glib-0.13.2 + >=gnome-base/gnome-desktop-2.91.2:3 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-extra/evolution-data-server-2.91.6 + >=media-libs/gstreamer-0.10.16:0.10 + >=media-libs/gst-plugins-base-0.10.16:0.10 + >=net-im/telepathy-logger-0.2.4[introspection] + net-libs/libsoup:2.4[introspection] + >=net-libs/telepathy-glib-0.15.5[introspection] + >=net-misc/networkmanager-0.8.999[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-wm/muffin-1.0.0[introspection] + + dev-libs/dbus-glib + dev-libs/libxml2:2 + x11-libs/pango[introspection] + >=dev-libs/libcroco-0.6.2:0.6 + + gnome-base/gconf:2[introspection] + >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] + gnome-base/librsvg + media-libs/libcanberra + media-sound/pulseaudio + + >=x11-libs/startup-notification-0.11 + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) + networkmanager? ( + gnome-base/libgnome-keyring + >=net-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="${COMMON_DEPEND} + >=gnome-base/dconf-0.4.1 + >=gnome-base/libgnomekbd-2.91.4[introspection] + sys-power/upower[introspection] + + >=gnome-base/gnome-session-3.2.1-r1 + + >=gnome-base/gnome-settings-daemon-2.91 + >=gnome-base/gnome-control-center-2.91.92-r1 + + >=sys-apps/accountsservice-0.6.14[introspection] + + >=app-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data )" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17 + >=dev-util/pkgconfig-0.22 + >=dev-util/intltool-0.40 + gnome-base/gnome-common + !!=dev-lang/spidermonkey-1.8.2*" +# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time +# https://bugs.gentoo.org/show_bug.cgi?id=360413 +S="${WORKDIR}/linuxmint-Cinnamon-185383f" + +pkg_setup() { + DOCS="AUTHORS NEWS README" + # Don't error out on warnings + G2CONF="${G2CONF} + --enable-compile-warnings=maximum + --disable-schemas-compile + --disable-jhbuild-wrapper-script + $(use_with bluetooth) + $(use_enable networkmanager) + --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt + BROWSER_PLUGIN_DIR=${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:${EPREFIX}/usr/libexec/gnome-session-check-accelerated:" \ + -i "files/usr/share/gnome-session/sessions/cinnamon.session" || die "sed 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.ams + 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 '>=media-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 >=media-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 ">=x11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=x11-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 " +Date: Wed, 25 Jan 2012 01:58:07 -0500 +Subject: [PATCH] Make NM optional + +Derived from a patch for gnome-shell by Michael Biebl +(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652482#29) +--- + configure.ac | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- + js/misc/config.js.in | 2 ++ + js/ui/main.js | 7 +++++-- + js/ui/panel.js | 3 ++- + src/Makefile.am | 13 ++++++++----- + 5 files changed, 63 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9e1d63d..a9606a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -94,8 +94,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION + libcanberra + telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION + telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION +- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes +- libnm-glib libnm-util gnome-keyring-1) ++ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes) ++ ++########################## ++# Check for NetworkManager ++########################## ++NM_MIN_VERSION=0.9 ++AC_ARG_ENABLE(networkmanager, ++ AS_HELP_STRING([--disable-networkmanager], ++ [disable NetworkManager support @<:@default=auto@:>@]),, ++ [enable_networkmanager=auto]) ++ ++if test "x$enable_networkmanager" != "xno"; then ++ PKG_CHECK_MODULES(NETWORKMANAGER, ++ [libnm-glib libnm-util gnome-keyring-1], ++ [have_networkmanager=yes], ++ [have_networkmanager=no]) ++ ++ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS" ++ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS" ++else ++ have_networkmanager="no (disabled)" ++fi ++ ++if test "x$have_networkmanager" = "xyes"; then ++ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager]) ++ AC_SUBST([HAVE_NETWORKMANAGER], [1]) ++else ++ if test "x$enable_networkmanager" = "xyes"; then ++ AC_MSG_ERROR([Couldn't find NetworkManager.]) ++ fi ++ AC_SUBST([HAVE_NETWORKMANAGER], [0]) ++fi ++ ++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") + + PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) + +@@ -250,3 +282,15 @@ AC_CONFIG_FILES([ + files/Makefile + ]) + AC_OUTPUT ++ ++echo " ++Build configuration: ++ ++ Prefix: ${prefix} ++ Source code location: ${srcdir} ++ Compiler: ${CC} ++ Compiler Warnings: $enable_compile_warnings ++ ++ Support for NetworkManager: $have_networkmanager ++ Support for GStreamer recording: $build_recorder ++" +diff --git a/js/misc/config.js.in b/js/misc/config.js.in +index 704989b..df7e014 100644 +--- a/js/misc/config.js.in ++++ b/js/misc/config.js.in +@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@'; + const GJS_VERSION = '@GJS_VERSION@'; + /* 1 if gnome-bluetooth is available, 0 otherwise */ + const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; ++/* 1 if networkmanager is available, 0 otherwise */ ++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; + /* The system TLS CA list */ + const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@'; +diff --git a/js/ui/main.js b/js/ui/main.js +index daeb4f7..2be3018 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -14,6 +14,7 @@ const St = imports.gi.St; + + const AutomountManager = imports.ui.automountManager; + const AutorunManager = imports.ui.autorunManager; ++const Config = imports.misc.config; + const EndSessionDialog = imports.ui.endSessionDialog; + const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent; + const Environment = imports.ui.environment; +@@ -27,7 +28,7 @@ const PlacesManager = imports.ui.placesManager; + const RunDialog = imports.ui.runDialog; + const Layout = imports.ui.layout; + const LookingGlass = imports.ui.lookingGlass; +-const NetworkAgent = imports.ui.networkAgent; ++const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null; + const NotificationDaemon = imports.ui.notificationDaemon; + const WindowAttentionHandler = imports.ui.windowAttentionHandler; + const Scripting = imports.ui.scripting; +@@ -103,7 +104,9 @@ function _createUserSession() { + placesManager = new PlacesManager.PlacesManager(); + automountManager = new AutomountManager.AutomountManager(); + autorunManager = new AutorunManager.AutorunManager(); +- networkAgent = new NetworkAgent.NetworkAgent(); ++ if (Config.HAVE_NETWORKMANAGER) { ++ networkAgent = new NetworkAgent.NetworkAgent(); ++ } + } + + function _createGDMSession() { +diff --git a/js/ui/panel.js b/js/ui/panel.js +index 677d907..25ea0c6 100644 +--- a/js/ui/panel.js ++++ b/js/ui/panel.js +@@ -44,7 +44,8 @@ if (Config.HAVE_BLUETOOTH) + STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator; + + try { +- STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; ++ if (Config.HAVE_NETWORKMANAGER) ++ STANDARD_STATUS_AREA_CINNAMON_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; + } catch(e) { + log('NMApplet is not supported. It is possible that your NetworkManager version is too old'); + } +diff --git a/src/Makefile.am b/src/Makefile.am +index 182bf17..54770e7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -108,9 +108,7 @@ cinnamon_public_headers_h = \ + cinnamon-generic-container.h \ + cinnamon-gtk-embed.h \ + cinnamon-global.h \ +- cinnamon-mobile-providers.h \ + cinnamon-mount-operation.h \ +- cinnamon-network-agent.h \ + cinnamon-perf-log.h \ + cinnamon-slicer.h \ + cinnamon-stack.h \ +@@ -145,9 +143,7 @@ libcinnamon_la_SOURCES = \ + cinnamon-generic-container.c \ + cinnamon-gtk-embed.c \ + cinnamon-global.c \ +- cinnamon-mobile-providers.c \ + cinnamon-mount-operation.c \ +- cinnamon-network-agent.c \ + cinnamon-perf-log.c \ + cinnamon-polkit-authentication-agent.h \ + cinnamon-polkit-authentication-agent.c \ +@@ -161,6 +157,10 @@ libcinnamon_la_SOURCES = \ + cinnamon-wm.c \ + cinnamon-xfixes-cursor.c + ++if HAVE_NETWORKMANAGER ++libcinnamon_la_SOURCES += cinnamon-mobile-providers.h cinnamon-mobile-providers.c cinnamon-network-agent.h cinnamon-network-agent.c ++endif ++ + libcinnamon_la_gir_sources = \ + $(filter-out %-private.h $(cinnamon_recorder_non_gir_sources), $(cinnamon_public_headers_h) $(libcinnamon_la_SOURCES)) + +@@ -272,7 +272,10 @@ libcinnamon_la_LIBADD = \ + libcinnamon_la_CPPFLAGS = $(cinnamon_cflags) + + Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir +-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6 ++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6 ++if HAVE_NETWORKMANAGER ++Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 ++endif + Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir) + Cinnamon_0_1_gir_LIBS = libcinnamon.la + Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources) +-- +1.7.8.4 + -- cgit v1.2.3-65-gdbad