* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2011-05-11 17:32 Tomas Chvatal
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal @ 2011-05-11 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 5886ab00394d846da4db9cd4804695a3a1b46534
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 17:31:46 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed May 11 17:31:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5886ab00
[kde-base/kwin] Apply the patch that will be needed for whole 4.6 lifetime.
---
kde-base/kwin/files/kwin-fix-opengl.patch | 51 +++++++++++++++++++++++++++++
kde-base/kwin/kwin-4.6.9999.ebuild | 3 +-
2 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/kde-base/kwin/files/kwin-fix-opengl.patch b/kde-base/kwin/files/kwin-fix-opengl.patch
new file mode 100644
index 0000000..245aced
--- /dev/null
+++ b/kde-base/kwin/files/kwin-fix-opengl.patch
@@ -0,0 +1,51 @@
+diff -urN kdebase-workspace-4.6.2/kwin/compositingprefs.cpp kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp
+--- kdebase-workspace-4.6.2/kwin/compositingprefs.cpp 2011-02-25 23:10:02.000000000 +0100
++++ kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp 2011-04-07 19:37:28.637388362 +0200
+@@ -241,6 +241,7 @@
+ // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
+ void CompositingPrefs::applyDriverSpecificOptions()
+ {
++#ifdef KWIN_HAVE_OPENGL_COMPOSITING
+ // Always recommend
+ mRecommendCompositing = true;
+
+@@ -248,6 +249,7 @@
+ mStrictBinding = !gl->supports( LooseBinding );
+ if ( gl->driver() == Driver_Intel )
+ mEnableVSync = false;
++#endif
+ }
+
+
+diff -urN kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp
+--- kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp 2011-02-25 23:10:02.000000000 +0100
++++ kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp 2011-04-07 19:50:58.355265494 +0200
+@@ -338,7 +338,9 @@
+
+ void LogoutEffect::windowDeleted( EffectWindow* w )
+ {
++#ifdef KWIN_HAVE_OPENGL_COMPOSITING
+ windows.removeAll( w );
++#endif
+ ignoredWindows.removeAll( w );
+ if( w == logoutWindow )
+ logoutWindow = NULL;
+diff -urN kdebase-workspace-4.6.2/kwin/options.cpp kdebase-workspace-4.6.2.new/kwin/options.cpp
+--- kdebase-workspace-4.6.2/kwin/options.cpp 2011-02-25 23:10:02.000000000 +0100
++++ kdebase-workspace-4.6.2.new/kwin/options.cpp 2011-04-07 19:43:34.358816214 +0200
+@@ -57,6 +57,7 @@
+ int rate = -1;
+ if( options->refreshRate > 0 ) // use manually configured refresh rate
+ rate = options->refreshRate;
++#ifdef KWIN_HAVE_OPENGL_COMPOSITING
+ else if ( GLPlatform::instance()->driver() == Driver_NVidia )
+ {
+ QProcess nvidia_settings;
+@@ -73,6 +74,7 @@
+ rate = qRound(frate);
+ }
+ }
++#endif
+ #ifdef HAVE_XRANDR
+ else if( Extensions::randrAvailable() )
+ {
diff --git a/kde-base/kwin/kwin-4.6.9999.ebuild b/kde-base/kwin/kwin-4.6.9999.ebuild
index a893720..99c27e5 100644
--- a/kde-base/kwin/kwin-4.6.9999.ebuild
+++ b/kde-base/kwin/kwin-4.6.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.3.ebuild,v 1.2 2011/05/09 10:05:21 scarabeus Exp $
EAPI=4
@@ -45,6 +45,7 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${PN}-fix-opengl.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2011-08-15 15:06 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2011-08-15 15:06 UTC (permalink / raw
To: gentoo-commits
commit: be9f16b4ee17ee38b260e4caea8bc0f2720f91d9
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 15:06:24 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 15:06:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=be9f16b4
[kde-base/kwin] Fix xcomposite automagic, bug 376785
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
.../kwin-4.7.0-xcomposite_cmake_automagic.patch | 16 ++++++++++++++++
kde-base/kwin/kwin-4.7.49.9999.ebuild | 4 +++-
kde-base/kwin/kwin-9999.ebuild | 4 +++-
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
new file mode 100644
index 0000000..726abe9
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
@@ -0,0 +1,16 @@
+diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake
+--- kwin-4.7.0.orig/ConfigureChecks.cmake 2011-05-20 22:32:06.000000000 +0200
++++ kwin-4.7.0/ConfigureChecks.cmake 2011-08-15 16:56:52.165002024 +0200
+@@ -67,6 +67,12 @@
+ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash
+ macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm
+ macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
++
++if(NOT WITH_X11_Xcomposite)
++ set(X11_Xcomposite_FOUND FALSE)
++ MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.")
++endif(NOT WITH_X11_Xcomposite)
++
+ macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
+ macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
+ macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
diff --git a/kde-base/kwin/kwin-4.7.49.9999.ebuild b/kde-base/kwin/kwin-4.7.49.9999.ebuild
index 3d1362e..c7c8228 100644
--- a/kde-base/kwin/kwin-4.7.49.9999.ebuild
+++ b/kde-base/kwin/kwin-4.7.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles xcomposite xinerama"
+IUSE="debug gles +xcomposite xinerama"
COMMONDEPEND="
$(add_kdebase_dep kephal)
@@ -45,6 +45,7 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
)
# you can use just gles or opengl or none
@@ -59,6 +60,7 @@ src_configure() {
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with xinerama X11_Xinerama)
+ $(cmake-utils_use_with xcomposite X11_Xcomposite)
)
kde4-meta_src_configure
diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index 3d1362e..c7c8228 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles xcomposite xinerama"
+IUSE="debug gles +xcomposite xinerama"
COMMONDEPEND="
$(add_kdebase_dep kephal)
@@ -45,6 +45,7 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
)
# you can use just gles or opengl or none
@@ -59,6 +60,7 @@ src_configure() {
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with xinerama X11_Xinerama)
+ $(cmake-utils_use_with xcomposite X11_Xcomposite)
)
kde4-meta_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2011-08-17 20:54 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2011-08-17 20:54 UTC (permalink / raw
To: gentoo-commits
commit: e2a94384e2cbef0488ca046473eb3d4dfba7e573
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Aug 17 20:53:41 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 20:53:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e2a94384
According to mgraesslin on #kde-devel, libXcomposite is now a hard dependency. Bug 379519.
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
.../kwin-4.7.0-xcomposite_cmake_automagic.patch | 16 ----------------
kde-base/kwin/kwin-4.7.49.9999.ebuild | 9 ++++-----
kde-base/kwin/kwin-9999.ebuild | 9 ++++-----
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
deleted file mode 100644
index 726abe9..0000000
--- a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake
---- kwin-4.7.0.orig/ConfigureChecks.cmake 2011-05-20 22:32:06.000000000 +0200
-+++ kwin-4.7.0/ConfigureChecks.cmake 2011-08-15 16:56:52.165002024 +0200
-@@ -67,6 +67,12 @@
- macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash
- macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm
- macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
-+
-+if(NOT WITH_X11_Xcomposite)
-+ set(X11_Xcomposite_FOUND FALSE)
-+ MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.")
-+endif(NOT WITH_X11_Xcomposite)
-+
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
diff --git a/kde-base/kwin/kwin-4.7.49.9999.ebuild b/kde-base/kwin/kwin-4.7.49.9999.ebuild
index c7c8228..1b47860 100644
--- a/kde-base/kwin/kwin-4.7.49.9999.ebuild
+++ b/kde-base/kwin/kwin-4.7.49.9999.ebuild
@@ -10,27 +10,27 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles +xcomposite xinerama"
+IUSE="debug gles xinerama"
COMMONDEPEND="
$(add_kdebase_dep kephal)
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep liboxygenstyle)
+ x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
>=x11-libs/libXrandr-1.2.1
x11-libs/libXrender
opengl? ( >=media-libs/mesa-7.10 )
gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
- xcomposite? ( x11-libs/libXcomposite )
xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
+ x11-proto/compositeproto
x11-proto/damageproto
x11-proto/fixesproto
x11-proto/randrproto
x11-proto/renderproto
- xcomposite? ( x11-proto/compositeproto )
xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
@@ -45,7 +45,6 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
- "${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
)
# you can use just gles or opengl or none
@@ -60,7 +59,7 @@ src_configure() {
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with xinerama X11_Xinerama)
- $(cmake-utils_use_with xcomposite X11_Xcomposite)
+ -DWITH_X11_Xcomposite=ON
)
kde4-meta_src_configure
diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index c7c8228..1b47860 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -10,27 +10,27 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles +xcomposite xinerama"
+IUSE="debug gles xinerama"
COMMONDEPEND="
$(add_kdebase_dep kephal)
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep liboxygenstyle)
+ x11-libs/libXcomposite
x11-libs/libXdamage
x11-libs/libXfixes
>=x11-libs/libXrandr-1.2.1
x11-libs/libXrender
opengl? ( >=media-libs/mesa-7.10 )
gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
- xcomposite? ( x11-libs/libXcomposite )
xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
+ x11-proto/compositeproto
x11-proto/damageproto
x11-proto/fixesproto
x11-proto/randrproto
x11-proto/renderproto
- xcomposite? ( x11-proto/compositeproto )
xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
@@ -45,7 +45,6 @@ KMEXTRACTONLY="
PATCHES=(
"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
- "${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
)
# you can use just gles or opengl or none
@@ -60,7 +59,7 @@ src_configure() {
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with xinerama X11_Xinerama)
- $(cmake-utils_use_with xcomposite X11_Xcomposite)
+ -DWITH_X11_Xcomposite=ON
)
kde4-meta_src_configure
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2012-01-13 12:22 Andreas Hüttel
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Hüttel @ 2012-01-13 12:22 UTC (permalink / raw
To: gentoo-commits
commit: 774a2f052c64748b64d0e0829d1b2690e14233de
Author: Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Fri Jan 13 12:21:53 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:21:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=774a2f05
[kde-base/kwin] Drag-n-drop fix for testing
(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kwin/files/kwin-4.7.97-dragndrop.patch | 20 ++++++
kde-base/kwin/kwin-4.7.97-r1.ebuild | 74 +++++++++++++++++++++++
2 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/kde-base/kwin/files/kwin-4.7.97-dragndrop.patch b/kde-base/kwin/files/kwin-4.7.97-dragndrop.patch
new file mode 100644
index 0000000..cab9a2f
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.7.97-dragndrop.patch
@@ -0,0 +1,20 @@
+diff --git a/kwin/layers.cpp b/kwin/layers.cpp
+index 931b988..31d1c49 100644
+--- a/kwin/layers.cpp
++++ b/kwin/layers.cpp
+@@ -174,6 +174,15 @@ void Workspace::propagateClients(bool propagate_new_clients)
+
+ newWindowStack << (Window*)client->frameId();
+ }
++
++ // when having hidden previews, stack hidden windows below everything else
++ // (as far as pure X stacking order is concerned), in order to avoid having
++ // these windows that should be unmapped to interfere with other windows
++ for (int i = stacking_order.size() - 1; i >= 0; i--) {
++ if (!stacking_order.at(i)->hiddenPreview())
++ continue;
++ newWindowStack << (Window*)stacking_order.at(i)->frameId();
++ }
+ // TODO isn't it too inefficient to restack always all clients?
+ // TODO don't restack not visible windows?
+ assert(newWindowStack.at(0) == (Window*)supportWindow->winId());
diff --git a/kde-base/kwin/kwin-4.7.97-r1.ebuild b/kde-base/kwin/kwin-4.7.97-r1.ebuild
new file mode 100644
index 0000000..7f3455e
--- /dev/null
+++ b/kde-base/kwin/kwin-4.7.97-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles xinerama"
+
+COMMONDEPEND="
+ $(add_kdebase_dep kactivities)
+ $(add_kdebase_dep kephal)
+ $(add_kdebase_dep libkworkspace)
+ $(add_kdebase_dep liboxygenstyle)
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ >=x11-libs/libXrandr-1.2.1
+ x11-libs/libXrender
+ opengl? ( >=media-libs/mesa-7.10 )
+ gles? (
+ || ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
+ >=media-libs/mesa-7.12[egl(+),gles2] )
+ )
+ xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+ x11-proto/compositeproto
+ x11-proto/damageproto
+ x11-proto/fixesproto
+ x11-proto/randrproto
+ x11-proto/renderproto
+ xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+ x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+ ksmserver/
+ libs/kephal/
+ libs/oxygen/
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+ "${FILESDIR}/${P}-dragndrop.patch"
+)
+
+# normally, you can use just gles or opengl or none
+#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
+
+# right now, upstream requires opengl to always be enabled with gles
+REQUIRED_USE="gles? ( opengl )"
+
+src_configure() {
+ # FIXME Remove when activity API moved away from libkworkspace
+ append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+ mycmakeargs=(
+ $(cmake-utils_use_with gles OpenGLES)
+ $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
+ $(cmake-utils_use_with opengl OpenGL)
+ $(cmake-utils_use_with xinerama X11_Xinerama)
+ -DWITH_X11_Xcomposite=ON
+ )
+
+ kde4-meta_src_configure
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2012-04-23 11:36 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2012-04-23 11:36 UTC (permalink / raw
To: gentoo-commits
commit: 0e8f725fcf4ddde600aada9d4dba250f66a685fc
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr 23 11:35:04 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr 23 11:36:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0e8f725f
[kde-base/kwin] Remove xinerama use flag and patch since the library is not used directly.
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
---
.../kwin-4.4.2-xinerama_cmake_automagic.patch | 18 ------------------
kde-base/kwin/kwin-4.8.49.9999.ebuild | 9 +--------
kde-base/kwin/kwin-9999.ebuild | 9 +--------
3 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
deleted file mode 100644
index 5596f41..0000000
--- a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100
-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200
-@@ -71,7 +71,14 @@
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
-+
-+if(NOT WITH_X11_Xinerama)
-+ set(X11_Xinerama_FOUND FALSE)
-+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
-+endif(NOT WITH_X11_Xinerama)
-+
- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
-+
- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
diff --git a/kde-base/kwin/kwin-4.8.49.9999.ebuild b/kde-base/kwin/kwin-4.8.49.9999.ebuild
index d377847..4702ad0 100644
--- a/kde-base/kwin/kwin-4.8.49.9999.ebuild
+++ b/kde-base/kwin/kwin-4.8.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles opengl xinerama"
+IUSE="debug gles opengl"
COMMONDEPEND="
$(add_kdebase_dep kactivities)
@@ -28,7 +28,6 @@ COMMONDEPEND="
|| ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
>=media-libs/mesa-7.12[egl(+),gles2] )
)
- xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
x11-proto/compositeproto
@@ -36,7 +35,6 @@ DEPEND="${COMMONDEPEND}
x11-proto/fixesproto
x11-proto/randrproto
x11-proto/renderproto
- xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
x11-apps/scripts
@@ -48,10 +46,6 @@ KMEXTRACTONLY="
libs/oxygen/
"
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
# you need one of these
REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
@@ -63,7 +57,6 @@ src_configure() {
$(cmake-utils_use_with gles OpenGLES)
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with xinerama X11_Xinerama)
-DWITH_X11_Xcomposite=ON
)
diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index d377847..4702ad0 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE window manager"
KEYWORDS=""
-IUSE="debug gles opengl xinerama"
+IUSE="debug gles opengl"
COMMONDEPEND="
$(add_kdebase_dep kactivities)
@@ -28,7 +28,6 @@ COMMONDEPEND="
|| ( ( >=media-libs/mesa-7.10[egl(+),gles] <media-libs/mesa-7.12[egl(+),gles] )
>=media-libs/mesa-7.12[egl(+),gles2] )
)
- xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
x11-proto/compositeproto
@@ -36,7 +35,6 @@ DEPEND="${COMMONDEPEND}
x11-proto/fixesproto
x11-proto/randrproto
x11-proto/renderproto
- xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
x11-apps/scripts
@@ -48,10 +46,6 @@ KMEXTRACTONLY="
libs/oxygen/
"
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
# you need one of these
REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
@@ -63,7 +57,6 @@ src_configure() {
$(cmake-utils_use_with gles OpenGLES)
$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
$(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with xinerama X11_Xinerama)
-DWITH_X11_Xcomposite=ON
)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/
@ 2014-09-19 17:22 Johannes Huber
0 siblings, 0 replies; 6+ messages in thread
From: Johannes Huber @ 2014-09-19 17:22 UTC (permalink / raw
To: gentoo-commits
commit: c231d35eaceec2ebc00d3282a26bc35819d8eda4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 19 17:22:09 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 19 17:22:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c231d35e
[kde-base/kwin] Add upstream patch, fixes build with Qt 5.4
Spotted by Franz Fellner <alpine.art.de <AT> gmail.com>, bug #523194.
Package-Manager: portage-2.2.13
---
kde-base/kwin/files/kwin-5.0.2-qt54.patch | 37 +++++++++++++++++++++++++++++++
kde-base/kwin/kwin-5.0.2.ebuild | 2 ++
2 files changed, 39 insertions(+)
diff --git a/kde-base/kwin/files/kwin-5.0.2-qt54.patch b/kde-base/kwin/files/kwin-5.0.2-qt54.patch
new file mode 100644
index 0000000..e490a94
--- /dev/null
+++ b/kde-base/kwin/files/kwin-5.0.2-qt54.patch
@@ -0,0 +1,37 @@
+commit c00c67bf29c10862a973289486a535c8566d5110
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date: Wed Sep 3 09:47:21 2014 +0200
+
+ [scripting] Drop qmlRegisterType for QQuickWindow
+
+ Not needed as one can just do:
+ import QtQuick.Window;
+
+ This fixes a build problem with Qt 5.4.
+
+ BUG: 338277
+
+diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
+index 3bc4358..9dc7bad 100644
+--- a/scripting/scripting.cpp
++++ b/scripting/scripting.cpp
+@@ -620,7 +620,6 @@ void KWin::Scripting::init()
+ qmlRegisterType<KWin::ScriptingClientModel::ClientModelByScreenAndDesktop>("org.kde.kwin", 2, 0, "ClientModelByScreenAndDesktop");
+ qmlRegisterType<KWin::ScriptingClientModel::ClientFilterModel>("org.kde.kwin", 2, 0, "ClientFilterModel");
+ qmlRegisterType<KWin::Client>();
+- qmlRegisterType<QQuickWindow>();
+ qmlRegisterType<QAbstractItemModel>();
+
+ m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), m_workspaceWrapper);
+diff --git a/scripts/desktopchangeosd/contents/ui/osd.qml b/scripts/desktopchangeosd/contents/ui/osd.qml
+index fbf7dd7..e2ff86c 100644
+--- a/scripts/desktopchangeosd/contents/ui/osd.qml
++++ b/scripts/desktopchangeosd/contents/ui/osd.qml
+@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *********************************************************************/
+ import QtQuick 2.0;
++import QtQuick.Window 2.0;
+ import org.kde.plasma.core 2.0 as PlasmaCore;
+ import org.kde.plasma.components 2.0 as Plasma;
+ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;
diff --git a/kde-base/kwin/kwin-5.0.2.ebuild b/kde-base/kwin/kwin-5.0.2.ebuild
index 0fd6e0b..5fbac2a 100644
--- a/kde-base/kwin/kwin-5.0.2.ebuild
+++ b/kde-base/kwin/kwin-5.0.2.ebuild
@@ -69,6 +69,8 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
+PATCHES=( "${FILESDIR}/${P}-qt54.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-19 17:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-19 17:22 [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2012-04-23 11:36 Michael Palimaka
2012-01-13 12:22 Andreas Hüttel
2011-08-17 20:54 Andreas Hüttel
2011-08-15 15:06 Andreas Hüttel
2011-05-11 17:32 Tomas Chvatal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox