From ad11e60559d50dfa8b01fbd08a8df780ac17a1b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Wed, 7 Feb 2018 02:50:19 +0300 Subject: [PATCH] Updated to 6.5.0 --- .abf.yml | 2 +- peazip-6.5.0-lazarus_1.8.0.patch | 24 ++++++++++++++++++++++++ peazip.spec | 9 ++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 peazip-6.5.0-lazarus_1.8.0.patch diff --git a/.abf.yml b/.abf.yml index dd9412c..47fa0e8 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - peazip-6.4.1.src.zip: 49be76034feb29bcbeefb5797c891556cd12bf81 + peazip-6.5.0.src.zip: 783cc020b2a693c90fe67a581231a36ed5100a72 diff --git a/peazip-6.5.0-lazarus_1.8.0.patch b/peazip-6.5.0-lazarus_1.8.0.patch new file mode 100644 index 0000000..9da5acc --- /dev/null +++ b/peazip-6.5.0-lazarus_1.8.0.patch @@ -0,0 +1,24 @@ +From: Luigi Baldoni +Date: 2017-12-27 13:01:22 +0100 +Subject: Make peazip compatible with lazarus 1.8.0 +References: https://sourceforge.net/p/peazip/tickets/468 +Upstream: submitted + +The GetSelectedNodePath method has been deprecated since +svn r48302 2015-03-12. +Using the Path property as recommended in lcl/shellctrls.pas#L86 +(lazarus source, same revision) + +Index: peazip-6.5.0.src/peach.pas +=================================================================== +--- peazip-6.5.0.src.orig/peach.pas ++++ peazip-6.5.0.src/peach.pas +@@ -56706,7 +56706,7 @@ var + begin + if fromtree=true then + begin +- s:=ShellTreeView1.GetSelectedNodePath; ++ s:=ShellTreeView1.Path; + if s='' then exit; + fun:='FILEBROWSER'; + fun_status:=fun; diff --git a/peazip.spec b/peazip.spec index 6b6109a..c2e3069 100644 --- a/peazip.spec +++ b/peazip.spec @@ -2,7 +2,7 @@ Summary: File and archive manager Name: peazip -Version: 6.4.1 +Version: 6.5.0 Release: 1 License: LGPLv3+ Group: File tools @@ -11,6 +11,8 @@ Source0: https://sourceforge.net/projects/peazip/files/%{version}/%{name}-%{vers # configure to run in users home appdata Source1: altconf.txt Source2: rosa-peazip.desktop +# https://sourceforge.net/p/peazip/tickets/468 +Patch0: peazip-6.5.0-lazarus_1.8.0.patch BuildRequires: dos2unix BuildRequires: lazarus >= 1.2.0 BuildRequires: qt4pas-devel @@ -36,6 +38,7 @@ UPX... %prep %setup -qn %{name}-%{version}.src +%apply_patches chmod +w res/lang dos2unix readme* @@ -56,8 +59,8 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/%{name}/res #install helper apps mkdir -p %{buildroot}%{_datadir}/%{name}/res/{7z,upx} -ln -s %{_bindir}/7z %{buildroot}%{_datadir}/%{name}/res/7z -ln -s %{_bindir}/upx %{buildroot}%{_datadir}/%{name}/res/upx +ln -s %{_bindir}/7z %{buildroot}%{_datadir}/%{name}/res/7z +ln -s %{_bindir}/upx %{buildroot}%{_datadir}/%{name}/res/upx install pea %{buildroot}%{_datadir}/%{name}/res ln -s %{_datadir}/%{name}/res/pea %{buildroot}%{_bindir}/pea