[arch-commits] Commit in deepin-qt5integration/repos (10 files)
Felix Yan
felixonmars at archlinux.org
Fri Jul 28 14:35:42 UTC 2017
Date: Friday, July 28, 2017 @ 14:35:41
Author: felixonmars
Revision: 246676
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-qt5integration/repos/community-i686/PKGBUILD
(from rev 246675, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-i686/use-system-qt5-headers.patch
(from rev 246675, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
deepin-qt5integration/repos/community-x86_64/PKGBUILD
(from rev 246675, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-x86_64/use-system-qt5-headers.patch
(from rev 246675, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
Deleted:
deepin-qt5integration/repos/community-i686/PKGBUILD
deepin-qt5integration/repos/community-i686/qt-5.9.patch
deepin-qt5integration/repos/community-i686/use-system-qt5-headers.patch
deepin-qt5integration/repos/community-x86_64/PKGBUILD
deepin-qt5integration/repos/community-x86_64/qt-5.9.patch
deepin-qt5integration/repos/community-x86_64/use-system-qt5-headers.patch
-----------------------------------------------+
/PKGBUILD | 70 ++++++++++++++++++++++++
/use-system-qt5-headers.patch | 54 ++++++++++++++++++
community-i686/PKGBUILD | 37 ------------
community-i686/qt-5.9.patch | 46 ---------------
community-i686/use-system-qt5-headers.patch | 27 ---------
community-x86_64/PKGBUILD | 37 ------------
community-x86_64/qt-5.9.patch | 46 ---------------
community-x86_64/use-system-qt5-headers.patch | 27 ---------
8 files changed, 124 insertions(+), 220 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-i686/PKGBUILD 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.1
-pkgrel=1
-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 qt-5.9.patch)
-sha512sums=('833d9716f10a5dbe7de19f5dc6ef2b11af3baac9108b96ab09b38f2dd71471257a26a4947bd0ff2f2258b7b35c66a3c298284aba269c327f1a255f98829e9989'
- '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
- 'b5c8a41184e5fd4d9bc6b7b3f1028181e1c98b5c2ca6cc072efcd49b643844f7999b13de66ffdf0260825ae1e1921437476d4865c96043dd376a4c452536379c')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../use-system-qt5-headers.patch
- patch -p1 -i ../qt-5.9.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-i686/PKGBUILD (from rev 246675, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-07-28 14:35:41 UTC (rev 246676)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.2
+pkgrel=1
+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)
+sha512sums=('af665a4156b20a9686c18956305ffd8def8e7eadf8ba970415bd5c41e25d97f61d1408d5ec4cb28fff29af8a660d66907280b62db2caa47b9cdbf1984fb622d6'
+ '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b')
+
+prepare() {
+ cd qt5integration-$pkgver
+ 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
+}
Deleted: community-i686/qt-5.9.patch
===================================================================
--- community-i686/qt-5.9.patch 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-i686/qt-5.9.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,46 +0,0 @@
-commit c07d348bae9bbb96dcecd682ff50e2e31fdffc48
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Tue Jul 11 12:46:16 2017 +0800
-
- Fix compatibility with Qt 5.9
-
- Change-Id: I53f07a89ff49c69a40e06ae91fc4b6e431280630
-
-diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp
-index 3145836..1700d6a 100644
---- a/platformplugin/dplatformwindowhelper.cpp
-+++ b/platformplugin/dplatformwindowhelper.cpp
-@@ -314,10 +314,17 @@ bool DPlatformWindowHelper::isExposed() const
- return me()->m_frameWindow->handle()->isExposed();
- }
-
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-+bool DPlatformWindowHelper::isEmbedded() const
-+{
-+ return me()->m_frameWindow->handle()->isEmbedded();
-+}
-+#else
- bool DPlatformWindowHelper::isEmbedded(const QPlatformWindow *parentWindow) const
- {
- return me()->m_frameWindow->handle()->isEmbedded(parentWindow);
- }
-+#endif
-
- void DPlatformWindowHelper::propagateSizeHints()
- {
-diff --git a/platformplugin/dplatformwindowhelper.h b/platformplugin/dplatformwindowhelper.h
-index 4c2f367..843aecc 100644
---- a/platformplugin/dplatformwindowhelper.h
-+++ b/platformplugin/dplatformwindowhelper.h
-@@ -60,7 +60,11 @@ public:
-
- bool isExposed() const;
- bool isActive() const;
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-+ bool isEmbedded() const;
-+#else
- bool isEmbedded(const QPlatformWindow *parentWindow = 0) const;
-+#endif
-
- void propagateSizeHints();
-
Deleted: community-i686/use-system-qt5-headers.patch
===================================================================
--- community-i686/use-system-qt5-headers.patch 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-i686/use-system-qt5-headers.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,27 +0,0 @@
-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-i686/use-system-qt5-headers.patch (from rev 246675, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
===================================================================
--- community-i686/use-system-qt5-headers.patch (rev 0)
+++ community-i686/use-system-qt5-headers.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -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)
+-}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-x86_64/PKGBUILD 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.1
-pkgrel=1
-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 qt-5.9.patch)
-sha512sums=('833d9716f10a5dbe7de19f5dc6ef2b11af3baac9108b96ab09b38f2dd71471257a26a4947bd0ff2f2258b7b35c66a3c298284aba269c327f1a255f98829e9989'
- '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
- 'b5c8a41184e5fd4d9bc6b7b3f1028181e1c98b5c2ca6cc072efcd49b643844f7999b13de66ffdf0260825ae1e1921437476d4865c96043dd376a4c452536379c')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../use-system-qt5-headers.patch
- patch -p1 -i ../qt-5.9.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-x86_64/PKGBUILD (from rev 246675, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-07-28 14:35:41 UTC (rev 246676)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.2
+pkgrel=1
+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)
+sha512sums=('af665a4156b20a9686c18956305ffd8def8e7eadf8ba970415bd5c41e25d97f61d1408d5ec4cb28fff29af8a660d66907280b62db2caa47b9cdbf1984fb622d6'
+ '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b')
+
+prepare() {
+ cd qt5integration-$pkgver
+ 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
+}
Deleted: community-x86_64/qt-5.9.patch
===================================================================
--- community-x86_64/qt-5.9.patch 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-x86_64/qt-5.9.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,46 +0,0 @@
-commit c07d348bae9bbb96dcecd682ff50e2e31fdffc48
-Author: Felix Yan <felixonmars at archlinux.org>
-Date: Tue Jul 11 12:46:16 2017 +0800
-
- Fix compatibility with Qt 5.9
-
- Change-Id: I53f07a89ff49c69a40e06ae91fc4b6e431280630
-
-diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp
-index 3145836..1700d6a 100644
---- a/platformplugin/dplatformwindowhelper.cpp
-+++ b/platformplugin/dplatformwindowhelper.cpp
-@@ -314,10 +314,17 @@ bool DPlatformWindowHelper::isExposed() const
- return me()->m_frameWindow->handle()->isExposed();
- }
-
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-+bool DPlatformWindowHelper::isEmbedded() const
-+{
-+ return me()->m_frameWindow->handle()->isEmbedded();
-+}
-+#else
- bool DPlatformWindowHelper::isEmbedded(const QPlatformWindow *parentWindow) const
- {
- return me()->m_frameWindow->handle()->isEmbedded(parentWindow);
- }
-+#endif
-
- void DPlatformWindowHelper::propagateSizeHints()
- {
-diff --git a/platformplugin/dplatformwindowhelper.h b/platformplugin/dplatformwindowhelper.h
-index 4c2f367..843aecc 100644
---- a/platformplugin/dplatformwindowhelper.h
-+++ b/platformplugin/dplatformwindowhelper.h
-@@ -60,7 +60,11 @@ public:
-
- bool isExposed() const;
- bool isActive() const;
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-+ bool isEmbedded() const;
-+#else
- bool isEmbedded(const QPlatformWindow *parentWindow = 0) const;
-+#endif
-
- void propagateSizeHints();
-
Deleted: community-x86_64/use-system-qt5-headers.patch
===================================================================
--- community-x86_64/use-system-qt5-headers.patch 2017-07-28 14:35:12 UTC (rev 246675)
+++ community-x86_64/use-system-qt5-headers.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -1,27 +0,0 @@
-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-x86_64/use-system-qt5-headers.patch (from rev 246675, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
===================================================================
--- community-x86_64/use-system-qt5-headers.patch (rev 0)
+++ community-x86_64/use-system-qt5-headers.patch 2017-07-28 14:35:41 UTC (rev 246676)
@@ -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)
+-}
More information about the arch-commits
mailing list