Skip to content

Commit 3ecdd5e

Browse files
wegankwegank
authored
freefilesync: 14.2 -> 14.3 (NixOS#394740)
2 parents e100737 + cff9b09 commit 3ecdd5e

File tree

3 files changed

+38
-30
lines changed

3 files changed

+38
-30
lines changed

‎pkgs/by-name/fr/freefilesync/Makefile.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ index 9d81055..aed0f30 100644
99

1010
CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
1111
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
12-
@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl`
13-
CXXFLAGS += `pkg-config --cflags libssh2`
14-
LDFLAGS += `pkg-config --libs libssh2`
12+
@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` -lidn2
13+
CXXFLAGS += `pkg-config --cflags libssh2`
14+
LDFLAGS += `pkg-config --libs libssh2`
1515

16-
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
17-
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
18-
+LDFLAGS += `pkg-config --libs gtk+-3.0`
16+
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
17+
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
18+
+LDFLAGS += `pkg-config --libs gtk+-3.0`
1919
#treat as system headers so that warnings are hidden:
20-
-CXXFLAGS += -isystem/usr/include/gtk-2.0
21-
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
20+
-CXXFLAGS += -isystem/usr/include/gtk-2.0
21+
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
2222

2323
#support for SELinux (optional)
2424
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
@@ -36,13 +36,13 @@ index 0be46c9..f510284 100644
3636
@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zen
3737
LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread
3838

39-
#Gtk - support "no button border"
40-
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
41-
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
42-
+LDFLAGS += `pkg-config --libs gtk+-3.0`
39+
40+
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
41+
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
42+
+LDFLAGS += `pkg-config --libs gtk+-3.0`
4343
#treat as system headers so that warnings are hidden:
44-
-CXXFLAGS += -isystem/usr/include/gtk-2.0
45-
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
44+
-CXXFLAGS += -isystem/usr/include/gtk-2.0
45+
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
4646

4747
cppFiles=
4848
cppFiles+=application.cpp

‎pkgs/by-name/fr/freefilesync/package.nix‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
curl,
1313
glib,
1414
gtk3,
15+
libidn2,
1516
libssh2,
1617
openssl,
1718
wxGTK32,
@@ -41,7 +42,7 @@ let
4142
in
4243
stdenv.mkDerivation (finalAttrs: {
4344
pname = "freefilesync";
44-
version = "14.2";
45+
version = "14.3";
4546

4647
src = fetchurl {
4748
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
5051
rm -f $out
5152
tryDownload "$url"
5253
'';
53-
hash = "sha256-xwIvoeWu/hgTHwAgs39nlfb3UBK/TI3yoG+9RRmw+2o=";
54+
hash = "sha256-F8oIoG+SaHwhT7aA+iYp9/eWyGf6CiDIGm6Y2px0wlI=";
5455
};
5556

5657
sourceRoot = ".";
@@ -72,6 +73,12 @@ stdenv.mkDerivation (finalAttrs: {
7273
})
7374
];
7475

76+
# https://freefilesync.org/forum/viewtopic.php?t=12163
77+
postPatch = ''
78+
substituteInPlace zen/socket.h zen/sys_error.h \
79+
--replace-fail "#undef G_GNUC_UNUSED" ""
80+
'';
81+
7582
nativeBuildInputs = [
7683
copyDesktopItems
7784
pkg-config
@@ -83,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
8390
curl
8491
glib
8592
gtk3
93+
libidn2
8694
libssh2
8795
openssl
8896
wxwidgets_3_3

‎pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@ index a40eea3..23ec896 100644
33
--- a/FreeFileSync/Source/ui/gui_generated.cpp
44
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
55
@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
6-
wxBoxSizer* bSizer183;
7-
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
6+
wxBoxSizer* bSizer183;
7+
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
88

9-
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
10-
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
9+
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
10+
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
1111

12-
wxPanel* m_panel39;
13-
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
12+
wxPanel* m_panel39;
13+
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
1414
@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
15-
m_staticTextDonate->Wrap( -1 );
16-
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
15+
m_staticTextDonate->Wrap( -1 );
16+
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
1717

18-
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
18+
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
1919

2020

21-
m_panel39->SetSizer( bSizer184 );
22-
m_panel39->Layout();
23-
bSizer184->Fit( m_panel39 );
24-
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
21+
m_panel39->SetSizer( bSizer184 );
22+
m_panel39->Layout();
23+
bSizer184->Fit( m_panel39 );
24+
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
2525

2626

27-
m_panelDonate->SetSizer( bSizer183 );
27+
m_panelDonate->SetSizer( bSizer183 );
2828
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
2929
index 933fe81..734201f 100644
3030
--- a/FreeFileSync/Source/ui/small_dlgs.cpp

0 commit comments

Comments
 (0)