[gentoo-commits] repo/gentoo:master commit in: x11-wm/compiz/, x11-wm/compiz/files/

[Johannes Huber]

commit:     820961ecc8e3e2898c5b84b6115b98e453733ef1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 20:51:07 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 20:51:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820961ec

x11-wm/compiz: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

 x11-wm/compiz/compiz-0.8.8-r3.ebuild      |  15 +--
 x11-wm/compiz/files/compiz-kde-4.10.patch |  30 -----
 x11-wm/compiz/files/compiz-kde-4.8.patch  |  17 ---
 x11-wm/compiz/files/compiz-kde-4.9.patch  | 196 ------------------------------
 4 files changed, 3 insertions(+), 255 deletions(-)

diff --git a/x11-wm/compiz/compiz-0.8.8-r3.ebuild b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
index 2b313d2..7bf01e7 100644
--- a/x11-wm/compiz/compiz-0.8.8-r3.ebuild
+++ b/x11-wm/compiz/compiz-0.8.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cairo dbus fuse gnome gconf gtk kde +svg"
+IUSE="+cairo dbus fuse gnome gconf gtk +svg"
 
 COMMONDEPEND="
 	>=dev-libs/glib-2
@@ -51,7 +51,6 @@ COMMONDEPEND="
 		>=x11-libs/libwnck-2.18.3:1
 		x11-libs/pango
 	)
-	kde? ( >=kde-base/kwin-4.2.0 )
 	svg? (
 		>=gnome-base/librsvg-2.14.0:2
 		>=x11-libs/cairo-1.0
@@ -83,14 +82,6 @@ src_prepare() {
 	if ! use gnome || ! use gconf; then
 		epatch "${FILESDIR}"/${PN}-no-gconf.patch
 	fi
-	if use kde; then
-		# patch for KDE 4.8 compatibility. Picked up from stuff overlay
-		has_version ">=kde-base/kwin-4.8" && epatch "${FILESDIR}"/${PN}-kde-4.8.patch
-		# patch for KDE 4.9 compatibility. Picked up from http://cgit.compiz.org
-		has_version ">=kde-base/kwin-4.9" && epatch "${FILESDIR}"/${PN}-kde-4.9.patch
-		# patch for KDE 4.10 compatibility. Picked up from stuff overlay
-		has_version ">=kde-base/kwin-4.10" && epatch "${FILESDIR}"/${PN}-kde-4.10.patch
-	fi
 	eautoreconf
 }
 
@@ -118,7 +109,7 @@ src_configure() {
 		$(use_enable gnome) \
 		$(use_enable gnome metacity) \
 		$(use_enable gtk) \
-		$(use_enable kde kde4) \
+		--disable-kde4 \
 		--disable-kde \
 		${myconf}
 }

diff --git a/x11-wm/compiz/files/compiz-kde-4.10.patch b/x11-wm/compiz/files/compiz-kde-4.10.patch
deleted file mode 100644
index a30d54b..00000000
--- a/x11-wm/compiz/files/compiz-kde-4.10.patch
+++ /dev/null
@@ -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;

diff --git a/x11-wm/compiz/files/compiz-kde-4.8.patch b/x11-wm/compiz/files/compiz-kde-4.8.patch
deleted file mode 100644
index f31751b..00000000
--- a/x11-wm/compiz/files/compiz-kde-4.8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur 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	2010-05-21 14:18:14.000000000 +0300
-+++ compiz-0.8.8//kde/window-decorator-kde4/window.cpp	2012-01-27 21:21:39.000000000 +0200
-@@ -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;

diff --git a/x11-wm/compiz/files/compiz-kde-4.9.patch b/x11-wm/compiz/files/compiz-kde-4.9.patch
deleted file mode 100644
index 7b56da9..00000000
--- a/x11-wm/compiz/files/compiz-kde-4.9.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001
-From: Dennis Kasprzyk <onestone@××××××.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