summaryrefslogtreecommitdiff
path: root/community/compiz
diff options
context:
space:
mode:
Diffstat (limited to 'community/compiz')
-rw-r--r--community/compiz/PKGBUILD22
-rw-r--r--community/compiz/compiz-kde-4.10.patch30
2 files changed, 45 insertions, 7 deletions
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
index 177282ddd..b69e9e0f5 100644
--- a/community/compiz/PKGBUILD
+++ b/community/compiz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77624 2012-10-13 11:41:40Z allan $
+# $Id: PKGBUILD 90011 2013-05-06 19:36:27Z foutrelis $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Hussam Al-Tayeb ht990332@gmail.com
# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
@@ -9,13 +9,13 @@ pkgname=('compiz-core'
'compiz-decorator-kde'
'compiz-decorator-gtk')
pkgver=0.8.8
-pkgrel=4
+pkgrel=5
pkgdesc="Composite manager for Aiglx and Xgl"
url="http://www.compiz.org/"
license=('GPL' 'LGPL' 'MIT')
arch=('i686' 'x86_64' 'mips64el')
groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion')
-makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
+makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace'
'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity')
options=(!libtool !emptydirs)
conflicts=('compiz' 'compiz-core-git' 'compiz-git')
@@ -23,19 +23,27 @@ replaces=('compiz')
source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz
compiz-kde-4.8.patch
compiz-kde-4.9.patch
+ compiz-kde-4.10.patch
compiz-gcc-4.7.patch)
sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
'148656352f8a20b3781ee185025c5c8d4b7d720f'
'2b6fa7398ccb96172a99f4d12990bbc0491e355c'
+ 'f3c97cc9835643d48058682506eac98d6deceeb7'
'2138342ae9f253bae003e96e91fdd0bc9918291a')
-build()
+prepare()
{
cd "$srcdir/compiz-$pkgver"
patch -p0 -i ../compiz-gcc-4.7.patch
- patch -p1 -i ../compiz-kde-4.8.patch
+ patch -p1 -i ../compiz-kde-4.8.patch
patch -p1 -i ../compiz-kde-4.9.patch
+ patch -p0 -i ../compiz-kde-4.10.patch
+}
+
+build()
+{
+ cd "$srcdir/compiz-$pkgver"
./configure --prefix=/usr \
--enable-gnome \
@@ -48,7 +56,7 @@ build()
--disable-kde \
--enable-kde4
- make
+ make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4
}
package_compiz-core()
@@ -75,7 +83,7 @@ package_compiz-core()
package_compiz-decorator-gtk()
{
pkgdesc="Compiz decorator for GNOME"
- depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
+ depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity')
install=compiz-decorator-gtk.install
cd "$srcdir/compiz-$pkgver"
diff --git a/community/compiz/compiz-kde-4.10.patch b/community/compiz/compiz-kde-4.10.patch
new file mode 100644
index 000000000..a30d54b90
--- /dev/null
+++ b/community/compiz/compiz-kde-4.10.patch
@@ -0,0 +1,30 @@
+--- kde/window-decorator-kde4/window.cpp 2012-11-14 10:17:09 +0000
++++ kde/window-decorator-kde4/window.cpp 2012-11-23 06:43:18 +0000
+@@ -554,6 +554,15 @@
+ showWindowMenu (pos.bottomLeft ());
+ }
+
++void KWD::Window::showApplicationMenu (const QPoint &p)
++{
++}
++
++bool KWD::Window::menuAvailable () const
++{
++ return false;
++}
++
+ KWD::Options::MouseCommand
+ KWD::Window::buttonToCommand (Qt::MouseButtons button)
+ {
+
+--- kde/window-decorator-kde4/window.h 2012-09-03 07:19:30 +0000
++++ kde/window-decorator-kde4/window.h 2012-11-23 06:43:18 +0000
+@@ -92,6 +92,8 @@
+ virtual void processMousePressEvent (QMouseEvent *);
+ virtual void showWindowMenu (const QRect &);
+ virtual void showWindowMenu (const QPoint &);
++ virtual void showApplicationMenu (const QPoint &);
++ virtual bool menuAvailable () const;
+ virtual void performWindowOperation (WindowOperation);
+ virtual void setMask (const QRegion &, int);
+ virtual bool isPreview (void) const;