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

Merge pull request #226244 from bobby285271/upd/gnome

parents 65be0ffe da27ace7

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

  version = "3.48.0";



  src = fetchurl {

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

    sha256 = "bLYE99MKkh7MgxA9ZPKOj1+1VcFT9mHSQvayB/9Hy58=";

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

  };



  patches = [

pkgs/applications/networking/mailreaders/evolution/evolution-ews/hardcode-gsettings.patch

+24 −0
Original line number Diff line number Diff line
@@ -70,3 +70,27 @@ index ff1b8e3..4f876c0 100644 
 	strv = g_settings_get_strv (settings, "labels");

 

 	for (ii = 0; strv && strv[ii]; ii++) {

diff --git a/src/Microsoft365/common/e-m365-tz-utils.c b/src/Microsoft365/common/e-m365-tz-utils.c

index 7a1d7f4..3c0d5e1 100644

--- a/src/Microsoft365/common/e-m365-tz-utils.c

+++ b/src/Microsoft365/common/e-m365-tz-utils.c

@@ -192,7 +192,18 @@ e_m365_tz_utils_get_user_timezone (void)

 	gchar *location;

 	ICalTimezone *zone = NULL;

 

-	settings = g_settings_new ("org.gnome.evolution.calendar");

+	{

+		g_autoptr(GSettingsSchemaSource) schema_source;

+		g_autoptr(GSettingsSchema) schema;

+		schema_source = g_settings_schema_source_new_from_directory("@evo@",

+									    g_settings_schema_source_get_default(),

+									    TRUE,

+									    NULL);

+		schema = g_settings_schema_source_lookup(schema_source,

+							 "org.gnome.evolution.calendar",

+							 FALSE);

+		settings = g_settings_new_full(schema, NULL, NULL);

+	}

 

 	if (g_settings_get_boolean (settings, "use-system-timezone"))

 		location = e_cal_util_get_system_timezone_location ();

pkgs/desktops/gnome/core/gucharmap/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ let 
  };

in stdenv.mkDerivation rec {

  pname = "gucharmap";

  version = "15.0.2";

  version = "15.0.3";



  outputs = [ "out" "lib" "dev" "devdoc" ];
@@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { 
    owner = "GNOME";

    repo = "gucharmap";

    rev = version;

    sha256 = "sha256-QoHLMq3U/BvpCFKttxLo0qs2xmZ/pCqPjsgq/MMWNbo=";

    sha256 = "sha256-Rdi48IJdiZy8Dt8hQCkQW2VFWBX1P2CtPPfowCcAEq0=";

  };



  strictDeps = true;

pkgs/desktops/gnome/games/aisleriot/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 


stdenv.mkDerivation rec {

  pname = "aisleriot";

  version = "3.22.27";

  version = "3.22.28";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "GNOME";

    repo = "aisleriot";

    rev = version;

    sha256 = "sha256-XvYQ1JWMBWVZF5u3VL1zPADgMDMN/1FNuwZ4vaOeo7Y=";

    sha256 = "sha256-/yxItJu8He6Zx7hDK5VaApqm9FJ6uK8KHIDj4adwb2Q=";

  };



  nativeBuildInputs = [

pkgs/desktops/gnome/misc/pomodoro/default.nix

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


stdenv.mkDerivation rec {

  pname = "gnome-pomodoro";

  version = "0.22.0";

  version = "0.23.1";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    hash = "sha256-VsrguYU1rfYWse7FuA4uYASfqET0Q3RBeU7i+HOWFBw=";

    hash = "sha256-0ZUTRrth5AfzI1E4JsuchbYeFwAbl9/XGBSYQ+AnNvM=";

  };



  patches = [