[arch-commits] Commit in deepin-qt5integration/trunk (PKGBUILD qt5.9.patch)

[Felix Yan]

Date: Tuesday, June 27, 2017 @ 05:10:23
  Author: felixonmars
Revision: 241073

upgpkg: deepin-qt5integration 0.2.0-1

Modified:
  deepin-qt5integration/trunk/PKGBUILD
Deleted:
  deepin-qt5integration/trunk/qt5.9.patch

-+
 PKGBUILD|   10 --
 qt5.9.patch |   42 --
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-27 05:08:47 UTC (rev 241072)
+++ PKGBUILD2017-06-27 05:10:23 UTC (rev 241073)
@@ -2,7 +2,7 @@
 # Maintainer: Felix Yan 
 
 pkgname=deepin-qt5integration
-pkgver=0.1.9
+pkgver=0.2.0
 pkgrel=1
 pkgdesc='Deepin Qt5 platform plugin'
 arch=('i686' 'x86_64')
@@ -14,14 +14,12 @@
 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=('f6936cc6a9a1d51c24d4be634cf38c97a42a926c7c92af74517a952163ad41ecf0ab105461d239035794651b303a71e1f85913242d698842b72dc66e3793f916'
-
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
-
'83695d051d100ab6e8fa0aa73f9387f320f6bbaab39c8db835b27f5b24b1c38c993535ed3c5864975e5881231d0f3151d6e4eacb8cc9364f67febc6328bf5b01')
+use-system-qt5-headers.patch)
+sha512sums=('3425cde5fe1653e30353e58f0dd66896045fa5c3b84b8c5da3c24d3ec01c84be4dbad9117f26d2a6e02dec0aa06d0445411bd6c180b23cbdc924ee474c8fe1c2'
+
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b')
 
 prepare() {
   cd qt5integration-$pkgver
-  patch -p1 -i ../qt5.9.patch
   patch -p1 -i ../use-system-qt5-headers.patch
 }
 

Deleted: qt5.9.patch
===
--- qt5.9.patch 2017-06-27 05:08:47 UTC (rev 241072)
+++ qt5.9.patch 2017-06-27 05:10:23 UTC (rev 241073)
@@ -1,42 +0,0 @@
-diff --git a/platformplugin/dplatformbackingstore.cpp 
b/platformplugin/dplatformbackingstore.cpp
-index 7f0db30..31cefef 100644
 a/platformplugin/dplatformbackingstore.cpp
-+++ b/platformplugin/dplatformbackingstore.cpp
-@@ -32,7 +32,13 @@
- #include 
- #include 
- #include 
-+
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
- #include 
-+#else
-+#include 
-+#endif
-+
- #include 
- #include 
- #endif
-@@ -804,7 +810,11 @@ void DPlatformBackingStore::composeAndFlushHelper(QWindow 
*window, const QRegion
- 
- if (textureId) {
- if (m_needsSwizzle)
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
- m_blitter->setSwizzleRB(true);
-+#else
-+m_blitter->setRedBlueSwizzle(true);
-+#endif
- // The backingstore is for the entire tlw.
- // In case of native children offset tells the position relative to 
the tlw.
- // reverse translate backward for widgets 
-@@ -814,7 +824,11 @@ void DPlatformBackingStore::composeAndFlushHelper(QWindow 
*window, const QRegion
-  
origin);
- m_blitter->blit(textureId, QMatrix4x4(), source);
- if (m_needsSwizzle)
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
- m_blitter->setSwizzleRB(false);
-+#else
-+m_blitter->setRedBlueSwizzle(false);
-+#endif
- }
- 
- // Textures for renderToTexture widgets that have WA_AlwaysStackOnTop set.

[arch-commits] Commit in deepin-qt5integration/trunk (PKGBUILD qt5.9.patch)

[Felix Yan]

Date: Friday, June 2, 2017 @ 08:13:55
  Author: felixonmars
Revision: 232965

upgpkg: deepin-qt5integration 0.1.9-1

Modified:
  deepin-qt5integration/trunk/PKGBUILD
Deleted:
  deepin-qt5integration/trunk/qt5.9.patch

-+
 PKGBUILD|8 
 qt5.9.patch |   25 -
 2 files changed, 4 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-02 08:02:03 UTC (rev 232964)
+++ PKGBUILD2017-06-02 08:13:55 UTC (rev 232965)
@@ -2,8 +2,8 @@
 # Maintainer: Felix Yan 
 
 pkgname=deepin-qt5integration
-pkgver=0.1.8
-pkgrel=2
+pkgver=0.1.9
+pkgrel=1
 pkgdesc='Deepin Qt5 platform plugin'
 arch=('i686' 'x86_64')
 url="http://github.com/linuxdeepin/qt5integration;
@@ -15,9 +15,9 @@
 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'
+sha512sums=('f6936cc6a9a1d51c24d4be634cf38c97a42a926c7c92af74517a952163ad41ecf0ab105461d239035794651b303a71e1f85913242d698842b72dc66e3793f916'
 
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
-
'871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
+
'83695d051d100ab6e8fa0aa73f9387f320f6bbaab39c8db835b27f5b24b1c38c993535ed3c5864975e5881231d0f3151d6e4eacb8cc9364f67febc6328bf5b01')
 
 prepare() {
   cd qt5integration-$pkgver

Deleted: qt5.9.patch
===
--- qt5.9.patch 2017-06-02 08:02:03 UTC (rev 232964)
+++ qt5.9.patch 2017-06-02 08:13:55 UTC (rev 232965)
@@ -1,25 +0,0 @@
-commit ae539894500a744ec87d9a7f2d6aca5306fc26a1
-Author: Felix Yan 
-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(w->handle()));
-+#endif
-+
- QWindowSystemInterface::handleWindowActivated(w, 
Qt::ActiveWindowFocusReason);
- }
- 

[arch-commits] Commit in deepin-qt5integration/trunk (PKGBUILD qt5.9.patch)

[Felix Yan]

Date: Friday, June 2, 2017 @ 07:07:54
  Author: felixonmars
Revision: 232915

upgpkg: deepin-qt5integration 0.1.8-2

Qt 5.9 rebuild

Added:
  deepin-qt5integration/trunk/qt5.9.patch
Modified:
  deepin-qt5integration/trunk/PKGBUILD

-+
 PKGBUILD|8 +---
 qt5.9.patch |   25 +
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-02 07:07:51 UTC (rev 232914)
+++ PKGBUILD2017-06-02 07:07:54 UTC (rev 232915)
@@ -3,7 +3,7 @@
 
 pkgname=deepin-qt5integration
 pkgver=0.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin Qt5 platform plugin'
 arch=('i686' 'x86_64')
 url="http://github.com/linuxdeepin/qt5integration;
@@ -14,12 +14,14 @@
 conflicts=('qt5dxcb-plugin')
 groups=('deepin')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz;
-use-system-qt5-headers.patch)
+use-system-qt5-headers.patch qt5.9.patch)
 
sha512sums=('bb3d9f0b406ec97b9eee371485fcc5d6cb7371342c3e1e454bd8e2949ca428475d371bd330a2c395ad5e0537f210e7ddcd839262f9ae79160b9038dd7687f780'
-
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b')
+
'29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
+
'871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
 
 prepare() {
   cd qt5integration-$pkgver
+  patch -p1 -i ../qt5.9.patch
   patch -p1 -i ../use-system-qt5-headers.patch
 }
 

Added: qt5.9.patch
===
--- qt5.9.patch (rev 0)
+++ qt5.9.patch 2017-06-02 07:07:54 UTC (rev 232915)
@@ -0,0 +1,25 @@
+commit ae539894500a744ec87d9a7f2d6aca5306fc26a1
+Author: Felix Yan 
+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(w->handle()));
++#endif
++
+ QWindowSystemInterface::handleWindowActivated(w, 
Qt::ActiveWindowFocusReason);
+ }
+