[arch-commits] Commit in deepin-tool-kit/trunk (PKGBUILD qt-5.8.patch)

Felix Yan felixonmars at archlinux.org
Fri Feb 17 12:54:20 UTC 2017


    Date: Friday, February 17, 2017 @ 12:54:20
  Author: felixonmars
Revision: 212860

upgpkg: deepin-tool-kit 0.2.2-1

Modified:
  deepin-tool-kit/trunk/PKGBUILD
Deleted:
  deepin-tool-kit/trunk/qt-5.8.patch

--------------+
 PKGBUILD     |   18 +++++-------------
 qt-5.8.patch |   32 --------------------------------
 2 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-17 12:53:31 UTC (rev 212859)
+++ PKGBUILD	2017-02-17 12:54:20 UTC (rev 212860)
@@ -4,26 +4,18 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-tool-kit
-pkgver=0.2.1
-_commit=20e36728822c43fb9a2abb1012770426c9e13959
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
 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')
+depends=('qt5-multimedia' 'qt5-x11extras' 'startup-notification' 'dtksettings')
 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')
+source=("git+https://github.com/linuxdeepin/deepin-tool-kit.git#tag=$pkgver")
+sha256sums=('SKIP')
 
-prepare() {
-  cd deepin-tool-kit
-  patch -p1 -i ../qt-5.8.patch
-}
-
 build() {
   cd deepin-tool-kit
   qmake-qt5 PREFIX=/usr

Deleted: qt-5.8.patch
===================================================================
--- qt-5.8.patch	2017-02-17 12:53:31 UTC (rev 212859)
+++ qt-5.8.patch	2017-02-17 12:54:20 UTC (rev 212860)
@@ -1,32 +0,0 @@
-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