Merge pull request #246359 from wegank/freefilesync-bump

freefilesync: 12.4 -> 12.5
This commit is contained in:
Weijia Wang 2023-08-01 21:44:16 +02:00 committed by GitHub
commit 965d4d3ce7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -17,11 +17,16 @@
stdenv.mkDerivation rec {
pname = "freefilesync";
version = "12.4";
version = "12.5";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip";
hash = "sha256-rH1xp0/ggWWyUPcksY2GhYtUddTGrEDxdL/uODurvDo=";
# The URL only redirects to the file on the second attempt
postFetch = ''
rm -f $out
tryDownload "$url"
'';
hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM=";
};
sourceRoot = ".";
@ -31,8 +36,12 @@ stdenv.mkDerivation rec {
# Disable loading of the missing Animal.dat
(fetchpatch {
url = "https://sources.debian.org/data/main/f/freefilesync/12.0-2/debian/patches/ffs_devuan.patch";
postFetch = ''
substituteInPlace $out \
--replace "-std=c++2b" "-std=c++23"
'';
excludes = [ "FreeFileSync/Source/ffs_paths.cpp" ];
hash = "sha256-6pHr5txabMTpGMKP7I5oe1lGAmgb0cPW8ZkPv/WXN74=";
hash = "sha256-CtUC94AoYTxoqSMWZrzuO3jTD46rj11JnbNyXtWckCo=";
})
# Fix build with GTK 3
(fetchpatch {