Date: Tuesday, June 27, 2017 @ 05:10:23 Author: felixonmars Revision: 241073
upgpkg: deepin-qt5integration 0.2.0-1 Modified: deepin-qt5integration/trunk/PKGBUILD Deleted: deepin-qt5integration/trunk/qt5.9.patch -------------+ PKGBUILD | 10 ++++------ qt5.9.patch | 42 ------------------------------------------ 2 files changed, 4 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-27 05:08:47 UTC (rev 241072) +++ PKGBUILD 2017-06-27 05:10:23 UTC (rev 241073) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <felixonm...@archlinux.org> pkgname=deepin-qt5integration -pkgver=0.1.9 +pkgver=0.2.0 pkgrel=1 pkgdesc='Deepin Qt5 platform plugin' arch=('i686' 'x86_64') @@ -14,14 +14,12 @@ 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') + use-system-qt5-headers.patch) +sha512sums=('3425cde5fe1653e30353e58f0dd66896045fa5c3b84b8c5da3c24d3ec01c84be4dbad9117f26d2a6e02dec0aa06d0445411bd6c180b23cbdc924ee474c8fe1c2' + '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b') prepare() { cd qt5integration-$pkgver - patch -p1 -i ../qt5.9.patch patch -p1 -i ../use-system-qt5-headers.patch } Deleted: qt5.9.patch =================================================================== --- qt5.9.patch 2017-06-27 05:08:47 UTC (rev 241072) +++ qt5.9.patch 2017-06-27 05:10:23 UTC (rev 241073) @@ -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.