Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=5e8365c3fd7df38585f57b3d00bd98a0a10d3818
commit 5e8365c3fd7df38585f57b3d00bd98a0a10d3818
Author: Devil505 <devil505li...@gmail.com>
Date: Wed Sep 14 08:50:24 2011 +0200
compiz-core-0.9.5.94-1-i686
* version bump
* added files for Unity
* splitted unity stuff to a subpackage
diff --git a/source/x11-extra/compiz-core/65compiz_profile-on-session
b/source/x11-extra/compiz-core/65compiz_profile-on-session
new file mode 100644
index 0000000..2808d60
--- /dev/null
+++ b/source/x11-extra/compiz-core/65compiz_profile-on-session
@@ -0,0 +1,9 @@
+# This file is sourced by Xsession(5), not executed.
+# Select unity profile if we are in the default session.
+# The default profile is used otherwise.
+
+if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
+ COMPIZ_CONFIG_PROFILE="ubuntu"
+ export COMPIZ_CONFIG_PROFILE
+fi
+
diff --git a/source/x11-extra/compiz-core/FrugalBuild
b/source/x11-extra/compiz-core/FrugalBuild
index 727b3c1..6e9f135 100644
--- a/source/x11-extra/compiz-core/FrugalBuild
+++ b/source/x11-extra/compiz-core/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Priyank Gosalia <priyan...@gmail.com>
pkgname=compiz-core
-pkgrel=5
+pkgrel=1
depends=('libgl>=7.4.2-5' 'libglx>=1.6.1-7' 'libpng>=1.4.1'
'libxcomposite>=0.4.0-2' 'libxfixes>=4.0.3-4' 'libxdamage>=1.1.1-3' \
'libxrandr>=1.3.0' 'libxinerama>=1.0.3' 'libice>=1.0.5-2' 'libsm>=1.1.0'
'startup-notification>=0.9-3' \
'libxrender>=0.9.4-3' 'libxslt' 'dbus' 'mesa>=7.4.2-5' 'libboost>=1.46.1'
'glibmm')
@@ -13,9 +13,17 @@ provides=('compiz')
groups=('x11-extra')
archs=('i686' 'x86_64')
Finclude compiz cmake
-source=(http://ftp.frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2)
+pkgver=0.9.5.94
+_ubuntu_ver="+bzr2803"
+source=(https://launchpad.net/ubuntu/+archive/primary/+files/compiz_$pkgver$_ubuntu_ver.orig.tar.gz
\
+ unity.ini \
+ 65compiz_profile-on-session \
+ compiz-decorator)
-sha1sums=('69283dbc335eb8fcacbace735eab97db3b3b2ffc')
+sha1sums=('59713cc1b3304ead9eb1c8e377d5476f101535e3' \
+ 'c6405e44cbed2abd7ce2301d2dbe235772888b5d' \
+ '8c869f053dc328daf96b5e20de1a43fdca04aab1' \
+ 'e34b3d7a60dc91b489c2629e100ee9776ece6903')
_F_gnome_schemas=('etc/gconf/schemas/compiz-annotate.schemas' \
'etc/gconf/schemas/compiz-ini.schemas' \
'etc/gconf/schemas/compiz-blur.schemas' \
@@ -48,33 +56,61 @@
_F_gnome_schemas=('etc/gconf/schemas/compiz-annotate.schemas' \
'etc/gconf/schemas/compiz-zoom.schemas' \
'etc/gconf/schemas/compiz-imgsvg.schemas' \
'etc/gconf/schemas/gwd.schemas' )
+_F_gnome_glib="y"
Finclude gnome-scriptlet
unset install
-subpkgs=("compiz-gnome")
-subdescs=('Compiz for GNOME')
-subrodepends=("$pkgname=$pkgver")
-subdepends=("librsvg>=2.26.0-2 metacity>=2.34.0-3 gnome-control-center>=2.30.0
gconf>=2.28.1")
-subinstall=("$_F_gnome_scriptlet")
-subgroups=('gnome-extra')
-subarchs=('i686 x86_64')
-subreplaces=('gnome-compiz-manager')
+subpkgs=("${subpkgs[@]}" "compiz-gnome")
+subdescs=("${subdescs[@]}" "Compiz for GNOME")
+subdepends=("${subdepends[@]}" "librsvg>=2.26.0-2 metacity>=2.34.0-3
gnome-control-center>=2.30.0 gconf>=2.28.1")
+subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver")
+subinstall=("${subinstall[@]}" "$_F_gnome_scriptlet")
+subgroups=("${subgroups[@]}" 'gnome-extra')
+subarchs=("${subarchs[@]}" 'i686 x86_64')
+subreplaces=("${subreplaces[@]}" 'gnome-compiz-manager')
+
+subpkgs=("${subpkgs[@]}" "compiz-unity")
+subdescs=("${subdescs[@]}" "Compiz stuff for Unity")
+subdepends=("${subdepends[@]}" "")
+subrodepends=("${subrodepends[@]}" "compiz-gnome=$pkgver")
+subinstall=("${subinstall[@]}" "")
+subgroups=("${subgroups[@]}" 'ayatana-extra')
+subarchs=("${subarchs[@]}" 'i686 x86_64')
+subreplaces=("${subreplaces[@]}" '')
build() {
- Fcd "core"
- CMake_build -DCOMPIZ_BUILD_WITH_RPATH=FALSE
-DCOMPIZ_DEFAULT_PLUGINS="core \
- bailer detection composite opengl decor mousepoll vpswitch regex
animation snap \
- expo move compiztoolbox place grid imgpng gnomecompat wall ezoom
workarounds \
- staticswitcher resize fade scale session"
-DCOMPIZ_PACKAGING_ENABLED=TRUE
- make install DESTDIR=$Fdestdir || Fdie
- Fmkdir usr/share/cmake-2.8/Modules
- Ffilerel ../cmake/*.cmake usr/share/cmake-2.8/Modules/
- Fmkdir etc/gconf/schemas
+ Fcd compiz-$pkgver
+ CMake_build
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCOMPIZ_DESTDIR="$Fdestdir" \
+ -DCOMPIZ_BUILD_WITH_RPATH=FALSE \
+ -DCOMPIZ_DEFAULT_PLUGINS="core bailer detection composite opengl decor
mousepoll vpswitch regex animation snap expo move compiztoolbox place grid
imgpng gnomecompat wall ezoom workarounds staticswitcher resize fade scale
session" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCOMPIZ_PACKAGING_ENABLED=TRUE \
+ -DUSE_GSETTINGS=OFF \
+ -DCOMPIZ_DISABLE_GS_SCHEMAS_INSTALL=ON \
+
+ Fmake
+
+ #unity_window_decorator's CMake install script ignores DESTDIR
+ sed -i "/INSTALL DESTINATION.*TYPE EXECUTABLE
FILES/s@\(\${CMAKE_INSTALL_PREFIX}\)@$Fdestdir\1@"
unity/unity_window_decorator/src/cmake_install.cmake || Fdie
+
+ make install DESTDIR=$Fdestdir || Fdie
+ cmake_dir=`cmake --system-information 2> /dev/null | grep "^CMAKE_ROOT " |
sed -e 's/.*"\(.*\)"/\1/'`
+ mkdir -p "$Fdestdir${cmake_dir}/Modules" || Fdie
+ cp ../cmake/FindCompiz.cmake "$Fdestdir${cmake_dir}/Modules" || Fdie
+
+ Fmkdir etc/X11/Xsession.d
+ Fmkdir etc/compizconfig/
+
+ Fexe compiz-decorator usr/bin/compiz-decorator
+ Finstall 644 65compiz_profile-on-session etc/X11/Xsession.d/
+ Finstall 644 unity.ini etc/compizconfig/
+
+ Fmkdir etc/gconf/schemas
Fmv usr/share/gconf/schemas/*.schemas etc/gconf/schemas/
Frm usr/share/gconf/
- Fsplit compiz-gnome usr/bin/gtk-window-decorator
- Fsplit compiz-gnome usr/bin/unity-window-decorator
- Fexerel ../debian/compiz-decorator usr/bin/compiz-decorator
+
Fsplit compiz-gnome etc/gconf/schemas/compiz-annotate.schemas
Fsplit compiz-gnome etc/gconf/schemas/compiz-ini.schemas
Fsplit compiz-gnome etc/gconf/schemas/compiz-blur.schemas
@@ -109,8 +145,11 @@ build() {
Fsplit compiz-gnome etc/gconf/schemas/compiz-bailer.schemas
Fsplit compiz-gnome etc/gconf/schemas/compiz-detection.schemas
Fsplit compiz-gnome etc/gconf/schemas/compiz-debugspew.schemas
- Fsplit compiz-gnome etc/gconf/schemas/compiz-grid.schemas
+ Fsplit compiz-unity usr/bin/unity-window-decorator
+ Fsplit compiz-unity etc/X11/Xsession.d/65compiz_profile-on-session
+ Fsplit compiz-unity etc/compizconfig/unity.ini
+ Frm /var
Fbuild_gnome_scriptlet
}
diff --git a/source/x11-extra/compiz-core/compiz-decorator
b/source/x11-extra/compiz-core/compiz-decorator
new file mode 100644
index 0000000..4359e8e
--- /dev/null
+++ b/source/x11-extra/compiz-core/compiz-decorator
@@ -0,0 +1,97 @@
+#!/bin/sh
+# Starts Compiz Decorator depending on the DE
+#
+# Copyright (c) 2007 CyberOrg <cyber...@cyberorg.info>
+# Based on compiz-manager script by Kristian Lyngstøl <krist...@bohemians.org>
+# 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 2 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.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Contributions by: crdlb
+#
+COMPIZ_BIN_PATH=/usr/bin/
+KWIN=`which kwin`
+METACITY="/usr/bin/metacity"
+
+#
+# Default to gtk/kde4-window-decorator
+#
+USE_EMERALD="no"
+DECORATOR=""
+
+#Do not leave users without decoration if decorator fails
+if [ "$DESKTOP_SESSION" = "kde" ]; then
+ FALLBACKWM="${KWIN}"
+else
+ FALLBACKWM="${METACITY}"
+fi
+FALLBACKWM_OPTIONS=" --replace"
+
+#
+# Set to yes to enable verbose
+#
+VERBOSE="yes"
+
+#
+# Echos the arguments if verbose
+#
+verbose()
+{
+ if [ "x$VERBOSE" = "xyes" ]; then
+ printf "$*"
+ fi
+}
+
+# Read configuration from XDG paths
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+ test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager
+else
+ test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && .
$XDG_CONFIG_DIRS/compiz/compiz-manager
+fi
+
+if [ -z "$XDG_CONFIG_HOME" ]; then
+ test -f $HOME/.config/compiz/compiz-manager && .
$HOME/.config/compiz/compiz-manager
+else
+ test -f $XDG_CONFIG_HOME/compiz/compiz-manager && .
$XDG_CONFIG_HOME/compiz/compiz-manager
+fi
+
+# start a decorator
+if [ -x ${COMPIZ_BIN_PATH}emerald ] && [ "$USE_EMERALD" = "yes" ]; then
+ DECORATOR=emerald
+elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n
"$GNOME_DESKTOP_SESSION_ID" ]; then
+ DECORATOR=gtk-window-decorator
+elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ] && [ x$KDE_SESSION_VERSION
= x"4" ]; then
+ DECORATOR=kde4-window-decorator
+fi
+
+# fall back to any decorator that is installed
+if [ -z "$DECORATOR" ]; then
+ verbose "Couldn't find a perfect decorator match; trying all decorators\n"
+ if [ -x ${COMPIZ_BIN_PATH}emerald ]; then
+ DECORATOR=emerald
+ elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ]; then
+ DECORATOR=gtk-window-decorator
+ elif [ -x ${COMPIZ_BIN_PATH}kde4-window-decorator ]; then
+ DECORATOR=kde4-window-decorator
+ fi
+fi
+
+if [ -n "$DECORATOR" ]; then
+ verbose "Starting ${DECORATOR}\n"
+ exec ${COMPIZ_BIN_PATH}$DECORATOR "$@"
+else
+ verbose "Found no decorator to start\n"
+ exec $FALLBACKWM $FALLBACKWM_OPTIONS
+fi
+
diff --git a/source/x11-extra/compiz-core/unity.ini
b/source/x11-extra/compiz-core/unity.ini
new file mode 100644
index 0000000..18b2da9
--- /dev/null
+++ b/source/x11-extra/compiz-core/unity.ini
@@ -0,0 +1,3 @@
+[core]
+s0_active_plugins =
core;bailer;detection;composite;opengl;decor;mousepoll;vpswitch;regex;animation;snap;expo;move;compiztoolbox;place;grid;imgpng;gnomecompat;wall;ezoom;workarounds;resize;fade;unitymtgrabhandles;scale;session;unityshell
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
