From 901150a736fd88ec27bbf813d9269dfbf6fb6812 Mon Sep 17 00:00:00 2001 From: reionwong Date: Thu, 16 Sep 2021 15:07:03 +0800 Subject: [PATCH] Update debian/ --- debian/changelog | 6 +++--- debian/control | 4 ++-- debian/copyright | 4 ++-- widgetstyle/CMakeLists.txt | 3 ++- widgetstyle/basestyle.cpp | 2 +- widgetstyle/blurhelper.cpp | 7 +++++++ 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8812e46..99e06b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -cutefish-qtplugins (0.1) UNRELEASED; urgency=low +cutefish-qtplugins (0.5) UNRELEASED; urgency=high - * Initial release (CutefishOS) + * Initial release (CutefishOS) - -- CutefishOS Thu, 16 Oct 2014 17:22:15 +0200 + -- CutefishOS Packaging Team Thu, 16 Sep 2021 02:31:42 +0800 \ No newline at end of file diff --git a/debian/control b/debian/control index a1025b4..4e50dfa 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: cutefish-qtplugins Section: devel Priority: optional -Maintainer: CutefishOS +Maintainer: CutefishOS Build-Depends: cmake, debhelper (>= 9), extra-cmake-modules, @@ -18,7 +18,7 @@ Build-Depends: cmake, qttools5-dev, qttools5-dev-tools Standards-Version: 4.5.0 -Homepage: https://github.com/cutefishos/qt-plugins +Homepage: https://cutefishos.com Package: cutefish-qtplugins Architecture: any diff --git a/debian/copyright b/debian/copyright index 716fe64..5978712 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,3 +1,3 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: calamares -Source: +Upstream-Name: cutefish-qt-plugins +Source: cutefishos.com diff --git a/widgetstyle/CMakeLists.txt b/widgetstyle/CMakeLists.txt index 218f64b..4c446c2 100644 --- a/widgetstyle/CMakeLists.txt +++ b/widgetstyle/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) find_package(ECM REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(QT Core Gui Widgets DBus) +set(QT Core Gui Widgets DBus X11Extras) find_package(Qt5 REQUIRED ${QT}) find_package(PkgConfig REQUIRED) find_package(KF5 REQUIRED WindowSystem) @@ -40,6 +40,7 @@ target_link_libraries(${TARGET} Qt5::Gui Qt5::Widgets Qt5::DBus + Qt5::X11Extras KF5::WindowSystem ) diff --git a/widgetstyle/basestyle.cpp b/widgetstyle/basestyle.cpp index 463ba06..7904196 100644 --- a/widgetstyle/basestyle.cpp +++ b/widgetstyle/basestyle.cpp @@ -115,7 +115,7 @@ namespace Phantom constexpr qint16 HeaderSortIndicator_VOffset = 2; constexpr qint16 TabBar_InctiveVShift = 0; - constexpr qreal DefaultFrame_Radius = 12.0; + constexpr qreal DefaultFrame_Radius = 11.0; constexpr qreal TabBarTab_Rounding = 1.0; constexpr qreal SpinBox_Rounding = 5.0; constexpr qreal LineEdit_Rounding = 5.0; diff --git a/widgetstyle/blurhelper.cpp b/widgetstyle/blurhelper.cpp index 4f511f3..edb757f 100644 --- a/widgetstyle/blurhelper.cpp +++ b/widgetstyle/blurhelper.cpp @@ -3,6 +3,7 @@ // handle regions passed to kwin for blurring // ------------------- // +// Copyright (C) 2021 Reion Wong // Copyright (C) 2018 Alex Nemeth // // Largely rewritten from Oxygen widget style @@ -38,6 +39,12 @@ #include #include #include +#include + +// XCB +#include +#include +#include BlurHelper::BlurHelper(QObject *parent) : QObject(parent)