From 05add124cc10335a27611688233301c946d2cfab Mon Sep 17 00:00:00 2001 From: vascom Date: Jun 28 2020 11:22:43 +0000 Subject: Update to 0.9.9. --- diff --git a/.gitignore b/.gitignore index 6e1c8c7..96fd488 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /doublecmd-0.9.6-src.tar.gz /doublecmd-0.9.7-src.tar.gz /doublecmd-0.9.8-src.tar.gz +/doublecmd-0.9.9-src.tar.gz diff --git a/doublecmd-fpc-3.2.0.patch b/doublecmd-fpc-3.2.0.patch deleted file mode 100644 index 4fb90c3..0000000 --- a/doublecmd-fpc-3.2.0.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: src/filesources/multilist/umultilistfilesource.pas -=================================================================== ---- src/filesources/multilist/umultilistfilesource.pas (revision 9387) -+++ src/filesources/multilist/umultilistfilesource.pas (revision 9388) -@@ -58,6 +58,7 @@ - } - FFileSource: IFileSource; - -+ protected - function GetFileList: TFileTree; - function GetFileSource: IFileSource; - -Index: src/fsyncdirsdlg.pas -=================================================================== ---- src/fsyncdirsdlg.pas (revision 9387) -+++ src/fsyncdirsdlg.pas (revision 9388) -@@ -1023,7 +1023,7 @@ - procedure TfrmSyncDirsDlg.InitVisibleItems; - var - i, j: Integer; -- filter: record -+ AFilter: record - copyLeft, copyRight, eq, neq: Boolean; - dup, single: Boolean; - end; -@@ -1037,7 +1037,7 @@ - FVisibleItems.CaseSensitive := FileNameCaseSensitive; - end; - { init filter } -- with filter do -+ with AFilter do - begin - copyLeft := sbCopyLeft.Down; - copyRight := sbCopyRight.Down; -@@ -1055,14 +1055,14 @@ - begin - { check filter } - r := TFileSyncRec(Objects[j]); -- if ((Assigned(r.FFileL) <> Assigned(r.FFileR)) and filter.single or -- (Assigned(r.FFileL) = Assigned(r.FFileR)) and filter.dup) -+ if ((Assigned(r.FFileL) <> Assigned(r.FFileR)) and AFilter.single or -+ (Assigned(r.FFileL) = Assigned(r.FFileR)) and AFilter.dup) - and -- ((r.FState = srsCopyLeft) and filter.copyLeft or -- (r.FState = srsCopyRight) and filter.copyRight or -- (r.FState = srsDeleteRight) and filter.copyLeft or -- (r.FState = srsEqual) and filter.eq or -- (r.FState = srsNotEq) and filter.neq or -+ ((r.FState = srsCopyLeft) and AFilter.copyLeft or -+ (r.FState = srsCopyRight) and AFilter.copyRight or -+ (r.FState = srsDeleteRight) and AFilter.copyLeft or -+ (r.FState = srsEqual) and AFilter.eq or -+ (r.FState = srsNotEq) and AFilter.neq or - (r.FState = srsUnknown)) - then - FVisibleItems.AddObject(Strings[j], Objects[j]); -Index: src/filesources/ufilesource.pas -=================================================================== ---- src/filesources/ufilesource.pas (revision 9320) -+++ src/filesources/ufilesource.pas (revision 9321) -@@ -285,8 +285,8 @@ - This is used if a file source has any internal cache or file list. - Overwrite DoReload in descendant classes. - } -- procedure Reload(const PathsToReload: TPathsArray); virtual; -- procedure Reload(const PathToReload: String); -+ procedure Reload(const PathsToReload: TPathsArray); virtual; overload; -+ procedure Reload(const PathToReload: String); overload; - - procedure AddReloadEventListener(FunctionToCall: TFileSourceReloadEventNotify); - procedure RemoveReloadEventListener(FunctionToCall: TFileSourceReloadEventNotify); -Index: src/platform/unix/upipeserver.pas -=================================================================== ---- src/platform/unix/upipeserver.pas (revision 9320) -+++ src/platform/unix/upipeserver.pas (revision 9321) -@@ -50,6 +50,7 @@ - FFileName: String; - FStream: TFileStream; - private -+ procedure OwnerReadMessage; - procedure Handler(Sender: TObject); - Public - Constructor Create(AOWner : TSimpleIPCServer); override; -@@ -74,9 +75,14 @@ - - { TPipeServerComm } - -+procedure TPipeServerComm.OwnerReadMessage; -+begin -+ Owner.ReadMessage; -+end; -+ - procedure TPipeServerComm.Handler(Sender: TObject); - begin -- TThread.Synchronize(nil, @Owner.ReadMessage); -+ TThread.Synchronize(nil, @OwnerReadMessage); - end; - - constructor TPipeServerComm.Create(AOWner: TSimpleIPCServer); -Index: src/platform/uuniqueinstance.pas -=================================================================== ---- src/platform/uuniqueinstance.pas (revision 9320) -+++ src/platform/uuniqueinstance.pas (revision 9321) -@@ -5,7 +5,7 @@ - interface - - uses -- Classes, SysUtils, SimpleIPC, uCmdLineParams, RegExpr; -+ Classes, SysUtils, SimpleIPC, uCmdLineParams; - - type - -@@ -72,7 +72,7 @@ - {$ELSEIF DEFINED(UNIX)} - ipc, baseunix, uPipeServer, - {$ENDIF} -- Forms, StrUtils, FileUtil, uGlobs, uDebug; -+ Forms, StrUtils, FileUtil, uRegExprA, uGlobs, uDebug; - - {$IF DEFINED(DARWIN)} - const diff --git a/doublecmd.spec b/doublecmd.spec index 5e0d86f..94e02d9 100644 --- a/doublecmd.spec +++ b/doublecmd.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: doublecmd -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Cross platform open source file manager with two panels @@ -11,7 +11,6 @@ URL: http://doublecmd.sourceforge.net Source0: https://sourceforge.net/projects/%{name}/files/Double%20Commander%20Source/%{name}-%{version}-src.tar.gz Source1: %{name}-qt.desktop Source2: licensecheck.txt -Patch0: doublecmd-fpc-3.2.0.patch BuildRequires: fpc >= 2.6.0 BuildRequires: fpc-src @@ -122,6 +121,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/polkit-1/actions/org.doublecmd.root.policy %changelog +* Sun Jun 28 2020 Vasiliy N. Glazov 0.9.9-1 +- Update to 0.9.9 + * Tue May 19 2020 Vasiliy N. Glazov 0.9.8-1 - Update to 0.9.8 diff --git a/sources b/sources index dc7a2a1..54d5b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (doublecmd-0.9.8-src.tar.gz) = e44e4e697cbea0cec08fbac7336cb980ae2a1f72e807435b6e25aa81baf5fc0b94d378161cb36199e0fe42242101c7ce30301c07d1195f5b6252e63cef443682 +SHA512 (doublecmd-0.9.9-src.tar.gz) = d574511d5a7169b80f96af0db2d9f5e44f0a8ee358d489dc6c3840770ec589e91c252df34e24e6a6f9fcb07832b62895166958a1e0e76f3f237945ea9bebfb98