Date: Monday, July 31, 2017 @ 15:19:18 Author: felixonmars Revision: 247134
archrelease: copy trunk to community-i686, community-x86_64 Added: deepin-qt5integration/repos/community-i686/PKGBUILD (from rev 247133, deepin-qt5integration/trunk/PKGBUILD) deepin-qt5integration/repos/community-i686/use-system-qt5-headers.patch (from rev 247133, deepin-qt5integration/trunk/use-system-qt5-headers.patch) deepin-qt5integration/repos/community-x86_64/PKGBUILD (from rev 247133, deepin-qt5integration/trunk/PKGBUILD) deepin-qt5integration/repos/community-x86_64/use-system-qt5-headers.patch (from rev 247133, deepin-qt5integration/trunk/use-system-qt5-headers.patch) Deleted: deepin-qt5integration/repos/community-i686/PKGBUILD deepin-qt5integration/repos/community-i686/use-system-qt5-headers.patch deepin-qt5integration/repos/community-x86_64/PKGBUILD deepin-qt5integration/repos/community-x86_64/use-system-qt5-headers.patch -----------------------------------------------+ /PKGBUILD | 74 ++++++++++++++++++++++++ /use-system-qt5-headers.patch | 54 +++++++++++++++++ community-i686/PKGBUILD | 35 ----------- community-i686/use-system-qt5-headers.patch | 27 -------- community-x86_64/PKGBUILD | 35 ----------- community-x86_64/use-system-qt5-headers.patch | 27 -------- 6 files changed, 128 insertions(+), 124 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-07-31 15:18:52 UTC (rev 247133) +++ community-i686/PKGBUILD 2017-07-31 15:19:18 UTC (rev 247134) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@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 -} Copied: deepin-qt5integration/repos/community-i686/PKGBUILD (from rev 247133, deepin-qt5integration/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-07-31 15:19:18 UTC (rev 247134) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-qt5integration +pkgver=0.2.2 +pkgrel=2 +pkgdesc='Deepin Qt5 platform plugin' +arch=('i686' 'x86_64') +url="http://github.com/linuxdeepin/qt5integration" +license=('GPL3') +depends=('deepin-tool-kit' '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" + use-system-qt5-headers.patch) +sha512sums=('af665a4156b20a9686c18956305ffd8def8e7eadf8ba970415bd5c41e25d97f61d1408d5ec4cb28fff29af8a660d66907280b62db2caa47b9cdbf1984fb622d6' + '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b') + +prepare() { + cd qt5integration-$pkgver + patch -p1 -i ../use-system-qt5-headers.patch + + sed -i 's/"fusion"/"gtk2"/' platformthemeplugin/qdeepintheme.cpp +} + +build() { + cd qt5integration-$pkgver + qmake-qt5 QMAKE_CFLAGS_ISYSTEM= PREFIX=/usr + make +} + +package() { + cd qt5integration-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: community-i686/use-system-qt5-headers.patch =================================================================== --- community-i686/use-system-qt5-headers.patch 2017-07-31 15:18:52 UTC (rev 247133) +++ community-i686/use-system-qt5-headers.patch 2017-07-31 15:19:18 UTC (rev 247134) @@ -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 247133, 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-31 15:19:18 UTC (rev 247134) @@ -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-31 15:18:52 UTC (rev 247133) +++ community-x86_64/PKGBUILD 2017-07-31 15:19:18 UTC (rev 247134) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@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 -} Copied: deepin-qt5integration/repos/community-x86_64/PKGBUILD (from rev 247133, deepin-qt5integration/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-07-31 15:19:18 UTC (rev 247134) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-qt5integration +pkgver=0.2.2 +pkgrel=2 +pkgdesc='Deepin Qt5 platform plugin' +arch=('i686' 'x86_64') +url="http://github.com/linuxdeepin/qt5integration" +license=('GPL3') +depends=('deepin-tool-kit' '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" + use-system-qt5-headers.patch) +sha512sums=('af665a4156b20a9686c18956305ffd8def8e7eadf8ba970415bd5c41e25d97f61d1408d5ec4cb28fff29af8a660d66907280b62db2caa47b9cdbf1984fb622d6' + '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b') + +prepare() { + cd qt5integration-$pkgver + patch -p1 -i ../use-system-qt5-headers.patch + + sed -i 's/"fusion"/"gtk2"/' platformthemeplugin/qdeepintheme.cpp +} + +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/use-system-qt5-headers.patch =================================================================== --- community-x86_64/use-system-qt5-headers.patch 2017-07-31 15:18:52 UTC (rev 247133) +++ community-x86_64/use-system-qt5-headers.patch 2017-07-31 15:19:18 UTC (rev 247134) @@ -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 247133, 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-31 15:19:18 UTC (rev 247134) @@ -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) +-}