[arch-commits] Commit in deepin-tool-kit/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Mon Jan 23 14:16:08 UTC 2017
Date: Monday, January 23, 2017 @ 14:16:08
Author: felixonmars
Revision: 208551
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
deepin-tool-kit/repos/community-staging-i686/
deepin-tool-kit/repos/community-staging-i686/PKGBUILD
(from rev 208550, deepin-tool-kit/trunk/PKGBUILD)
deepin-tool-kit/repos/community-staging-i686/qt-5.8.patch
(from rev 208550, deepin-tool-kit/trunk/qt-5.8.patch)
deepin-tool-kit/repos/community-staging-x86_64/
deepin-tool-kit/repos/community-staging-x86_64/PKGBUILD
(from rev 208550, deepin-tool-kit/trunk/PKGBUILD)
deepin-tool-kit/repos/community-staging-x86_64/qt-5.8.patch
(from rev 208550, deepin-tool-kit/trunk/qt-5.8.patch)
---------------------------------------+
community-staging-i686/PKGBUILD | 38 ++++++++++++++++++++++++++++++++
community-staging-i686/qt-5.8.patch | 32 ++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 38 ++++++++++++++++++++++++++++++++
community-staging-x86_64/qt-5.8.patch | 32 ++++++++++++++++++++++++++
4 files changed, 140 insertions(+)
Copied: deepin-tool-kit/repos/community-staging-i686/PKGBUILD (from rev 208550, deepin-tool-kit/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-01-23 14:16:08 UTC (rev 208551)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-tool-kit
+pkgver=0.2.1
+_commit=20e36728822c43fb9a2abb1012770426c9e13959
+pkgrel=3
+pkgdesc='Base development tool of all C++/Qt Developer work on Deepin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/deepin-tool-kit"
+license=('GPL3')
+depends=('qt5-multimedia' 'qt5-x11extras' 'startup-notification')
+makedepends=('qt5-tools' 'git')
+replaces=('libdui')
+source=("git+https://github.com/linuxdeepin/deepin-tool-kit.git#commit=$_commit"
+ qt-5.8.patch)
+sha256sums=('SKIP'
+ '7eb88e018bd0fb48fb51f36fc97b203792770c7a2593a0a885e6614cb126ba05')
+
+prepare() {
+ cd deepin-tool-kit
+ patch -p1 -i ../qt-5.8.patch
+}
+
+build() {
+ cd deepin-tool-kit
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd deepin-tool-kit
+ make INSTALL_ROOT="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/tests
+}
Copied: deepin-tool-kit/repos/community-staging-i686/qt-5.8.patch (from rev 208550, deepin-tool-kit/trunk/qt-5.8.patch)
===================================================================
--- community-staging-i686/qt-5.8.patch (rev 0)
+++ community-staging-i686/qt-5.8.patch 2017-01-23 14:16:08 UTC (rev 208551)
@@ -0,0 +1,32 @@
+commit 67e275a60b0aea6a3f2a95f0be22dc22eb1e0698
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Jan 23 22:10:28 2017 +0800
+
+ Add support for Qt 5.8+
+
+ qpa/qplatformintegrationfactory_p.h is now under QtGui, using
+ gui-private instead of platformsupport-private fixes build with latest
+ Qt.
+
+ Change-Id: Icacabdec98e0b40fedacf19ce659ab987511dd3e
+
+diff --git a/dwidget/dwidget.pro b/dwidget/dwidget.pro
+index 12fc68d..0bb3449 100644
+--- a/dwidget/dwidget.pro
++++ b/dwidget/dwidget.pro
+@@ -5,8 +5,13 @@ TARGET = dtkwidget
+
+ DEFINES += LIBDTKWIDGET_LIBRARY
+
+-QT += multimedia multimediawidgets platformsupport-private
+-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
++QT += multimedia multimediawidgets
++greaterThan(QT_MAJOR_VERSION, 4) {
++ QT += widgets
++ # Qt >= 5.8
++ greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 7): QT += gui-private
++ else: QT += platformsupport-private
++}
+
+ unix{
+ QT += x11extras dbus
Copied: deepin-tool-kit/repos/community-staging-x86_64/PKGBUILD (from rev 208550, deepin-tool-kit/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-01-23 14:16:08 UTC (rev 208551)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-tool-kit
+pkgver=0.2.1
+_commit=20e36728822c43fb9a2abb1012770426c9e13959
+pkgrel=3
+pkgdesc='Base development tool of all C++/Qt Developer work on Deepin'
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/deepin-tool-kit"
+license=('GPL3')
+depends=('qt5-multimedia' 'qt5-x11extras' 'startup-notification')
+makedepends=('qt5-tools' 'git')
+replaces=('libdui')
+source=("git+https://github.com/linuxdeepin/deepin-tool-kit.git#commit=$_commit"
+ qt-5.8.patch)
+sha256sums=('SKIP'
+ '7eb88e018bd0fb48fb51f36fc97b203792770c7a2593a0a885e6614cb126ba05')
+
+prepare() {
+ cd deepin-tool-kit
+ patch -p1 -i ../qt-5.8.patch
+}
+
+build() {
+ cd deepin-tool-kit
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd deepin-tool-kit
+ make INSTALL_ROOT="$pkgdir" install
+
+ rm -r "$pkgdir"/usr/tests
+}
Copied: deepin-tool-kit/repos/community-staging-x86_64/qt-5.8.patch (from rev 208550, deepin-tool-kit/trunk/qt-5.8.patch)
===================================================================
--- community-staging-x86_64/qt-5.8.patch (rev 0)
+++ community-staging-x86_64/qt-5.8.patch 2017-01-23 14:16:08 UTC (rev 208551)
@@ -0,0 +1,32 @@
+commit 67e275a60b0aea6a3f2a95f0be22dc22eb1e0698
+Author: Felix Yan <felixonmars at archlinux.org>
+Date: Mon Jan 23 22:10:28 2017 +0800
+
+ Add support for Qt 5.8+
+
+ qpa/qplatformintegrationfactory_p.h is now under QtGui, using
+ gui-private instead of platformsupport-private fixes build with latest
+ Qt.
+
+ Change-Id: Icacabdec98e0b40fedacf19ce659ab987511dd3e
+
+diff --git a/dwidget/dwidget.pro b/dwidget/dwidget.pro
+index 12fc68d..0bb3449 100644
+--- a/dwidget/dwidget.pro
++++ b/dwidget/dwidget.pro
+@@ -5,8 +5,13 @@ TARGET = dtkwidget
+
+ DEFINES += LIBDTKWIDGET_LIBRARY
+
+-QT += multimedia multimediawidgets platformsupport-private
+-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
++QT += multimedia multimediawidgets
++greaterThan(QT_MAJOR_VERSION, 4) {
++ QT += widgets
++ # Qt >= 5.8
++ greaterThan(QT_MAJOR_VERSION, 5)|greaterThan(QT_MINOR_VERSION, 7): QT += gui-private
++ else: QT += platformsupport-private
++}
+
+ unix{
+ QT += x11extras dbus
More information about the arch-commits
mailing list