[arch-commits] Commit in deepin-file-manager/trunk (PKGBUILD fix-plugin-link.patch)

Felix Yan felixonmars at archlinux.org
Thu Nov 8 18:43:04 UTC 2018


    Date: Thursday, November 8, 2018 @ 18:43:04
  Author: felixonmars
Revision: 404143

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

restore disk-mount plugin by disabling jemalloc for now, until upstream fixes it.

Added:
  deepin-file-manager/trunk/fix-plugin-link.patch
Modified:
  deepin-file-manager/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   17 ++++++++++++-----
 fix-plugin-link.patch |   13 +++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-08 18:04:18 UTC (rev 404142)
+++ PKGBUILD	2018-11-08 18:43:04 UTC (rev 404143)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-file-manager
 pkgver=4.6.10
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('x86_64')
@@ -13,7 +13,7 @@
 depends=('deepin-qt5integration' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'avfs'
          'polkit-qt5' 'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'xdg-user-dirs'
          'file-roller' 'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal'
-         'gst-plugins-good' 'mpv' 'deepin-anything' 'deepin-movie' 'jemalloc' 'kcodecs')
+         'gst-plugins-good' 'mpv' 'deepin-anything' 'deepin-movie' 'kcodecs')
 makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
 optdepends=('deepin-manual: view the help manual')
 groups=('deepin')
@@ -20,12 +20,19 @@
 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=('b20b1463a6dd38817a5443366fde7fc8b7036e55b292f1a1bf1ba10346199f0ce029757c523f2c6a3126deaedafba1b62e79ad6747652c755be456adcd2e8ede')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+        fix-plugin-link.patch)
+sha512sums=('b20b1463a6dd38817a5443366fde7fc8b7036e55b292f1a1bf1ba10346199f0ce029757c523f2c6a3126deaedafba1b62e79ad6747652c755be456adcd2e8ede'
+            '8a1ed955a25ea2e8d477d3c70da6243c053e940af671211eb3e4c363783d5fd7864176f92c6f59d748c97f569825e3ef9c81e2f8b4d1454542193215605fb009')
 
+prepare() {
+  cd dde-file-manager-$pkgver
+  patch -p1 -i ../fix-plugin-link.patch
+}
+
 build() {
   cd dde-file-manager-$pkgver
-  qmake-qt5 PREFIX=/usr
+  qmake-qt5 PREFIX=/usr DISABLE_JEMALLOC=1
   make
 }
 

Added: fix-plugin-link.patch
===================================================================
--- fix-plugin-link.patch	                        (rev 0)
+++ fix-plugin-link.patch	2018-11-08 18:43:04 UTC (rev 404143)
@@ -0,0 +1,13 @@
+diff --git a/dde-dock-plugins/disk-mount/disk-mount.pro b/dde-dock-plugins/disk-mount/disk-mount.pro
+index c5d336e8..c9575b15 100644
+--- a/dde-dock-plugins/disk-mount/disk-mount.pro
++++ b/dde-dock-plugins/disk-mount/disk-mount.pro
+@@ -15,7 +15,7 @@ DISTFILES       += disk-mount.json
+ 
+ DEFINES += QT_MESSAGELOGCONTEXT DFM_NO_FILE_WATCHER
+ 
+-#unix: LIBS += -L$$OUT_PWD/../../dde-file-manager-lib -ldde-file-manager
++LIBS += -L$$OUT_PWD/../../dde-file-manager-lib -ldde-file-manager
+ 
+ HEADERS += \
+     diskmountplugin.h \


More information about the arch-commits mailing list