Compare commits
No commits in common. "f791e2b055a60c1b9ffbf9d0218556bac4628ba4" and "4a5ce22f3a5a9b65b4bbdcd7c3fa0644ad44766d" have entirely different histories.
f791e2b055
...
4a5ce22f3a
@ -1,35 +0,0 @@
|
||||
From 4a113e33e135b2f66bc93226abf6381837edf00a Mon Sep 17 00:00:00 2001
|
||||
From: leeffo <leeffo@yeah.net>
|
||||
Date: Fri, 6 Jan 2023 09:35:07 +0800
|
||||
Subject: [PATCH] support QFont
|
||||
|
||||
---
|
||||
plugins/kdecoration/chameleon.h | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/plugins/kdecoration/chameleon.h b/plugins/kdecoration/chameleon.h
|
||||
index 6bfde0b..9da09cd 100644
|
||||
--- a/plugins/kdecoration/chameleon.h
|
||||
+++ b/plugins/kdecoration/chameleon.h
|
||||
@@ -35,6 +35,18 @@
|
||||
#include <QPainterPath>
|
||||
#include <KWayland/Server/ddeshell_interface.h>
|
||||
|
||||
+//add
|
||||
+#include <QtCore/QVariant>
|
||||
+#include <QtWidgets/QApplication>
|
||||
+#include <QtWidgets/QCheckBox>
|
||||
+#include <QtWidgets/QFrame>
|
||||
+#include <QtWidgets/QGridLayout>
|
||||
+#include <QtWidgets/QLabel>
|
||||
+#include <QtWidgets/QSpacerItem>
|
||||
+#include <QtWidgets/QSpinBox>
|
||||
+#include <QtWidgets/QWidget>
|
||||
+//end
|
||||
+
|
||||
class Settings;
|
||||
class ChameleonWindowTheme;
|
||||
class Chameleon : public KDecoration2::Decoration
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 4b99c1e34be05b732eee277695292d564bbfae8a Mon Sep 17 00:00:00 2001
|
||||
From: leeffo <leeffo@yeah.net>
|
||||
Date: Wed, 8 Feb 2023 11:13:50 +0800
|
||||
Subject: [PATCH] feat: close judge XDG_SESSION_TYPE
|
||||
|
||||
---
|
||||
deepin-wm-dbus/deepinwmfaker.cpp | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/deepin-wm-dbus/deepinwmfaker.cpp b/deepin-wm-dbus/deepinwmfaker.cpp
|
||||
index 4d76d1f..4869c38 100644
|
||||
--- a/deepin-wm-dbus/deepinwmfaker.cpp
|
||||
+++ b/deepin-wm-dbus/deepinwmfaker.cpp
|
||||
@@ -356,11 +356,11 @@ DeepinWMFaker::DeepinWMFaker(QObject *parent)
|
||||
auto e = QProcessEnvironment::systemEnvironment();
|
||||
QString XDG_SESSION_TYPE = e.value(QStringLiteral("XDG_SESSION_TYPE"));
|
||||
|
||||
- if (XDG_SESSION_TYPE != QLatin1String("x11")) {
|
||||
- for (auto iter = WaylandDeepinWMKWinAccelsMap.begin(); iter != WaylandDeepinWMKWinAccelsMap.end(); iter++) {
|
||||
- AllDeepinWMKWinAccelsMap.insert(iter.key(), iter.value());
|
||||
- }
|
||||
- }
|
||||
+ //if (XDG_SESSION_TYPE != QLatin1String("x11")) {
|
||||
+ // for (auto iter = WaylandDeepinWMKWinAccelsMap.begin(); iter != WaylandDeepinWMKWinAccelsMap.end(); iter++) {
|
||||
+ // AllDeepinWMKWinAccelsMap.insert(iter.key(), iter.value());
|
||||
+ // }
|
||||
+ //}
|
||||
}
|
||||
|
||||
DeepinWMFaker::~DeepinWMFaker()
|
||||
--
|
||||
2.20.1
|
||||
|
||||
Binary file not shown.
114
dde-kwin.spec
114
dde-kwin.spec
@ -1,57 +1,31 @@
|
||||
# not build kwin ext with kwin >= 5.25
|
||||
%global kwin_ext 0
|
||||
%global sname deepin-kwin
|
||||
|
||||
Name: dde-kwin
|
||||
Version: 5.5.24
|
||||
Release: 1
|
||||
Version: 5.0.13+c1
|
||||
Release: 6
|
||||
Summary: KWin configuration for Deepin Desktop Environment
|
||||
License: GPLv3+
|
||||
URL: https://github.com/linuxdeepin/%{name}
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
%if !%{kwin_ext}
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
Patch0001: 0001-dde-kwin-support-QFont.patch
|
||||
Patch0002: 0002-feat-close-judge-XDG_SESSION_TYPE.patch
|
||||
|
||||
|
||||
Source0: %{name}_%{version}.orig.tar.xz
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: extra-cmake-modules >= 5.54
|
||||
BuildRequires: gdb
|
||||
BuildRequires: kwin-devel
|
||||
BuildRequires: kwayland-server-devel
|
||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
||||
BuildRequires: pkgconfig(Qt5Qml)
|
||||
BuildRequires: gsettings-qt-devel
|
||||
BuildRequires: libepoxy-devel
|
||||
BuildRequires: dtkgui-devel
|
||||
BuildRequires: dtkcore-devel
|
||||
BuildRequires: kf5-kwayland-devel
|
||||
BuildRequires: kf5-kglobalaccel-devel
|
||||
BuildRequires: cmake(KDecoration2)
|
||||
BuildRequires: cmake(KF5I18n)
|
||||
BuildRequires: qt5-linguist
|
||||
BuildRequires: kf5-kdeclarative-devel
|
||||
BuildRequires: kf5-kservice-devel
|
||||
BuildRequires: kf5-plasma-devel
|
||||
BuildRequires: kdecoration-devel
|
||||
BuildRequires: kf5-ktextwidgets-devel
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
|
||||
%if %{kwin_ext}
|
||||
# for libQt5EdidSupport.a
|
||||
BuildRequires: qt5-qtbase-static
|
||||
BuildRequires: qt5-qtbase-private-devel
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
BuildRequires: dtkgui-devel
|
||||
BuildRequires: kf5-ki18n-devel
|
||||
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
|
||||
Requires: dde-qt5integration%{?_isa}
|
||||
Requires: kwin%{?_isa} >= 5.21
|
||||
%else
|
||||
Requires: %{_bindir}/kwin_x11
|
||||
%endif
|
||||
|
||||
# since F31
|
||||
Requires: kwin%{?_isa} >= 5.15
|
||||
Obsoletes: deepin-wm <= 1.9.38
|
||||
Obsoletes: deepin-wm-switcher <= 1.1.9
|
||||
Obsoletes: deepin-metacity <= 3.22.24
|
||||
@ -70,7 +44,6 @@ Requires: kdecoration
|
||||
This package provides a kwin configuration that used as the new WM for Deepin
|
||||
Desktop Environment.
|
||||
|
||||
%if %{kwin_ext}
|
||||
%package devel
|
||||
Summary: Development package for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
@ -79,89 +52,52 @@ Requires: qt5-qtx11extras-devel%{?_isa}
|
||||
Requires: gsettings-qt-devel%{?_isa}
|
||||
Requires: dtkcore-devel%{?_isa}
|
||||
Requires: kf5-kglobalaccel-devel%{?_isa}
|
||||
Requires: deepin-desktop-server
|
||||
|
||||
|
||||
%description devel
|
||||
Header files and libraries for %{sname}.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
sed -i 's:/lib/:%{_lib}/:' plugins/platforms/lib/CMakeLists.txt
|
||||
sed -i 's:/lib/:/%{_lib}/:' plugins/platforms/plugin/main.cpp \
|
||||
plugins/platforms/plugin/main_wayland.cpp
|
||||
%setup -q -n %{name}-%{version}
|
||||
sed -i 's:/lib:/%{_lib}:' plugins/kwin-xcb/lib/CMakeLists.txt
|
||||
sed -i 's:/usr/lib:%{_libdir}:' plugins/kwin-xcb/plugin/main.cpp
|
||||
sed -i 's:/usr/lib:%{_libexecdir}:' deepin-wm-dbus/deepinwmfaker.cpp
|
||||
sed -i 's/kwin 5.21.5/kwin 5.24.4/' configures/kwin_no_scale.in
|
||||
|
||||
%build
|
||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||
export PATH=%{_qt5_bindir}:$PATH
|
||||
%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DUSE_WINDOW_TOOL=OFF \
|
||||
-DENABLE_BUILTIN_BLUR=OFF \
|
||||
-DENABLE_KDECORATION=ON \
|
||||
-DENABLE_BUILTIN_MULTITASKING=OFF \
|
||||
-DENABLE_BUILTIN_BLACK_SCREEN=OFF \
|
||||
-DUSE_DEEPIN_WAYLAND=OFF \
|
||||
%if !%{kwin_ext}
|
||||
-DUSE_PLUGINS=OFF
|
||||
%endif
|
||||
|
||||
%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -DKWIN_VERSION=$(rpm -q --qf '%%{version}' kwin-devel) .
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%make_install INSTALL_ROOT=%{buildroot}
|
||||
chmod 755 %{buildroot}%{_bindir}/kwin_no_scale
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%doc CHANGELOG.md
|
||||
%license LICENSE
|
||||
%{_sysconfdir}/xdg/*
|
||||
%{_bindir}/kwin_no_scale
|
||||
%{_bindir}/deepin-wm-dbus
|
||||
%{_bindir}/kwin_no_scale
|
||||
%{_libdir}/libkwin-xcb.so.*
|
||||
%{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so
|
||||
%{_qt5_plugindir}/platforms/lib%{name}-xcb.so
|
||||
%{_datadir}/dde-kwin-xcb/
|
||||
%{_datadir}/dbus-1/services/*.service
|
||||
%{_datadir}/dbus-1/interfaces/*.xml
|
||||
%{_datadir}/kwin/scripts/*
|
||||
%{_datadir}/kwin/tabbox/*
|
||||
%{_datadir}/dsg/
|
||||
%if %{kwin_ext}
|
||||
%{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so
|
||||
%{_qt5_plugindir}/platforms/lib%{name}-xcb.so
|
||||
%{_qt5_plugindir}/platforms/lib%{name}-wayland.so
|
||||
%{_qt5_plugindir}/kwin/effects/plugins/
|
||||
%{_datadir}/dde-kwin-xcb/
|
||||
%{_libdir}/libkwin-xcb.so.0
|
||||
%{_libdir}/libkwin-xcb.so.0.*
|
||||
%{_libdir}/qt5/plugins/kwin/effects/plugins/libblur.so
|
||||
%{_libdir}/qt5/plugins/kwin/effects/plugins/libmultitasking.so
|
||||
%{_libdir}/qt5/plugins/kwin/effects/plugins/libscissor-window.so
|
||||
|
||||
|
||||
%files devel
|
||||
%{_libdir}/libkwin-xcb.so
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_includedir}/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 18 2024 lvgenggeng <lvgenggeng@uniontech.com> - 5.5.24-1
|
||||
- upgrade to version 5.5.24
|
||||
|
||||
* Tue Jun 13 2023 liweigang <liweiganga@uniontech.com> - 5.4.26-4
|
||||
- add deepin-wm-dbus
|
||||
|
||||
* Wed Aug 03 2022 liweiganga <liweiganga@uniontech.com> - 5.4.26-3
|
||||
- modify kwin_no_scale permission to 755
|
||||
|
||||
* Tue Aug 02 2022 liweiganga <liweiganga@uniontech.com> - 5.4.26-2
|
||||
- modify requires
|
||||
|
||||
* Mon Jul 25 2022 konglidong <konglidong@uniontech.com> - 5.4.26-1
|
||||
- update to 5.4.26
|
||||
|
||||
* Mon Feb 21 2022 liweigang <liweiganga@uniontech.com> - 5.1.0.27-2
|
||||
- fix copmile error
|
||||
|
||||
* Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.1.0.27-1
|
||||
- Update 5.1.0.27
|
||||
|
||||
* Thu Jul 30 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.0.13+c1-6
|
||||
- Package init
|
||||
|
||||
BIN
dde-kwin_5.0.13+c1.orig.tar.xz
Normal file
BIN
dde-kwin_5.0.13+c1.orig.tar.xz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user