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

[Felix Yan]

    Date: Monday, July 31, 2017 @ 15:16:13
  Author: felixonmars
Revision: 247131

upgpkg: deepin-file-manager 1:4.2.2-2

fix plugins symbol error

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

----------------------------------+
 PKGBUILD                         |   13 ++++++++++---
 remove-unimplemented-slots.patch |   24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-31 15:15:35 UTC (rev 247130)
+++ PKGBUILD	2017-07-31 15:16:13 UTC (rev 247131)
@@ -5,7 +5,7 @@
 
 pkgname=deepin-file-manager
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('i686' 'x86_64')
@@ -19,9 +19,16 @@
 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")
-sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+        remove-unimplemented-slots.patch)
+sha512sums=('07a1814f97c5abf63d9800453ec38fbb5d60b9ec1eae3e3be282c076f3a88e0f74399de1a965fbc3c234617aa2584be05caa47a6def486fb792810932f61aafb'
+            '73c7a008322fa771f7d0defae487461e4ec9c6c08c02160df985653b320bcb47a353e7a16b7407c5516077f8aa4e059ddb2d11db5f39f94b7fc1b0f88f9ddbb6')
 
+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=

Added: remove-unimplemented-slots.patch
===================================================================
--- remove-unimplemented-slots.patch	                        (rev 0)
+++ remove-unimplemented-slots.patch	2017-07-31 15:16:13 UTC (rev 247131)
@@ -0,0 +1,24 @@
+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;