Unverified Commit 3ecdd5eb authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

freefilesync: 14.2 -> 14.3 (#394740)

parents e1007376 cff9b094

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

+14 −14
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 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`

@@ -17,9 +17,10 @@ LDFLAGS  += `pkg-config --libs libcurl` -lidn2

 CXXFLAGS += `pkg-config --cflags libssh2`

 LDFLAGS  += `pkg-config --libs libssh2`
@@ -36,7 +36,7 @@ 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`

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

+10 −2
Original line number Diff line number Diff line
@@ -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

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

+14 −14

File changed.

Contains only whitespace changes.