Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt-fsarchiver for openSUSE:Factory
checked in at 2021-05-19 17:49:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt-fsarchiver (Old)
and /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-fsarchiver"
Wed May 19 17:49:33 2021 rev:4 rq:894282 version:0.8.5_22
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt-fsarchiver/qt-fsarchiver.changes
2020-07-08 19:12:27.846999346 +0200
+++ /work/SRC/openSUSE:Factory/.qt-fsarchiver.new.2988/qt-fsarchiver.changes
2021-05-19 17:49:52.361410704 +0200
@@ -1,0 +2,28 @@
+Wed May 12 08:59:10 UTC 2021 - opensuse.lietuviu.ka...@gmail.com
+
+- Update to version 0.8.5-22 and terminal package to version 0.8.5-22:
+ * drop /usr/sbin/{findsmb-qt,ccguess,de} from tarball
+ * use standard findsmb directly instead of findsmb-qt
+ * drop use-system-ccrypt.patch (now upstream use /usr/bin/ccrypt)
+ * update translations
+
+-------------------------------------------------------------------
+Thu May 6 09:34:53 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Added use-system-ccrypt.patch, fixing boo#1185620
+ * Requires ccrypt
+- Add upstream patches replacing sed commands
+ * 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch
+ * 0001-Allow-setting-custom-DOCDIR.patch
+
+-------------------------------------------------------------------
+Sat May 1 12:22:40 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 0.8.5-21 and terminal package to version 0.8.5-18:
+ * Backup of the gpt partition table is checked
+ * corrected korean translation.
+ * Error correction: Progress bar when cloning a hard disk or
+ partition with dd again active.
+- Use SourceUrls: https://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
Old:
----
qt-fsarchiver-0.8.5-18.tar.gz
qt-fsarchiver-terminal-0.8.5-12.tar.gz
New:
----
0001-Allow-setting-custom-DOCDIR.patch
0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch
qt-fsarchiver-0.8.5-22.tar.gz
qt-fsarchiver-terminal-0.8.5-22.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt-fsarchiver.spec ++++++
--- /var/tmp/diff_new_pack.laas5c/_old 2021-05-19 17:49:52.973408138 +0200
+++ /var/tmp/diff_new_pack.laas5c/_new 2021-05-19 17:49:52.977408121 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt-fsarchiver
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,20 +13,24 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
-# or upstream https://sourceforge.net/p/qt-fsarchiver/tickets/
+#
-%define hyphen_version 0.8.5-18
-%define terminal_version 0.8.5-12
+%define hyphen_version 0.8.5-22
+%define terminal_version 0.8.5-22
Name: qt-fsarchiver
-Version: 0.8.5_18
+Version: 0.8.5_22
Release: 0
Summary: Qt GUI for fsarchiver
License: GPL-2.0-or-later
Group: System/Filesystems
-URL: http://qt-fsarchiver.sourceforge.net/
-Source0: %{name}-%{hyphen_version}.tar.gz
-Source1: %{name}-terminal-%{terminal_version}.tar.gz
+URL: https://sourceforge.net/projects/qt-fsarchiver
+Source0: %{URL}/files/source/%{name}/%{name}-%{hyphen_version}.tar.gz
+Source1:
%{URL}/files/source/%{name}-terminal/%{name}-terminal-%{terminal_version}.tar.gz
+# PATCH-FEATURE-UPSTREAM
0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch --
https://github.com/DieterBaum/qt-fsarchiver/pull/12
+Patch0: 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch
+# PATCH-FEATURE-UPSTREAM 0001-Allow-setting-custom-DOCDIR.patch --
https://github.com/DieterBaum/qt-fsarchiver-terminal/pull/2
+Patch1: 0001-Allow-setting-custom-DOCDIR.patch
BuildRequires: e2fsprogs-devel
BuildRequires: libattr-devel
BuildRequires: libgcrypt-devel
@@ -48,6 +52,7 @@
BuildRequires: pkgconfig(lzo2)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(zlib)
+Requires: ccrypt
Recommends: btrfsprogs
Recommends: gdisk
Recommends: jfsutils
@@ -65,59 +70,45 @@
%prep
%setup -q -n %{name}
%setup -T -D -a 1 -n %{name}
-rm -f .qmake.stash
-rm -f translations/*.qm
-sed "s|target.path = /usr/sbin|target.path = %{_sbindir}|" -i %{name}.pro
-sed "s|icon.path = /usr/share/app-install/icons|icon.path =
%{_datadir}/icons/hicolor/48x48/apps|" -i %{name}.pro
-sed "s|autostart.path = /usr/share/applications|autostart.path =
%{_datadir}/applications|" -i %{name}.pro
-sed "s|doc.path = /usr/share/doc/qt-fsarchiver/doc|doc.path =
%{_docdir}/%{name}|" -i %{name}.pro
-sed "s|Icon=/usr/share/app-install/icons/harddrive2.png|Icon=%{name}|" -i
starter/%{name}.desktop
-echo "GenericName=Qt GUI for fsarchiver" >> starter/%{name}.desktop
-echo "GenericName[lt]=Qt fsarchiver" >> starter/%{name}.desktop
+# Part of %%patch0 but binary diffs are not supported
+ln src/images/harddrive2.png src/images/qt-fsarchiver.png
+%patch0 -p2
+%patch1 -p1
+
+rm -vf .qmake.stash
+rm -vf translations/*.qm
+# Fix file permissions
+find doc -type f -exec chmod -x \{\} +
+# Remove prebuilt binaries
+rm -vf src/sbin/{ccguess,de}
%build
export CFLAGS="%{optflags} -fcommon"
pushd %{name}-terminal
-%qmake5 %{name}-terminal.pro
-%make_jobs
+%qmake5 "DOC_DIR=%{_docdir}/%{name}-terminal" %{name}-terminal.pro
+%make_build
popd
-%qmake5 %{name}.pro
-%make_jobs
+%qmake5 "DOC_DIR=%{_docdir}/%{name}" %{name}.pro
+%make_build
%install
pushd %{name}-terminal
%make_install INSTALL_ROOT=%{buildroot}
popd
%make_install INSTALL_ROOT=%{buildroot}
-
-#clean doc directory from backup files
-rm -rf %{buildroot}%{_datadir}/doc/%{name}/*~
-rm -rf %{buildroot}%{_datadir}/doc/%{name}-terminal
-
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
-mkdir -p %{buildroot}%{_datadir}/applications
-mv ~/rpmbuild/BUILD/qt-fsarchiver/src/sbin/findsmb-qt %{buildroot}/%{_sbindir}
-mv ~/rpmbuild/BUILD/qt-fsarchiver/src/sbin/qt-fsarchiver.sh
%{buildroot}/%{_sbindir}
-mv %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/harddrive2.png
%{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
+# Install translations
mkdir -p %{buildroot}%{_datadir}/qt5/translations/
-install -m 0644 -p translations/*.qm %{buildroot}%{_datadir}/qt5/translations/
-
-%suse_update_desktop_file -r %{name} System Filesystem
+install -m 0644 translations/*.qm %{buildroot}%{_datadir}/qt5/translations/
+# -terminal package contains the same documentation
+rm -rf %{buildroot}%{_docdir}/%{name}-terminal
%files
%{_sbindir}/%{name}
%{_sbindir}/%{name}.sh
%{_sbindir}/%{name}-terminal
-%{_sbindir}/findsmb-qt
-%{_sbindir}/ccguess
-%{_sbindir}/de
-%defattr(644,root,root,755)
+%doc %{_docdir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%dir %{_datadir}/icons/hicolor/48x48
-%dir %{_datadir}/icons/hicolor/48x48/apps
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_docdir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
%exclude %{_datadir}/qt5/translations/%{name}*.qm
%files lang
@@ -125,5 +116,4 @@
%dir %{_datadir}/qt5/translations
%{_datadir}/qt5/translations/%{name}*.qm
-
%changelog
++++++ 0001-Allow-setting-custom-DOCDIR.patch ++++++
>From a7e4c97b8b8e7e914e4a91e38810de498b6c0227 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <r...@fthiessen.de>
Date: Wed, 12 May 2021 00:43:18 +0200
Subject: [PATCH] Allow setting custom DOCDIR
By setting DOC_DIR when invoking qmake you can now
set the target directory for the documentation files.
---
qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro
b/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro
index 4a2c1cb..bb2e8f5 100644
--- a/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro
+++ b/qt-fsarchiver-terminal/qt-fsarchiver-terminal.pro
@@ -102,7 +102,11 @@ SOURCES += src/archinfo.c \
src/thread_comp.c \
src/writebuf.c
# install
+ isEmpty(DOC_DIR) {
+ DOC_DIR = /usr/share/doc/qt-fsarchiver-terminal
+ }
+
target.path = /usr/sbin
- doc.files = doc
- doc.path = /usr/share/doc/qt-fsarchiver-terminal/doc
+ doc.files = doc/*
+ doc.path = $$DOC_DIR
INSTALLS = target doc
--
2.26.2
++++++ 0001-Use-standard-paths-and-allow-setting-custom-DOCDIR.patch ++++++
>From 132dfe35ccb4272e49cbc43dfccf6f8a432ec513 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <r...@fthiessen.de>
Date: Tue, 11 May 2021 22:36:41 +0200
Subject: [PATCH] Use standard paths and allow setting custom DOCDIR
* Add GenericName and categories to .desktop file
* Install icon into more standard location /usr/share/pixmaps
* Allow setting custom directory for documentation
---
qt-fsarchiver/qt-fsarchiver.pro | 15 +++++++++------
qt-fsarchiver/starter/qt-fsarchiver.desktop | 7 ++++---
4 files changed, 13 insertions(+), 9 deletions(-)
mode change 100644 => 120000 qt-fsarchiver/src/images/harddrive2.png
create mode 100644 qt-fsarchiver/src/images/qt-fsarchiver.png
diff --git a/qt-fsarchiver/qt-fsarchiver.pro b/qt-fsarchiver/qt-fsarchiver.pro
index c38f179..2dcb696 100755
--- a/qt-fsarchiver/qt-fsarchiver.pro
+++ b/qt-fsarchiver/qt-fsarchiver.pro
@@ -53,16 +53,19 @@ SOURCES += src/clone.cpp \
src/thread.cpp \
src/treeview.cpp
RESOURCES += src/icon.qrc
+isEmpty(DOC_DIR) {
+ DOC_DIR = /usr/share/doc/qt-fsarchiver
+}
# install
target.path = /usr/sbin
- icon.files = src/images/harddrive2.png
- icon.path = /usr/share/app-install/icons
+ icon.files = src/images/qt-fsarchiver.png
+ icon.path = /usr/share/pixmaps
autostart.files = starter/qt-fsarchiver.desktop
autostart.path = /usr/share/applications
- doc.files = doc
- doc.path = /usr/share/doc/qt-fsarchiver/doc
- smbfind.files = src/sbin
- smbfind.path = /usr
+ doc.files = doc/*
+ doc.path = $$DOC_DIR
+ smbfind.files = src/sbin/findsmb-qt src/sbin/qt-fsarchiver.sh
+ smbfind.path = /usr/sbin
TRANSLATIONS += translations/qt-fsarchiver_ar.ts \
translations/qt-fsarchiver_ca.ts \
translations/qt-fsarchiver_ch.ts \
diff --git a/qt-fsarchiver/starter/qt-fsarchiver.desktop
b/qt-fsarchiver/starter/qt-fsarchiver.desktop
index 9f37765..1058cf2 100644
--- a/qt-fsarchiver/starter/qt-fsarchiver.desktop
+++ b/qt-fsarchiver/starter/qt-fsarchiver.desktop
@@ -1,10 +1,11 @@
[Desktop Entry]
Name=qt-fsarchiver
Name[de_DE]=qt-fsarchiver
-Comment=Qt GUI for fsarchiver
+GenericName=Qt GUI for fsarchiver
+GenericName[lt]=Qt fsarchiver
Exec=/usr/sbin/qt-fsarchiver
-Icon=/usr/share/app-install/icons/harddrive2.png
+Icon=qt-fsarchiver
Terminal=false
Type=Application
StartupNotify=true
-
+Categories=System;Filesystem;
--
2.26.2
++++++ qt-fsarchiver-0.8.5-18.tar.gz -> qt-fsarchiver-0.8.5-22.tar.gz ++++++
++++ 76594 lines of diff (skipped)
++++++ qt-fsarchiver-terminal-0.8.5-12.tar.gz ->
qt-fsarchiver-terminal-0.8.5-22.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/.qmake.stash
new/qt-fsarchiver-terminal/.qmake.stash
--- old/qt-fsarchiver-terminal/.qmake.stash 2019-11-03 14:04:09.000000000
+0100
+++ new/qt-fsarchiver-terminal/.qmake.stash 1970-01-01 01:00:00.000000000
+0100
@@ -1,24 +0,0 @@
-QMAKE_CXX.INCDIRS = \
- /usr/include/c++/7 \
- /usr/include/x86_64-linux-gnu/c++/7 \
- /usr/include/c++/7/backward \
- /usr/lib/gcc/x86_64-linux-gnu/7/include \
- /usr/local/include \
- /usr/lib/gcc/x86_64-linux-gnu/7/include-fixed \
- /usr/include/x86_64-linux-gnu \
- /usr/include
-QMAKE_CXX.LIBDIRS = \
- /usr/lib/gcc/x86_64-linux-gnu/7 \
- /usr/lib/x86_64-linux-gnu \
- /usr/lib \
- /lib/x86_64-linux-gnu \
- /lib
-QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
-QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7
-QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 4
-QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
-QMAKE_CXX.COMPILER_MACROS = \
- QT_COMPILER_STDCXX \
- QMAKE_GCC_MAJOR_VERSION \
- QMAKE_GCC_MINOR_VERSION \
- QMAKE_GCC_PATCH_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Liesmich
new/qt-fsarchiver-terminal/doc/Liesmich
--- old/qt-fsarchiver-terminal/doc/Liesmich 2019-03-27 09:24:58.000000000
+0100
+++ new/qt-fsarchiver-terminal/doc/Liesmich 2019-12-28 17:30:04.000000000
+0100
@@ -2,7 +2,7 @@
qt-fsarchiverterminal: Sichern und Wiederherstellen von Partitionen Debian,
Ubuntu, Linux-Mint, Suse und Fedora. [http://wiki.ubuntuusers.de/qt-fsarchiver]
=====================================================================================================================================================
-Copyright (C) 2008-2019 Francois Dupoux und Dieter Baum. All rights reserved.
+Copyright (C) 2008-2020 Francois Dupoux und Dieter Baum. All rights reserved.
Kopieren der Dateien, mit und ohne ??nderung ist erlaubt. Der Code ist ohne
jegliche Garantie. Die Benutzung erfolgt auf eigene Gefahr.
Francois Dupoux entwickelte das Basisprogramm fsarchiver, Hihin Ruslan hat das
Programm verbessert und nach Englisch und Russisch ??bersetzt. Michael R.
Lawrence und sein Team ??bersetzte nach Spanisch und Italienisch, Zhenneng Li
??bersetzte nach Chinesisch, Dieter Baum erstellte die GUI.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/Readme
new/qt-fsarchiver-terminal/doc/Readme
--- old/qt-fsarchiver-terminal/doc/Readme 2019-03-27 09:25:10.000000000
+0100
+++ new/qt-fsarchiver-terminal/doc/Readme 2019-12-28 17:30:17.000000000
+0100
@@ -2,7 +2,7 @@
qt-fsarchiver-terminal: Back up and restore partitions for Debian,Ubuntu,
Linux-Mint, Suse and Fedora [http://wiki.ubuntuusers.de/qt-fsarchiver]
=========================================================================================================================================
-Copyright (C) 2008-2019 Francois Dupoux and Dieter Baum. All rights reserved.
+Copyright (C) 2008-2020 Francois Dupoux and Dieter Baum. All rights reserved.
Copying the files is permitted with or without modifications. The code is
without warranty of any kind. Use at your own risk.
Fran??ois Dupoux has developed the basic program fsarchiver, Hihin Ruslan has
improved the program and tranlate to englisch und russian. Michael R. Lawrence
and his team translated to Spanish and Italian, Zhenneng Li translated to
Chinese, Dieter Baum created the GUI and the code to use the GUI.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/doc/copyright
new/qt-fsarchiver-terminal/doc/copyright
--- old/qt-fsarchiver-terminal/doc/copyright 2018-09-21 22:55:54.000000000
+0200
+++ new/qt-fsarchiver-terminal/doc/copyright 2019-12-28 17:29:36.000000000
+0100
@@ -1,9 +1,9 @@
-==================================================================================================
+=========================================================================================================
qt-fsarchiver-terminal: Back up and restore partitions for (K)Ubuntu, Debian,
Linux Mint, Suse and Fedora.
-[http://wiki.ubuntuusers.de/qt4-fsarchiver]
-==================================================================================================
+[http://wiki.ubuntuusers.de/qt-fsarchiver]
+=========================================================================================================
-Copyright (C) 2008-2018 Francois Dupoux und Dieter Baum. All rights reserved.
+Copyright (C) 2008-2020 Francois Dupoux und Dieter Baum. All rights reserved.
Copy the files, with or without modification is permitted.The code is without
warranty of any kind.
Use at your own risk.
@@ -17,10 +17,10 @@
================================================================================================================
qt-fsarchiver-terminal: Sichern und Wiederherstellen von Partitionen f??r
(K)Ubuntu, Debian, Linux Mint, Suse and Fedora.
-[http://wiki.ubuntuusers.de/qt4-fsarchiver]
+[http://wiki.ubuntuusers.de/qt-fsarchiver]
================================================================================================================
-Copyright (C) 2008-2018 Francois Dupoux und Dieter Baum. All rights reserved.
+Copyright (C) 2008-2020 Francois Dupoux und Dieter Baum. All rights reserved.
Kopieren der Dateien, mit und ohne ??nderung ist erlaubt. Der Code ist ohne
jegliche Garantie.
Die Benutzung erfolgt auf eigene Gefahr.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/src/archinfo.c
new/qt-fsarchiver-terminal/src/archinfo.c
--- old/qt-fsarchiver-terminal/src/archinfo.c 2019-11-03 14:02:35.000000000
+0100
+++ new/qt-fsarchiver-terminal/src/archinfo.c 2019-11-04 14:41:45.000000000
+0100
@@ -87,7 +87,6 @@
FILE *fp1;
fp1 = fopen(home, "a");
if (cryptalgostr(ai->cryptalgo) == crypt)
- // if (cryptalgostr(ai->cryptalgo) == "none")
fprintf(fp1, "%s %s\n", "none", "s");
if ((ai->archtype==ARCHTYPE_FILESYSTEMS))
fprintf(fp1, "%s %s\n", "sys", "o");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/src/main.cc
new/qt-fsarchiver-terminal/src/main.cc
--- old/qt-fsarchiver-terminal/src/main.cc 2019-11-03 14:02:58.000000000
+0100
+++ new/qt-fsarchiver-terminal/src/main.cc 2020-10-24 16:38:21.000000000
+0200
@@ -43,7 +43,7 @@
aufruf = argv[2];
if (homepath == "version")
{
- qDebug() << "Version: 0.8.5-12";
+ qDebug() << "Version: 0.8.5-18";
return 1;
}
if (aufruf == "version")
@@ -52,7 +52,7 @@
QFile file(filename);
file.open(QIODevice::WriteOnly);
QDataStream out(&file);
- out << QString("0.8.5-12");
+ out << QString("0.8.5-18");
file.close();
return 1;
}
@@ -63,7 +63,6 @@
{
QString dummy;
int found = 0;
- int i = 0;
string filename;
const char *filename1;
char *argv[15];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/src/oper_restore.c
new/qt-fsarchiver-terminal/src/oper_restore.c
--- old/qt-fsarchiver-terminal/src/oper_restore.c 2019-11-01
11:42:08.000000000 +0100
+++ new/qt-fsarchiver-terminal/src/oper_restore.c 2020-10-24
17:14:34.000000000 +0200
@@ -64,10 +64,10 @@
u64 cost_global;
u64 cost_current;
} cextractar;
-long long anzahlfile;
- float progress;
- int zeitflag = 0;
- int symlink_ = 0;
+
+//float progress;
+int zeitflag = 0;
+int symlink_ = 0;
// returns true if this file of a parent directory has been excluded
int is_filedir_excluded(char *relpath)
@@ -174,13 +174,14 @@
int extractar_listing_print_file(cextractar *exar, int objtype, char *relpath)
{
char strprogress[256];
+ float progress;
memset(strprogress, 0, sizeof(strprogress));
if (exar->cost_global>0)
{
progress=(((exar->cost_current)*100)/(exar->cost_global));
if (progress>=0 && progress<=100)
- snprintf(strprogress, sizeof(strprogress), "[%3d%%]",
(int)progress);
+ snprintf(strprogress, sizeof(strprogress), "[%3d%%]", progress);
}
msgprintf(MSG_VERB1, "-[%.2d]%s[%s] %s\n", exar->fsid, strprogress,
get_objtype_name(objtype), relpath);
/// Terminal Ausgabe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt-fsarchiver-terminal/src/oper_save.c
new/qt-fsarchiver-terminal/src/oper_save.c
--- old/qt-fsarchiver-terminal/src/oper_save.c 2019-04-21 13:28:18.000000000
+0200
+++ new/qt-fsarchiver-terminal/src/oper_save.c 2020-10-24 17:02:15.000000000
+0200
@@ -83,8 +83,8 @@
int fstype;
} cdevinfo;
int meldeflag = 0;
- long long anzahlfile = 0;
- float progress = 0;
+ //long long anzahlfile = 0;
+ float progress = 0;
int createar_obj_regfile_multi(csavear *save, cdico *header, char *relpath,
char *fullpath, u64 filesize)
{
@@ -421,6 +421,8 @@
char filename[100] = ".config/qt-fsarchiver/anzahl_file.txt";
char filename1[100] = ".config/qt-fsarchiver/prozent.txt";
char filename2[100] = ".config/qt-fsarchiver/anzahlfile.txt";
+ long long anzahlfile = 0;
+ //float progress = 0;
// init
flags=0;
*objtype=OBJTYPE_NULL;
@@ -627,6 +629,7 @@
u64 filecost;
int objtype;
int res;
+ //float progress = 0;
// init
concatenate_paths(fullpath, sizeof(fullpath), root, relpath);
