Unverified Commit 9a9e7fd7 authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #227451 from bobby285271/upd/evolution

parents 3a9a093d 7f17c918

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.48.0";

  version = "3.48.1";



  src = fetchurl {

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

    sha256 = "FmFlu+oUQbuS8qk0jZp97EiCoNMTGc0lZlcdpnd+8t4=";

    sha256 = "vqakEdZAHXOqTh3oHUN5LwPAQ54DBZxVSn+YTEptmtg=";

  };



  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.48.0";

  version = "3.48.1";



  src = fetchurl {

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

    sha256 = "LYRygZWJ6S78zk8tw70STpPTedMwCXj2mpZTxZKmDvY=";

    sha256 = "tJpa3u3JGx0yVPAw9affjiYYLjNAzvd3Ecob9FU+5lA=";

  };



  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.48.0";

  version = "3.48.1";



  outputs = [ "out" "dev" ];



  src = fetchurl {

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

    sha256 = "DyX3MzHt9TkJvkD0ErKoaTknAydRdhYwPzIt4VcIPDU=";

    sha256 = "XOYsHmfyeJNCp/SgNbEC905i7YX2DoGlt/PgQWVATf8=";

  };



  patches = [

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

+5 −5
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ index e85a56b..59d3fe2 100644 
 	g_object_unref (settings);

 

diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c

index 127dcd1..5fa62f6 100644

index 4aaabee..dd6ce6d 100644

--- a/src/addressbook/libedata-book/e-book-meta-backend.c

+++ b/src/addressbook/libedata-book/e-book-meta-backend.c

@@ -136,7 +136,18 @@ ebmb_is_power_saver_enabled (void)

@@ -143,7 +143,18 @@ ebmb_is_power_saver_enabled (void)

 	GSettings *settings;

 	gboolean enabled = FALSE;
@@ -201,10 +201,10 @@ index 5087de1..5c24b87 100644 
 	watcher->priv->default_zone = e_cal_util_copy_timezone (zone);

 	watcher->priv->timers_enabled = TRUE;

diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c

index 94a875f..1d2ed92 100644

index cd91f07..79ede04 100644

--- a/src/calendar/libedata-cal/e-cal-meta-backend.c

+++ b/src/calendar/libedata-cal/e-cal-meta-backend.c

@@ -149,7 +149,18 @@ ecmb_is_power_saver_enabled (void)

@@ -156,7 +156,18 @@ ecmb_is_power_saver_enabled (void)

 	GSettings *settings;

 	gboolean enabled = FALSE;
@@ -298,7 +298,7 @@ index e61160c..b6553a4 100644 
 		G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);

 	G_UNLOCK (mi_user_headers);

diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c

index 95918a0..a7fc669 100644

index ce4a58c..2906228 100644

--- a/src/camel/providers/imapx/camel-imapx-server.c

+++ b/src/camel/providers/imapx/camel-imapx-server.c

@@ -5591,7 +5591,18 @@ camel_imapx_server_skip_old_flags_update (CamelStore *store)