Unverified Commit 7cf8f9bc authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #211346 from bobby285271/upd/evolution 

evolution: 3.46.2 → 3.46.3
parents eecef898 b8e80088

pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix

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


stdenv.mkDerivation rec {

  pname = "evolution-ews";

  version = "3.46.2";

  version = "3.46.3";



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "6spQz4oq6sFT2bCmaixVJDbTw1wM3LQFmg3E1trZ30E=";

    sha256 = "BFnqQFY2OKWllPQt3BzHGRotOCLCEcz/+82LNtMmQCU=";

  };



  patches = [

pkgs/applications/networking/mailreaders/evolution/evolution/default.nix

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


stdenv.mkDerivation rec {

  pname = "evolution";

  version = "3.46.2";

  version = "3.46.3";



  src = fetchurl {

    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "cks7uFOapRxpJsPxfTO7zjWpnBbqY7gJCzRsWr9ol30=";

    sha256 = "riIQdCXTDRejo0w1bNpfQKrXhG12vbYINEUYtdQpwfM=";

  };



  nativeBuildInputs = [

pkgs/desktops/gnome/core/evolution-data-server/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ 


stdenv.mkDerivation rec {

  pname = "evolution-data-server";

  version = "3.46.2";

  version = "3.46.3";



  outputs = [ "out" "dev" ];



  src = fetchurl {

    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    sha256 = "+b1SAIt+U12BaSDPzscKDlViveKK9x+ZbiA/9qhuRuA=";

    sha256 = "CTjiJ55c+8IgR2bKnT/qVwkRaZsHwQy+AaymKn6LK+4=";

  };



  patches = [

pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch

+4 −4
Original line number Diff line number Diff line
@@ -442,10 +442,10 @@ index 8e4ee81..cc94026 100644 
 		g_object_unref (settings);

 

diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c

index 7783781..6a2db01 100644

index b0c2410..ca915e0 100644

--- a/src/libedataserver/e-oauth2-service.c

+++ b/src/libedataserver/e-oauth2-service.c

@@ -90,7 +90,18 @@ eos_default_guess_can_process (EOAuth2Service *service,

@@ -94,7 +94,18 @@ eos_default_guess_can_process (EOAuth2Service *service,

 	name_len = strlen (name);

 	hostname_len = strlen (hostname);
@@ -466,10 +466,10 @@ index 7783781..6a2db01 100644 
 	g_object_unref (settings);

 

diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c

index 6701a3a..f497263 100644

index 4a9b398..e7cb404 100644

--- a/src/libedataserver/e-source-registry.c

+++ b/src/libedataserver/e-source-registry.c

@@ -1764,7 +1764,19 @@ e_source_registry_init (ESourceRegistry *registry)

@@ -1773,7 +1773,19 @@ e_source_registry_init (ESourceRegistry *registry)

 

 	g_mutex_init (&registry->priv->sources_lock);