Date: Thursday, April 13, 2017 @ 14:58:58 Author: felixonmars Revision: 222742
upgpkg: deepin-qt5integration 0.1.7-1 Added: deepin-qt5integration/trunk/use-system-qt5-headers.patch Modified: deepin-qt5integration/trunk/PKGBUILD ------------------------------+ PKGBUILD | 12 ++++++------ use-system-qt5-headers.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-04-13 14:41:51 UTC (rev 222741) +++ PKGBUILD 2017-04-13 14:58:58 UTC (rev 222742) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=deepin-qt5integration -pkgver=0.1.6 +pkgver=0.1.7 pkgrel=1 pkgdesc='Deepin Qt5 platform plugin' arch=('i686' 'x86_64') @@ -9,18 +9,18 @@ url="http://github.com/linuxdeepin/qt5integration"; license=('GPL3') depends=('deepin-tool-kit' 'libqtxdg' 'gtk2') -makedepends=('git' 'xcb-util-renderutil' 'deepin-file-manager') +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"; - "libqt5xcbqpa-dev::git+https://github.com/zccrs/libqt5xcbqpa-dev.git";) -sha512sums=('39db1197eb67b532a8d919a1216cfb2f25eabd3840d3c7b319faa74446464f21d76ece7c6a3f064f09e4aa7c248d248a973acbd0f71578aa22c0aec0fd767cb8' - 'SKIP') + use-system-qt5-headers.patch) +sha512sums=('8ccb4bece187f2bbcee091df6789a55d5463348e4f2b0a7241d866c648ebe76a37191d249fc6d81993615b2825ba1e034f7f4d5d64d3174f0fca95e914576a3a' + '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b') prepare() { cd qt5integration-$pkgver - ln -s ../../libqt5xcbqpa-dev ./platformplugin/libqt5xcbqpa-dev + patch -p1 -i ../use-system-qt5-headers.patch } build() { Added: use-system-qt5-headers.patch =================================================================== --- use-system-qt5-headers.patch (rev 0) +++ use-system-qt5-headers.patch 2017-04-13 14:58:58 UTC (rev 222742) @@ -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) +-}
