Date: Wednesday, May 1, 2013 @ 09:20:08 Author: foutrelis Revision: 89651
upgpkg: compiz 0.8.8-5 libpng 1.6 rebuild. Added: compiz/trunk/compiz-kde-4.10.patch Modified: compiz/trunk/PKGBUILD -----------------------+ PKGBUILD | 23 +++++++++++++++++------ compiz-kde-4.10.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-01 05:38:53 UTC (rev 89650) +++ PKGBUILD 2013-05-01 07:20:08 UTC (rev 89651) @@ -9,34 +9,45 @@ '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') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') -makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') +makedepends=('intltool' 'gnome-control-center' 'gconf' 'libwnck' 'kdebase-workspace' + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity' + 'qtchooser') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') 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" + + export QT_SELECT=4 + ./configure --prefix=/usr \ --enable-gnome \ --enable-gtk \ @@ -75,7 +86,7 @@ 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" Added: compiz-kde-4.10.patch =================================================================== --- compiz-kde-4.10.patch (rev 0) +++ compiz-kde-4.10.patch 2013-05-01 07:20:08 UTC (rev 89651) @@ -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;