From 77b9297d375179c9cf9bc3be5b982ca088435682 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sep 29 2020 06:22:47 +0000 Subject: [packit] 5.1.0.8 upstream release Upstream tag: 5.1.0.8 Upstream commit: d0750e2e Signed-off-by: Robin Lee --- diff --git a/.gitignore b/.gitignore index 0aeea92..b953996 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /qt5dxcb-plugin-1.1.24.tar.gz /qt5integration-0.3.10.tar.gz /qt5integration-5.0.0.tar.gz +/qt5integration-5.1.0.8.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..fa908cf --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,17 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: rpm/deepin-qt5integration.spec + +# add or remove files that should be synced +synced_files: + - rpm/deepin-qt5integration.spec + - .packit.yaml + +upstream_package_name: qt5integration +# downstream (Fedora) RPM package name +downstream_package_name: deepin-qt5integration + +actions: + fix-spec-file: | + bash -c "sed -i -r \"s/Version:(\s*)\S*/Version:\1${PACKIT_PROJECT_VERSION}/\" rpm/deepin-qt5integration.spec" diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..73ac72c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.16.1.dev31+g5d22fb7. diff --git a/deepin-qt5integration-fix-build-qt-5.15.patch b/deepin-qt5integration-fix-build-qt-5.15.patch deleted file mode 100644 index c463ea0..0000000 --- a/deepin-qt5integration-fix-build-qt-5.15.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/dstyleplugin/painterhelper.cpp b/dstyleplugin/painterhelper.cpp -index 3db216d..66d548f 100644 ---- a/dstyleplugin/painterhelper.cpp -+++ b/dstyleplugin/painterhelper.cpp -@@ -18,6 +18,7 @@ - #include "painterhelper.h" - - #include -+#include - #include - - namespace dstyle { -diff --git a/dstyleplugin/painterhelper.h b/dstyleplugin/painterhelper.h -index 6a0aa0e..9235781 100644 ---- a/dstyleplugin/painterhelper.h -+++ b/dstyleplugin/painterhelper.h -@@ -19,6 +19,7 @@ - #define PAINTERHELPER_H - - #include -+#include - - #include "common.h" - -diff --git a/dstyleplugin/pushbuttonhelper.cpp b/dstyleplugin/pushbuttonhelper.cpp -index 8069070..168b009 100644 ---- a/dstyleplugin/pushbuttonhelper.cpp -+++ b/dstyleplugin/pushbuttonhelper.cpp -@@ -30,6 +30,7 @@ - - #include - #include -+#include - - DWIDGET_USE_NAMESPACE - -diff --git a/dstyleplugin/tabbarhelper.cpp b/dstyleplugin/tabbarhelper.cpp -index 51f677b..e0ef36c 100644 ---- a/dstyleplugin/tabbarhelper.cpp -+++ b/dstyleplugin/tabbarhelper.cpp -@@ -33,6 +33,7 @@ DWIDGET_USE_NAMESPACE - #include - #include - #include -+#include - #include - #include - #include -diff --git a/dstyleplugin/tabwidgethelper.cpp b/dstyleplugin/tabwidgethelper.cpp -index a2b6756..c5a7d65 100644 ---- a/dstyleplugin/tabwidgethelper.cpp -+++ b/dstyleplugin/tabwidgethelper.cpp -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - - namespace dstyle { -diff --git a/styles/norwegianwoodstyle.h b/styles/norwegianwoodstyle.h -index 8bcb846..de2baa6 100644 ---- a/styles/norwegianwoodstyle.h -+++ b/styles/norwegianwoodstyle.h -@@ -43,6 +43,7 @@ - - #include - #include -+#include - - QT_BEGIN_NAMESPACE - class QPainterPath; diff --git a/deepin-qt5integration-qt5.13.patch b/deepin-qt5integration-qt5.13.patch deleted file mode 100644 index 6863fd6..0000000 --- a/deepin-qt5integration-qt5.13.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp -index 04e03fe..65be15f 100644 ---- a/dstyleplugin/style.cpp -+++ b/dstyleplugin/style.cpp -@@ -1418,6 +1418,4 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal - } - } - --#include "moc_style.cpp" -- - } diff --git a/deepin-qt5integration-qt5.14.patch b/deepin-qt5integration-qt5.14.patch deleted file mode 100644 index 9c90d68..0000000 --- a/deepin-qt5integration-qt5.14.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp -index e98487b..45e90bc 100644 ---- a/platformthemeplugin/qdeepintheme.cpp -+++ b/platformthemeplugin/qdeepintheme.cpp -@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value, - } - - QHighDpiScaling::updateHighDpiScaling(); -+#if QT_VERSION < QT_VERSION_CHECK(5,14,0) - qDebug() << QHighDpiScaling::logicalDpi(); -+#else -+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); -+#endif - updateScaleLogcailDpi(s->scaleLogicalDpi()); - -+#if QT_VERSION < QT_VERSION_CHECK(5,14,0) - qDebug() << QHighDpiScaling::logicalDpi(); -+#else -+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); -+#endif - - return true; - } ---- a/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800 -+++ b/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:46:28.436136243 +0800 -@@ -516,19 +516,7 @@ - static bool updateScaleLogcailDpi(const QPair &dpi) - { - bool ok = dpi.first >= 0 && dpi.second >= 0; -- -- if (dpi.first > 0) { -- QHighDpiScaling::m_logicalDpi.first = dpi.first; -- } else if (qIsNull(dpi.first)) { -- QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first; -- } -- -- if (dpi.second > 0) { -- QHighDpiScaling::m_logicalDpi.second = dpi.second; -- } else if (qIsNull(dpi.second)) { -- QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second; -- } -- -+ QHighDpiScaling::m_usePixelDensity = false; - return ok; - } - diff --git a/deepin-qt5integration.spec b/deepin-qt5integration.spec index b3b6c17..dabd8db 100644 --- a/deepin-qt5integration.spec +++ b/deepin-qt5integration.spec @@ -1,21 +1,15 @@ %global repo qt5integration Name: deepin-qt5integration -Version: 5.0.0 -Release: 7%{?dist} +Version: 5.1.0.8 +Release: 1%{?dist} Summary: Qt platform theme integration plugins for DDE # The entire source code is GPLv3+ except styles/ which is BSD, -# dstyleplugin/ which is GPLv3, dstyleplugin/dstyleanimation* which is LGPL -License: GPLv3 and BSD and LGPLv2+ +# styleplugins/dstyleplugin/dstyleanimation* which is LGPL +License: GPLv3+ and BSD and LGPLv2+ URL: https://github.com/linuxdeepin/qt5integration Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz -# https://git.archlinux.org/svntogit/community.git/plain/trunk/deepin-qt5integration-qt5.13.patch?h=packages/deepin-qt5integration&id=b9bad53f20d27a15f9587f39db3e1a0243ec6880 -Patch0: deepin-qt5integration-qt5.13.patch -# https://git.archlinux.org/svntogit/community.git/plain/trunk/deepin-qt5integration-qt5.14.patch?h=packages/deepin-qt5integration&id=b9bad53f20d27a15f9587f39db3e1a0243ec6880 -Patch1: deepin-qt5integration-qt5.14.patch -Patch2: deepin-qt5integration-fix-build-qt-5.15.patch - BuildRequires: gcc-c++ BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(dtkcore) @@ -39,6 +33,8 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(mtdev) +BuildRequires: pkgconfig(Qt5Multimedia) +BuildRequires: pkgconfig(Qt5MultimediaWidgets) BuildRequires: qt5-qtbase-common # for libQt5ThemeSupport.a BuildRequires: qt5-qtbase-static @@ -50,11 +46,7 @@ Requires: deepin-qt5dxcb-plugin%{?_isa} Multiple Qt plugins to provide better Qt5 integration for DDE is included. %prep -%setup -q -n %{repo}-%{version} - -%patch0 -p1 -b .fix-build-with-qt5-13 -%patch1 -p1 -b .fix-build-with-qt5-14 -%patch2 -p1 -b .fix-build-qt-5.15 +%autosetup -n %{repo}-%{version} %build %qmake_qt5 PREFIX=%{_prefix} @@ -67,11 +59,15 @@ Multiple Qt plugins to provide better Qt5 integration for DDE is included. %doc README.md %license LICENSE %{_qt5_plugindir}/platformthemes/libqdeepin.so -%{_qt5_plugindir}/styles/libdstyleplugin.so %{_qt5_plugindir}/iconengines/libdsvgicon.so %{_qt5_plugindir}/imageformats/libdsvg.so +%{_qt5_plugindir}/iconengines/libdtkbuiltin.so +%{_qt5_plugindir}/styles/libchameleon.so %changelog +* Tue Sep 29 2020 Robin Lee - 5.1.0.8-1 +- new upstream release: 5.1.0.8 + * Fri Sep 11 2020 Jan Grulich - 5.0.0-7 - rebuild (qt5) diff --git a/sources b/sources index 891494d..d80fe71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt5integration-5.0.0.tar.gz) = bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00 +SHA512 (qt5integration-5.1.0.8.tar.gz) = d078a6df45da702de21175b159b05291883c53a0f87669b9cc78cc76fe7079e036a4a00ae6e349d11d59e84d3553471228ff059adfd391260baac582b15252fe