[arch-commits] Commit in deepin-qt5integration/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Thu Oct 19 07:47:43 UTC 2017
Date: Thursday, October 19, 2017 @ 07:47:42
Author: felixonmars
Revision: 263526
archrelease: copy trunk to community-i686, community-x86_64
Added:
deepin-qt5integration/repos/community-i686/PKGBUILD
(from rev 263525, deepin-qt5integration/trunk/PKGBUILD)
deepin-qt5integration/repos/community-x86_64/PKGBUILD
(from rev 263525, deepin-qt5integration/trunk/PKGBUILD)
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 | 68 ++++++++++++++++++++++++
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 ---------
5 files changed, 68 insertions(+), 124 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-19 07:46:57 UTC (rev 263525)
+++ community-i686/PKGBUILD 2017-10-19 07:47:42 UTC (rev 263526)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.3
-pkgrel=2
-pkgdesc='Deepin Qt5 platform plugin'
-arch=('i686' 'x86_64')
-url="http://github.com/linuxdeepin/qt5integration"
-license=('GPL3')
-depends=('dtkwidget' '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=('a113bbe9a537e6ad04672f11957530fa0897e362166baf4af935dc3d1e89cf1bae7d69564f44719705d1c8522c37a21f44b70eedd6fdf23ddcfdb432a1db8ab7'
- '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 263525, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-19 07:47:42 UTC (rev 263526)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.4
+pkgrel=1
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget' '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")
+sha512sums=('ac534f6e61e01ce0efb903f7314a63e326486c8d8e28b64dd4bb6def835f50b8834059a038af350b4c688aad43a97f91bc4e679b3d032678a3eac5434c733a9b')
+
+prepare() {
+ cd qt5integration-$pkgver
+ rm -r platformplugin/libqt5xcbqpa-dev
+ sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+}
+
+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-10-19 07:46:57 UTC (rev 263525)
+++ community-i686/use-system-qt5-headers.patch 2017-10-19 07:47:42 UTC (rev 263526)
@@ -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)
--}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-19 07:46:57 UTC (rev 263525)
+++ community-x86_64/PKGBUILD 2017-10-19 07:47:42 UTC (rev 263526)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=deepin-qt5integration
-pkgver=0.2.3
-pkgrel=2
-pkgdesc='Deepin Qt5 platform plugin'
-arch=('i686' 'x86_64')
-url="http://github.com/linuxdeepin/qt5integration"
-license=('GPL3')
-depends=('dtkwidget' '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=('a113bbe9a537e6ad04672f11957530fa0897e362166baf4af935dc3d1e89cf1bae7d69564f44719705d1c8522c37a21f44b70eedd6fdf23ddcfdb432a1db8ab7'
- '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 263525, deepin-qt5integration/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-19 07:47:42 UTC (rev 263526)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5integration
+pkgver=0.2.4
+pkgrel=1
+pkgdesc='Deepin Qt5 platform plugin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/qt5integration"
+license=('GPL3')
+depends=('dtkwidget' '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")
+sha512sums=('ac534f6e61e01ce0efb903f7314a63e326486c8d8e28b64dd4bb6def835f50b8834059a038af350b4c688aad43a97f91bc4e679b3d032678a3eac5434c733a9b')
+
+prepare() {
+ cd qt5integration-$pkgver
+ rm -r platformplugin/libqt5xcbqpa-dev
+ sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+}
+
+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-10-19 07:46:57 UTC (rev 263525)
+++ community-x86_64/use-system-qt5-headers.patch 2017-10-19 07:47:42 UTC (rev 263526)
@@ -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)
--}
More information about the arch-commits
mailing list