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

Merge pull request #285118 from felixalbrigtsen/bump-netsurf 

Update netsurf.browser and netsurf.lib*, fix on darwin
parents da728269 4c947c73

pkgs/applications/graphics/imv/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
, libxkbcommon

, libGLU

, wayland

, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ]

# "libnsgif" is disabled until https://todo.sr.ht/~exec64/imv/55 is solved

, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ]

, freeimage

, libtiff

, libjpeg_turbo

pkgs/applications/networking/browsers/netsurf/browser.nix

+19 −3
Original line number Diff line number Diff line
@@ -5,12 +5,14 @@ 
, check

, curl

, expat

, gperf

, gtk2

, gtk3

, libXcursor

, libXrandr

, libidn

, libjpeg

, libjxl

, libpng

, libwebp

, libxml2
@@ -44,11 +46,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf";

  version = "3.10";

  version = "3.11";



  src = fetchurl {

    url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz";

    hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";

    hash = "sha256-wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI=";

  };



  nativeBuildInputs = [
@@ -63,10 +65,12 @@ stdenv.mkDerivation (finalAttrs: { 
  buildInputs = [

    check

    curl

    gperf

    libXcursor

    libXrandr

    libidn

    libjpeg

    libjxl

    libpng

    libwebp

    libxml2
@@ -103,8 +107,20 @@ stdenv.mkDerivation (finalAttrs: { 


  env.NIX_CFLAGS_COMPILE = "-fcommon";



  env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";



  patchPhase = lib.optionalString stdenv.cc.isClang ''

    runHook prePatch



    substituteInPlace Makefile \

      --replace-warn '--trace' '-t' \

      --replace-warn '-Wimplicit-fallthrough=3' '-Wimplicit-fallthrough'



    runHook postPatch

  '';



  preConfigure = ''

    cat <<EOF > Makefile.conf

    cat <<EOF > Makefile.config

    override NETSURF_GTK_RES_PATH  := $out/share/

    override NETSURF_USE_GRESOURCE := YES

    EOF

pkgs/applications/networking/browsers/netsurf/libcss.nix

+3 −3
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libcss";

  version = "0.9.1";

  version = "0.9.2";



  src = fetchurl {

    url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz";

    hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";

    hash = "sha256-LfIVu+w01R1gwaBLAbLfTV0Y9RDx86evS4DN21ZxFU4=";

  };



  nativeBuildInputs = [ pkg-config ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { 


  env.NIX_CFLAGS_COMPILE = toString [

    "-Wno-error=implicit-fallthrough"

    "-Wno-error=maybe-uninitialized"

    "-Wno-error=${if stdenv.cc.isGNU then "maybe-uninitialized" else "uninitialized"}"

  ];



  meta = {

pkgs/applications/networking/browsers/netsurf/libdom.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libdom";

  version = "0.4.1";

  version = "0.4.2";



  src = fetchurl {

    url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz";

    hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";

    hash = "sha256-0F5FrxZUcBTCsKOuzzZw+hPUGfUFs/X8esihSR/DDzw=";

  };



  nativeBuildInputs = [ pkg-config ];

pkgs/applications/networking/browsers/netsurf/libhubbub.nix

+4 −2
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, gperf

, perl

, pkg-config

, buildsystem
@@ -9,16 +10,17 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "netsurf-libhubbub";

  version = "0.3.7";

  version = "0.3.8";



  src = fetchurl {

    url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz";

    hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";

    hash = "sha256-isHm9fPUjAUUHVk5FxlTQpDFnNAp78JJ60/brBAs1aU=";

  };



  nativeBuildInputs = [ pkg-config ];



  buildInputs = [

    gperf

    perl

    buildsystem

    libparserutils