From 221267325937d71e433bb897a3cd40b780b8381e Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sep 16 2020 03:50:40 +0000 Subject: Update to 5.0.17 --- diff --git a/.gitignore b/.gitignore index b26f7c8..8bec973 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /deepin-qt5dxcb-plugin-1.1.25.tar.gz /deepin-qt5dxcb-plugin-1.2.0.tar.gz /deepin-qt5dxcb-plugin-5.0.1.tar.gz +/qt5platform-plugins-5.0.17.tar.gz diff --git a/deepin-qt5dxcb-plugin.spec b/deepin-qt5dxcb-plugin.spec index ca78eca..acb8fe9 100644 --- a/deepin-qt5dxcb-plugin.spec +++ b/deepin-qt5dxcb-plugin.spec @@ -1,15 +1,15 @@ -%global repo qt5dxcb-plugin +%global repo qt5platform-plugins -Name: deepin-%{repo} -Version: 5.0.1 -Release: 7%{?dist} +Name: deepin-qt5dxcb-plugin +Version: 5.0.17 +Release: 1%{?dist} Summary: Qt platform integration plugin for Deepin Desktop Environment License: GPLv3+ URL: https://github.com/linuxdeepin/%{repo} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz BuildRequires: gcc-c++ -BuildRequires: git BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5WaylandClient) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) @@ -19,7 +19,6 @@ BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-keysyms) -BuildRequires: pkgconfig(xcb-xinput) BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(sm) @@ -36,8 +35,12 @@ BuildRequires: qt5-qtbase-private-devel %prep %setup -q -n %{repo}-%{version} -rm -r platformplugin/libqt5xcbqpa-dev -sed -i 's|error.*|INCLUDEPATH += %{_qt5_includedir}/QtXcb|' platformplugin/linux.pri +rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev + +# Disable wayland for now: https://github.com/linuxdeepin/qt5platform-plugins/issues/47 +sed -i '/wayland/d' qt5platform-plugins.pro + +sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += %{_qt5_includedir}/QtXcb|' xcb/linux.pri %build # help find (and prefer) qt5 utilities, e.g. qmake, lrelease @@ -54,6 +57,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_qt5_plugindir}/platforms/libdxcb.so %changelog +* Wed Sep 16 2020 Robin Lee - 5.0.17-1 +- Update to 5.0.17 + * Fri Sep 11 2020 Jan Grulich - 5.0.1-7 - rebuild (qt5) diff --git a/sources b/sources index 806bb32..63ca789 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (deepin-qt5dxcb-plugin-5.0.1.tar.gz) = 6ef1e6cf771fb68a907f76ecf779fe7daaa8891d5263c0c89365d3f5bc67f6d30550e40103f5909cdc7392c9653f2baf5f85287565535c177ff35e01f8be31a7 +SHA512 (qt5platform-plugins-5.0.17.tar.gz) = 5c3d7a0866020ea1f0d8491c990607de0f125a80ce2d83eb44ff12c69373247203fa67a80204ec1d3cb013ef131631232fe6e23cb38c5aa8621a06d6c2791932