kwin: remove obsolete patch

This commit is contained in:
Andreas Cord-Landwehr
2025-01-17 18:52:07 +01:00
parent 002e837225
commit 3b7daa8ca8
2 changed files with 3 additions and 41 deletions

View File

@@ -59,7 +59,6 @@ SRC_URI:append = " \
SRC_URI:append:class-native = " \
file://0001-Add-install-operation-for-native-build.patch \
file://0002-qtwaylandscanner-don-t-track-source-location.patch \
"
OECMAKE_SOURCEPATH:class-native = "${S}/src/wayland/tools"
@@ -112,8 +111,8 @@ FILES:${PN} += " \
${libdir}/plugins/kpackage/packagestructure/*.so \
${libdir}/plugins/kwin/effects/configs/*.so \
${libdir}/plugins/kwin/plugins/*.so \
${libdir}/plugins/org.kde.kdecoration2.kcm/kcm_auroraedecoration.so \
${libdir}/plugins/org.kde.kdecoration2/*.so \
${libdir}/plugins/org.kde.kdecoration3.kcm/kcm_auroraedecoration.so \
${libdir}/plugins/org.kde.kdecoration3/org.kde.kwin.aurorae.so \
${libdir}/plugins/org.kde.kglobalaccel6.platforms/*.so \
${libdir}/plugins/org.kde.kwin.platforms/*.so \
${libdir}/plugins/org.kde.kwin.scenes/*.so \
@@ -131,6 +130,7 @@ FILES:${PN} += " \
${libdir}/systemd/user/*.service \
"
FILES:${PN}-dev += " \
${libdir}/libkwin*.so \
${datadir}/dbus-1/interfaces/*.xml \

View File

@@ -1,38 +0,0 @@
From 12a2160868151a5dbc4a4077d02bda4a292c0d6e Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sat, 16 Nov 2024 13:10:49 +0100
Subject: [PATCH] qtwaylandscanner: don't track source location
This is a backport of upstream fix for reproducible builds, see:
https://codereview.qt-project.org/c/qt/qtwayland/+/557799
Upstream-Status: Backport [https://invent.kde.org/plasma/kwin/-/merge_requests/6789]
Signed-Off-by: Andreas Cord-Landwehr <cordlandwehr@kde.org>
---
src/wayland/tools/qtwaylandscanner.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/wayland/tools/qtwaylandscanner.cpp b/src/wayland/tools/qtwaylandscanner.cpp
index 2e0dd03577..9c5a957599 100644
--- a/src/wayland/tools/qtwaylandscanner.cpp
+++ b/src/wayland/tools/qtwaylandscanner.cpp
@@ -39,6 +39,7 @@
#include <QCoreApplication>
#include <QFile>
+#include <QFileInfo>
#include <QXmlStreamReader>
#include <vector>
@@ -469,7 +470,7 @@ bool Scanner::process()
return false;
printf("// This file was generated by qtwaylandscanner\n");
- printf("// source file is %s\n\n", qPrintable(m_protocolFilePath));
+ printf("// source file is %s\n\n", qPrintable(QFileInfo(file).fileName()));
for (auto b : std::as_const(m_includes))
printf("#include %s\n", b.constData());
--
2.43.0