rebase patches
OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/peazip?expand=0&rev=147
This commit is contained in:
committed by
Git OBS Bridge
parent
3f1f3aa0c4
commit
f193aa8838
@@ -5,11 +5,11 @@ Subject: Build PIE binaries
|
||||
Set lazarus project files so that we produce position
|
||||
independent executables.
|
||||
|
||||
Index: peazip-10.3.0.src/dev/project_pea.lpi
|
||||
Index: peazip-10.4.0.src/dev/project_pea.lpi
|
||||
===================================================================
|
||||
--- peazip-10.3.0.src.orig/dev/project_pea.lpi
|
||||
+++ peazip-10.3.0.src/dev/project_pea.lpi
|
||||
@@ -581,6 +581,8 @@
|
||||
--- peazip-10.4.0.src.orig/dev/project_pea.lpi
|
||||
+++ peazip-10.4.0.src/dev/project_pea.lpi
|
||||
@@ -585,6 +585,8 @@
|
||||
<DebugInfoType Value="dsDwarf3"/>
|
||||
</Debugging>
|
||||
<Options>
|
||||
@@ -18,11 +18,11 @@ Index: peazip-10.3.0.src/dev/project_pea.lpi
|
||||
<Win32>
|
||||
<GraphicApplication Value="True"/>
|
||||
</Win32>
|
||||
Index: peazip-10.3.0.src/dev/project_peach.lpi
|
||||
Index: peazip-10.4.0.src/dev/project_peach.lpi
|
||||
===================================================================
|
||||
--- peazip-10.3.0.src.orig/dev/project_peach.lpi
|
||||
+++ peazip-10.3.0.src/dev/project_peach.lpi
|
||||
@@ -1654,6 +1654,8 @@
|
||||
--- peazip-10.4.0.src.orig/dev/project_peach.lpi
|
||||
+++ peazip-10.4.0.src/dev/project_peach.lpi
|
||||
@@ -1657,6 +1657,8 @@
|
||||
<RunWithoutDebug Value="True"/>
|
||||
</Debugging>
|
||||
<Options>
|
||||
|
@@ -1,8 +1,8 @@
|
||||
Index: peazip-10.3.0.src/dev/project_peach.lpi
|
||||
Index: peazip-10.4.0.src/dev/project_peach.lpi
|
||||
===================================================================
|
||||
--- peazip-10.3.0.src.orig/dev/project_peach.lpi
|
||||
+++ peazip-10.3.0.src/dev/project_peach.lpi
|
||||
@@ -1650,7 +1650,7 @@
|
||||
--- peazip-10.4.0.src.orig/dev/project_peach.lpi
|
||||
+++ peazip-10.4.0.src/dev/project_peach.lpi
|
||||
@@ -1653,7 +1653,7 @@
|
||||
</CodeGeneration>
|
||||
<Linking>
|
||||
<Debugging>
|
||||
|
@@ -1,7 +1,7 @@
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipadd.desktop
|
||||
@@ -2,6 +2,8 @@
|
||||
Exec=peazip -add2archive %F
|
||||
Icon=peazip
|
||||
@@ -16,10 +16,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
Icon=peazip
|
||||
ServiceTypes=KonqPopupMenu/Plugin,all/all
|
||||
+X-SuSE-translate=true
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipext.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipext]
|
||||
Exec=peazip -ext2full %F
|
||||
@@ -36,10 +36,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
Name[en_US]=peazipext
|
||||
ServiceTypes=KonqPopupMenu/Plugin,all/all
|
||||
+X-SuSE-translate=true
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipextfolder.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipextfolder]
|
||||
Exec=peazip -ext2folder %F
|
||||
@@ -56,10 +56,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
Name[en_US]=peazipextfolder
|
||||
ServiceTypes=KonqPopupMenu/Plugin,all/all
|
||||
+X-SuSE-translate=true
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipexthere.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipexthere]
|
||||
Exec=peazip -ext2here %F
|
||||
@@ -76,10 +76,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
Name[en_US]=peazipexthere
|
||||
ServiceTypes=KonqPopupMenu/Plugin,all/all
|
||||
+X-SuSE-translate=true
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE4-dolphin/peazipopen.desktop
|
||||
@@ -2,6 +2,8 @@
|
||||
Exec=peazip -ext2browse %F
|
||||
Icon=peazip
|
||||
@@ -94,10 +94,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
Name[en_US]=peazipopen
|
||||
ServiceTypes=KonqPopupMenu/Plugin,all/all
|
||||
+X-SuSE-translate=true
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipadd.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipadd]
|
||||
Exec=peazip -add2archive %F
|
||||
@@ -109,10 +109,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipext.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipext]
|
||||
Exec=peazip -ext2full %F
|
||||
@@ -124,10 +124,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipextfolder.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipextfolder]
|
||||
Exec=peazip -ext2folder %F
|
||||
@@ -139,10 +139,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipexthere.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipexthere]
|
||||
Exec=peazip -ext2here %F
|
||||
@@ -154,13 +154,13 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus/KDE5-dolphin/peazipopen.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Action peazipopen]
|
||||
Exec=peazip -ext2browse %F
|
||||
Exec=peazip -ext2browse %f
|
||||
Icon=peazip
|
||||
-Name=Open with PeaZip...
|
||||
+Name=Open with PeaZip
|
||||
@@ -169,10 +169,10 @@ Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/KDE-servicemenus
|
||||
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
Index: peazip-9.8.0.src/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
Index: peazip-10.4.0.src/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
===================================================================
|
||||
--- peazip-9.8.0.src.orig/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
+++ peazip-9.8.0.src/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
--- peazip-10.4.0.src.orig/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
+++ peazip-10.4.0.src/res/share/batch/freedesktop_integration/peazip.desktop
|
||||
@@ -1,14 +1,21 @@
|
||||
[Desktop Entry]
|
||||
Name=PeaZip
|
||||
|
@@ -1,8 +1,8 @@
|
||||
Index: peazip-10.3.0.src/dev/peach.pas
|
||||
Index: peazip-10.4.0.src/dev/peach.pas
|
||||
===================================================================
|
||||
--- peazip-10.3.0.src.orig/dev/peach.pas
|
||||
+++ peazip-10.3.0.src/dev/peach.pas
|
||||
@@ -45554,7 +45554,7 @@ end;
|
||||
--- peazip-10.4.0.src.orig/dev/peach.pas
|
||||
+++ peazip-10.4.0.src/dev/peach.pas
|
||||
@@ -45484,7 +45484,7 @@ end;
|
||||
|
||||
procedure TForm_peach.baboutlocalhelpClick(Sender: TObject);
|
||||
begin
|
||||
@@ -11,7 +11,7 @@ Index: peazip-10.3.0.src/dev/peach.pas
|
||||
end;
|
||||
|
||||
procedure TForm_peach.baboutplugindirClick(Sender: TObject);
|
||||
@@ -71444,7 +71444,7 @@ end;
|
||||
@@ -71369,7 +71369,7 @@ end;
|
||||
|
||||
procedure TForm_peach.mpeahelpofflineClick(Sender: TObject);
|
||||
begin
|
||||
|
Reference in New Issue
Block a user