summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Vijay Marcel <vijaymarcel@outlook.com>2024-04-29 20:56:56 +0700
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2024-05-04 21:44:57 +0700
commit8c0de5c2a6e35777b4297aed64191d7aba1a15c8 (patch)
tree45395a8ca5d5f3999d7a0b7d64452816a44d2b12
parent5c65319a5b042866cae14be6b224ff0e92910b75 (diff)
downloadslackbuilds-8c0de5c2a6e35777b4297aed64191d7aba1a15c8.tar.gz
slackbuilds-8c0de5c2a6e35777b4297aed64191d7aba1a15c8.tar.xz
multimedia/winff: Updated for version 1.6.4.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--multimedia/winff/changelog5
-rw-r--r--multimedia/winff/patches/unit1-pas.patch60
-rw-r--r--multimedia/winff/patches/unit3-pas.patch61
-rw-r--r--multimedia/winff/patches/winff-lpi.patch22
-rw-r--r--multimedia/winff/winff.SlackBuild2
-rw-r--r--multimedia/winff/winff.info6
6 files changed, 77 insertions, 79 deletions
diff --git a/multimedia/winff/changelog b/multimedia/winff/changelog
index a67e2f90bc..e464b2ee64 100644
--- a/multimedia/winff/changelog
+++ b/multimedia/winff/changelog
@@ -121,3 +121,8 @@ Resubmit to SBo
Modify the SlackBuild to avoid creating object code files to /usr/share/lazarus
when compiling winff and remove unused function in doinst.sh Thanks to Andrew Clemons
for pointing it out.
+
+27/04/2024:
+
+Updated to version 1.6.4
+Fixed dead links. Fix documentation to properly open the pdf.
diff --git a/multimedia/winff/patches/unit1-pas.patch b/multimedia/winff/patches/unit1-pas.patch
index 402e4634a9..cb6ddd2217 100644
--- a/multimedia/winff/patches/unit1-pas.patch
+++ b/multimedia/winff/patches/unit1-pas.patch
@@ -1,5 +1,5 @@
---- unit1.pas 2023-10-03 19:20:47.000000000 +0530
-+++ unit1n.pas 2024-01-10 22:26:54.221464261 +0530
+--- unit1.pas 2024-04-17 01:41:03.000000000 +0530
++++ unit1n.pas 2024-04-25 19:19:53.307142871 +0530
@@ -1,8 +1,8 @@
unit Unit1;
@@ -9,35 +9,39 @@
-// http://winff.org
+// https://github.com/WinFF/winff
// Licensed under the GPL v3 or any later version
- //
+
// This program is free software: you can redistribute it and/or modify
-@@ -1988,16 +1988,16 @@
- language:=leftstr(lang,2);
- {$ifdef unix}
- s :='';
-- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz';
-- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf';
-+ if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.' + language + '.pdf.gz';
-+ if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.' + language + '.pdf';
- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf';
- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz';
- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz';
- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf';
- if s='' then
- begin
-- s := '/usr/share/doc/winff/WinFF.en.pdf.gz';
-- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf';
-+ s := '/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf.gz';
-+ if fileexists('/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf') then s:='/usr/doc/winff-20231003_31b79e3/WinFF.en.pdf';
- if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf';
- if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz';
- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz';
-@@ -2015,7 +2015,7 @@
+@@ -1795,20 +1795,12 @@
+ language:=leftstr(lang,2);
+ {$ifdef unix}
+ s :='';
+- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz';
+- if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf';
+- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf') then s:='/usr/share/winff/WinFF.' + language + '.pdf';
+- if fileexists('/usr/share/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/winff/WinFF.' + language + '.pdf.gz';
+- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf.gz';
+- if fileexists('/usr/share/doc/packages/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/packages/winff/WinFF.' + language + '.pdf';
++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf.gz';
++ if fileexists('/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.' + language + '.pdf';
+ if s='' then
+ begin
+- s := '/usr/share/doc/winff/WinFF.en.pdf.gz';
+- if fileexists('/usr/share/doc/winff/WinFF.en.pdf') then s:='/usr/share/doc/winff/WinFF.en.pdf';
+- if fileexists('/usr/share/winff/WinFF.en.pdf') then s:='/usr/share/winff/WinFF.en.pdf';
+- if fileexists('/usr/share/winff/WinFF.en.pdf.gz') then s:='/usr/share/winff/WinFF.en.pdf.gz';
+- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf.gz') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf.gz';
+- if fileexists('/usr/share/doc/packages/winff/WinFF.en.pdf') then s:='/usr/share/doc/packages/winff/WinFF.en.pdf';
++ s := '/usr/doc/winff-1.6.4/WinFF.en.pdf.gz';
++ if fileexists('/usr/doc/winff-1.6.4/WinFF.en.pdf') then s:='/usr/doc/winff-1.6.4/WinFF.en.pdf';
+ end;
+ {$endif}
+ {$IFDEF WINDOWS}
+@@ -1821,7 +1813,7 @@
+ //menu: Help Forums
procedure TfrmMain.mitForumsClick(Sender: TObject);
-
begin
-- launchbrowser('https://groups.google.com/g/winff');
-+ launchbrowser('https://github.com/WinFF/winff/issues');
+- launchbrowser('https://groups.google.com/g/winff');
++ launchbrowser('http://github.com/WinFF/winff/issues');
end;
procedure TfrmMain.mitRestoreDefaultsClick(Sender: TObject);
diff --git a/multimedia/winff/patches/unit3-pas.patch b/multimedia/winff/patches/unit3-pas.patch
index 1d99d96642..5f8dd7c238 100644
--- a/multimedia/winff/patches/unit3-pas.patch
+++ b/multimedia/winff/patches/unit3-pas.patch
@@ -1,7 +1,8 @@
---- unit3.pas 2024-02-19 19:19:13.000000000 +0530
-+++ unit3n.pas 2024-02-27 18:15:24.377843083 +0530
-@@ -1,8 +1,8 @@
- unit Unit3;
+--- unit3.pas 2024-04-17 01:41:03.000000000 +0530
++++ unit3n.pas 2024-04-25 17:30:56.674161644 +0530
+@@ -2,9 +2,9 @@
+
+ // About form
-// WInFF 1.0 Copyright 2006-2013 Matthew Weatherford
+// WInFF 1.0 Copyright 2006-2024 Matthew Weatherford
@@ -9,69 +10,69 @@
-// http://winff.org
+// https://github.com/WinFF/winff
// Licensed under the GPL v3 or any later version
- //
+
// This program is free software: you can redistribute it and/or modify
-@@ -62,7 +62,6 @@
- procedure lblBellardClick(Sender: TObject);
- procedure lblGeversClick(Sender: TObject);
- procedure lblStoffbergClick(Sender: TObject);
-- procedure lblGmaqClick(Sender: TObject);
- procedure lblURLZeranoClick(Sender: TObject);
- procedure lblWeatherfordClick(Sender: TObject);
- procedure lblURLWinffOrgClick(Sender: TObject);
-@@ -132,27 +131,22 @@
+@@ -60,7 +60,6 @@
+ procedure lblBellardClick(Sender: TObject);
+ procedure lblGeversClick(Sender: TObject);
+ procedure lblStoffbergClick(Sender: TObject);
+- procedure lblGmaqClick(Sender: TObject);
+ procedure lblURLZeranoClick(Sender: TObject);
+ procedure lblWeatherfordClick(Sender: TObject);
+ procedure lblURLWinffOrgClick(Sender: TObject);
+@@ -128,27 +127,22 @@
procedure TfrmAbout.lblBellardClick(Sender: TObject);
begin
-
-+ frmMain.LaunchBrowser('https://bellard.org/');
++ frmMain.LaunchBrowser('https://bellard.org/');
end;
procedure TfrmAbout.lblGeversClick(Sender: TObject);
begin
-- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/');
-+ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff');
+- frmMain.LaunchBrowser('https://launchpad.net/~paul-climbing/+archive/ppa/');
++ frmMain.LaunchBrowser('https://tracker.debian.org/pkg/winff');
end;
procedure TfrmAbout.lblStoffbergClick(Sender: TObject);
begin
--frmMain.LaunchBrowser('http://istoff.blogspot.com');
+- frmMain.LaunchBrowser('http://istoff.blogspot.com');
-end;
-
-procedure TfrmAbout.lblGmaqClick(Sender: TObject);
-begin
-- frmMain.LaunchBrowser('http://www.bandshed.net/');
-+frmMain.LaunchBrowser('https://istoff.blogspot.com');
+- frmMain.LaunchBrowser('http://www.bandshed.net/');
++ frmMain.LaunchBrowser('https://istoff.blogspot.com');
end;
procedure TfrmAbout.lblURLZeranoClick(Sender: TObject);
begin
-- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com');
-+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds');
+- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com');
++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds');
end;
procedure TfrmAbout.btnOkClick(Sender: TObject);
-@@ -162,7 +156,7 @@
+@@ -158,7 +152,7 @@
procedure TfrmAbout.lblWeatherfordClick(Sender: TObject);
begin
-- frmMain.LaunchBrowser('http://www.biggmatt.com');
-+ frmMain.LaunchBrowser('https://www.biggmatt.com/p/winff.html');
+- frmMain.LaunchBrowser('http://www.biggmatt.com');
++ frmMain.LaunchBrowser('https://github.com/WinFF/winff');
end;
procedure TfrmAbout.lblURLWinffOrgClick(Sender: TObject);
-@@ -172,12 +166,12 @@
+@@ -168,12 +162,12 @@
procedure TfrmAbout.lblURLffmpegClick(Sender: TObject);
begin
-- frmMain.LaunchBrowser('http://ffmpeg.org/');
-+ frmMain.LaunchBrowser('https://ffmpeg.org/');
+- frmMain.LaunchBrowser('http://ffmpeg.org/');
++ frmMain.LaunchBrowser('https://ffmpeg.org/');
end;
procedure TfrmAbout.lblwinbuildsClick(Sender: TObject);
begin
-- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/');
-+ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds');
+- frmMain.LaunchBrowser('http://ffmpeg.zeranoe.com/builds/');
++ frmMain.LaunchBrowser('https://www.gyan.dev/ffmpeg/builds');
end;
procedure TfrmAbout.lblWindowsBuildsClick(Sender: TObject);
diff --git a/multimedia/winff/patches/winff-lpi.patch b/multimedia/winff/patches/winff-lpi.patch
index 663bce1c32..5c606b7ec4 100644
--- a/multimedia/winff/patches/winff-lpi.patch
+++ b/multimedia/winff/patches/winff-lpi.patch
@@ -1,5 +1,5 @@
---- winff.lpi 2023-10-03 19:20:47.000000000 +0530
-+++ winffn.lpi 2024-01-10 22:47:30.406244263 +0530
+--- winff.lpi 2024-04-17 01:41:03.000000000 +0530
++++ winffn.lpi 2024-04-25 17:33:23.998161221 +0530
@@ -20,7 +20,7 @@
<MajorVersionNr Value="1"/>
<MinorVersionNr Value="6"/>
@@ -9,23 +9,11 @@
</VersionInfo>
<BuildModes Count="1">
<Item1 Name="default" Default="True"/>
-@@ -117,6 +117,11 @@
- <UseAnsiStrings Value="False"/>
- </SyntaxOptions>
- </Parsing>
-+ <CodeGeneration>
-+ <Optimizations>
-+ <OptimizationLevel Value="2"/>
-+ </Optimizations>
-+ </CodeGeneration>
- <Linking>
- <Debugging>
- <DebugInfoType Value="dsStabs"/>
-@@ -124,7 +129,7 @@
- <LinkSmart Value="True"/>
+@@ -129,7 +129,7 @@
+ </Debugging>
<Options>
<PassLinkerOptions Value="True"/>
-- <LinkerOptions Value="--as-needed"/>
+- <LinkerOptions Value="--as-needed -zrelro -znow"/>
+ <LinkerOptions Value="--as-needed -zrelro -znow -zdefs -pie"/>
<Win32>
<GraphicApplication Value="True"/>
diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild
index 70d2b7209e..52eb1ccfc3 100644
--- a/multimedia/winff/winff.SlackBuild
+++ b/multimedia/winff/winff.SlackBuild
@@ -31,7 +31,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=winff
-VERSION=${VERSION:-1.6.3}
+VERSION=${VERSION:-1.6.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info
index 5ac2f04f02..52aaafeaf7 100644
--- a/multimedia/winff/winff.info
+++ b/multimedia/winff/winff.info
@@ -1,8 +1,8 @@
PRGNAM="winff"
-VERSION="1.6.3"
+VERSION="1.6.4"
HOMEPAGE="https://github.com/WinFF/winff"
-DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.3/winff-winff-1.6.3.tar.gz"
-MD5SUM="7a85f02bd23acef5b916166f83586e82"
+DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.4/winff-winff-1.6.4.tar.gz"
+MD5SUM="23138be15b60bf3fcb1c11c634d44d16"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libqtpas lazarus"