Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-file-manager for
openSUSE:Factory checked in at 2022-04-08 00:28:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-file-manager (Old)
and /work/SRC/openSUSE:Factory/.deepin-file-manager.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-file-manager"
Fri Apr 8 00:28:00 2022 rev:6 rq:967449 version:5.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/deepin-file-manager/deepin-file-manager.changes
2022-01-31 22:57:13.065623652 +0100
+++
/work/SRC/openSUSE:Factory/.deepin-file-manager.new.1900/deepin-file-manager.changes
2022-04-08 00:28:36.305725027 +0200
@@ -1,0 +2,16 @@
+Thu Mar 31 08:48:21 UTC 2022 - Dominique Leuenberger <[email protected]>
+
+- No longer pin to GCC10: the code builds just fine using GCC11
+ too, so let's use the distro default compiler.
+
+-------------------------------------------------------------------
+Tue Feb 22 12:00:45 UTC 2022 - Hillwood Yang <[email protected]>
+
+- Update version to 5.5.3
+ * Bring docparser
+ * Update translations
+ * Update manual documents
+ * Fix bugs
+- Drop fix-return-type-error.patch, fixed by upstream
+
+-------------------------------------------------------------------
Old:
----
dde-file-manager-5.5.1.tar.gz
fix-return-type-error.patch
New:
----
dde-file-manager-5.5.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-file-manager.spec ++++++
--- /var/tmp/diff_new_pack.qoxqi2/_old 2022-04-08 00:28:37.553710955 +0200
+++ /var/tmp/diff_new_pack.qoxqi2/_new 2022-04-08 00:28:37.557710910 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-file-manager
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%endif
Name: deepin-file-manager
-Version: 5.5.1
+Version: 5.5.3
Release: 0
Summary: Deepin File Manager
License: GPL-3.0-or-later AND MIT
@@ -35,10 +35,6 @@
Source0:
https://github.com/linuxdeepin/dde-file-manager/archive/%{version}/%{_name}-%{version}.tar.gz
Source1: deepin-file-dbus-installer.in
Source2: deepin-file-polkit-installer.in
-# PATCH-FIX-UPSTEAM fix-expected-token-errors.patch [email protected] -
Fix error for js code
-# Patch1: fix-expected-token-errors.patch
-# PATCH-FIX-UPSTEAM fix-return-type-error.patch [email protected] - Fix
build error
-Patch1: fix-return-type-error.patch
# PATCH-FIX-UPSTEAM fix-header-include.patch [email protected] - dfsearch
is necessary
Patch2: fix-header-include.patch
Patch3: harden_dde-filemanager-daemon.service.patch
@@ -79,6 +75,7 @@
BuildRequires: pkgconfig(dde-dock)
BuildRequires: pkgconfig(dframeworkdbus)
BuildRequires: pkgconfig(disomaster)
+BuildRequires: pkgconfig(docparser)
BuildRequires: pkgconfig(dtkwidget)
BuildRequires: pkgconfig(dtkwm)
BuildRequires: pkgconfig(gio-qt)
@@ -101,11 +98,6 @@
BuildRequires: pkgconfig(udisks2)
BuildRequires: pkgconfig(xcb-ewmh)
BuildRequires: pkgconfig(xcb-util)
-# Workaround the error: 'sleep_for' is not a member of 'std::this_thread'
-%if 0%{?suse_version} > 1500
-BuildRequires: gcc10
-BuildRequires: gcc10-c++
-%endif
Requires: deepin-shortcut-viewer
Requires: deepin-terminal
Requires: file-roller
@@ -215,10 +207,6 @@
%build
qmake-qt5 \
-%if 0%{?suse_version} > 1500
- QMAKE_CC=/usr/bin/gcc-10 \
- QMAKE_CXX=/usr/bin/g++-10 \
-%endif
PREFIX=%{_prefix} \
LIBDIR=%{_libdir} \
CONFIG+="DISABLE_ANYTHING" \
++++++ dde-file-manager-5.5.1.tar.gz -> dde-file-manager-5.5.3.tar.gz ++++++
/work/SRC/openSUSE:Factory/deepin-file-manager/dde-file-manager-5.5.1.tar.gz
/work/SRC/openSUSE:Factory/.deepin-file-manager.new.1900/dde-file-manager-5.5.3.tar.gz
differ: char 13, line 1
++++++ fix-header-include.patch ++++++
--- /var/tmp/diff_new_pack.qoxqi2/_old 2022-04-08 00:28:37.637710008 +0200
+++ /var/tmp/diff_new_pack.qoxqi2/_new 2022-04-08 00:28:37.645709918 +0200
@@ -1,6 +1,6 @@
-diff -Nur
dde-file-manager-5.5.1/src/dde-file-manager-lib/dde-file-manager-lib.pro
dde-file-manager-5.5.1-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
---- dde-file-manager-5.5.1/src/dde-file-manager-lib/dde-file-manager-lib.pro
2021-11-12 14:53:16.000000000 +0800
-+++
dde-file-manager-5.5.1-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
2021-12-16 20:49:03.774588565 +0800
+diff -Nur
dde-file-manager-5.5.3/src/dde-file-manager-lib/dde-file-manager-lib.pro
dde-file-manager-5.5.3-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
+--- dde-file-manager-5.5.3/src/dde-file-manager-lib/dde-file-manager-lib.pro
2021-12-22 13:28:44.000000000 +0800
++++
dde-file-manager-5.5.3-new/src/dde-file-manager-lib/dde-file-manager-lib.pro
2022-02-19 14:44:40.015369606 +0800
@@ -93,9 +93,7 @@
include(interfaces/customization/customization.pri)
include(src.pri)
@@ -10,6 +10,235 @@
-}
+include(search/dfsearch.pri)
- APPSHAREDIR = $$PREFIX/share/$$TARGET
- ICONDIR = $$PREFIX/share/icons/hicolor/scalable/apps
+ #????????????
+ QMAKE_CXXFLAGS += -fstack-protector-all
+diff -Nur
dde-file-manager-5.5.3/src/dde-file-manager-lib/dde-file-manager-lib.pro.orig
dde-file-manager-5.5.3-new/src/dde-file-manager-lib/dde-file-manager-lib.pro.orig
+---
dde-file-manager-5.5.3/src/dde-file-manager-lib/dde-file-manager-lib.pro.orig
1970-01-01 08:00:00.000000000 +0800
++++
dde-file-manager-5.5.3-new/src/dde-file-manager-lib/dde-file-manager-lib.pro.orig
2021-12-22 13:28:44.000000000 +0800
+@@ -0,0 +1,225 @@
++#-------------------------------------------------
++#
++# Project created by QtCreator 2015-06-24T09:14:17
++#
++#-------------------------------------------------
++#system($$PWD/../vendor/prebuild)
++#include($$PWD/../vendor/vendor.pri)
++
++include(../common/common.pri)
++
++QT += core gui svg dbus x11extras concurrent multimedia dbus xml
KCodecs network
++#private
++QT += gui-private
++LIBS += -lKF5Codecs
++
++greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
++
++QT += widgets-private
++
++TARGET = $$ProjectName
++
++TEMPLATE = lib
++CONFIG += create_pc create_prl no_install_prl
++
++DEFINES += QMAKE_TARGET=\\\"$$TARGET\\\" QMAKE_VERSION=\\\"$$VERSION\\\"
++
++# sp3 ????????????feature???????????? UNSTABLE_FEATURE_ENABLE
???????????????????????????
++#DEFINES += SP3_UNSTABLE_FEATURE_ENABLE
++
++isEmpty(QMAKE_ORGANIZATION_NAME) {
++ DEFINES += QMAKE_ORGANIZATION_NAME=\\\"deepin\\\"
++}
++
++isEmpty(PREFIX){
++ PREFIX = /usr
++}
++
++CONFIG += c++11 link_pkgconfig
++PKGCONFIG += libsecret-1 gio-unix-2.0 poppler-cpp dtkwidget dtkgui
udisks2-qt5 disomaster gio-qt libcrypto Qt5Xdg dframeworkdbus polkit-agent-1
polkit-qt5-1
++#DEFINES += QT_NO_DEBUG_OUTPUT
++DEFINES += QT_MESSAGELOGCONTEXT
++
++CONFIG(DISABLE_FFMPEG) | isEqual(BUILD_MINIMUM, YES) {
++ DEFINES += DISABLE_FFMEPG
++}
++
++# BUILD_MINIMUM for live system
++isEqual(BUILD_MINIMUM, YES){
++ DEFINES += DFM_MINIMUM
++}
++
++CONFIG(DISABLE_ANYTHING) {
++ message("Quick search and tag support disabled dut to Anything support
disabled.")
++ DEFINES += DISABLE_QUICK_SEARCH
++ DEFINES += DISABLE_TAG_SUPPORT
++}
++
++# ????????????????????????
++AC_FUNC_ENABLE = true
++#AC_FUNC_ENABLE = $$(ENABLE_AC_FUNC)
++# ????????????????????????
++equals( AC_FUNC_ENABLE, true ){
++ DEFINES += ENABLE_ACCESSIBILITY
++ message("lib-dde-file-manager enabled accessibility function with set: "
$$AC_FUNC_ENABLE)
++}
++
++include(../dialogs/dialogs.pri)
++include(../utils/utils.pri)
++include(../chinese2pinyin/chinese2pinyin.pri)
++include(../fileoperations/fileoperations.pri)
++include(deviceinfo/deviceinfo.pri)
++include(devicemanagement/devicemanagement.pri)
++include(dbusinterface/dbusinterface.pri)
++include(../usershare/usershare.pri)
++include(../dde-file-manager-plugins/plugininterfaces/plugininterfaces.pri)
++include(tag/tag.pri)
++include(mediainfo/mediainfo.pri)
++include(vault/vault.pri)
++include(log/log.pri)
++
++isEqual(ARCH, sw_64){
++ DEFINES += SW_LABEL
++ include(./sw_label/sw_label.pri)
++}
++
++include(fulltextsearch/fulltextsearch.pri)
++DEFINES += FULLTEXTSEARCH_ENABLE
++TR_EXCLUDE += /usr/include/boost/ \
++ $$PWD/fulltextsearch/*
++
++include(io/io.pri)
++include(interfaces/vfs/vfs.pri)
++include(interfaces/customization/customization.pri)
++include(src.pri)
++
++isEqual(ARCH, sw_64) | isEqual(ARCH, mips64) | isEqual(ARCH, mips32) |
isEqual(ARCH, aarch64) | isEqual(ARCH, loongarch64) {
++ include(search/dfsearch.pri)
++}
++
++#????????????
++QMAKE_CXXFLAGS += -fstack-protector-all
++QMAKE_LFLAGS += -z now -fPIC
++isEqual(ARCH, mips64) | isEqual(ARCH, mips32){
++ QMAKE_LFLAGS += -z noexecstack -z relro
++}
++
++APPSHAREDIR = $$PREFIX/share/$$TARGET
++ICONDIR = $$PREFIX/share/icons/hicolor/scalable/apps
++DEFINES += APPSHAREDIR=\\\"$$APPSHAREDIR\\\"
++
++win32* {
++ DEFINES += STATIC_LIB
++ CONFIG += staticlib
++ LIB_DIR =
++}
++
++isEmpty(LIB_INSTALL_DIR) {
++ target.path = $$[QT_INSTALL_LIBS]
++} else {
++ target.path = $$LIB_INSTALL_DIR
++}
++
++isEmpty(INCLUDE_INSTALL_DIR) {
++ includes.path = $$PREFIX/include/dde-file-manager
++} else {
++ includes.path = $$INCLUDE_INSTALL_DIR/dde-file-manager
++}
++
++includes.files += $$PWD/interfaces/*.h $$PWD/interfaces/plugins/*.h
++
++includes_private.path = $${includes.path}/private
++includes_private.files += $$PWD/interfaces/private/*.h
++
++isEmpty(INCLUDE_INSTALL_DIR) {
++ gvfs_includes.path = $$PREFIX/include/dde-file-manager/gvfs
++} else {
++ gvfs_includes.path = $$INCLUDE_INSTALL_DIR/dde-file-manager/gvfs
++}
++
++gvfs_includes.files += $$PWD/gvfs/*.h
++
++isEmpty(INCLUDE_INSTALL_DIR) {
++ plugin_includes.path =
$$PREFIX/include/dde-file-manager/dde-file-manager-plugins
++} else {
++ plugin_includes.path =
$$INCLUDE_INSTALL_DIR/dde-file-manager/dde-file-manager-plugins
++}
++
++plugin_includes.files +=
$$PWD/../dde-file-manager-plugins/plugininterfaces/menu/*.h
++plugin_includes.files +=
$$PWD/../dde-file-manager-plugins/plugininterfaces/preview/*.h
++plugin_includes.files +=
$$PWD/../dde-file-manager-plugins/plugininterfaces/view/*.h
++
++QMAKE_PKGCONFIG_LIBDIR = $$target.path
++QMAKE_PKGCONFIG_VERSION = $$VERSION
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++QMAKE_PKGCONFIG_NAME = dde-file-manager
++QMAKE_PKGCONFIG_DESCRIPTION = DDE File Manager Header Files
++QMAKE_PKGCONFIG_INCDIR = $$includes.path
++
++templateFiles.path = $$APPSHAREDIR/templates
++
++isEqual(BUILD_MINIMUM, YES){
++ templateFiles.files = skin/templates/newTxt.txt
++}else{
++ templateFiles.files = skin/templates/newDoc.doc \
++ skin/templates/newExcel.xls \
++ skin/templates/newPowerPoint.ppt \
++ skin/templates/newDoc.wps \
++ skin/templates/newExcel.et \
++ skin/templates/newPowerPoint.dps \
++ skin/templates/newTxt.txt
++}
++
++mimetypeFiles.path = $$APPSHAREDIR/mimetypes
++mimetypeFiles.files += \
++ mimetypes/archive.mimetype \
++ mimetypes/text.mimetype \
++ mimetypes/video.mimetype \
++ mimetypes/audio.mimetype \
++ mimetypes/image.mimetype \
++ mimetypes/executable.mimetype \
++ mimetypes/backup.mimetype
++
++mimetypeAssociations.path = $$APPSHAREDIR/mimetypeassociations
++mimetypeAssociations.files += \
++ mimetypeassociations/mimetypeassociations.json
++
++TRANSLATIONS += $$PWD/translations/$${TARGET}.ts \
++ $$PWD/translations/$${TARGET}_zh_CN.ts
++
++# Automating generation .qm files from .ts files
++CONFIG(release, debug|release) {
++ !system($$PWD/generate_translations.sh): error("Failed to generate
translation")
++ !system($$PWD/update_translations.sh): error("Failed to generate
translation")
++# DEFINES += QT_NO_DEBUG_OUTPUT
++}
++
++translations.path = $$APPSHAREDIR/translations
++translations.files = translations/*.qm
++
++icon.path = $$ICONDIR
++icon.files = skin/images/$${TARGET}.svg
++
++defaultConfig.path = $$APPSHAREDIR/config
++defaultConfig.files = configure/default-view-states.json
++
++# readme file for create oem-menuextension directory
++readmefile.path = $$PREFIX/share/deepin/$$TARGET/oem-menuextensions
++readmefile.files = plugins/.readme
++
++# readme file for create context-menus directory
++contextmenusfile.path = /usr/share/applications/context-menus
++contextmenusfile.files = plugins/.readme
++
++appentry.path = $$APPSHAREDIR/extensions/appEntry
++appentry.files = plugins/.readme
++
++INSTALLS += target templateFiles translations mimetypeFiles
mimetypeAssociations appentry \
++ icon includes includes_private gvfs_includes plugin_includes defaultConfig
readmefile contextmenusfile policy
++
++DISTFILES += \
++ mimetypeassociations/mimetypeassociations.json \
++ confirm/deepin-vault-authenticateProxy \
++ policy/com.deepin.pkexec.deepin-vault-authenticateProxy.policy
++
++include($$PWD/settings_dialog_json.pri)
