From c478c38a259c2ca3946d7876d371f35591026e20 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Sun, 16 Oct 2011 18:47:03 -0700 Subject: [PATCH] Cairo-dock version bump 2.4.0-2 --- x11-misc/cairo-dock/Manifest | 3 + x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild | 74 ++++++++++++ .../files/improved-cairo-dock-session.patch | 106 ++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild create mode 100644 x11-misc/cairo-dock/files/improved-cairo-dock-session.patch diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest index 5e1469d..bf6cac7 100644 --- a/x11-misc/cairo-dock/Manifest +++ b/x11-misc/cairo-dock/Manifest @@ -1,3 +1,6 @@ AUX cairo-dock-2.2.0.4-rpath.patch 553 RMD160 3d22935978ea90b8629a9527cf55861e6bf1b9e7 SHA1 9682d118974e06b0f2754b797b5a84e525f257c3 SHA256 4f80c8aabd51c5ad67353676baaced276e5350cc2b97a601a22675a0b1edd467 +AUX improved-cairo-dock-session.patch 5129 RMD160 33000789484425f77ade2f9016c37ac514183b67 SHA1 3cc8dbea855e11c51804183c6156b71fb2608fa1 SHA256 015147962c7e9a0a131b8ec52334d6ad51409e12f814011ce31653a7024cceb2 DIST cairo-dock-2.2.0-4.tar.gz 2335519 RMD160 23d0917e5b0c49790b7b5f266d40b837af555bd2 SHA1 4edc1d4f71d71b5c7cf295bdcc4b40bc016bc54e SHA256 dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95 +DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c EBUILD cairo-dock-2.2.0.4.ebuild 1708 RMD160 d7c55b03ab87bb560a676f7ee09036ec47dbbbe3 SHA1 f05f441ee356d7e49351eccb8ecde0e5193731e8 SHA256 208769e6bf9d3fadf4041a20f074aca38dd608d0b5a13fdc1762b803a4c32b93 +EBUILD cairo-dock-2.4.0.2.ebuild 2028 RMD160 ea10b2721b66dfadc6723e645b8a3ea506130406 SHA1 fc6ef9b3cc2b22c5203ed3a37d03e9cbfb8eab63 SHA256 43bdb7da1442d485a9e106c69791d7fbd741cd6a160a11c2bef56b004cf2a225 diff --git a/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild b/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild new file mode 100644 index 0000000..cf43c0f --- /dev/null +++ b/x11-misc/cairo-dock/cairo-dock-2.4.0.2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit cmake-utils eutils versionator + +MY_PN="${PN}-core" +MY_PV=$(replace_version_separator 3 '~') +MM_PV=$(get_version_component_range '1-2') +MMD_PV=$(get_version_component_range '1-3') + +DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock." +HOMEPAGE="https://launchpad.net/cairo-dock-core/" +SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz" +echo $SRC_URI + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="crypt xcomposite" + +RDEPEND=" + dev-libs/dbus-glib + dev-libs/glib:2 + dev-libs/libxml2:2 + gnome-base/librsvg:2 + net-misc/curl + sys-apps/dbus + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/gtkglext + x11-libs/libXrender + crypt? ( sys-libs/glibc ) + xcomposite? ( + x11-libs/libXcomposite + x11-libs/libXinerama + x11-libs/libXtst + ) +" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig + sys-devel/gettext +" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + epatch "${FILESDIR}/improved-cairo-dock-session.patch" || die + # intltoolize --automake --copy --force || die "intltoolize failed" + # eautoreconf +} + +src_configure() { + # glitz support has been dropped from recent cairo, so drop it here as well. + mycmakeargs+=( "-DENABLE_GLITZ=OFF" ) + cmake-utils_src_configure +} + +pkg_postinst() { + elog "Additional plugins are available to extend the functionality" + elog "of Cairo-Dock. It is recommended to install at least" + elog "x11-misc/cairo-dock-plugins-core." + elog + elog "Cairo-Dock is an app that draws on a RGBA GLX visual." + elog "Some users have noticed that if the dock is launched," + elog "severals qt4-based applications could crash, like skype or vlc." + elog "If you have this problem, add the following line into your bashrc :" + echo + elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'" + elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details." +} diff --git a/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch b/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch new file mode 100644 index 0000000..c76ae98 --- /dev/null +++ b/x11-misc/cairo-dock/files/improved-cairo-dock-session.patch @@ -0,0 +1,106 @@ +## From: Matthieu Baerts (matttbe) +## Description: Improved the launch of our Cairo-Dock session (by removing Unity +## Compiz plugin and by launching the dock with a short delay) +## Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/cairo-dock/revision/885 +## Forwarded: yes +Index: cairo-dock/data/desktop-manager/CMakeLists.txt +=================================================================== +--- cairo-dock.orig/data/desktop-manager/CMakeLists.txt 2011-10-06 12:02:24.494184799 +0200 ++++ cairo-dock/data/desktop-manager/CMakeLists.txt 2011-10-06 12:02:17.554184897 +0200 +@@ -7,3 +7,7 @@ + cairo-dock.session + cairo-dock-fallback.session + DESTINATION /usr/share/gnome-session/sessions) ++ ++install (FILES cairo-dock-session ++ DESTINATION ${bindir} ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +Index: cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop +=================================================================== +--- cairo-dock.orig/data/desktop-manager/cairo-dock-fallback.desktop 2011-10-06 12:02:24.578184798 +0200 ++++ cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop 2011-10-06 12:02:17.554184897 +0200 +@@ -2,6 +2,6 @@ + Name=Cairo-Dock (with Gnome and without effect) + Comment=This session logs you into GNOME with Cairo-Dock and without any graphical effect. + Exec=gnome-session --session=cairo-dock-fallback +-TryExec=gnome-session ++TryExec=cairo-dock-session + Icon= + Type=Application +Index: cairo-dock/data/desktop-manager/cairo-dock-session +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ cairo-dock/data/desktop-manager/cairo-dock-session 2011-10-06 12:02:17.554184897 +0200 +@@ -0,0 +1,47 @@ ++#!/bin/bash ++ ++# Script for the 'desktop-manager' subproject of Cairo-Dock ++# ++# Copyright : (C) see the 'copyright' file. ++# E-mail : see the 'copyright' file. ++# ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License ++# as published by the Free Software Foundation; either version 3 ++# of the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# http://www.gnu.org/licenses/licenses.html#GPL ++ ++# This script removes Unity Compiz plugin and launches Cairo-Dock with a short delay ++ ++UNITY_NAME="unityshell" ++COMPIZ_FLAT_FILE="$HOME/.config/compiz-1/compizconfig/Default.ini" ++COMPIZ_GCONF="/apps/compiz-1/general/screen0/options/active_plugins" ++ ++if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9 ++ # plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins are in double or wrong, compiz crashes :) ) ++ # flat file ++ if test -f "$COMPIZ_FLAT_FILE"; then ++ pluginsFlat=`grep "s0_active_plugins" $COMPIZ_FLAT_FILE` ++ if test `echo $pluginsFlat | grep -c $UNITY_NAME` -gt 0; then ++ pluginsFlatWithoutUnity=`echo $pluginsFlat | sed -e "s/$UNITY_NAME;//g"` ++ sed -i "/s0_active_plugins/ s/$pluginsFlat/$pluginsFlatWithoutUnity/g" $COMPIZ_FLAT_FILE ++ fi ++ fi ++ # gconf ++ plugins=`gconftool-2 -g $COMPIZ_GCONF` ++ if test `echo $plugins | grep -c $UNITY_NAME` -gt 0; then ++ pluginsWithoutUnity=`echo $plugins | sed -e "s/$UNITY_NAME,//g"` ++ gconftool-2 -s $COMPIZ_GCONF --type=list --list-type=string "$pluginsWithoutUnity" ++ killall unity-panel-service ++ fi ++fi ++ ++if test `ps aux | grep -c " [c]airo-dock"` -eq 0; then # cairo-dock not launched ++ cairo-dock -w 3 ++fi +Index: cairo-dock/data/desktop-manager/cairo-dock.desktop +=================================================================== +--- cairo-dock.orig/data/desktop-manager/cairo-dock.desktop 2011-10-06 12:02:24.450184800 +0200 ++++ cairo-dock/data/desktop-manager/cairo-dock.desktop 2011-10-06 12:02:17.554184897 +0200 +@@ -2,6 +2,6 @@ + Name=Cairo-Dock (with Gnome and effects) + Comment=This session logs you into GNOME with Cairo-Dock and with graphical effects. + Exec=gnome-session --session=cairo-dock +-TryExec=gnome-session ++TryExec=cairo-dock-session + Icon= + Type=Application +Index: cairo-dock/data/scripts/help_scripts.sh +=================================================================== +--- cairo-dock.orig/data/scripts/help_scripts.sh 2011-10-06 12:02:24.294184802 +0200 ++++ cairo-dock/data/scripts/help_scripts.sh 2011-10-06 12:02:17.554184897 +0200 +@@ -115,7 +115,7 @@ + # flat file + if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then + pluginsList="s0_active_plugins = "`echo $ARG2 |sed -e 's/,/;/g'`";" # , => ; +- sed -i "/s0_active_plugins/ s/.*/$ARG2/g" $HOME/.config/compiz-1/compizconfig/Default.ini ++ sed -i "/s0_active_plugins/ s/.*/$pluginsList/g" $HOME/.config/compiz-1/compizconfig/Default.ini + fi + # gconf + gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "[$ARG2]"