[arch-commits] Commit in compiz/repos/community-staging-x86_64 (12 files)

Eric Bélanger eric at nymeria.archlinux.org
Wed May 1 15:29:21 EDT 2013


    Date: Wednesday, May 1, 2013 @ 21:29:21
  Author: eric
Revision: 89656

archrelease: copy trunk to community-staging-x86_64

Added:
  compiz/repos/community-staging-x86_64/PKGBUILD
    (from rev 89655, compiz/trunk/PKGBUILD)
  compiz/repos/community-staging-x86_64/compiz-decorator-gtk.install
    (from rev 89655, compiz/trunk/compiz-decorator-gtk.install)
  compiz/repos/community-staging-x86_64/compiz-gcc-4.7.patch
    (from rev 89655, compiz/trunk/compiz-gcc-4.7.patch)
  compiz/repos/community-staging-x86_64/compiz-kde-4.10.patch
    (from rev 89655, compiz/trunk/compiz-kde-4.10.patch)
  compiz/repos/community-staging-x86_64/compiz-kde-4.8.patch
    (from rev 89655, compiz/trunk/compiz-kde-4.8.patch)
  compiz/repos/community-staging-x86_64/compiz-kde-4.9.patch
    (from rev 89655, compiz/trunk/compiz-kde-4.9.patch)
Deleted:
  compiz/repos/community-staging-x86_64/PKGBUILD
  compiz/repos/community-staging-x86_64/compiz-decorator-gtk.install
  compiz/repos/community-staging-x86_64/compiz-gcc-4.7.patch
  compiz/repos/community-staging-x86_64/compiz-kde-4.10.patch
  compiz/repos/community-staging-x86_64/compiz-kde-4.8.patch
  compiz/repos/community-staging-x86_64/compiz-kde-4.9.patch

------------------------------+
 PKGBUILD                     |  287 ++++++++++++++----------------
 compiz-decorator-gtk.install |   56 ++---
 compiz-gcc-4.7.patch         |   76 +++----
 compiz-kde-4.10.patch        |   60 +++---
 compiz-kde-4.8.patch         |   36 +--
 compiz-kde-4.9.patch         |  392 ++++++++++++++++++++---------------------
 6 files changed, 452 insertions(+), 455 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-01 19:28:33 UTC (rev 89655)
+++ PKGBUILD	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,145 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Hussam Al-Tayeb ht990332 at gmail.com
-# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
-# Contributor: JJDaNiMoTh <jjdanimoth.aur at gmail.com>
-
-pkgbase=compiz
-pkgname=('compiz-core'
-	'compiz-decorator-kde'
-	'compiz-decorator-gtk')
-pkgver=0.8.8
-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' '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')
-
-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.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 \
-	    --enable-metacity \
-	    --enable-gconf \
-            --with-gconf-schema-file-dir=/etc/gconf/schemas \
-	    --enable-dbus \
-	    --enable-librsvg \
-	    --disable-kde \
-	    --enable-kde4
-
-  make
-}
-
-package_compiz-core()
-{
-
-  pkgdesc="Composite manager for Aiglx and Xgl"
-  depends=('startup-notification' 'librsvg' \
-         'libgl' 'dbus' 'glu' 'libxslt' 'fuse')
-
-  cd "$srcdir/compiz-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the decorations
-   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf "${pkgdir}"/etc
-
-  # install MIT license
-  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
-	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
-}
-
-package_compiz-decorator-gtk()
-{
-  pkgdesc="Compiz decorator for GNOME"
-  depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity')
-  install=compiz-decorator-gtk.install
-
-  cd "$srcdir/compiz-$pkgver"
-
-  pushd gtk
-  make DESTDIR="$pkgdir" install
-  install -Dm644 window-decorator/gwd.schemas \
-                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
-  popd
-
-  for i in dbus gconf ini inotify png regex svg glib kconfig
-  do
-    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
-  done
-
-  gconf-merge-schema \
-    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
-
-  make DESTDIR="$pkgdir" install
-
-  # remove stuff which is in one of the other packages
-   rm -rf "${pkgdir}"/etc
-   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf "$pkgdir"/usr/include
-   cd "$pkgdir"/usr/lib
-   rm libdecoration*
-   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd "${pkgdir}"/usr/lib/compiz
-   rm $(ls --hide=*gconf*)
-   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
-   
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
-}
-
-package_compiz-decorator-kde()
-{
-  pkgdesc="Compiz decorator for KDE"
-  depends=('kdebase-workspace' 'compiz-core')
-
-  cd "$srcdir"/compiz-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf "$pkgdir"/usr/{include,lib}
-  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
-
-  # install MIT license
-  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
-        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
-}
-

Copied: compiz/repos/community-staging-x86_64/PKGBUILD (from rev 89655, compiz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-01 19:29:21 UTC (rev 89656)
@@ -0,0 +1,142 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Hussam Al-Tayeb ht990332 at gmail.com
+# Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net>
+# Contributor: JJDaNiMoTh <jjdanimoth.aur at gmail.com>
+
+pkgbase=compiz
+pkgname=('compiz-core'
+	'compiz-decorator-kde'
+	'compiz-decorator-gtk')
+pkgver=0.8.8
+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' 'gconf' 'libwnck' 'kdebase-workspace'
+ 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity')
+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')
+
+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.9.patch
+  patch -p0 -i ../compiz-kde-4.10.patch
+}
+
+build()
+{
+  cd "$srcdir/compiz-$pkgver"
+
+  ./configure   --prefix=/usr \
+	    --enable-gnome \
+	    --enable-gtk \
+	    --enable-metacity \
+	    --enable-gconf \
+            --with-gconf-schema-file-dir=/etc/gconf/schemas \
+	    --enable-dbus \
+	    --enable-librsvg \
+	    --disable-kde \
+	    --enable-kde4
+
+  make QDBUSXML2CPP=/usr/bin/qdbusxml2cpp-qt4
+}
+
+package_compiz-core()
+{
+
+  pkgdesc="Composite manager for Aiglx and Xgl"
+  depends=('startup-notification' 'librsvg' \
+         'libgl' 'dbus' 'glu' 'libxslt' 'fuse')
+
+  cd "$srcdir/compiz-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # remove stuff which is in one of the decorations
+   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
+   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
+   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
+   rm -rf "${pkgdir}"/etc
+
+  # install MIT license
+  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
+	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
+}
+
+package_compiz-decorator-gtk()
+{
+  pkgdesc="Compiz decorator for GNOME"
+  depends=('gnome-control-center' 'gconf' 'libwnck' 'compiz-core' 'metacity')
+  install=compiz-decorator-gtk.install
+
+  cd "$srcdir/compiz-$pkgver"
+
+  pushd gtk
+  make DESTDIR="$pkgdir" install
+  install -Dm644 window-decorator/gwd.schemas \
+                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
+  popd
+
+  for i in dbus gconf ini inotify png regex svg glib kconfig
+  do
+    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
+  done
+
+  gconf-merge-schema \
+    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
+        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
+
+  make DESTDIR="$pkgdir" install
+
+  # remove stuff which is in one of the other packages
+   rm -rf "${pkgdir}"/etc
+   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
+   rm -rf "$pkgdir"/usr/include
+   cd "$pkgdir"/usr/lib
+   rm libdecoration*
+   rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
+   cd "${pkgdir}"/usr/lib/compiz
+   rm $(ls --hide=*gconf*)
+   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
+   
+  # install MIT license
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
+}
+
+package_compiz-decorator-kde()
+{
+  pkgdesc="Compiz decorator for KDE"
+  depends=('kdebase-workspace' 'compiz-core')
+
+  cd "$srcdir"/compiz-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # Let's remove stuff that are in compiz-core package or gtk decorator
+  rm -rf "$pkgdir"/usr/{include,lib}
+  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
+  rm -rf "${pkgdir}"/etc
+  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
+
+  # install MIT license
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
+}
+

Deleted: compiz-decorator-gtk.install
===================================================================
--- compiz-decorator-gtk.install	2013-05-01 19:28:33 UTC (rev 89655)
+++ compiz-decorator-gtk.install	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,28 +0,0 @@
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
-  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
-}
-
-post_remove() {
-  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
-  update-desktop-database -q
-}
-

Copied: compiz/repos/community-staging-x86_64/compiz-decorator-gtk.install (from rev 89655, compiz/trunk/compiz-decorator-gtk.install)
===================================================================
--- compiz-decorator-gtk.install	                        (rev 0)
+++ compiz-decorator-gtk.install	2013-05-01 19:29:21 UTC (rev 89656)
@@ -0,0 +1,28 @@
+post_install() {
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/gwd.schemas > /dev/null
+  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
+  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
+  update-desktop-database -q
+
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
+  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/gwd.schemas >/dev/null
+  usr/bin/gconftool-2 --makefile-uninstall-rule usr/share/gconf/schemas/compiz-decorator-gtk.schemas > /dev/null
+}
+
+post_remove() {
+  kill -s HUP `pidof usr/bin/gconfd-2` > /dev/null 2>&1
+  update-desktop-database -q
+}
+

Deleted: compiz-gcc-4.7.patch
===================================================================
--- compiz-gcc-4.7.patch	2013-05-01 19:28:33 UTC (rev 89655)
+++ compiz-gcc-4.7.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,38 +0,0 @@
---- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
-+++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
-@@ -59,6 +59,9 @@
- 
- #include "paintredirector.h"
- 
-+// header for gcc-4.7 compatibility
-+#include "unistd.h"
-+
- KWD::Window::Window (WId  parentId,
- 		     WId  clientId,
- 		     WId  frame,
---- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
-+++ configure.ac	2012-09-12 23:40:37.253686000 +0400
-@@ -72,11 +72,6 @@
-   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-   esac
- 
--  case " $CFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
--
-   if test "x$enable_ansi" = "xyes"; then
-     case " $CFLAGS " in
-     *[[\ \	]]-ansi[[\ \	]]*) ;;
-@@ -95,11 +90,6 @@
-   *[[\ \	]]-Wall[[\ \	]]*) ;;
-   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
-   esac
--
--  case " $CXXFLAGS " in
--  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
--  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
--  esac
- fi
- 
- AC_C_BIGENDIAN

Copied: compiz/repos/community-staging-x86_64/compiz-gcc-4.7.patch (from rev 89655, compiz/trunk/compiz-gcc-4.7.patch)
===================================================================
--- compiz-gcc-4.7.patch	                        (rev 0)
+++ compiz-gcc-4.7.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -0,0 +1,38 @@
+--- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
++++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
+@@ -59,6 +59,9 @@
+ 
+ #include "paintredirector.h"
+ 
++// header for gcc-4.7 compatibility
++#include "unistd.h"
++
+ KWD::Window::Window (WId  parentId,
+ 		     WId  clientId,
+ 		     WId  frame,
+--- configure.ac.orig	2012-09-12 23:39:54.093812000 +0400
++++ configure.ac	2012-09-12 23:40:37.253686000 +0400
+@@ -72,11 +72,6 @@
+   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
+   esac
+ 
+-  case " $CFLAGS " in
+-  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
+-  esac
+-
+   if test "x$enable_ansi" = "xyes"; then
+     case " $CFLAGS " in
+     *[[\ \	]]-ansi[[\ \	]]*) ;;
+@@ -95,11 +90,6 @@
+   *[[\ \	]]-Wall[[\ \	]]*) ;;
+   *) CXXFLAGS="$CXXFLAGS -Wall" ;;
+   esac
+-
+-  case " $CXXFLAGS " in
+-  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
+-  *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
+-  esac
+ fi
+ 
+ AC_C_BIGENDIAN

Deleted: compiz-kde-4.10.patch
===================================================================
--- compiz-kde-4.10.patch	2013-05-01 19:28:33 UTC (rev 89655)
+++ compiz-kde-4.10.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,30 +0,0 @@
---- 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;

Copied: compiz/repos/community-staging-x86_64/compiz-kde-4.10.patch (from rev 89655, compiz/trunk/compiz-kde-4.10.patch)
===================================================================
--- compiz-kde-4.10.patch	                        (rev 0)
+++ compiz-kde-4.10.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -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;

Deleted: compiz-kde-4.8.patch
===================================================================
--- compiz-kde-4.8.patch	2013-05-01 19:28:33 UTC (rev 89655)
+++ compiz-kde-4.8.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,18 +0,0 @@
-diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
-+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
-@@ -986,10 +986,10 @@
- {
-     Atom    atom = Atoms::compizWindowBlurDecor;
-     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    Region  topRegion = NULL;
--    Region  bottomRegion = NULL;
--    Region  leftRegion = NULL;
--    Region  rightRegion = NULL;
-+    ::Region  topRegion = NULL;
-+    ::Region  bottomRegion = NULL;
-+    ::Region  leftRegion = NULL;
-+    ::Region  rightRegion = NULL;
-     int     size = 0;
-     int     w, h;
- 

Copied: compiz/repos/community-staging-x86_64/compiz-kde-4.8.patch (from rev 89655, compiz/trunk/compiz-kde-4.8.patch)
===================================================================
--- compiz-kde-4.8.patch	                        (rev 0)
+++ compiz-kde-4.8.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -0,0 +1,18 @@
+diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
+--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
+@@ -986,10 +986,10 @@
+ {
+     Atom    atom = Atoms::compizWindowBlurDecor;
+     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
+-    Region  topRegion = NULL;
+-    Region  bottomRegion = NULL;
+-    Region  leftRegion = NULL;
+-    Region  rightRegion = NULL;
++    ::Region  topRegion = NULL;
++    ::Region  bottomRegion = NULL;
++    ::Region  leftRegion = NULL;
++    ::Region  rightRegion = NULL;
+     int     size = 0;
+     int     w, h;
+ 

Deleted: compiz-kde-4.9.patch
===================================================================
--- compiz-kde-4.9.patch	2013-05-01 19:28:33 UTC (rev 89655)
+++ compiz-kde-4.9.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -1,196 +0,0 @@
-From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001
-From: Dennis Kasprzyk <onestone at compiz.org>
-Date: Mon, 06 Aug 2012 18:23:17 +0000
-Subject: KDE 4.9 support.
-
-Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov
-
----
-diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
-index a65f99f..78d1a47 100644
---- a/kde/window-decorator-kde4/window.cpp
-+++ b/kde/window-decorator-kde4/window.cpp
-@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const
-     return QRect ();
- }
- 
-+KDecorationDefines::WindowOperation
-+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+{
-+    Options::MouseCommand com = buttonToCommand (button);
-+
-+    if (com == Options::MouseOperationsMenu)
-+	return KDecorationDefines::OperationsOp;
-+
-+    return KDecorationDefines::NoOp;
-+}
-+
-+
-+#endif
-+
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
-+
- bool
- KWD::Window::isClientGroupActive ()
- {
-@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos)
-     showWindowMenu (pos);
- }
- 
--KDecorationDefines::WindowOperation
--KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+#endif
-+
-+#if KDE_IS_VERSION(4,8,80)
-+QString 
-+KWD::Window::caption(int idx) const
- {
--    Options::MouseCommand com = buttonToCommand (button);
-+    return mName;
-+}
- 
--    if (com == Options::MouseOperationsMenu)
--	return KDecorationDefines::OperationsOp;
-+void
-+KWD::Window::closeTab(long id)
-+{
-+    closeWindow ();
-+}
- 
--    return KDecorationDefines::NoOp;
-+void
-+KWD::Window::closeTabGroup()
-+{
-+    closeWindow ();
-+}
-+
-+long
-+KWD::Window::currentTabId() const
-+{
-+     return (long) mClientId;
-+}
-+
-+QIcon
-+KWD::Window::icon(int idx) const
-+{
-+    QIcon icon (mIcon);
-+    icon.addPixmap (mMiniIcon);
-+    return icon;
-+}
-+
-+void
-+KWD::Window::setCurrentTab(long id)
-+{
-+}
-+
-+void
-+KWD::Window::showWindowMenu(const QPoint& pos, long id)
-+{
-+  showWindowMenu (pos);
-+}
-+
-+void
-+KWD::Window::tab_A_before_B(long A, long B)
-+{
-+}
-+
-+void
-+KWD::Window::tab_A_behind_B(long A, long B)
-+{
-+}
-+
-+int
-+KWD::Window::tabCount() const
-+{
-+    return 1;
-+}
-+
-+long
-+KWD::Window::tabId(int idx) const
-+{
-+    return (long) mClientId;
-+}
-+
-+void
-+KWD::Window::untab(long id, const QRect& newGeom)
-+{
- }
- 
- #endif
- 
-+
- void
- KWD::Window::createDecoration (void)
- {
-@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset,
- 				 int leftOffset,
- 				 int rightOffset)
- {
--    Atom    atom = Atoms::compizWindowBlurDecor;
--    QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
--    ::Region  topRegion = NULL;
--    ::Region  bottomRegion = NULL;
--    ::Region  leftRegion = NULL;
--    ::Region  rightRegion = NULL;
--    int     size = 0;
--    int     w, h;
-+    Atom      atom = Atoms::compizWindowBlurDecor;
-+    QRegion   topQRegion, bottomQRegion, leftQRegion, rightQRegion;
-+    _XRegion *topRegion = NULL;
-+    _XRegion *bottomRegion = NULL;
-+    _XRegion *leftRegion = NULL;
-+    _XRegion *rightRegion = NULL;
-+    int       size = 0;
-+    int       w, h;
- 
-     w = mGeometry.width () + mBorder.left + mBorder.right;
-     h = mGeometry.height () + mBorder.top + mBorder.bottom;
-diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
-index c2b274b..1ddfbd1 100644
---- a/kde/window-decorator-kde4/window.h
-+++ b/kde/window-decorator-kde4/window.h
-@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual bool compositingActive () const;
- #if KDE_IS_VERSION(4,3,90)
- 	virtual QRect transparentRect () const;
--
-+	virtual WindowOperation
-+	    buttonToWindowOperation(Qt::MouseButtons button);
-+#endif
-+#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
- 	virtual bool isClientGroupActive ();
- 	virtual QList<ClientGroupItem> clientGroupItems () const;
- 	virtual long itemId (int index);
-@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 	virtual void closeClientGroupItem (int index);
- 	virtual void closeAllInClientGroup ();
- 	virtual void displayClientMenu (int index, const QPoint& pos);
--
--	virtual WindowOperation
--	    buttonToWindowOperation(Qt::MouseButtons button);
-+	
-+#endif
-+#if KDE_IS_VERSION(4,8,80)
-+	using KDecorationBridge::caption;
-+	virtual QString caption(int idx) const;
-+	virtual void closeTab(long id);
-+	virtual void closeTabGroup();
-+	virtual long currentTabId() const;
-+	using KDecorationBridge::icon;
-+	virtual QIcon icon(int idx) const;
-+	virtual void setCurrentTab(long id);
-+	using KDecorationBridge::showWindowMenu;
-+	virtual void showWindowMenu(const QPoint& pos, long id);
-+	virtual void tab_A_before_B(long A, long B);
-+	virtual void tab_A_behind_B(long A, long B);
-+	virtual int tabCount() const;
-+	virtual long tabId(int idx) const;
-+	virtual void untab(long id, const QRect& newGeom);
- #endif
-+	
-+
- 	virtual bool eventFilter (QObject* o, QEvent* e);
- 
- 	void handleActiveChange (void);
---
-cgit v0.8.3.1-30-gff3a

Copied: compiz/repos/community-staging-x86_64/compiz-kde-4.9.patch (from rev 89655, compiz/trunk/compiz-kde-4.9.patch)
===================================================================
--- compiz-kde-4.9.patch	                        (rev 0)
+++ compiz-kde-4.9.patch	2013-05-01 19:29:21 UTC (rev 89656)
@@ -0,0 +1,196 @@
+From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001
+From: Dennis Kasprzyk <onestone at compiz.org>
+Date: Mon, 06 Aug 2012 18:23:17 +0000
+Subject: KDE 4.9 support.
+
+Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov
+
+---
+diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
+index a65f99f..78d1a47 100644
+--- a/kde/window-decorator-kde4/window.cpp
++++ b/kde/window-decorator-kde4/window.cpp
+@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const
+     return QRect ();
+ }
+ 
++KDecorationDefines::WindowOperation
++KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
++{
++    Options::MouseCommand com = buttonToCommand (button);
++
++    if (com == Options::MouseOperationsMenu)
++	return KDecorationDefines::OperationsOp;
++
++    return KDecorationDefines::NoOp;
++}
++
++
++#endif
++
++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
++
+ bool
+ KWD::Window::isClientGroupActive ()
+ {
+@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos)
+     showWindowMenu (pos);
+ }
+ 
+-KDecorationDefines::WindowOperation
+-KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
++#endif
++
++#if KDE_IS_VERSION(4,8,80)
++QString 
++KWD::Window::caption(int idx) const
+ {
+-    Options::MouseCommand com = buttonToCommand (button);
++    return mName;
++}
+ 
+-    if (com == Options::MouseOperationsMenu)
+-	return KDecorationDefines::OperationsOp;
++void
++KWD::Window::closeTab(long id)
++{
++    closeWindow ();
++}
+ 
+-    return KDecorationDefines::NoOp;
++void
++KWD::Window::closeTabGroup()
++{
++    closeWindow ();
++}
++
++long
++KWD::Window::currentTabId() const
++{
++     return (long) mClientId;
++}
++
++QIcon
++KWD::Window::icon(int idx) const
++{
++    QIcon icon (mIcon);
++    icon.addPixmap (mMiniIcon);
++    return icon;
++}
++
++void
++KWD::Window::setCurrentTab(long id)
++{
++}
++
++void
++KWD::Window::showWindowMenu(const QPoint& pos, long id)
++{
++  showWindowMenu (pos);
++}
++
++void
++KWD::Window::tab_A_before_B(long A, long B)
++{
++}
++
++void
++KWD::Window::tab_A_behind_B(long A, long B)
++{
++}
++
++int
++KWD::Window::tabCount() const
++{
++    return 1;
++}
++
++long
++KWD::Window::tabId(int idx) const
++{
++    return (long) mClientId;
++}
++
++void
++KWD::Window::untab(long id, const QRect& newGeom)
++{
+ }
+ 
+ #endif
+ 
++
+ void
+ KWD::Window::createDecoration (void)
+ {
+@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset,
+ 				 int leftOffset,
+ 				 int rightOffset)
+ {
+-    Atom    atom = Atoms::compizWindowBlurDecor;
+-    QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
+-    ::Region  topRegion = NULL;
+-    ::Region  bottomRegion = NULL;
+-    ::Region  leftRegion = NULL;
+-    ::Region  rightRegion = NULL;
+-    int     size = 0;
+-    int     w, h;
++    Atom      atom = Atoms::compizWindowBlurDecor;
++    QRegion   topQRegion, bottomQRegion, leftQRegion, rightQRegion;
++    _XRegion *topRegion = NULL;
++    _XRegion *bottomRegion = NULL;
++    _XRegion *leftRegion = NULL;
++    _XRegion *rightRegion = NULL;
++    int       size = 0;
++    int       w, h;
+ 
+     w = mGeometry.width () + mBorder.left + mBorder.right;
+     h = mGeometry.height () + mBorder.top + mBorder.bottom;
+diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
+index c2b274b..1ddfbd1 100644
+--- a/kde/window-decorator-kde4/window.h
++++ b/kde/window-decorator-kde4/window.h
+@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable {
+ 	virtual bool compositingActive () const;
+ #if KDE_IS_VERSION(4,3,90)
+ 	virtual QRect transparentRect () const;
+-
++	virtual WindowOperation
++	    buttonToWindowOperation(Qt::MouseButtons button);
++#endif
++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80)
+ 	virtual bool isClientGroupActive ();
+ 	virtual QList<ClientGroupItem> clientGroupItems () const;
+ 	virtual long itemId (int index);
+@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable {
+ 	virtual void closeClientGroupItem (int index);
+ 	virtual void closeAllInClientGroup ();
+ 	virtual void displayClientMenu (int index, const QPoint& pos);
+-
+-	virtual WindowOperation
+-	    buttonToWindowOperation(Qt::MouseButtons button);
++	
++#endif
++#if KDE_IS_VERSION(4,8,80)
++	using KDecorationBridge::caption;
++	virtual QString caption(int idx) const;
++	virtual void closeTab(long id);
++	virtual void closeTabGroup();
++	virtual long currentTabId() const;
++	using KDecorationBridge::icon;
++	virtual QIcon icon(int idx) const;
++	virtual void setCurrentTab(long id);
++	using KDecorationBridge::showWindowMenu;
++	virtual void showWindowMenu(const QPoint& pos, long id);
++	virtual void tab_A_before_B(long A, long B);
++	virtual void tab_A_behind_B(long A, long B);
++	virtual int tabCount() const;
++	virtual long tabId(int idx) const;
++	virtual void untab(long id, const QRect& newGeom);
+ #endif
++	
++
+ 	virtual bool eventFilter (QObject* o, QEvent* e);
+ 
+ 	void handleActiveChange (void);
+--
+cgit v0.8.3.1-30-gff3a



More information about the arch-commits mailing list