From 0ff00b6d210fca0cb9e010b84ed4324d9ce7e388 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Aug 11 2019 04:52:09 +0000 Subject: Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild --- diff --git a/.gitignore b/.gitignore index f15bf83..d76b296 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /deepin-kwin-0.0.3.2.tar.gz /dde-kwin-0.0.4.tar.gz +/dde-kwin-0.1.0.tar.gz diff --git a/deepin-kwin.spec b/deepin-kwin.spec index cf46673..966045f 100644 --- a/deepin-kwin.spec +++ b/deepin-kwin.spec @@ -1,26 +1,36 @@ %global repo dde-kwin Name: deepin-kwin -Version: 0.0.4 -Release: 4%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Summary: KWin configuration for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/%{repo} Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz -# https://github.com/linuxdeepin/developer-center/issues/1103 -Patch0: newer_kwin.patch BuildRequires: gcc-c++ +BuildRequires: cmake BuildRequires: kwin-devel BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: gsettings-qt-devel +BuildRequires: libepoxy-devel BuildRequires: dtkcore-devel +BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kglobalaccel-devel +BuildRequires: cmake(KDecoration2) +BuildRequires: qt5-linguist # for libQt5EdidSupport.a BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} Requires: deepin-qt5integration%{?_isa} Requires: kwin%{?_isa} +# since F31 +Obsoletes: deepin-wm <= 1.9.38 +Obsoletes: deepin-wm-switcher <= 1.1.9 +Obsoletes: deepin-metacity <= 3.22.24 +Obsoletes: deepin-metacity-devel <= 3.22.24 +Obsoletes: deepin-mutter <= 3.20.38 +Obsoletes: deepin-mutter-devel <= 3.20.38 %description This package provides a kwin configuration that used as the new WM for Deepin @@ -41,18 +51,19 @@ Header files and libraries for %{name}. %prep %setup -q -n %{repo}-%{version} -%patch0 -p1 +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 %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease export PATH=%{_qt5_bindir}:$PATH -%qmake_qt5 PREFIX=%{_prefix} +%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -DKWIN_VERSION=$(rpm -q --qf '%%{version}' kwin-devel) . %make_build %install %make_install INSTALL_ROOT=%{buildroot} -chmod 644 %{buildroot}%{_datadir}/kwin/tabbox/thumbnail_grid/metadata.desktop \ - %{buildroot}%{_datadir}/kwin/tabbox/thumbnail_grid/contents/ui/main.qml +chmod 755 %{buildroot}%{_bindir}/kwin_no_scale %ldconfig_scriptlets @@ -62,18 +73,21 @@ chmod 644 %{buildroot}%{_datadir}/kwin/tabbox/thumbnail_grid/metadata.desktop \ %{_sysconfdir}/xdg/* %{_bindir}/deepin-wm-dbus %{_bindir}/kwin_no_scale +%{_libdir}/libkwin-xcb.so.* +%{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so %{_qt5_plugindir}/platforms/lib%{repo}-xcb.so -%{_libdir}/lib%{repo}.so.0* -%{_datadir}/aurorae/ +#{_qt5_plugindir}/kwin/effects/plugins/ +%{_datadir}/dde-kwin-xcb/ +%{_datadir}/applications/kwin-wm-multitaskingview.desktop %{_datadir}/dbus-1/services/*.service %{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/kwin/scripts/* %{_datadir}/kwin/tabbox/* %files devel -%{_includedir}/%{repo} -%{_libdir}/lib%{repo}.so +%{_libdir}/libkwin-xcb.so %{_libdir}/pkgconfig/%{repo}.pc +%{_includedir}/%{repo} %changelog * Wed Jul 24 2019 Fedora Release Engineering - 0.0.4-4 diff --git a/newer_kwin.patch b/newer_kwin.patch deleted file mode 100644 index 7bb7d6a..0000000 --- a/newer_kwin.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/plugins/kwin-xcb/lib/kwinutils.cpp b/plugins/kwin-xcb/lib/kwinutils.cpp -index 7a0bf5c..c6c0b82 100644 ---- a/plugins/kwin-xcb/lib/kwinutils.cpp -+++ b/plugins/kwin-xcb/lib/kwinutils.cpp -@@ -33,27 +33,6 @@ - - #include - --static int appVersion() --{ -- static int version = -1; -- -- if (version == -1) { -- // 初始化版本号 -- const QStringList &ver_list = qApp->applicationVersion().split("."); -- int app_major = ver_list.value(0).toInt(); -- int app_minor = ver_list.value(1).toInt(); -- int app_patch = ver_list.value(2).toInt(); -- -- version = QT_VERSION_CHECK(app_major, app_minor, app_patch); -- -- if (version == -1) { -- version = INT_MAX; -- } -- } -- -- return version; --} -- - // KWin全局静态对象 - namespace KWin { - class Workspace : public QObject { -@@ -80,15 +59,6 @@ public Q_SLOTS: - void slotWindowMove(); - void slotWindowMaximize(); - -- // kwin 5.8.6 -- void slotWindowQuickTileLeft(); -- void slotWindowQuickTileRight(); -- void slotWindowQuickTileTop(); -- void slotWindowQuickTileBottom(); -- void slotWindowQuickTileTopLeft(); -- void slotWindowQuickTileTopRight(); -- void slotWindowQuickTileBottomLeft(); -- void slotWindowQuickTileBottomRight(); - }; - class Scripting : public QObject { - public: -@@ -388,43 +358,6 @@ void KWinUtils::QuickTileWindow(uint side) - if (ws) { - if (interface->quickTileWindow) { - interface->quickTileWindow(ws, (KWin::Workspace::QuickTileFlag)side); -- } else { // fallback for kwin 5.8.6 -- switch ((KWin::Workspace::QuickTileFlag)side) { -- case KWin::Workspace::QuickTileFlag::Left: -- ws->slotWindowQuickTileLeft(); -- break; -- case KWin::Workspace::QuickTileFlag::Right: -- ws->slotWindowQuickTileRight();; -- break; -- case KWin::Workspace::QuickTileFlag::Top: -- ws->slotWindowQuickTileTop(); -- break; -- case KWin::Workspace::QuickTileFlag::Bottom: -- ws->slotWindowQuickTileBottom(); -- break; -- case KWin::Workspace::QuickTileFlag::Horizontal: -- ws->slotWindowQuickTileLeft(); -- ws->slotWindowQuickTileRight(); -- break; -- case KWin::Workspace::QuickTileFlag::Vertical: -- ws->slotWindowQuickTileTop(); -- ws->slotWindowQuickTileBottom(); -- break; -- case KWin::Workspace::QuickTileFlag::TopLeft: -- ws->slotWindowQuickTileTopLeft(); -- break; -- case KWin::Workspace::QuickTileFlag::TopRight: -- ws->slotWindowQuickTileTopRight(); -- break; -- case KWin::Workspace::QuickTileFlag::BottomLeft: -- ws->slotWindowQuickTileBottomLeft(); -- break; -- case KWin::Workspace::QuickTileFlag::BottomRight: -- ws->slotWindowQuickTileBottomRight(); -- break; -- default: -- break; -- } - } - } - } diff --git a/sources b/sources index 895babb..55b1558 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dde-kwin-0.0.4.tar.gz) = 7874849dcd399221f6c3a65d10f00562ededcff273fd390eb1c16f3d864c608fe41ec55de6b1624fa71bd776f393129b53095a8eaa1aaddb816a0e75f0757af2 +SHA512 (dde-kwin-0.1.0.tar.gz) = ae670e9f7763df5d614b39e6e0752e04a8ff56cfedaac06272a3a626fe61b3be11cc68d17fb6e2758d50b55a8895e9932d4a70720fcecd8c0e26737aa35a6061