chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

freefilesync: 14.2 -> 14.3

Browse Source
This commit is contained in:
Weijia Wang
2025-03-31 00:09:04 +02:00
parent 7ace45436b
commit cff9b09432
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/by-name/fr/freefilesync/Makefile.patch
View File

@@ -9,16 +9,16 @@ index 9d81055..aed0f30 100644
CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wnon-virtual-dtor -Wno-unused-function -Wshadow -Wno-maybe-uninitialized \
@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl`
CXXFLAGS += `pkg-config --cflags libssh2`
LDFLAGS += `pkg-config --libs libssh2`
@@ -17,9 +17,10 @@ LDFLAGS += `pkg-config --libs libcurl` -lidn2
CXXFLAGS += `pkg-config --cflags libssh2`
LDFLAGS += `pkg-config --libs libssh2`
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
+LDFLAGS += `pkg-config --libs gtk+-3.0`
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
+LDFLAGS += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
-CXXFLAGS += -isystem/usr/include/gtk-2.0
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
-CXXFLAGS += -isystem/usr/include/gtk-2.0
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
#support for SELinux (optional)
SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES)
@@ -36,13 +36,13 @@ index 0be46c9..f510284 100644
@@ -8,9 +8,10 @@ CXXFLAGS += -std=c++23 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zen
LDFLAGS += -s `wx-config --libs std, aui, richtext --debug=no` -pthread
#Gtk - support "no button border"
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
+LDFLAGS += `pkg-config --libs gtk+-3.0`
-CXXFLAGS += `pkg-config --cflags gtk+-2.0`
+CXXFLAGS += `pkg-config --cflags gtk+-3.0`
+LDFLAGS += `pkg-config --libs gtk+-3.0`
#treat as system headers so that warnings are hidden:
-CXXFLAGS += -isystem/usr/include/gtk-2.0
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
-CXXFLAGS += -isystem/usr/include/gtk-2.0
+CXXFLAGS += -isystem@gtk3-dev@/include/gtk-3.0
cppFiles=
cppFiles+=application.cpp

12
pkgs/by-name/fr/freefilesync/package.nix
View File

@@ -12,6 +12,7 @@
curl,
glib,
gtk3,
libidn2,
libssh2,
openssl,
wxGTK32,
@@ -41,7 +42,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "freefilesync";
version = "14.2";
version = "14.3";
src = fetchurl {
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
rm -f $out
tryDownload "$url"
'';
hash = "sha256-xwIvoeWu/hgTHwAgs39nlfb3UBK/TI3yoG+9RRmw+2o=";
hash = "sha256-F8oIoG+SaHwhT7aA+iYp9/eWyGf6CiDIGm6Y2px0wlI=";
};
sourceRoot = ".";
@@ -72,6 +73,12 @@ stdenv.mkDerivation (finalAttrs: {
})
];
# https://freefilesync.org/forum/viewtopic.php?t=12163
postPatch = ''
substituteInPlace zen/socket.h zen/sys_error.h \
--replace-fail "#undef G_GNUC_UNUSED" ""
'';
nativeBuildInputs = [
copyDesktopItems
pkg-config
@@ -83,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
curl
glib
gtk3
libidn2
libssh2
openssl
wxwidgets_3_3

28
pkgs/by-name/fr/freefilesync/skip-missing-Animal.dat.patch
View File

@@ -3,28 +3,28 @@ index a40eea3..23ec896 100644
--- a/FreeFileSync/Source/ui/gui_generated.cpp
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
wxBoxSizer* bSizer183;
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bSizer183;
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxPanel* m_panel39;
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxPanel* m_panel39;
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
m_staticTextDonate->Wrap( -1 );
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
m_staticTextDonate->Wrap( -1 );
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
m_panel39->SetSizer( bSizer184 );
m_panel39->Layout();
bSizer184->Fit( m_panel39 );
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
m_panel39->SetSizer( bSizer184 );
m_panel39->Layout();
bSizer184->Fit( m_panel39 );
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
m_panelDonate->SetSizer( bSizer183 );
m_panelDonate->SetSizer( bSizer183 );
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
index 933fe81..734201f 100644
--- a/FreeFileSync/Source/ui/small_dlgs.cpp