[arch-commits] Commit in deepin-qt5integration/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Wed Oct 25 13:56:14 UTC 2017
Date: Wednesday, October 25, 2017 @ 13:56:14
Author: felixonmars
Revision: 264273
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-qt5integration/repos/community-i686/PKGBUILD
(from rev 264272, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-i686/qt5.7.1.patch
(from rev 264272, deepin-qt5integration/trunk/qt5.7.1.patch)
deepin-qt5integration/repos/community-x86_64/PKGBUILD
(from rev 264272, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-x86_64/qt5.7.1.patch
(from rev 264272, deepin-qt5integration/trunk/qt5.7.1.patch)
Deleted:
deepin-qt5integration/repos/community-i686/PKGBUILD
deepin-qt5integration/repos/community-x86_64/PKGBUILD
--------------------------------+
/PKGBUILD | 80 +++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 39 -------------------
community-i686/qt5.7.1.patch | 24 +++++++++++
community-x86_64/PKGBUILD | 39 -------------------
community-x86_64/qt5.7.1.patch | 24 +++++++++++
5 files changed, 128 insertions(+), 78 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-25 13:55:32 UTC (rev 264272)
+++ community-i686/PKGBUILD 2017-10-25 13:56:14 UTC (rev 264273)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.4.20171017
-_commit=a045b17e86735779b48ea734bd18f2b2e25b4251
-pkgrel=1
-pkgdesc='Deepin Qt5 platform plugin'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/qt5integration"
-license=('GPL3')
-depends=('dtkwidget' 'libqtxdg' 'qt5-styleplugins')
-makedepends=('xcb-util-renderutil' 'deepin-file-manager' 'qt5-xcb-private-headers')
-replaces=('qt5dxcb-plugin')
-conflicts=('qt5dxcb-plugin')
-groups=('deepin')
-source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$_commit.tar.gz")
-sha512sums=('a2c83fe53d5c1fe264c91dae14b88389d9a5404607144082013306c6ca16c122393b7ca047ec26c1618ce776ffd6174935491d972c25530b30950f36e2ff1ff3')
-
-prepare() {
- mv qt5integration-{$_commit,$pkgver}
-
- cd qt5integration-$pkgver
- rm -r platformplugin/libqt5xcbqpa-dev
- sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
-
- sed -i 's|qt5xdgiconloader/2.0.0|qt5xdgiconloader/3.1.0|' platformthemeplugin/main.cpp
-}
-
-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-i686/PKGBUILD (from rev 264272, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-25 13:56:14 UTC (rev 264273)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.5
+pkgrel=1
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget' 'libqtxdg' 'qt5-styleplugins')
+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"
+ qt5.7.1.patch)
+sha512sums=('70127543e5b14efd1960793513889b948662128148c6eb9c6bf95f3e950d6d030f59e0f3c3707d83ad1f43599057dcd132b7fcae1d4985ad2354c2db5fd14685'
+ '1f94c0925deb6659721ced265d690b5d058c8e8482cadfad572efe4a0d1888ba42bb214de5d8c29236087d96c4ab7266c5fb1c8eeeb7b30cef6c3708744e1f0a')
+
+prepare() {
+ cd qt5integration-$pkgver
+ patch -p1 -i ../qt5.7.1.patch
+
+ rm -r platformplugin/libqt5xcbqpa-dev
+ sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+
+ sed -i 's|qt5xdgiconloader/2.0.0|qt5xdgiconloader/3.1.0|' platformthemeplugin/main.cpp
+}
+
+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-i686/qt5.7.1.patch (from rev 264272, deepin-qt5integration/trunk/qt5.7.1.patch)
===================================================================
--- community-i686/qt5.7.1.patch (rev 0)
+++ community-i686/qt5.7.1.patch 2017-10-25 13:56:14 UTC (rev 264273)
@@ -0,0 +1,24 @@
+commit 774ffb89733232b8728b897b58db3eab6c7a6e05
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Wed Oct 25 21:48:23 2017 +0800
+
+ fix: compatibility with Qt 5.7.1+
+
+ Change-Id: I484234a2008597a728dbe167f578e84c550602c3
+
+diff --git a/platformplugin/dplatformintegration.cpp b/platformplugin/dplatformintegration.cpp
+index caa36c4..ca84e4a 100644
+--- a/platformplugin/dplatformintegration.cpp
++++ b/platformplugin/dplatformintegration.cpp
+@@ -543,7 +543,11 @@ static void overrideChangeCursor(QPlatformCursor *cursorHandle, QCursor * cursor
+ it = xcb_cursor->m_cursorHash.insert(key, overrideCreateFontCursor(xcb_cursor, cursor, widget));
+ }
+ c = it.value();
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 1)
+ w->setCursor(c);
++#else
++ w->setCursor(c, false);
++#endif
+ }
+
+ VtableHook::callOriginalFun(cursorHandle, &QPlatformCursor::changeCursor, cursor, widget);
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-25 13:55:32 UTC (rev 264272)
+++ community-x86_64/PKGBUILD 2017-10-25 13:56:14 UTC (rev 264273)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.4.20171017
-_commit=a045b17e86735779b48ea734bd18f2b2e25b4251
-pkgrel=1
-pkgdesc='Deepin Qt5 platform plugin'
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/qt5integration"
-license=('GPL3')
-depends=('dtkwidget' 'libqtxdg' 'qt5-styleplugins')
-makedepends=('xcb-util-renderutil' 'deepin-file-manager' 'qt5-xcb-private-headers')
-replaces=('qt5dxcb-plugin')
-conflicts=('qt5dxcb-plugin')
-groups=('deepin')
-source=("$pkgname-$_commit.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$_commit.tar.gz")
-sha512sums=('a2c83fe53d5c1fe264c91dae14b88389d9a5404607144082013306c6ca16c122393b7ca047ec26c1618ce776ffd6174935491d972c25530b30950f36e2ff1ff3')
-
-prepare() {
- mv qt5integration-{$_commit,$pkgver}
-
- cd qt5integration-$pkgver
- rm -r platformplugin/libqt5xcbqpa-dev
- sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
-
- sed -i 's|qt5xdgiconloader/2.0.0|qt5xdgiconloader/3.1.0|' platformthemeplugin/main.cpp
-}
-
-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-x86_64/PKGBUILD (from rev 264272, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-25 13:56:14 UTC (rev 264273)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.5
+pkgrel=1
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget' 'libqtxdg' 'qt5-styleplugins')
+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"
+ qt5.7.1.patch)
+sha512sums=('70127543e5b14efd1960793513889b948662128148c6eb9c6bf95f3e950d6d030f59e0f3c3707d83ad1f43599057dcd132b7fcae1d4985ad2354c2db5fd14685'
+ '1f94c0925deb6659721ced265d690b5d058c8e8482cadfad572efe4a0d1888ba42bb214de5d8c29236087d96c4ab7266c5fb1c8eeeb7b30cef6c3708744e1f0a')
+
+prepare() {
+ cd qt5integration-$pkgver
+ patch -p1 -i ../qt5.7.1.patch
+
+ rm -r platformplugin/libqt5xcbqpa-dev
+ sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+
+ sed -i 's|qt5xdgiconloader/2.0.0|qt5xdgiconloader/3.1.0|' platformthemeplugin/main.cpp
+}
+
+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-x86_64/qt5.7.1.patch (from rev 264272, deepin-qt5integration/trunk/qt5.7.1.patch)
===================================================================
--- community-x86_64/qt5.7.1.patch (rev 0)
+++ community-x86_64/qt5.7.1.patch 2017-10-25 13:56:14 UTC (rev 264273)
@@ -0,0 +1,24 @@
+commit 774ffb89733232b8728b897b58db3eab6c7a6e05
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Wed Oct 25 21:48:23 2017 +0800
+
+ fix: compatibility with Qt 5.7.1+
+
+ Change-Id: I484234a2008597a728dbe167f578e84c550602c3
+
+diff --git a/platformplugin/dplatformintegration.cpp b/platformplugin/dplatformintegration.cpp
+index caa36c4..ca84e4a 100644
+--- a/platformplugin/dplatformintegration.cpp
++++ b/platformplugin/dplatformintegration.cpp
+@@ -543,7 +543,11 @@ static void overrideChangeCursor(QPlatformCursor *cursorHandle, QCursor * cursor
+ it = xcb_cursor->m_cursorHash.insert(key, overrideCreateFontCursor(xcb_cursor, cursor, widget));
+ }
+ c = it.value();
++#if QT_VERSION < QT_VERSION_CHECK(5, 7, 1)
+ w->setCursor(c);
++#else
++ w->setCursor(c, false);
++#endif
+ }
+
+ VtableHook::callOriginalFun(cursorHandle, &QPlatformCursor::changeCursor, cursor, widget);
More information about the arch-commits
mailing list