[arch-commits] Commit in deepin-file-manager/trunk (2 files)

[Felix Yan]

    Date: Monday, August 14, 2017 @ 06:09:56
  Author: felixonmars
Revision: 250179

upgpkg: deepin-file-manager 1:4.2.3-1

Modified:
  deepin-file-manager/trunk/PKGBUILD
Deleted:
  deepin-file-manager/trunk/remove-unimplemented-slots.patch

----------------------------------+
 PKGBUILD                         |   15 ++++-----------
 remove-unimplemented-slots.patch |   24 ------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-14 06:03:01 UTC (rev 250178)
+++ PKGBUILD	2017-08-14 06:09:56 UTC (rev 250179)
@@ -4,8 +4,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-file-manager
-pkgver=4.2.2
-pkgrel=3
+pkgver=4.2.3
+pkgrel=1
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('i686' 'x86_64')
@@ -19,16 +19,9 @@
 provides=('deepin-desktop')
 conflicts=('deepin-desktop')
 replaces=('deepin-desktop')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
-        remove-unimplemented-slots.patch)
-sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb'
-            '73c7a008322fa771f7d0defae487461e4ec9c6c08c02160df985653b320bcb47a353e7a16b7407c5516077f8aa4e059ddb2d11db5f39f94b7fc1b0f88f9ddbb6')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
+sha512sums=('f1bf6cf12e4e9a44612468405c5117f0e31ff9857f8f8cee27d1021b45aa83b5d3bace46c007678b12b1b5dc41352834347409eadca08b26633b6efda4d1e0ad')
 
-prepare() {
-  cd dde-file-manager-$pkgver
-  patch -p1 -i ../remove-unimplemented-slots.patch
-}
-
 build() {
   cd dde-file-manager-$pkgver
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=

Deleted: remove-unimplemented-slots.patch
===================================================================
--- remove-unimplemented-slots.patch	2017-08-14 06:03:01 UTC (rev 250178)
+++ remove-unimplemented-slots.patch	2017-08-14 06:09:56 UTC (rev 250179)
@@ -1,24 +0,0 @@
-commit fba6ea12ec4d7f9c547d61fb76bc48710fc98f55
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Mon Jul 31 13:06:16 2017 +0800
-
-    Remove unimplemented slots
-    
-    The names are not used, and defining them in the headers will break
-    plugin loading with CXXFLAGS -fno-plt and LDFLAGS -z,now enabled,
-    causing a symbol not found error.
-    
-    Change-Id: I23c0cddbb856f645008c0306bf3ecefd27cae61f
-
-diff --git a/dde-dock-plugins/disk-mount/diskcontrolwidget.h b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
-index e0d07048..56017cd3 100644
---- a/dde-dock-plugins/disk-mount/diskcontrolwidget.h
-+++ b/dde-dock-plugins/disk-mount/diskcontrolwidget.h
-@@ -31,7 +31,6 @@ private slots:
-     void onVolume_removed(const QDiskInfo &diskInfo);
-     void onVolume_changed(const QDiskInfo &diskInfo);
-     void unmountDisk(const QString &diskId) const;
--    void addMountDiskInfo(const QDiskInfo &diskInfo);
- 
- private:
-     QVBoxLayout *m_centralLayout;