diff options
| author | Bobby Rong <rjl931189261@126.com> | 2024-01-07 15:05:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 15:05:20 +0800 |
| commit | 0269b2a485fd519114310540c483ecada2ec38da (patch) | |
| tree | 91240bf9ba7694a0fce85c128515c37e89f8a3dd /pkgs/desktops | |
| parent | dca849a13d7f78ce98dcdc50d7e40ef3bb91b126 (diff) | |
| parent | 09686ed7f85fcdc9bceee2e25f2ad9a38563cc16 (diff) | |
| download | nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar.gz nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar.bz2 nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar.lz nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar.xz nixlib-0269b2a485fd519114310540c483ecada2ec38da.tar.zst nixlib-0269b2a485fd519114310540c483ecada2ec38da.zip | |
Merge pull request #278939 from amaxine/evolution_3.50.3
evolution{,-data-server}: 3.50.2 -> 3.50.3Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 24a2e7d50e0d..a6fccb8713b3 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -33,7 +33,6 @@ , enableOAuth2 ? stdenv.isLinux , webkitgtk_4_1 , webkitgtk_6_0 -, libaccounts-glib , json-glib , glib , gtk3 @@ -51,13 +50,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.50.2"; + version = "3.50.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XmYnA4jVDBTzsa4/oNISe5/tznUqzTk7VUUoGwH8SXA="; + sha256 = "sha256-Il1wtqQCaPIlwqxCjuXrUtWm/aJgKVXVCiSXBSb+JFI="; }; patches = [ @@ -107,8 +106,6 @@ stdenv.mkDerivation rec { libphonenumber boost protobuf - ] ++ lib.optionals stdenv.isLinux [ - libaccounts-glib ] ++ lib.optionals stdenv.isDarwin [ libiconv ] ++ lib.optionals withGtk3 [ @@ -150,6 +147,10 @@ stdenv.mkDerivation rec { --replace "-Wl,--no-undefined" "" substituteInPlace src/services/evolution-alarm-notify/e-alarm-notify.c \ --replace "G_OS_WIN32" "__APPLE__" + '' + lib.optionalString stdenv.cc.isClang '' + # https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/513 + substituteInPlace src/addressbook/libebook-contacts/e-phone-number-private.cpp \ + --replace "std::auto_ptr" "std::unique_ptr" ''; postInstall = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch index f502e89a71bd..6fef72819391 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch @@ -361,7 +361,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 ef34665..59f294b 100644 +index 8518c90..6a655a9 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c @@ -5627,7 +5627,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) |