* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2015-06-11 20:55 Johannes Huber
0 siblings, 0 replies; 13+ messages in thread
From: Johannes Huber @ 2015-06-11 20:55 UTC (permalink / raw
To: gentoo-commits
commit: fe13fd14d67a9ff1046b8ee8ecf065836b20300a
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 11 20:50:52 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 20:50:52 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe13fd14
[kde-plasma/kwin] Upstream patch to fix gles2 support, bug #551448
Thanks to Dennis Schridde <devurandom <AT> gmx.net>.
Package-Manager: portage-2.2.20
kde-plasma/kwin/files/kwin-5.3.1-gles2.patch | 47 ++++++++++++++++++++++++++++
kde-plasma/kwin/kwin-5.3.49.9999.ebuild | 2 ++
2 files changed, 49 insertions(+)
diff --git a/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch b/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch
new file mode 100644
index 0000000..cf4d859
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.3.1-gles2.patch
@@ -0,0 +1,47 @@
+commit 713c6b25dce2fc60184ddc7b618b0b1195ab9870
+Author: Martin Gräßlin <mgraesslin@kde.org>
+Date: Fri May 8 08:53:34 2015 +0200
+
+ [kwinglutils] Init glVersion on gles
+
+ The glVersion was not set at all for gles causing any code doing a
+ hasGLVersion check to fail which means that the compositor doesn't
+ start at all, because it has a hasGLVersion(2, 0) check.
+
+ The complete ifdef is no longer needed. The used additional glGetStringi
+ is also available in gles 3.0, thus epoxy can handle it quite well
+ without a need for ifdef.
+
+ Unfortunately the version string can be "strange" on GLES. On desktop
+ it looks like: "3.0 some driver foo", on GLES it could also be:
+ "OpenGL ES 3.0 some driver bar". Thus to make the logic work we are
+ first removing any leading "OpenGL ES " and hope that then the version
+ is encoded just like on GL.
+
+diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp
+index 8830c44..fd2e217 100644
+--- a/libkwineffects/kwinglutils.cpp
++++ b/libkwineffects/kwinglutils.cpp
+@@ -106,11 +106,12 @@ void initGL(OpenGLPlatformInterface platformInterface)
+ {
+ // Get OpenGL version
+ QString glversionstring = QString::fromUtf8((const char*)glGetString(GL_VERSION));
++ if (glversionstring.startsWith(QLatin1String("OpenGL ES "))) {
++ glversionstring = glversionstring.mid(10);
++ }
+ QStringList glversioninfo = glversionstring.left(glversionstring.indexOf(QStringLiteral(" "))).split(QStringLiteral("."));
+ while (glversioninfo.count() < 3)
+ glversioninfo << QStringLiteral("0");
+-
+-#ifndef KWIN_HAVE_OPENGLES
+ glVersion = MAKE_GL_VERSION(glversioninfo[0].toInt(), glversioninfo[1].toInt(), glversioninfo[2].toInt());
+
+ // Get list of supported OpenGL extensions
+@@ -123,7 +124,6 @@ void initGL(OpenGLPlatformInterface platformInterface)
+ glExtensions << name;
+ }
+ } else
+-#endif
+ glExtensions = QByteArray((const char*)glGetString(GL_EXTENSIONS)).split(' ');
+
+ // handle OpenGL extensions functions
diff --git a/kde-plasma/kwin/kwin-5.3.49.9999.ebuild b/kde-plasma/kwin/kwin-5.3.49.9999.ebuild
index 524e9ac..ca541e2 100644
--- a/kde-plasma/kwin/kwin-5.3.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.3.49.9999.ebuild
@@ -73,6 +73,8 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+PATCHES=( "${FILESDIR}/${PN}-5.3.1-gles2.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2015-09-03 10:53 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2015-09-03 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 7f9ada54cb358916796ea3108ef72d371542134f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 10:53:35 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 10:53:35 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f9ada54
kde-plasma/kwin: introduce gstreamer USE flag by popular request.
Package-Manager: portage-2.2.20.1
kde-plasma/kwin/files/kwin-gstreamer-optional.patch | 15 +++++++++++++++
kde-plasma/kwin/kwin-5.4.49.9999.ebuild | 10 ++++++++--
kde-plasma/kwin/kwin-9999.ebuild | 10 ++++++++--
3 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
new file mode 100644
index 0000000..d9ace47
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-gstreamer-optional.patch
@@ -0,0 +1,15 @@
+Disable the effect video button if gstreamer is missing.
+
+diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml
+index fcd5e8a..2331da2 100644
+--- a/kcmkwin/kwincompositing/qml/Effect.qml
++++ b/kcmkwin/kwincompositing/qml/Effect.qml
+@@ -144,7 +144,7 @@ Rectangle {
+
+ Button {
+ id: videoButton
+- visible: model.VideoRole.toString() !== ""
++ visible: false
+ iconName: "video"
+ onClicked: videoItem.showHide()
+ }
diff --git a/kde-plasma/kwin/kwin-5.4.49.9999.ebuild b/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
index 02c64a7..aad35e3 100644
--- a/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.4.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2 wayland"
+IUSE="gles2 gstreamer wayland"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -41,7 +41,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
- dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
@@ -64,6 +63,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+ gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
"
@@ -75,6 +75,12 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+src_prepare() {
+ kde5_src_prepare
+
+ use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package wayland)
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 6b00476..29049e5 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="KDE window manager"
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="gles2"
+IUSE="gles2 gstreamer"
COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -44,7 +44,6 @@ COMMON_DEPEND="
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5[gles2=,opengl(+)]
- dev-qt/qtmultimedia:5[gstreamer,qml]
dev-qt/qtscript:5
dev-qt/qtwayland:5
dev-qt/qtwidgets:5
@@ -62,6 +61,7 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
+ gstreamer? ( dev-qt/qtmultimedia:5[gstreamer,qml] )
!kde-base/kwin
!kde-base/systemsettings
"
@@ -72,3 +72,9 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
test? ( x11-libs/xcb-util-wm )
"
+
+src_prepare() {
+ kde5_src_prepare
+
+ use gstreamer || epatch "${FILESDIR}/${PN}-gstreamer-optional.patch"
+}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2016-04-19 16:09 Johannes Huber
0 siblings, 0 replies; 13+ messages in thread
From: Johannes Huber @ 2016-04-19 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 059c31670c57e299982d417b871026905d3cd2d4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 16:07:49 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 16:07:49 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=059c3167
kde-plasma/kwin: Fix build with future glibc
Patch by Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>,
https://git.reviewboard.kde.org/r/127662.
Gentoo-bug: 580042
Package-Manager: portage-2.2.28
.../kwin/files/kwin-5.6.3-glibc-sysmacros.patch | 24 ++++++++++++++++++++++
kde-plasma/kwin/kwin-5.6.3.ebuild | 2 ++
kde-plasma/kwin/kwin-5.6.49.9999.ebuild | 2 ++
kde-plasma/kwin/kwin-9999.ebuild | 2 ++
4 files changed, 30 insertions(+)
diff --git a/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
new file mode 100644
index 0000000..06016e0
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.6.3-glibc-sysmacros.patch
@@ -0,0 +1,24 @@
+diff --git a/logind.cpp b/logind.cpp
+index 22a86cdfceaac3138a186cb2f7ab3eae674a1c77..7be9366614c0b70808c6944161a5801773f34a24 100644
+--- a/logind.cpp
++++ b/logind.cpp
+@@ -28,6 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <QDBusUnixFileDescriptor>
+
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include "utils.h"
+
+diff --git a/virtual_terminal.cpp b/virtual_terminal.cpp
+index 40628315620e3d943b7ae0462c4415072fc256b8..8ceb74d3adaae610d99fa7e8349d93cea366d2e8 100644
+--- a/virtual_terminal.cpp
++++ b/virtual_terminal.cpp
+@@ -36,6 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <sys/ioctl.h>
+ #include <sys/signalfd.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+
+ #define RELEASE_SIGNAL SIGUSR1
+ #define ACQUISITION_SIGNAL SIGUSR2
diff --git a/kde-plasma/kwin/kwin-5.6.3.ebuild b/kde-plasma/kwin/kwin-5.6.3.ebuild
index 566e23a..401efc2 100644
--- a/kde-plasma/kwin/kwin-5.6.3.ebuild
+++ b/kde-plasma/kwin/kwin-5.6.3.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+PATCHES=( "${FILESDIR}/${P}-glibc-sysmacros.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
index e92ff08..40b5b4a 100644
--- a/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.6.49.9999.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index e92ff08..40b5b4a 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -84,6 +84,8 @@ DEPEND="${COMMON_DEPEND}
test? ( x11-libs/xcb-util-wm )
"
+PATCHES=( "${FILESDIR}/${PN}-5.6.3-glibc-sysmacros.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2016-09-17 17:50 Michael Palimaka
0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-09-17 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 3aea2e9156416c9bc22e04c70b08e3e67c35abff
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 17:49:54 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 17:50:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3aea2e91
kde-plasma/kwin: backport patch from upstream solving build failure with Qt 5.6
Package-Manager: portage-2.3.0
kde-plasma/kwin/files/kwin-5.7.95-qt56.patch | 52 ++++++++++++++++++++++++++++
kde-plasma/kwin/kwin-5.7.95.ebuild | 2 ++
2 files changed, 54 insertions(+)
diff --git a/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch b/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch
new file mode 100644
index 0000000..18eb671
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.7.95-qt56.patch
@@ -0,0 +1,52 @@
+From 99f491e79914da85213a899574ae36ad2e3c097c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
+Date: Thu, 15 Sep 2016 13:59:25 +0200
+Subject: [PATCH] parent qaction in test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+My compiler doesn't seem to like this constructor, it bails out with the
+following error:
+
+/home/sebas/kf5/src/kde/workspace/kwin/autotests/integration/globalshortcuts_test.cpp:
+In member function ‘void GlobalShortcutsTest::testConsumedShift()’:
+/home/sebas/kf5/src/kde/workspace/kwin/autotests/integration/globalshortcuts_test.cpp:79:40:
+error: no matching function for call to ‘QAction::QAction()’
+ QScopedPointer<QAction> action(new QAction);
+ ^~~~~~~
+
+Using this as first argument fixes the build on my machine.
+
+Test Plan: screenedges test fails, others pass. (this screenedges test failure seems unrelated)
+
+Reviewers: graesslin
+
+Reviewed By: graesslin
+
+Subscribers: luebking, kwin
+
+Tags: #kwin
+
+Differential Revision: https://phabricator.kde.org/D2782
+---
+ autotests/integration/globalshortcuts_test.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp
+index 69dae83..ab46fbd 100644
+--- a/autotests/integration/globalshortcuts_test.cpp
++++ b/autotests/integration/globalshortcuts_test.cpp
+@@ -76,7 +76,7 @@ void GlobalShortcutsTest::testConsumedShift()
+ {
+ // this test verifies that a shortcut with a consumed shift modifier triggers
+ // create the action
+- QScopedPointer<QAction> action(new QAction);
++ QScopedPointer<QAction> action(new QAction(nullptr));
+ action->setProperty("componentName", QStringLiteral(KWIN_NAME));
+ action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift"));
+ QSignalSpy triggeredSpy(action.data(), &QAction::triggered);
+--
+2.7.3
+
diff --git a/kde-plasma/kwin/kwin-5.7.95.ebuild b/kde-plasma/kwin/kwin-5.7.95.ebuild
index 1e8ce63..bb812ee 100644
--- a/kde-plasma/kwin/kwin-5.7.95.ebuild
+++ b/kde-plasma/kwin/kwin-5.7.95.ebuild
@@ -90,6 +90,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-qt56.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2017-06-13 21:09 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2017-06-13 21:09 UTC (permalink / raw
To: gentoo-commits
commit: c3e6e6bdcd1108209df98de131a49bf6cf86c86d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 20:19:33 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 20:22:44 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c3e6e6bd
kde-plasma/kwin: Fix build with future glibc
Gentoo-bug: 603138
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../kwin/files/kwin-5.8.7-glibc-sysmacros.patch | 38 ++++++++++++++++++++++
kde-plasma/kwin/kwin-5.10.49.9999.ebuild | 2 ++
kde-plasma/kwin/kwin-5.8.49.9999.ebuild | 2 ++
3 files changed, 42 insertions(+)
diff --git a/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
new file mode 100644
index 0000000000..61c07feaee
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.8.7-glibc-sysmacros.patch
@@ -0,0 +1,38 @@
+commit 8efef12eeb377e9087551e333d65631968c80e5f
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat Jun 10 17:00:25 2017 +0200
+
+ Fix build with future glibc (major/minor macros), BSD compatible
+
+ Summary:
+ Also adding sys/types.h which is not implicitly included from all over.
+
+ Thanks-to: [ade] in #kde-devel
+
+ See also:
+ https://sourceware.org/ml/libc-alpha/2015-11/msg00452.html
+ https://git.reviewboard.kde.org/r/127662/
+
+ Reviewers: #plasma
+
+ Subscribers: plasma-devel, kwin, #kwin, adridg
+
+ Tags: #kwin
+
+ Differential Revision: https://phabricator.kde.org/D6175
+
+diff --git a/logind.cpp b/logind.cpp
+index fee0f2ff4..bb84af4f9 100644
+--- a/logind.cpp
++++ b/logind.cpp
+@@ -29,6 +29,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #include <QDBusMetaType>
+
+ #include <sys/stat.h>
++#include <sys/types.h>
++#ifndef major
++#include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include "utils.h"
+
diff --git a/kde-plasma/kwin/kwin-5.10.49.9999.ebuild b/kde-plasma/kwin/kwin-5.10.49.9999.ebuild
index 2c30350ef7..a66b73c17a 100644
--- a/kde-plasma/kwin/kwin-5.10.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.10.49.9999.ebuild
@@ -87,6 +87,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.8.49.9999.ebuild b/kde-plasma/kwin/kwin-5.8.49.9999.ebuild
index b80a548d23..f02dc903ec 100644
--- a/kde-plasma/kwin/kwin-5.8.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-5.8.49.9999.ebuild
@@ -88,6 +88,8 @@ DEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-5.8.7-glibc-sysmacros.patch" )
+
src_prepare() {
kde5_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2019-03-22 22:48 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-03-22 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 629e28dccb9f78c9c2d8dcc5d2bf65267cc4c026
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:10:36 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:10:36 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=629e28dc
kde-plasma/kwin: Rebase gstreamer-optional.patch
Closes: https://bugs.gentoo.org/681238
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch | 13 +++++++++++++
kde-plasma/kwin/kwin-9999.ebuild | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
new file mode 100644
index 0000000000..81db399f6b
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
@@ -0,0 +1,13 @@
+Disable the effect video button if gstreamer is missing.
+
+--- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml 2019-03-22 23:06:45.172699544 +0100
++++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml 2019-03-22 23:07:30.435043637 +0100
+@@ -111,7 +111,7 @@
+
+ QtControls.Button {
+ icon.name: "video"
+- visible: model.VideoRole.toString() !== ""
++ visible: false
+
+ onClicked: videoItem.showHide()
+ }
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index dc24e073c6..f0b90c2bba 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -89,7 +89,7 @@ RESTRICT+=" test"
src_prepare() {
kde5_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-gstreamer-optional.patch"
+ use multimedia || eapply "${FILESDIR}/${PN}-5.15.80-gstreamer-optional.patch"
# Access violations, bug #640432
sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2019-08-06 23:02 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2019-08-06 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 4689fa76c4f2a1ce41df0b82c9345be09acdb065
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 20:43:30 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 20:43:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4689fa76
kde-plasma/kwin: Rebase gstreamer-optional.patch on git master
Broken by upstream commit 52eba31ea23d73731600851838f61118a3fd9f9e
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kwin-5.16.80-gstreamer-optional.patch | 25 ++++++++++++++++++++++
kde-plasma/kwin/kwin-9999.ebuild | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch
new file mode 100644
index 0000000000..08a472ad55
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch
@@ -0,0 +1,25 @@
+From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 6 Aug 2019 22:36:44 +0200
+Subject: [PATCH] Disable the effect video button if gstreamer is missing
+
+---
+ kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+index 71dbc5935..86ddf40b3 100644
+--- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml
++++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+@@ -112,7 +112,7 @@ Kirigami.SwipeListItem {
+ }
+ actions: [
+ Kirigami.Action {
+- visible: model.VideoRole.toString() !== ""
++ visible: false
+ icon.name: "videoclip-amarok"
+ tooltip: i18nc("@info:tooltip", "Show/Hide Video")
+ onTriggered: videoItem.showHide()
+--
+2.22.0
+
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index f0b90c2bba..cf1130f7cc 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -89,7 +89,7 @@ RESTRICT+=" test"
src_prepare() {
kde5_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.15.80-gstreamer-optional.patch"
+ use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
# Access violations, bug #640432
sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2020-06-07 22:45 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2020-06-07 22:45 UTC (permalink / raw
To: gentoo-commits
commit: f6177a45f8fa7279677e3ced174052122864e1ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 7 21:17:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 7 21:17:22 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6177a45
kde-plasma/kwin: Fix the Plastik decoration with Qt 5.15
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch | 39 +++++++++++++++++++++++++
kde-plasma/kwin/kwin-5.19.0.ebuild | 2 ++
2 files changed, 41 insertions(+)
diff --git a/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch
new file mode 100644
index 0000000000..eb8f661702
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch
@@ -0,0 +1,39 @@
+From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sun, 7 Jun 2020 18:05:21 +0200
+Subject: [PATCH] Fix the Plastik decoration with Qt 5.15
+
+The trick in qmldir no longer works with Qt 5.15, so use a more reliable
+approach. This way works with Qt 5.15 and also on previous versions of Qt.
+---
+ .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++-
+ plugins/kdecorations/aurorae/themes/plastik/code/qmldir | 3 ---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
+index 25d11251f..4304dcdc1 100644
+--- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
++++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
+@@ -20,7 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ void PlastikPlugin::registerTypes(const char *uri)
+ {
+- Q_UNUSED(uri)
++ // Need to register something to tell Qt that it loaded (QTBUG-84571)
++ qmlRegisterModule(uri, 1, 0);
+ }
+
+ void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
+index 49a4b402d..aa7bf16b3 100644
+--- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
++++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
+@@ -1,5 +1,2 @@
+ module org.kde.kwin.decorations.plastik
+ plugin plastikplugin
+-
+-# we need to have at least one element of Qt is not able to find the plugin *shrug*
+-Foo 1.0 Foo.qml
+--
+2.27.0
+
diff --git a/kde-plasma/kwin/kwin-5.19.0.ebuild b/kde-plasma/kwin/kwin-5.19.0.ebuild
index 1bba7ee2de..fdfae8e98d 100644
--- a/kde-plasma/kwin/kwin-5.19.0.ebuild
+++ b/kde-plasma/kwin/kwin-5.19.0.ebuild
@@ -94,6 +94,8 @@ PDEPEND="
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # Plastik deco issue; in Plasma/5.19
+
src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2020-06-08 12:34 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2020-06-08 12:34 UTC (permalink / raw
To: gentoo-commits
commit: ece27db96a469b1e6c27622afe853729a858fc80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 11:45:26 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 11:46:48 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ece27db9
kde-plasma/kwin: Tarball respun
See also: https://mail.kde.org/pipermail/release-team/2020-June/011900.html
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch | 39 -------------------------
kde-plasma/kwin/kwin-5.19.0.ebuild | 2 --
2 files changed, 41 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch
deleted file mode 100644
index eb8f661702..0000000000
--- a/kde-plasma/kwin/files/kwin-5.19.0-qt-5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun, 7 Jun 2020 18:05:21 +0200
-Subject: [PATCH] Fix the Plastik decoration with Qt 5.15
-
-The trick in qmldir no longer works with Qt 5.15, so use a more reliable
-approach. This way works with Qt 5.15 and also on previous versions of Qt.
----
- .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++-
- plugins/kdecorations/aurorae/themes/plastik/code/qmldir | 3 ---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-index 25d11251f..4304dcdc1 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-@@ -20,7 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-
- void PlastikPlugin::registerTypes(const char *uri)
- {
-- Q_UNUSED(uri)
-+ // Need to register something to tell Qt that it loaded (QTBUG-84571)
-+ qmlRegisterModule(uri, 1, 0);
- }
-
- void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-index 49a4b402d..aa7bf16b3 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-@@ -1,5 +1,2 @@
- module org.kde.kwin.decorations.plastik
- plugin plastikplugin
--
--# we need to have at least one element of Qt is not able to find the plugin *shrug*
--Foo 1.0 Foo.qml
---
-2.27.0
-
diff --git a/kde-plasma/kwin/kwin-5.19.0.ebuild b/kde-plasma/kwin/kwin-5.19.0.ebuild
index fdfae8e98d..1bba7ee2de 100644
--- a/kde-plasma/kwin/kwin-5.19.0.ebuild
+++ b/kde-plasma/kwin/kwin-5.19.0.ebuild
@@ -94,8 +94,6 @@ PDEPEND="
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # Plastik deco issue; in Plasma/5.19
-
src_prepare() {
ecm_src_prepare
use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2021-02-15 14:48 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2021-02-15 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 369b14fcdc70b8ddb0b5cb34ca34036e4c18a486
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 15 14:45:26 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 14:45:26 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=369b14fc
kde-plasma/kwin: Rebase gstreamer-optional.patch on top of HEAD
Reported-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kwin-5.21.80-gstreamer-optional.patch | 25 ++++++++++++++++++++++
kde-plasma/kwin/kwin-9999.ebuild | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch
new file mode 100644
index 0000000000..15936e6dd3
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch
@@ -0,0 +1,25 @@
+From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 6 Aug 2019 22:36:44 +0200
+Subject: [PATCH] Disable the effect video button if gstreamer is missing
+
+---
+ kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+index 71dbc5935..86ddf40b3 100644
+--- a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml
++++ b/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml
+@@ -112,7 +112,7 @@ Kirigami.SwipeListItem {
+ }
+ actions: [
+ Kirigami.Action {
+- visible: model.VideoRole.toString() !== ""
++ visible: false
+ icon.name: "videoclip-amarok"
+ tooltip: i18nc("@info:tooltip", "Show/Hide Video")
+ onTriggered: videoItem.showHide()
+--
+2.22.0
+
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index a14e8d4d78..1e7d628b61 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -102,7 +102,7 @@ PDEPEND="
src_prepare() {
ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+ use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
# TODO: try to get a build switch upstreamed
if ! use screencast; then
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2023-12-02 20:30 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2023-12-02 20:30 UTC (permalink / raw
To: gentoo-commits
commit: d9be2e47f7a656cb4c7a47432570a63b90467ebe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 20:16:58 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 20:17:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d9be2e47
kde-plasma/kwin: Rebase gstreamer-optional.patch onto git master
Drop obsolete pkg_postinst
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kwin-5.90.0-gstreamer-optional.patch | 25 ++++++++++++++++++++++
kde-plasma/kwin/kwin-9999.ebuild | 17 ++-------------
2 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch
new file mode 100644
index 0000000000..a6cd6729a1
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.90.0-gstreamer-optional.patch
@@ -0,0 +1,25 @@
+From a6eec8e984aa97110a9cad22121fc4e88d3f12ba Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 6 Aug 2019 22:36:44 +0200
+Subject: [PATCH] Disable the effect video button if gstreamer is missing
+
+---
+ src/kcms/effects/ui/Effect.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kcms/effects/ui/Effect.qml b/src/kcms/effects/ui/Effect.qml
+index c973afb941..b083d3ac22 100644
+--- a/src/kcms/effects/ui/Effect.qml
++++ b/src/kcms/effects/ui/Effect.qml
+@@ -122,7 +122,7 @@ Kirigami.SwipeListItem {
+
+ actions: [
+ Kirigami.Action {
+- visible: model.VideoRole.toString() !== ""
++ visible: false
+ icon.name: "videoclip-amarok"
+ tooltip: i18nc("@info:tooltip", "Show/Hide Video")
+ onTriggered: videoItem.showHide()
+--
+2.43.0
+
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 6fc43a856a..dcdf163bc3 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="optional"
KFMIN=5.245.0
PVCUT=$(ver_cut 1-3)
QTMIN=6.6.0
-inherit ecm plasma.kde.org optfeature
+inherit ecm plasma.kde.org
DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
@@ -96,7 +96,7 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
src_prepare() {
ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch"
+ use multimedia || eapply "${FILESDIR}/${PN}-5.90.0-gstreamer-optional.patch"
# TODO: try to get a build switch upstreamed
if ! use screencast; then
@@ -115,16 +115,3 @@ src_configure() {
ecm_src_configure
}
-
-pkg_postinst() {
- ecm_pkg_postinst
- optfeature "color management support" x11-misc/colord
- elog
- elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
- elog "windows to the end of the list was changed so that it remains in the"
- elog "original order. To revert to the well established behavior:"
- elog
- elog " - Edit ~/.config/kwinrc"
- elog " - Find [TabBox] section"
- elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2024-03-08 20:17 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2024-03-08 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 344cf95a2de16eed57704ee660dbb39f5a56043d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 23:53:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 20:15:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=344cf95a
kde-plasma/kwin: Drop dev-qt/qtmultimedia[gstreamer] USEdep
Qt6Multimedia ensures a video backend is available, w/ ffmpeg as default.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/kwin-5.90.90-gstreamer-optional.patch | 25 ----------------------
kde-plasma/kwin/kwin-6.0.49.9999.ebuild | 15 +++++++------
kde-plasma/kwin/kwin-9999.ebuild | 15 +++++++------
kde-plasma/kwin/metadata.xml | 1 -
4 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
deleted file mode 100644
index dfd544af00..0000000000
--- a/kde-plasma/kwin/files/kwin-5.90.90-gstreamer-optional.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3b851958984a2028780ee6078004690ca2b0723b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 6 Aug 2019 22:36:44 +0200
-Subject: [PATCH] Disable the effect video button if gstreamer is missing
-
----
- src/kcms/effects/ui/Effect.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kcms/effects/ui/Effect.qml b/src/kcms/effects/ui/Effect.qml
-index e4a7daca7e..23d32e63a1 100644
---- a/src/kcms/effects/ui/Effect.qml
-+++ b/src/kcms/effects/ui/Effect.qml
-@@ -120,7 +120,7 @@ QQC2.ItemDelegate {
- }
-
- QQC2.ToolButton {
-- visible: model.VideoRole.toString() !== ""
-+ visible: false
- icon.name: "videoclip-amarok"
- text: i18nc("@info:tooltip", "Show/Hide Video")
- display: QQC2.AbstractButton.IconOnly
---
-2.43.0
-
diff --git a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
index bdd5083917..2f1fc7b3e1 100644
--- a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="6"
KEYWORDS=""
-IUSE="accessibility caps gles2-only lock multimedia screencast +shortcuts"
+IUSE="accessibility caps gles2-only lock screencast +shortcuts"
RESTRICT="test"
@@ -78,15 +78,19 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
!kde-plasma/kdeplasma-addons:5
!kde-plasma/kwayland-server
+ >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+ || (
+ dev-qt/qtmultimedia:6[ffmpeg]
+ (
+ dev-qt/qtmultimedia:6[gstreamer]
+ media-plugins/gst-plugins-soup:1.0
+ )
+ )
>=kde-frameworks/kirigami-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-plasma/libplasma-${PVCUT}:6[wayland]
sys-apps/hwdata
x11-base/xwayland
- multimedia? (
- >=dev-qt/qtmultimedia-${QTMIN}:6[gstreamer,qml]
- media-plugins/gst-plugins-soup:1.0
- )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.11.1
@@ -108,7 +112,6 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
src_prepare() {
ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.90.90-gstreamer-optional.patch"
# TODO: try to get a build switch upstreamed
if ! use screencast; then
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index 7b9df0fd21..6c7dd44b6b 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
LICENSE="GPL-2+"
SLOT="6"
KEYWORDS=""
-IUSE="accessibility caps gles2-only lock multimedia screencast +shortcuts"
+IUSE="accessibility caps gles2-only lock screencast +shortcuts"
RESTRICT="test"
@@ -78,15 +78,19 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
!kde-plasma/kdeplasma-addons:5
!kde-plasma/kwayland-server
+ >=dev-qt/qtmultimedia-${QTMIN}:6[qml]
+ || (
+ dev-qt/qtmultimedia:6[ffmpeg]
+ (
+ dev-qt/qtmultimedia:6[gstreamer]
+ media-plugins/gst-plugins-soup:1.0
+ )
+ )
>=kde-frameworks/kirigami-${KFMIN}:6
>=kde-frameworks/kitemmodels-${KFMIN}:6
>=kde-plasma/libplasma-${PVCUT}:6[wayland]
sys-apps/hwdata
x11-base/xwayland
- multimedia? (
- >=dev-qt/qtmultimedia-${QTMIN}:6[gstreamer,qml]
- media-plugins/gst-plugins-soup:1.0
- )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.11.1
@@ -108,7 +112,6 @@ PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
src_prepare() {
ecm_src_prepare
- use multimedia || eapply "${FILESDIR}/${PN}-5.90.90-gstreamer-optional.patch"
# TODO: try to get a build switch upstreamed
if ! use screencast; then
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 4903bdce5a..bb4709286c 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -10,7 +10,6 @@
</upstream>
<use>
<flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag>
- <flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
<flag name="shortcuts">Enable global shortcuts support via <pkg>kde-plasma/kglobalacceld</pkg></flag>
</use>
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/
@ 2024-03-13 21:05 Andreas Sturmlechner
0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2024-03-13 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 87ee31d4545a99ad38e76ac72d969dc4c19438fa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 21:00:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 21:05:07 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=87ee31d4
kde-plasma/kwin: Add dev-qt/qtbase:6[accessibility=] USEdep
Upstream commit ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90
Backporting to 6.0 stable branch.
Bug: https://bugs.gentoo.org/926935
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kwin-6.0.2-qtgui-accessibility-optional.patch | 41 ++++++++++++++++++++++
kde-plasma/kwin/kwin-6.0.49.9999.ebuild | 6 +++-
kde-plasma/kwin/kwin-9999.ebuild | 2 +-
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch
new file mode 100644
index 0000000000..3bf872a6e3
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch
@@ -0,0 +1,41 @@
+From ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90 Mon Sep 17 00:00:00 2001
+From: Aleix Pol Gonzalez <aleixpol@kde.org>
+Date: Wed, 21 Feb 2024 12:25:09 +0000
+Subject: [PATCH] qpa: Don't build SPI support if Qt wasn't build with it
+
+Signed-off-by: Falko Becker <falko.becker@mbition.io>
+---
+ src/plugins/qpa/integration.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp
+index 9a9195d8173..238a2e60628 100644
+--- a/src/plugins/qpa/integration.cpp
++++ b/src/plugins/qpa/integration.cpp
+@@ -33,9 +33,12 @@
+ #include <QtGui/private/qgenericunixeventdispatcher_p.h>
+ #include <QtGui/private/qgenericunixfontdatabase_p.h>
+ #include <QtGui/private/qgenericunixthemes_p.h>
+-#include <QtGui/private/qspiaccessiblebridge_p.h>
+ #include <QtGui/private/qunixeventdispatcher_qpa_p.h>
+
++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
++#include <QtGui/private/qspiaccessiblebridge_p.h>
++#endif
++
+ namespace KWin
+ {
+
+@@ -160,7 +163,9 @@ QPlatformOpenGLContext *Integration::createPlatformOpenGLContext(QOpenGLContext
+ QPlatformAccessibility *Integration::accessibility() const
+ {
+ if (!m_accessibility) {
++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
+ m_accessibility.reset(new QSpiAccessibleBridge());
++#endif
+ }
+ return m_accessibility.get();
+ }
+--
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
index 13705af800..4017cd45b4 100644
--- a/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.49.9999.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
>=dev-libs/libinput-1.19:=
>=dev-libs/wayland-1.22.0
>=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,libinput,opengl,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,dbus,gles2-only=,gui,libinput,opengl,widgets]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsensors-${QTMIN}:6
>=dev-qt/qtshadertools-${QTMIN}:6
@@ -111,6 +111,10 @@ BDEPEND="
"
PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
+PATCHES=(
+ "${FILESDIR}/${PN}-6.0.2-qtgui-accessibility-optional.patch" # bug 926935, 6.1
+)
+
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild
index df54f1711c..763b72a6c1 100644
--- a/kde-plasma/kwin/kwin-9999.ebuild
+++ b/kde-plasma/kwin/kwin-9999.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
>=dev-libs/libinput-1.19:=
>=dev-libs/wayland-1.22.0
>=dev-qt/qt5compat-${QTMIN}:6[qml]
- >=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,libinput,opengl,widgets]
+ >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
>=dev-qt/qtdeclarative-${QTMIN}:6
>=dev-qt/qtsensors-${QTMIN}:6
>=dev-qt/qtshadertools-${QTMIN}:6
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-03-13 21:05 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-11 20:55 [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/, kde-plasma/kwin/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2015-09-03 10:53 Michael Palimaka
2016-04-19 16:09 Johannes Huber
2016-09-17 17:50 Michael Palimaka
2017-06-13 21:09 Andreas Sturmlechner
2019-03-22 22:48 Andreas Sturmlechner
2019-08-06 23:02 Andreas Sturmlechner
2020-06-07 22:45 Andreas Sturmlechner
2020-06-08 12:34 Andreas Sturmlechner
2021-02-15 14:48 Andreas Sturmlechner
2023-12-02 20:30 Andreas Sturmlechner
2024-03-08 20:17 Andreas Sturmlechner
2024-03-13 21:05 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox