[arch-commits] Commit in deepin-qt5dxcb-plugin/repos/community-x86_64 (5 files)
Felix Yan
felixonmars at archlinux.org
Thu Jun 7 04:26:20 UTC 2018
Date: Thursday, June 7, 2018 @ 04:26:19
Author: felixonmars
Revision: 341576
archrelease: copy trunk to community-x86_64
Added:
deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
(from rev 341575, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.10.patch
(from rev 341575, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.10.patch)
Deleted:
deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.10.patch
deepin-qt5dxcb-plugin/repos/community-x86_64/qt-5.11.patch
------------------------------------+
PKGBUILD | 68 ++++++++++++++++-------------------
deepin-qt5dxcb-plugin-qt5.10.patch | 22 +++++------
qt-5.11.patch | 49 -------------------------
3 files changed, 43 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-07 04:26:00 UTC (rev 341575)
+++ PKGBUILD 2018-06-07 04:26:19 UTC (rev 341576)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5dxcb-plugin
-pkgver=1.1.8.6
-pkgrel=2
-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')
-groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz"
- qt-5.11.patch)
-sha512sums=('c8fd99d299e4867a69c4c846ea444861a5bdf8c711d7d9015ec8626f3cd2d3471b7cf78c60aa22a93d318bf82bc42598ca59f784cc29793b70c9f49ec5c7a0b2'
- 'e076c590a15f43df729eb28d92c510d80ffbdd312b769179b53ca0b364d9b8232d0f14927b11a6626bcd14bea952d07a24505fb82bd0867174a76f9c937a2c32')
-
-prepare() {
- cd qt5dxcb-plugin-$pkgver
- patch -p1 -i ../qt-5.11.patch
-
- 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
-}
Copied: deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD (from rev 341575, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-07 04:26:19 UTC (rev 341576)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5dxcb-plugin
+pkgver=1.1.8.8
+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')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz")
+sha512sums=('0b083cf60e4765f3e402b29b1f3b29e17e0b957609868eac3292dbe2796c6ab5cda98a28b85572083c9aae35ab7a99d4579ec6681827516c6bd610de79d6ccc6')
+
+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.10.patch
===================================================================
--- deepin-qt5dxcb-plugin-qt5.10.patch 2018-06-07 04:26:00 UTC (rev 341575)
+++ deepin-qt5dxcb-plugin-qt5.10.patch 2018-06-07 04:26:19 UTC (rev 341576)
@@ -1,11 +0,0 @@
---- qt5dxcb-plugin-1.1.5/platformplugin/windoweventhook.cpp.orig 2017-12-07 16:01:23.609087845 +0000
-+++ qt5dxcb-plugin-1.1.5/platformplugin/windoweventhook.cpp 2017-12-07 16:02:33.895912926 +0000
-@@ -125,7 +125,7 @@
- dropData = drag->currentDrag()->mimeData();
- supported_drop_actions = Qt::DropActions(l[4]);
- } else {
-- dropData = drag->platformDropData();
-+ dropData = drag->dragMimeData();
- supported_drop_actions = drag->accepted_drop_action;
-
- // Drop coming from another app? Update keyboard modifiers.
Copied: deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.10.patch (from rev 341575, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.10.patch)
===================================================================
--- deepin-qt5dxcb-plugin-qt5.10.patch (rev 0)
+++ deepin-qt5dxcb-plugin-qt5.10.patch 2018-06-07 04:26:19 UTC (rev 341576)
@@ -0,0 +1,11 @@
+--- qt5dxcb-plugin-1.1.5/platformplugin/windoweventhook.cpp.orig 2017-12-07 16:01:23.609087845 +0000
++++ qt5dxcb-plugin-1.1.5/platformplugin/windoweventhook.cpp 2017-12-07 16:02:33.895912926 +0000
+@@ -125,7 +125,7 @@
+ dropData = drag->currentDrag()->mimeData();
+ supported_drop_actions = Qt::DropActions(l[4]);
+ } else {
+- dropData = drag->platformDropData();
++ dropData = drag->dragMimeData();
+ supported_drop_actions = drag->accepted_drop_action;
+
+ // Drop coming from another app? Update keyboard modifiers.
Deleted: qt-5.11.patch
===================================================================
--- qt-5.11.patch 2018-06-07 04:26:00 UTC (rev 341575)
+++ qt-5.11.patch 2018-06-07 04:26:19 UTC (rev 341576)
@@ -1,49 +0,0 @@
-diff --git a/platformplugin/dplatformintegration.cpp b/platformplugin/dplatformintegration.cpp
-index 4785057..cbb470e 100644
---- a/platformplugin/dplatformintegration.cpp
-+++ b/platformplugin/dplatformintegration.cpp
-@@ -583,8 +583,11 @@ static void overrideChangeCursor(QPlatformCursor *cursorHandle, QCursor * cursor
- c = it.value();
- #if QT_VERSION < QT_VERSION_CHECK(5, 7, 1)
- w->setCursor(c);
--#else
-+#elif QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
- w->setCursor(c, false);
-+#else
-+ xcb_change_window_attributes(DPlatformIntegration::xcbConnection()->xcb_connection(), w->xcb_window(), XCB_CW_CURSOR, &c);
-+ xcb_flush(DPlatformIntegration::xcbConnection()->xcb_connection());
- #endif
- }
-
-diff --git a/platformplugin/windoweventhook.cpp b/platformplugin/windoweventhook.cpp
-index 2855ba0..ccf887a 100644
---- a/platformplugin/windoweventhook.cpp
-+++ b/platformplugin/windoweventhook.cpp
-@@ -431,6 +431,7 @@ void WindowEventHook::handleXIEnterLeave(xcb_ge_event_t *event)
- const int root_x = fixed1616ToInt(ev->root_x);
- const int root_y = fixed1616ToInt(ev->root_y);
-
-+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
- if (buttons.testFlag(b)) {
- if (!isSet) {
- QGuiApplicationPrivate::lastCursorPosition = DHighDpi::fromNativePixels(QPointF(root_x, root_y), me->window());
-@@ -442,6 +443,19 @@ void WindowEventHook::handleXIEnterLeave(xcb_ge_event_t *event)
- me->handleButtonPressEvent(event_x, event_y, root_x, root_y,
- 0, modifiers, ev->time);
- }
-+#else
-+ if (buttons.testFlag(b)) {
-+ if (!isSet) {
-+ QGuiApplicationPrivate::lastCursorPosition = DHighDpi::fromNativePixels(QPointF(root_x, root_y), me->window());
-+ me->handleButtonReleaseEvent(event_x, event_y, root_x, root_y,
-+ 0, modifiers, ev->time, QEvent::MouseButtonRelease);
-+ }
-+ } else if (isSet) {
-+ QGuiApplicationPrivate::lastCursorPosition = DHighDpi::fromNativePixels(QPointF(root_x, root_y), me->window());
-+ me->handleButtonPressEvent(event_x, event_y, root_x, root_y,
-+ 0, modifiers, ev->time, QEvent::MouseButtonRelease);
-+ }
-+#endif
- }
- }
- }
More information about the arch-commits
mailing list