Date: Friday, June 2, 2017 @ 07:08:30
Author: felixonmars
Revision: 232919
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
deepin-qt5integration/repos/community-staging-i686/
deepin-qt5integration/repos/community-staging-i686/PKGBUILD
(from rev 232916, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-staging-i686/qt5.9.patch
(from rev 232916, deepin-qt5integration/trunk/qt5.9.patch)
deepin-qt5integration/repos/community-staging-i686/use-system-qt5-headers.patch
(from rev 232916, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
deepin-qt5integration/repos/community-staging-x86_64/
deepin-qt5integration/repos/community-staging-x86_64/PKGBUILD
(from rev 232916, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-staging-x86_64/qt5.9.patch
(from rev 232916, deepin-qt5integration/trunk/qt5.9.patch)
deepin-qt5integration/repos/community-staging-x86_64/use-system-qt5-headers.patch
(from rev 232916, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
-------------------------------------------------------+
community-staging-i686/PKGBUILD | 37 ++++++++++++++++
community-staging-i686/qt5.9.patch | 25 ++++++++++
community-staging-i686/use-system-qt5-headers.patch | 27 +++++++++++
community-staging-x86_64/PKGBUILD | 37 ++++++++++++++++
community-staging-x86_64/qt5.9.patch | 25 ++++++++++
community-staging-x86_64/use-system-qt5-headers.patch | 27 +++++++++++
6 files changed, 178 insertions(+)
Copied: deepin-qt5integration/repos/community-staging-i686/PKGBUILD (from rev
232916, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-06-02 07:08:30 UTC (rev 232919)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.1.8
+pkgrel=2
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="http://github.com/linuxdeepin/qt5integration";
+license=('GPL3')
+depends=('deepin-tool-kit' 'libqtxdg' 'gtk2')
+makedepends=('xcb-util-renderutil' 'deepin-file-manager'
'qt5-xcb-private-headers')
+replaces=('qt5dxcb-plugin')
+conflicts=('qt5dxcb-plugin')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz";
+ use-system-qt5-headers.patch qt5.9.patch)
+sha512sums=('bb3d9f0b406ec97b9eee371485fcc5d6cb7371342c3e1e454bd8e2949ca428475d371bd330a2c395ad5e0537f210e7ddcd839262f9ae79160b9038dd7687f780'
+
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
+
'871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
+
+prepare() {
+ cd qt5integration-$pkgver
+ patch -p1 -i ../qt5.9.patch
+ patch -p1 -i ../use-system-qt5-headers.patch
+}
+
+build() {
+ cd qt5integration-$pkgver
+ qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr
+ make
+}
+
+package() {
+ cd qt5integration-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied: deepin-qt5integration/repos/community-staging-i686/qt5.9.patch (from
rev 232916, deepin-qt5integration/trunk/qt5.9.patch)
===================================================================
--- community-staging-i686/qt5.9.patch (rev 0)
+++ community-staging-i686/qt5.9.patch 2017-06-02 07:08:30 UTC (rev 232919)
@@ -0,0 +1,25 @@
+commit ae539894500a744ec87d9a7f2d6aca5306fc26a1
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Fri Jun 2 15:03:59 2017 +0800
+
+ Add support for Qt 5.9+
+
+ Change-Id: I5596a429ed3e0f4e7522a479cd420c57f0a88dc9
+
+diff --git a/platformplugin/windoweventhook.cpp
b/platformplugin/windoweventhook.cpp
+index 2bf3e36..92ae529 100644
+--- a/platformplugin/windoweventhook.cpp
++++ b/platformplugin/windoweventhook.cpp
+@@ -204,7 +204,12 @@ void WindowEventHook::handleFocusInEvent(const
xcb_focus_in_event_t *event)
+ if (relayFocusToModalWindow(w, xcbWindow->connection()))
+ return;
+
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
++ xcbWindow->connection()->setFocusWindow(w);
++#else
+ xcbWindow->connection()->setFocusWindow(static_cast<QXcbWindow
*>(w->handle()));
++#endif
++
+ QWindowSystemInterface::handleWindowActivated(w,
Qt::ActiveWindowFocusReason);
+ }
+
Copied:
deepin-qt5integration/repos/community-staging-i686/use-system-qt5-headers.patch
(from rev 232916, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
===================================================================
--- community-staging-i686/use-system-qt5-headers.patch
(rev 0)
+++ community-staging-i686/use-system-qt5-headers.patch 2017-06-02 07:08:30 UTC
(rev 232919)
@@ -0,0 +1,27 @@
+diff --git a/platformplugin/linux.pri b/platformplugin/linux.pri
+index a36b405..9e4fce8 100644
+--- a/platformplugin/linux.pri
++++ b/platformplugin/linux.pri
+@@ -22,7 +22,7 @@ SOURCES += \
+ $$PWD/utility_x11.cpp \
+ $$PWD/dxcbwmsupport.cpp
+
+-INCLUDEPATH += $$PWD/libqt5xcbqpa-dev
++INCLUDEPATH += /usr/include/qtxcb-private
+
+ contains(QT_CONFIG, xcb-xlib)|qtConfig(xcb-xlib) {
+ DEFINES += XCB_USE_XLIB
+@@ -63,13 +63,3 @@ contains(QT_CONFIG, xcb-sm)|qtConfig(xcb-sm) {
+ contains(QT_CONFIG, xcb-qt) {
+ DEFINES += XCB_USE_RENDER
+ }
+-
+-exists($$PWD/libqt5xcbqpa-dev) {
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout $$VERSION) {
+- !system(cd $$PWD/libqt5xcbqpa-dev && git fetch -p):error(update
libqt5xcbqpa header sources failed)
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout
$$VERSION):error(Not support Qt Version: $$VERSION)
+- }
+-} else {
+- !system(git clone https://cr.deepin.io/libqt5xcbqpa-dev):error(clone
libqt5xcbqpa header sources failed)
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout $$VERSION):error(Not
support Qt Version: $$VERSION)
+-}
Copied: deepin-qt5integration/repos/community-staging-x86_64/PKGBUILD (from rev
232916, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-06-02 07:08:30 UTC (rev 232919)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.1.8
+pkgrel=2
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="http://github.com/linuxdeepin/qt5integration";
+license=('GPL3')
+depends=('deepin-tool-kit' 'libqtxdg' 'gtk2')
+makedepends=('xcb-util-renderutil' 'deepin-file-manager'
'qt5-xcb-private-headers')
+replaces=('qt5dxcb-plugin')
+conflicts=('qt5dxcb-plugin')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz";
+ use-system-qt5-headers.patch qt5.9.patch)
+sha512sums=('bb3d9f0b406ec97b9eee371485fcc5d6cb7371342c3e1e454bd8e2949ca428475d371bd330a2c395ad5e0537f210e7ddcd839262f9ae79160b9038dd7687f780'
+
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
+
'871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
+
+prepare() {
+ cd qt5integration-$pkgver
+ patch -p1 -i ../qt5.9.patch
+ patch -p1 -i ../use-system-qt5-headers.patch
+}
+
+build() {
+ cd qt5integration-$pkgver
+ qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr
+ make
+}
+
+package() {
+ cd qt5integration-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied: deepin-qt5integration/repos/community-staging-x86_64/qt5.9.patch (from
rev 232916, deepin-qt5integration/trunk/qt5.9.patch)
===================================================================
--- community-staging-x86_64/qt5.9.patch (rev 0)
+++ community-staging-x86_64/qt5.9.patch 2017-06-02 07:08:30 UTC (rev
232919)
@@ -0,0 +1,25 @@
+commit ae539894500a744ec87d9a7f2d6aca5306fc26a1
+Author: Felix Yan <felixonm...@archlinux.org>
+Date: Fri Jun 2 15:03:59 2017 +0800
+
+ Add support for Qt 5.9+
+
+ Change-Id: I5596a429ed3e0f4e7522a479cd420c57f0a88dc9
+
+diff --git a/platformplugin/windoweventhook.cpp
b/platformplugin/windoweventhook.cpp
+index 2bf3e36..92ae529 100644
+--- a/platformplugin/windoweventhook.cpp
++++ b/platformplugin/windoweventhook.cpp
+@@ -204,7 +204,12 @@ void WindowEventHook::handleFocusInEvent(const
xcb_focus_in_event_t *event)
+ if (relayFocusToModalWindow(w, xcbWindow->connection()))
+ return;
+
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
++ xcbWindow->connection()->setFocusWindow(w);
++#else
+ xcbWindow->connection()->setFocusWindow(static_cast<QXcbWindow
*>(w->handle()));
++#endif
++
+ QWindowSystemInterface::handleWindowActivated(w,
Qt::ActiveWindowFocusReason);
+ }
+
Copied:
deepin-qt5integration/repos/community-staging-x86_64/use-system-qt5-headers.patch
(from rev 232916, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
===================================================================
--- community-staging-x86_64/use-system-qt5-headers.patch
(rev 0)
+++ community-staging-x86_64/use-system-qt5-headers.patch 2017-06-02
07:08:30 UTC (rev 232919)
@@ -0,0 +1,27 @@
+diff --git a/platformplugin/linux.pri b/platformplugin/linux.pri
+index a36b405..9e4fce8 100644
+--- a/platformplugin/linux.pri
++++ b/platformplugin/linux.pri
+@@ -22,7 +22,7 @@ SOURCES += \
+ $$PWD/utility_x11.cpp \
+ $$PWD/dxcbwmsupport.cpp
+
+-INCLUDEPATH += $$PWD/libqt5xcbqpa-dev
++INCLUDEPATH += /usr/include/qtxcb-private
+
+ contains(QT_CONFIG, xcb-xlib)|qtConfig(xcb-xlib) {
+ DEFINES += XCB_USE_XLIB
+@@ -63,13 +63,3 @@ contains(QT_CONFIG, xcb-sm)|qtConfig(xcb-sm) {
+ contains(QT_CONFIG, xcb-qt) {
+ DEFINES += XCB_USE_RENDER
+ }
+-
+-exists($$PWD/libqt5xcbqpa-dev) {
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout $$VERSION) {
+- !system(cd $$PWD/libqt5xcbqpa-dev && git fetch -p):error(update
libqt5xcbqpa header sources failed)
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout
$$VERSION):error(Not support Qt Version: $$VERSION)
+- }
+-} else {
+- !system(git clone https://cr.deepin.io/libqt5xcbqpa-dev):error(clone
libqt5xcbqpa header sources failed)
+- !system(cd $$PWD/libqt5xcbqpa-dev && git checkout $$VERSION):error(Not
support Qt Version: $$VERSION)
+-}
