[arch-commits] Commit in dtkwidget/trunk (PKGBUILD dtkwidget-qt5.13.patch)

[Felix Yan]

    Date: Sunday, July 7, 2019 @ 02:11:52
  Author: felixonmars
Revision: 487574

upgpkg: dtkwidget 2.0.15-1

Modified:
  dtkwidget/trunk/PKGBUILD
Deleted:
  dtkwidget/trunk/dtkwidget-qt5.13.patch

------------------------+
 PKGBUILD               |   16 ++++------------
 dtkwidget-qt5.13.patch |   39 ---------------------------------------
 2 files changed, 4 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-07 02:11:44 UTC (rev 487573)
+++ PKGBUILD	2019-07-07 02:11:52 UTC (rev 487574)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=dtkwidget
-pkgver=2.0.14
-pkgrel=3
+pkgver=2.0.15
+pkgrel=1
 pkgdesc='Deepin graphical user interface library'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dtkwidget"
@@ -14,19 +14,11 @@
 makedepends=('qt5-tools')
 replaces=('deepin-tool-kit')
 conflicts=('deepin-tool-kit<0.3.4')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkwidget/archive/$pkgver.tar.gz"
-        dtkwidget-qt5.13.patch)
-sha512sums=('0250ee77234bb0487420a1176e08c27b25f674137913e656048b66502810a20bbacd3180272400a5bb3fb30bd969bc6d4236d3178edc42e2fd1270b5e194a713'
-            '4b2f4373bb55ed38ebeee1345213a9c3b3e1f97a762b955a4b96baae41ed0da35c901d65157113f914ef808af370d0490c83e2e595b6b44010b5297063c8eeaa')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkwidget/archive/$pkgver.tar.gz")
+sha512sums=('7081edbb0bc05260250f1293243d1bb4689934a7ce29ad630ab3bf8b01743d7f47cf23547daec9d226e55e8147b06866d17e4208dc98c627c6a07176238f73a3')
 
-prepare() {
-  cd dtkwidget-$pkgver
-  patch -p1 -i ../dtkwidget-qt5.13.patch # Fix build with Qt 5.13
-}
-
 build() {
   cd dtkwidget-$pkgver
-  LDFLAGS=${LDFLAGS/,-z,now/}
   qmake-qt5 PREFIX=/usr
   make
 }

Deleted: dtkwidget-qt5.13.patch
===================================================================
--- dtkwidget-qt5.13.patch	2019-07-07 02:11:44 UTC (rev 487573)
+++ dtkwidget-qt5.13.patch	2019-07-07 02:11:52 UTC (rev 487574)
@@ -1,39 +0,0 @@
-diff --git a/src/widgets/daboutdialog.cpp b/src/widgets/daboutdialog.cpp
-index 5c6ba91..a33fd94 100644
---- a/src/widgets/daboutdialog.cpp
-+++ b/src/widgets/daboutdialog.cpp
-@@ -575,6 +575,6 @@ void DAboutDialog::showEvent(QShowEvent *event)
-     }
- }
- 
--#include "moc_daboutdialog.cpp"
--
- DWIDGET_END_NAMESPACE
-+
-+#include "moc_daboutdialog.cpp"
-diff --git a/src/widgets/dipv4lineedit.cpp b/src/widgets/dipv4lineedit.cpp
-index 4efe6e4..1cc68b4 100644
---- a/src/widgets/dipv4lineedit.cpp
-+++ b/src/widgets/dipv4lineedit.cpp
-@@ -530,6 +530,6 @@ bool DIpv4LineEdit::eventFilter(QObject *obj, QEvent *e)
-     return DLineEdit::eventFilter(obj, e);
- }
- 
--#include "moc_dipv4lineedit.cpp"
--
- DWIDGET_END_NAMESPACE
-+
-+#include "moc_dipv4lineedit.cpp"
-diff --git a/src/widgets/dlistview.cpp b/src/widgets/dlistview.cpp
-index 0dcc244..523ebd5 100644
---- a/src/widgets/dlistview.cpp
-+++ b/src/widgets/dlistview.cpp
-@@ -709,6 +709,6 @@ bool DListView::edit(const QModelIndex &index, QAbstractItemView::EditTrigger tr
-     return tmp;
- }
- 
--#include "moc_dlistview.cpp"
--
- DWIDGET_END_NAMESPACE
-+
-+#include "moc_dlistview.cpp"