Date: Wednesday, November 9, 2022 @ 14:47:53
Author: felixonmars
Revision: 1346187
upgpkg: deepin-file-manager 1:5.8.0-1
Modified:
deepin-file-manager/trunk/PKGBUILD
Deleted:
deepin-file-manager/trunk/gcc12.patch
-------------+
PKGBUILD | 16 ++++++----------
gcc12.patch | 25 -------------------------
2 files changed, 6 insertions(+), 35 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-09 14:34:30 UTC (rev 1346186)
+++ PKGBUILD 2022-11-09 14:47:53 UTC (rev 1346187)
@@ -3,8 +3,8 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=deepin-file-manager
-pkgver=5.6.4
-pkgrel=5
+pkgver=5.8.0
+pkgrel=1
epoch=1
pkgdesc='Deepin File Manager'
arch=('x86_64')
@@ -14,7 +14,7 @@
# startdde: for com.deepin.SessionManager
depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'docparser'
'file' 'gio-qt'
'libmediainfo' 'lucene++' 'avfs' 'polkit-qt5' 'poppler'
'ffmpegthumbnailer' 'jemalloc'
- 'kcodecs' 'startdde' 'taglib' 'htmlcxx' 'libgsf' 'mimetic'
'boost-libs')
+ 'kcodecs' 'startdde' 'htmlcxx' 'libgsf' 'mimetic' 'boost-libs')
makedepends=('boost' 'qt5-tools' 'deepin-dock' 'deepin-movie'
'deepin-gettext-tools')
optdepends=('deepin-manual: for help menual'
'deepin-shortcut-viewer: for shortcut display'
@@ -27,18 +27,14 @@
conflicts=('deepin-desktop')
replaces=('deepin-desktop')
source=("https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver/$pkgname-$pkgver.tar.gz";
-
$pkgname-fix-crash-426.patch::https://github.com/linuxdeepin/dde-file-manager/pull/426.patch
- gcc12.patch)
-sha512sums=('e913e2689dfe6460239b19c0a59c2affed36f1ef2d4832e2eddb709b74aa939da970a040fd4dd874398a055fc945078373a7f763f5e78d391de4ea0380f09c8e'
-
'd27e606930349f906407cd3710894c8ed1080d0a0b9bcfedf01221b830530439b17c369f8c46897ab278b4c083f96ffba64bb024a0e177ccdd716fe5b82d6685'
-
'4e3a35742efd43ecfc70a9bfa7e41b80e73a9197f0afa922d300ac27d655286d6fe3c8891c8a13bf08fd1e0e0b0d6a03e63f7f8af18e00673ea51db549fd5f46')
+
$pkgname-fix-crash-426.patch::https://github.com/linuxdeepin/dde-file-manager/pull/426.patch)
+sha512sums=('898e7a738c352f898ac79f30729604315bbdd4a34187f7c87201ace640109f438ba1d241a7463aff8b7a67dc9f643a14fbb377a5467bb7ddf0a4430b57aa3d61'
+
'd27e606930349f906407cd3710894c8ed1080d0a0b9bcfedf01221b830530439b17c369f8c46897ab278b4c083f96ffba64bb024a0e177ccdd716fe5b82d6685')
prepare() {
cd dde-file-manager-$pkgver
patch -p1 -i ../$pkgname-fix-crash-426.patch
- patch -p1 -i ../gcc12.patch # Fix build with GCC 12
sed -e 's|systembusconf.path = /etc/dbus-1/system.d|systembusconf.path =
/usr/share/dbus-1/system.d|' \
- -e 's|systemd_service.path = /lib/systemd/system|systemd_service.path =
/usr/lib/systemd/system|' \
-i src/dde-file-manager-daemon/dde-file-manager-daemon.pro
}
Deleted: gcc12.patch
===================================================================
--- gcc12.patch 2022-11-09 14:34:30 UTC (rev 1346186)
+++ gcc12.patch 2022-11-09 14:47:53 UTC (rev 1346187)
@@ -1,25 +0,0 @@
-diff --git a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
-index 80c5c202c..3d6bc9988 100644
---- a/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
-+++ b/src/dde-file-manager-lib/dialogs/private/ddesktoprenamedialog_p.h
-@@ -29,6 +29,7 @@
- #include <QComboBox>
- #include <QHBoxLayout>
- #include <QStackedLayout>
-+#include <array>
-
- #include "interfaces/dfileservices.h"
-
-diff --git a/src/dde-file-manager-lib/views/drenamebar.h
b/src/dde-file-manager-lib/views/drenamebar.h
-index 45f3b094a..5ada4bcb8 100644
---- a/src/dde-file-manager-lib/views/drenamebar.h
-+++ b/src/dde-file-manager-lib/views/drenamebar.h
-@@ -29,7 +29,7 @@
- #include <QList>
- #include <QFrame>
- #include <memory>
--
-+#include <array>
-
- #include "shutil/filebatchprocess.h"
-
