free-delta: re-patch

This commit is contained in:
Kuoi 2023-05-13 23:05:30 +08:00
parent c644e74250
commit a245b2163a
2 changed files with 14 additions and 50 deletions

View file

@ -21,7 +21,7 @@ source=("git+https://github.com/maurobio/freedelta.git#tag=v$pkgver"
"git+https://github.com/skalogryz/richmemo.git") "git+https://github.com/skalogryz/richmemo.git")
sha256sums=('SKIP' sha256sums=('SKIP'
'df398bcf5f3ef5ae7bddd624e309f9b30188eb1200befc436acf11f4a8fcd7c9' 'df398bcf5f3ef5ae7bddd624e309f9b30188eb1200befc436acf11f4a8fcd7c9'
'025d7782b3edffbebde90d709c4f70a28bac56dd5bfd3802d65afeec7dd1a05a' '6174c9fc98683df55454513f53ffbdf92346fbb04dc1a2c9c10d6485c898b2aa'
'7d7176cb08b546c6f7537032aba9fbca60c72e17cfc66dc320ebcbb8a239b03a' '7d7176cb08b546c6f7537032aba9fbca60c72e17cfc66dc320ebcbb8a239b03a'
'520f7ec155398c94a96d504453bcc6bfec08108c42e8b5db78c8d7b5187fa04c' '520f7ec155398c94a96d504453bcc6bfec08108c42e8b5db78c8d7b5187fa04c'
'56921e78696d12690f0123e742d92663706386e6342a46e96a0ed9a14cbecc92' '56921e78696d12690f0123e742d92663706386e6342a46e96a0ed9a14cbecc92'

View file

@ -1,11 +1,5 @@
From: Sergej Pupykin <sergej@p5n.pp.ru>
Date: Tues, 29 Nov 2022
Subject: [PATCH] fix fde.lpi and main.pas
---
diff --git a/fde.lpi b/fde.lpi diff --git a/fde.lpi b/fde.lpi
index 447c2e6..ec46b9a 100644 index c4c605c..84a2823 100644
--- a/fde.lpi --- a/fde.lpi
+++ b/fde.lpi +++ b/fde.lpi
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
@ -24,56 +18,26 @@ index 447c2e6..ec46b9a 100644
<Title Value="FreeDelta Editor"/> <Title Value="FreeDelta Editor"/>
<Scaled Value="True"/> <Scaled Value="True"/>
<ResourceType Value="res"/> <ResourceType Value="res"/>
@@ -43,28 +45,31 @@ @@ -43,7 +45,7 @@
<Mode0 Name="default"/> <Mode0 Name="default"/>
</Modes> </Modes>
</RunParams> </RunParams>
- <RequiredPackages Count="7"> - <RequiredPackages Count="7">
+ <RequiredPackages Count="8"> + <RequiredPackages Count="8">
<Item1> <Item1>
- <PackageName Value="richmemopackage"/> <PackageName Value="richmemopackage"/>
+ <PackageName Value="synfacilsyn"/>
</Item1> </Item1>
<Item2> @@ -65,6 +67,9 @@
- <PackageName Value="SynEdit"/>
+ <PackageName Value="richmemopackage"/>
</Item2>
<Item3>
- <PackageName Value="FrameViewer09"/>
+ <PackageName Value="SynEdit"/>
</Item3>
<Item4>
- <PackageName Value="TurboPowerIPro"/>
+ <PackageName Value="FrameViewer09"/>
</Item4>
<Item5>
- <PackageName Value="LazControls"/>
+ <PackageName Value="TurboPowerIPro"/>
</Item5>
<Item6>
- <PackageName Value="HistoryLazarus"/>
+ <PackageName Value="LazControls"/>
</Item6>
<Item7> <Item7>
- <PackageName Value="LCL"/> <PackageName Value="LCL"/>
+ <PackageName Value="HistoryLazarus"/>
</Item7> </Item7>
+ <Item8> + <Item8>
+ <PackageName Value="LCL"/> + <PackageName Value="synfacilsyn"/>
+ </Item8> + </Item8>
</RequiredPackages> </RequiredPackages>
<Units Count="17"> <Units Count="18">
<Unit0> <Unit0>
@@ -196,7 +201,7 @@ @@ -218,20 +223,4 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
- <OtherUnitFiles Value="C:\lazarus\user\SynFacilSyn\"/>
+ <OtherUnitFiles Value="C:\lazarus\user\SynFacilSyn"/>
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Linking>
@@ -210,20 +215,4 @@
</Options> </Options>
</Linking> </Linking>
</CompilerOptions> </CompilerOptions>
@ -95,10 +59,10 @@ index 447c2e6..ec46b9a 100644
- </Debugging> - </Debugging>
</CONFIG> </CONFIG>
diff --git a/main.pas b/main.pas diff --git a/main.pas b/main.pas
index e6ee9d3..f885687 100644 index 6bb8296..6e3c63d 100644
--- a/main.pas --- a/main.pas
+++ b/main.pas +++ b/main.pas
@@ -1558,7 +1558,7 @@ begin @@ -1633,7 +1633,7 @@ begin
sPath := GetAppConfigDir(False); sPath := GetAppConfigDir(False);
IniFile := TIniFile.Create(sPath + 'fde.ini'); IniFile := TIniFile.Create(sPath + 'fde.ini');
sLang := IniFile.ReadString('Options', 'Language', 'en'); // First default is English sLang := IniFile.ReadString('Options', 'Language', 'en'); // First default is English
@ -107,7 +71,7 @@ index e6ee9d3..f885687 100644
case sLang of case sLang of
'en': 'en':
begin begin
@@ -2525,7 +2525,7 @@ begin @@ -2650,7 +2650,7 @@ begin
LanguageFrenchItem.Checked := False; LanguageFrenchItem.Checked := False;
sPath := GetAppConfigDir(False); sPath := GetAppConfigDir(False);
IniFile := TIniFile.Create(sPath + 'fde.ini'); IniFile := TIniFile.Create(sPath + 'fde.ini');
@ -116,7 +80,7 @@ index e6ee9d3..f885687 100644
IniFile.WriteString('Options', 'Language', 'en'); IniFile.WriteString('Options', 'Language', 'en');
IniFile.Free; IniFile.Free;
end; end;
@@ -2541,7 +2541,7 @@ begin @@ -2666,7 +2666,7 @@ begin
LanguageEnglishItem.Checked := False; LanguageEnglishItem.Checked := False;
sPath := GetAppConfigDir(False); sPath := GetAppConfigDir(False);
IniFile := TIniFile.Create(sPath + 'fde.ini'); IniFile := TIniFile.Create(sPath + 'fde.ini');
@ -125,7 +89,7 @@ index e6ee9d3..f885687 100644
IniFile.WriteString('Options', 'Language', 'fr'); IniFile.WriteString('Options', 'Language', 'fr');
IniFile.Free; IniFile.Free;
end; end;
@@ -2557,7 +2557,7 @@ begin @@ -2682,7 +2682,7 @@ begin
LanguageFrenchItem.Checked := False; LanguageFrenchItem.Checked := False;
sPath := GetAppConfigDir(False); sPath := GetAppConfigDir(False);
IniFile := TIniFile.Create(sPath + 'fde.ini'); IniFile := TIniFile.Create(sPath + 'fde.ini');