update

2 files changed, 56 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca9ed0756933..b92dfc5a791e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,42 +1,54 @@
 pkgbase = deepin-file-manager-git
 	pkgdesc = Deepin File Manager
-	pkgver = 5.8.3.r5.g1ec4c5734
+	pkgver = 6.0.40.r7.g1319bb076
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/dde-file-manager
 	arch = x86_64
 	arch = aarch64
 	groups = deepin-git
 	license = GPL3
-	makedepends = git
-	makedepends = deepin-movie-git
-	makedepends = lucene++
-	makedepends = jemalloc
-	makedepends = kcodecs
-	makedepends = htmlcxx
-	makedepends = libgsf
-	makedepends = mimetic
 	makedepends = boost
-	makedepends = boost-libs
+	makedepends = cmake
+	makedepends = ninja
 	makedepends = qt5-tools
-	makedepends = deepin-dock-git
-	makedepends = deepin-gettext-tools-git
-	makedepends = gtest
-	makedepends = docparser
-	depends = deepin-anything-git
-	depends = disomaster-git
-	depends = file
-	depends = gio-qt
-	depends = libmediainfo
+	makedepends = deepin-dock
+	makedepends = deepin-movie
+	makedepends = deepin-gettext-tools
+	depends = dtkcore
+	depends = dtkgui
+	depends = dtkwidget
+	depends = deepin-anything
+	depends = deepin-util-dfm
+	depends = qt5-base
+	depends = qt5-svg
+	depends = qt5-x11extras
+	depends = deepin-pdfium
+	depends = docparser
+	depends = libsecret
+	depends = zlib
+	depends = dconf
+	depends = openssl
+	depends = glib2
+	depends = libxcb
+	depends = libx11
+	depends = qt5-multimedia
+	depends = cryptsetup
+	depends = lucene++
 	depends = avfs
+	depends = gsettings-qt
 	depends = polkit-qt5
 	depends = poppler
-	depends = ffmpegthumbnailer
-	depends = startdde-git
+	depends = kcodecs5
 	depends = taglib
-	depends = jemalloc
-	depends = htmlcxx
-	depends = mimetic
-	depends = lucene++
+	depends = util-linux-libs
+	depends = icu
+	depends = pcre
+	depends = glibc
+	depends = gcc-libs
+	depends = deepin-appearance
+	depends = deepin-qt-dbus-factory
+	depends = cryfs
+	depends = socat
 	optdepends = deepin-manual: for help menual
 	optdepends = deepin-shortcut-viewer: for shortcut display
 	optdepends = deepin-screensaver: for screensaver chooser
diff --git a/PKGBUILD b/PKGBUILD
index c9e74f0d2489..2914e179513c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,25 @@
 # Maintainer: justforlxz <justforlxz@gmail.com>
 
 pkgname=deepin-file-manager-git
-pkgver=5.8.3.r5.g1ec4c5734
+pkgver=6.0.40.r7.g1319bb076
 pkgrel=1
 pkgdesc='Deepin File Manager'
 arch=('x86_64' 'aarch64')
 url="https://github.com/linuxdeepin/dde-file-manager"
 license=('GPL3')
-depends=('deepin-anything-git' 'disomaster-git' 'file' 'gio-qt' 'libmediainfo' 'avfs' 'polkit-qt5' 'poppler'
-         'ffmpegthumbnailer' 'startdde-git' 'taglib' 'jemalloc' 'htmlcxx' 'mimetic' 'lucene++')
-makedepends=('git' 'deepin-movie-git' 'lucene++' 'jemalloc' 'kcodecs' 'htmlcxx' 'libgsf' 'mimetic' 'boost' 'boost-libs' 'qt5-tools' 'deepin-dock-git' 'deepin-gettext-tools-git' 'gtest' 'docparser')
+# deepin-appearance: org.deepin.dde.Appearance1
+depends=('dtkcore' 'dtkgui' 'dtkwidget' 'deepin-anything' 'deepin-util-dfm' 'qt5-base' 'qt5-svg'
+         'qt5-x11extras' 'deepin-pdfium' 'docparser' 'libsecret' 'zlib' 'dconf' 'openssl' 'glib2'
+         'libxcb' 'libx11' 'qt5-multimedia' 'cryptsetup' 'lucene++' 'avfs' 'gsettings-qt'
+         'polkit-qt5' 'poppler' 'kcodecs5' 'taglib' 'util-linux-libs' 'icu' 'pcre' 'glibc' 'gcc-libs'
+         'deepin-appearance' 'deepin-qt-dbus-factory' 'cryfs' 'socat')
+makedepends=('boost' 'cmake' 'ninja' 'qt5-tools' 'deepin-dock' 'deepin-movie' 'deepin-gettext-tools')
+optdepends=('deepin-manual: for help menual'
+            'deepin-shortcut-viewer: for shortcut display'
+            'deepin-screensaver: for screensaver chooser'
+            'deepin-movie: for video preview'
+            'deepin-terminal: for opening in terminal'
+            'deepin-compressor: for compress/decompress')
 optdepends=('deepin-manual: for help menual'
             'deepin-shortcut-viewer: for shortcut display'
             'deepin-screensaver: for screensaver chooser'
@@ -27,25 +37,13 @@ pkgver() {
     git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-    cd $pkgname
-    if [[ ! -z ${sha} ]];then
-      git checkout -b $sha
-    fi
-
-    sed -i '/#include <QException>/a #include <QPainterPath>' src/dialogs/dfmtaskwidget.cpp
-    sed -i '/#include <QTimer>/a #include <QPainterPath>' src/dde-file-manager-lib/interfaces/dfmglobal.cpp
-    sed -i '/#include <QPainter>/a #include <QPainterPath>' src/dde-file-manager-lib/interfaces/{dlistitemdelegate,dfmstyleditemdelegate,diconitemdelegate}.cpp src/dde-file-manager-lib/dialogs/openwithdialog.cpp
-    sed -i 's|systembusconf.path = /etc/dbus-1/system.d|systembusconf.path = /usr/share/dbus-1/system.d|' src/dde-file-manager-daemon/dde-file-manager-daemon.pro
-}
-
 build() {
-  cd ${pkgname}
-  qmake-qt5 PREFIX=/usr filemanager.pro
-  make
+  # cmake confused with glob files, see https://github.com/linuxdeepin/developer-center/issues/5158
+  cmake -GNinja -B build -S $pkgname -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc
+  cmake --build build
 }
 
 package() {
-  cd ${pkgname}
-  make INSTALL_ROOT="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 }