[arch-commits] Commit in deepin-qt5integration/repos (10 files)
Felix Yan
felixonmars at archlinux.org
Tue Jun 27 05:11:30 UTC 2017
Date: Tuesday, June 27, 2017 @ 05:11:29
Author: felixonmars
Revision: 241074
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-qt5integration/repos/community-i686/PKGBUILD
(from rev 241073, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-i686/use-system-qt5-headers.patch
(from rev 241073, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
deepin-qt5integration/repos/community-x86_64/PKGBUILD
(from rev 241073, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-x86_64/use-system-qt5-headers.patch
(from rev 241073, deepin-qt5integration/trunk/use-system-qt5-headers.patch)
Deleted:
deepin-qt5integration/repos/community-i686/PKGBUILD
deepin-qt5integration/repos/community-i686/qt5.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/qt5.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/qt5.9.patch | 42 --------------
community-i686/use-system-qt5-headers.patch | 27 ---------
community-x86_64/PKGBUILD | 37 ------------
community-x86_64/qt5.9.patch | 42 --------------
community-x86_64/use-system-qt5-headers.patch | 27 ---------
8 files changed, 124 insertions(+), 212 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-06-27 05:10:23 UTC (rev 241073)
+++ community-i686/PKGBUILD 2017-06-27 05:11:29 UTC (rev 241074)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.1.9
-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 qt5.9.patch)
-sha512sums=('f6936cc6a9a1d51c24d4be634cf38c97a42a926c7c92af74517a952163ad41ecf0ab105461d239035794651b303a71e1f85913242d698842b72dc66e3793f916'
- '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
- '83695d051d100ab6e8fa0aa73f9387f320f6bbaab39c8db835b27f5b24b1c38c993535ed3c5864975e5881231d0f3151d6e4eacb8cc9364f67febc6328bf5b01')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../qt5.9.patch
- 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
-}
Copied: deepin-qt5integration/repos/community-i686/PKGBUILD (from rev 241073, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-06-27 05:11:29 UTC (rev 241074)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.0
+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=('3425cde5fe1653e30353e58f0dd66896045fa5c3b84b8c5da3c24d3ec01c84be4dbad9117f26d2a6e02dec0aa06d0445411bd6c180b23cbdc924ee474c8fe1c2'
+ '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/qt5.9.patch
===================================================================
--- community-i686/qt5.9.patch 2017-06-27 05:10:23 UTC (rev 241073)
+++ community-i686/qt5.9.patch 2017-06-27 05:11:29 UTC (rev 241074)
@@ -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 <QtGui/QOpenGLShaderProgram>
- #include <QtGui/QOpenGLContext>
- #include <QtGui/QOpenGLFunctions>
-+
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
- #include <QtGui/private/qopengltextureblitter_p.h>
-+#else
-+#include <QtGui/qopengltextureblitter.h>
-+#endif
-+
- #include <QtGui/qpa/qplatformgraphicsbuffer.h>
- #include <QtGui/qpa/qplatformgraphicsbufferhelper.h>
- #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.
Deleted: community-i686/use-system-qt5-headers.patch
===================================================================
--- community-i686/use-system-qt5-headers.patch 2017-06-27 05:10:23 UTC (rev 241073)
+++ community-i686/use-system-qt5-headers.patch 2017-06-27 05:11:29 UTC (rev 241074)
@@ -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 241073, 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-06-27 05:11:29 UTC (rev 241074)
@@ -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-06-27 05:10:23 UTC (rev 241073)
+++ community-x86_64/PKGBUILD 2017-06-27 05:11:29 UTC (rev 241074)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.1.9
-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 qt5.9.patch)
-sha512sums=('f6936cc6a9a1d51c24d4be634cf38c97a42a926c7c92af74517a952163ad41ecf0ab105461d239035794651b303a71e1f85913242d698842b72dc66e3793f916'
- '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
- '83695d051d100ab6e8fa0aa73f9387f320f6bbaab39c8db835b27f5b24b1c38c993535ed3c5864975e5881231d0f3151d6e4eacb8cc9364f67febc6328bf5b01')
-
-prepare() {
- cd qt5integration-$pkgver
- patch -p1 -i ../qt5.9.patch
- 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
-}
Copied: deepin-qt5integration/repos/community-x86_64/PKGBUILD (from rev 241073, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-06-27 05:11:29 UTC (rev 241074)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.0
+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=('3425cde5fe1653e30353e58f0dd66896045fa5c3b84b8c5da3c24d3ec01c84be4dbad9117f26d2a6e02dec0aa06d0445411bd6c180b23cbdc924ee474c8fe1c2'
+ '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/qt5.9.patch
===================================================================
--- community-x86_64/qt5.9.patch 2017-06-27 05:10:23 UTC (rev 241073)
+++ community-x86_64/qt5.9.patch 2017-06-27 05:11:29 UTC (rev 241074)
@@ -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 <QtGui/QOpenGLShaderProgram>
- #include <QtGui/QOpenGLContext>
- #include <QtGui/QOpenGLFunctions>
-+
-+#if QT_VERSION < QT_VERSION_CHECK(5, 9, 0)
- #include <QtGui/private/qopengltextureblitter_p.h>
-+#else
-+#include <QtGui/qopengltextureblitter.h>
-+#endif
-+
- #include <QtGui/qpa/qplatformgraphicsbuffer.h>
- #include <QtGui/qpa/qplatformgraphicsbufferhelper.h>
- #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.
Deleted: community-x86_64/use-system-qt5-headers.patch
===================================================================
--- community-x86_64/use-system-qt5-headers.patch 2017-06-27 05:10:23 UTC (rev 241073)
+++ community-x86_64/use-system-qt5-headers.patch 2017-06-27 05:11:29 UTC (rev 241074)
@@ -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 241073, 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-06-27 05:11:29 UTC (rev 241074)
@@ -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