[arch-commits] Commit in deepin-qt5dxcb-plugin/repos/community-x86_64 (3 files)

[Felix Yan]

    Date: Tuesday, July 16, 2019 @ 07:43:39
  Author: felixonmars
Revision: 489951

archrelease: copy trunk to community-x86_64

Added:
  deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
    (from rev 489950, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
Deleted:
  deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
  deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.13.patch

------------------------------------+
 PKGBUILD                           |   67 ++++++++++++++++-------------------
 deepin-qt5dxcb-plugin-qt5.13.patch |   22 -----------
 2 files changed, 32 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-16 07:43:29 UTC (rev 489950)
+++ PKGBUILD	2019-07-16 07:43:39 UTC (rev 489951)
@@ -1,35 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5dxcb-plugin
-pkgver=1.2.5
-pkgrel=1
-pkgdesc='Qt platform plugins for DDE'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/qt5dxcb-plugin"
-license=('GPL3')
-depends=('cairo' 'qt5-x11extras')
-makedepends=('qt5-xcb-private-headers' 'libglvnd')
-groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz"
-        deepin-qt5dxcb-plugin-qt5.13.patch)
-sha512sums=('3dfcf74ed749ccffb2986430908fba93cd77a7626c649a7c51b0b32e407571b1b7d82ebf9866777070ff25357e4378f041da0ce7481ee4d4e63a08b583685feb'
-            '6ff5dc34d32a923a390b65e01270e7fa186dac3dd1562a1d9be3a292666ef2392574105483c8f8150a7ab9a98ffcaa21c0b65ad44f2e8314804bed28aa0b8073')
-
-prepare() {
-  cd qt5dxcb-plugin-$pkgver
-
-  rm -r platformplugin/libqt5xcbqpa-dev
-  sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
-  patch -p1 -i ../deepin-qt5dxcb-plugin-qt5.13.patch # Fix build with Qt 5.13
-}
-
-build() {
-  cd qt5dxcb-plugin-$pkgver
-  qmake-qt5 PREFIX=/usr
-  make
-}
-
-package() {
-  cd qt5dxcb-plugin-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD (from rev 489950, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-16 07:43:39 UTC (rev 489951)
@@ -0,0 +1,32 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5dxcb-plugin
+pkgver=1.2.6
+pkgrel=1
+pkgdesc='Qt platform plugins for DDE'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/qt5dxcb-plugin"
+license=('GPL3')
+depends=('cairo' 'qt5-x11extras')
+makedepends=('qt5-xcb-private-headers' 'libglvnd')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz")
+sha512sums=('504ff833a09d48f374058d0426ae79b468417366c1378e518834f874f299dfd940c0e98a1f6a8da6dd0e7341422b5aac6983998e7928881b94af3389a98131c1')
+
+prepare() {
+  cd qt5dxcb-plugin-$pkgver
+
+  rm -r platformplugin/libqt5xcbqpa-dev
+  sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+}
+
+build() {
+  cd qt5dxcb-plugin-$pkgver
+  qmake-qt5 PREFIX=/usr
+  make
+}
+
+package() {
+  cd qt5dxcb-plugin-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Deleted: deepin-qt5dxcb-plugin-qt5.13.patch
===================================================================
--- deepin-qt5dxcb-plugin-qt5.13.patch	2019-07-16 07:43:29 UTC (rev 489950)
+++ deepin-qt5dxcb-plugin-qt5.13.patch	2019-07-16 07:43:39 UTC (rev 489951)
@@ -1,22 +0,0 @@
-diff --git a/platformplugin/windoweventhook.cpp b/platformplugin/windoweventhook.cpp
-index 742b41d..428dcb0 100644
---- a/platformplugin/windoweventhook.cpp
-+++ b/platformplugin/windoweventhook.cpp
-@@ -359,6 +359,8 @@ void WindowEventHook::handleFocusInEvent(const xcb_focus_in_event_t *event)
-     if (relayFocusToModalWindow(w, xcbWindow->connection()))
-         return;
- 
-+    xcbWindow->connection()->focusInTimer().stop();
-+
- #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-     xcbWindow->connection()->setFocusWindow(w);
- #else
-@@ -433,7 +435,7 @@ void WindowEventHook::handleFocusOutEvent(const xcb_focus_out_event_t *event)
-     // Do not set the active window to 0 if there is a FocusIn coming.
-     // There is however no equivalent for XPutBackEvent so register a
-     // callback for QXcbConnection instead.
--    xcbWindow->connection()->addPeekFunc(focusInPeeker);
-+    xcbWindow->connection()->focusInTimer().start(400);
- }
- 
- void WindowEventHook::handlePropertyNotifyEvent(const xcb_property_notify_event_t *event)