[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/

2022-12-02 Thread Matt Turner
commit: c1ff0f9f4d13b7c98e4619812cbdedb79865c701
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec  2 20:37:05 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec  2 20:37:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ff0f9f

mail-client/evolution: Add the patches

Signed-off-by: Matt Turner  gentoo.org>

 ...llWindow-The-New-menu-is-not-filled-after.patch | 119 ++
 ...-Update-preview-s-iframe-height-to-match-.patch | 417 +
 2 files changed, 536 insertions(+)

diff --git 
a/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
 
b/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
new file mode 100644
index ..882448e2f07c
--- /dev/null
+++ 
b/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
@@ -0,0 +1,119 @@
+From 080791256d78a6d97384b4eef0d411cdc73feeb0 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Fri, 23 Sep 2022 11:34:51 +0200
+Subject: [PATCH 2/2] I#1969 - EShellWindow: The 'New' menu is not filled after
+ start
+
+Related to https://gitlab.gnome.org/GNOME/evolution/-/issues/1969
+---
+ src/shell/e-shell-window.c | 45 --
+ 1 file changed, 43 insertions(+), 2 deletions(-)
+
+diff --git a/src/shell/e-shell-window.c b/src/shell/e-shell-window.c
+index e7be30feee..86c83e5e1e 100644
+--- a/src/shell/e-shell-window.c
 b/src/shell/e-shell-window.c
+@@ -47,6 +47,7 @@ enum {
+ enum {
+   CLOSE_ALERT,
+   SHELL_VIEW_CREATED,
++  UPDATE_NEW_MENU,
+   LAST_SIGNAL
+ };
+ 
+@@ -120,6 +121,17 @@ shell_window_toolbar_update_new_menu (GtkMenuToolButton 
*menu_tool_button,
+   gtk_menu_tool_button_set_menu (menu_tool_button, menu);
+ }
+ 
++static void
++shell_window_toolbar_update_new_menu_sig (EShellWindow *shell_window,
++  GtkMenuToolButton *menu_tool_button)
++{
++  GtkWidget *menu;
++
++  /* Update the "New" menu tool button submenu. */
++  menu = e_shell_window_create_new_menu (shell_window);
++  gtk_menu_tool_button_set_menu (menu_tool_button, menu);
++}
++
+ static gboolean
+ shell_window_active_view_to_prefer_item (GBinding *binding,
+  const GValue *source_value,
+@@ -160,6 +172,8 @@ shell_window_set_notebook_page (EShellWindow *shell_window,
+   g_return_if_fail (page_num >= 0);
+ 
+   gtk_notebook_set_current_page (notebook, page_num);
++
++  g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
+ }
+ 
+ static void
+@@ -463,8 +477,8 @@ shell_window_construct_menubar (EShellWindow *shell_window)
+   main_menu, "visible",
+   G_BINDING_SYNC_CREATE);
+ 
+-  e_signal_connect_notify (
+-  shell_window, "notify::active-view",
++  g_signal_connect (
++  shell_window, "update-new-menu",
+   G_CALLBACK (shell_window_menubar_update_new_menu), NULL);
+ 
+   return main_menu;
+@@ -544,6 +558,11 @@ shell_window_construct_toolbar (EShellWindow 
*shell_window)
+   G_CALLBACK (shell_window_toolbar_update_new_menu),
+   shell_window);
+ 
++  g_signal_connect_object (
++  shell_window, "update-new-menu",
++  G_CALLBACK (shell_window_toolbar_update_new_menu_sig),
++  item, 0);
++
+   gtk_box_pack_start (GTK_BOX (box), toolbar, TRUE, TRUE, 0);
+ 
+   toolbar = e_shell_window_get_managed_widget (
+@@ -1133,6 +1152,24 @@ e_shell_window_class_init (EShellWindowClass *class)
+   G_TYPE_NONE, 1,
+   E_TYPE_SHELL_VIEW);
+ 
++  /*
++   * EShellWindow::update-new-menu
++   * @shell_window: the #EShellWindow
++   *
++   * Emitted when the 'New' menu should be updated.
++   *
++   * Since: 3.44.5
++   */
++  signals[UPDATE_NEW_MENU] = g_signal_new (
++  "update-new-menu",
++  G_OBJECT_CLASS_TYPE (object_class),
++  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
++  0,
++  NULL, NULL,
++  g_cclosure_marshal_VOID__VOID,
++  G_TYPE_NONE, 0,
++  G_TYPE_NONE);
++
+   binding_set = gtk_binding_set_by_class (class);
+   gtk_binding_entry_add_signal (
+   binding_set, GDK_KEY_Escape, 0, "close-alert", 0);
+@@ -2049,6 +2086,8 @@ e_shell_window_register_new_item_actions (EShellWindow 
*shell_window,
+   G_OBJECT (action),
+   "primary", GINT_TO_POINTER (TRUE));
+   }
++
++  g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
+ }
+ 
+ /**
+@@ -2126,6 +2165,8 @@ e_shell_window_register_new_source_actions (EShellWindow 
*shell_window,
+   G_OBJECT (action),
+   "backend-name", (gpointer) backend_name);
+   }
++
++  g

[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/, mail-client/evolution/

2021-04-16 Thread Matt Turner
commit: c0068bb3863bdee6d3d01f78b7d7ea6a8f23261c
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Apr 16 13:23:24 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Apr 16 13:23:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0068bb3

mail-client/evolution: Add patch for cmake-3.20 compat

Closes: https://bugs.gentoo.org/781971
Signed-off-by: Matt Turner  gentoo.org>

 mail-client/evolution/evolution-3.38.4.ebuild  |  2 +
 ...tions.cmake-Correct-variable-name-compari.patch | 75 ++
 2 files changed, 77 insertions(+)

diff --git a/mail-client/evolution/evolution-3.38.4.ebuild 
b/mail-client/evolution/evolution-3.38.4.ebuild
index 3a5b6390343..3dbfedc6526 100644
--- a/mail-client/evolution/evolution-3.38.4.ebuild
+++ b/mail-client/evolution/evolution-3.38.4.ebuild
@@ -95,6 +95,8 @@ file from /usr/share/applications if you use a different 
browser)."
 src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+   eapply 
"${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
 }
 
 src_configure() {

diff --git 
a/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
 
b/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
new file mode 100644
index 000..f7e8855bbe0
--- /dev/null
+++ 
b/mail-client/evolution/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
@@ -0,0 +1,75 @@
+From 7cfe4190e3e72b40472d57871459f1b136393003 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Wed, 14 Apr 2021 16:58:08 +0200
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
+
+CMake 3.20.1 errors out with:
+
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
+   variable name cannot be empty
+ Call Stack (most recent call first):
+   CMakeLists.txt:152 (add_printable_variable)
+
+Change how the parameter value is compared, to fix it.
+---
+ cmake/modules/PrintableOptions.cmake | 20 ++--
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/cmake/modules/PrintableOptions.cmake 
b/cmake/modules/PrintableOptions.cmake
+index ba1c9d0b7f..339f1da4b4 100644
+--- a/cmake/modules/PrintableOptions.cmake
 b/cmake/modules/PrintableOptions.cmake
+@@ -19,40 +19,40 @@
+ #prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-  if(_name STREQUAL "")
++  if("${_name}" STREQUAL "")
+   message(FATAL_ERROR "variable name cannot be empty")
+-  endif(_name STREQUAL "")
++  endif("${_name}" STREQUAL "")
+   list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-  if(_name STREQUAL "")
++  if("${_name}" STREQUAL "")
+   message(FATAL_ERROR "option name cannot be empty")
+-  endif(_name STREQUAL "")
++  endif("${_name}" STREQUAL "")
+   option(${_name} ${_description} ${_default_value})
+   add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-  if(_name STREQUAL "")
++  if("${_name}" STREQUAL "")
+   message(FATAL_ERROR "variable name cannot be empty")
+-  endif(_name STREQUAL "")
++  endif("${_name}" STREQUAL "")
+   set(${_name} ${_default_value} CACHE STRING ${_description})
+   add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-  if(_name STREQUAL "")
++  if("${_name}" STREQUAL "")
+   message(FATAL_ERROR "path variable name cannot be empty")
+-  endif(_name STREQUAL "")
++  endif("${_name}" STREQUAL "")
+   set(${_name} ${_default_value} CACHE PATH ${_description})
+   add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_filepath _name _description _default_value)
+-  if(_name STREQUAL "")
++  if("${_name}" STREQUAL "")
+   message(FATAL_ERROR "filepath variable name cannot be empty")
+-  endif(_name STREQUAL "")
++  endif("${_name}" STREQUAL "")
+   set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+   add_printable_variable_bare(${_name})
+ endmacro()
+-- 
+2.26.3
+



[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/, mail-client/evolution/

2020-04-17 Thread Mart Raudsepp
commit: 38193445919ae80cf0e16c18bf96a254dc49117c
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Apr 17 18:20:52 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Apr 17 18:21:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38193445

mail-client/evolution: Fix CVE-2020-11879

Bug: https://bugs.gentoo.org/717932
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-client/evolution/evolution-3.34.4-r1.ebuild   | 155 +
 .../evolution/files/3.34.4-CVE-2020-11879.patch| 122 
 2 files changed, 277 insertions(+)

diff --git a/mail-client/evolution/evolution-3.34.4-r1.ebuild 
b/mail-client/evolution/evolution-3.34.4-r1.ebuild
new file mode 100644
index 000..fb45ae68495
--- /dev/null
+++ b/mail-client/evolution/evolution-3.34.4-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution";
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin 
spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=webkit-gtk-2.26.4-r1 and >=gspell-1.8 to ensure all use enchant:2
+# TODO: Adjust webkit-gtk dep to actually be that once it's keyworded for 
needed arches
+COMMON_DEPEND="
+   >=app-crypt/gcr-3.4:=[gtk]
+   >=app-text/enchant-2.2.0:2
+   >=dev-libs/glib-2.46:2[dbus]
+   >=dev-libs/libxml2-2.7.3:2
+   >=gnome-base/gnome-desktop-2.91.3:3=
+   >=gnome-base/gsettings-desktop-schemas-2.91.92
+   >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+   >=media-libs/libcanberra-0.25[gtk3]
+   >=net-libs/libsoup-2.42:2.4
+   >=net-libs/webkit-gtk-2.16.0:4
+   >=x11-libs/cairo-1.9.15:=[glib]
+   >=x11-libs/gdk-pixbuf-2.24:2
+   >=x11-libs/gtk+-3.22:3
+   >=x11-libs/libnotify-0.7:=
+   >=x11-misc/shared-mime-info-0.22
+
+   >=app-text/iso-codes-0.49
+   dev-libs/atk
+   gnome-base/dconf
+   x11-libs/libSM
+   x11-libs/libICE
+
+   archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+   bogofilter? ( mail-filter/bogofilter )
+   geolocation? (
+   >=media-libs/libchamplain-0.12:0.12[gtk]
+   >=media-libs/clutter-1.0.0:1.0
+   >=media-libs/clutter-gtk-0.90:1.0
+   >=sci-geosciences/geocode-glib-3.10.0
+   x11-libs/mx:1.0 )
+   ldap? ( >=net-nds/openldap-2:= )
+   spamassassin? ( mail-filter/spamassassin )
+   spell? ( >=app-text/gspell-1.8:= )
+   ssl? (
+   >=dev-libs/nspr-4.6.1:=
+   >=dev-libs/nss-3.11:= )
+   weather? ( >=dev-libs/libgweather-3.10:2= )
+   ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.1.2
+   dev-util/gdbus-codegen
+   dev-util/glib-utils
+   dev-util/itstool
+   gtk-doc? ( dev-util/gtk-doc
+   app-text/docbook-xml-dtd:4.3 )
+   >=dev-util/intltool-0.40.0
+   >=sys-devel/gettext-0.18.3
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   highlight? ( app-text/highlight )
+   !gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double 
default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+   cmake-utils_src_prepare
+   eapply "${FILESDIR}"/${PV}-CVE-2020-11879.patch
+   gnome2_src_prepare
+}
+
+src_configure() {
+   # Use NSS/NSPR only if 'ssl' is enabled.
+   local mycmakeargs=(
+   -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+   -DENABLE_SCHEMAS_COMPILE=OFF
+   -DENABLE_GTK_DOC=$(usex gtk-doc)
+   -DWITH_OPENLDAP=$(usex ldap)
+   -DENABLE_SMIME=$(usex ssl)
+   -DENABLE_GNOME_DESKTOP=ON
+   -DWITH_ENCHANT_VERSION=2
+   -DENA

[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/, mail-client/evolution/

2019-12-29 Thread Mart Raudsepp
commit: 0a846e963e87ae6a37a037c447326831d003ad9b
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Dec 29 13:50:40 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Dec 29 14:39:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a846e96

mail-client/evolution: make compatible with webkit-gtk-2.26

Bug: https://bugs.gentoo.org/699156
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-client/evolution/evolution-3.32.5-r1.ebuild   | 155 +
 .../files/3.32.5-webkitgtk-2.26-compat.patch   |  26 
 2 files changed, 181 insertions(+)

diff --git a/mail-client/evolution/evolution-3.32.5-r1.ebuild 
b/mail-client/evolution/evolution-3.32.5-r1.ebuild
new file mode 100644
index 000..7505a1ae344
--- /dev/null
+++ b/mail-client/evolution/evolution-3.32.5-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution";
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin 
spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+COMMON_DEPEND="
+   >=app-crypt/gcr-3.4:=[gtk]
+   >=app-text/enchant-1.6.0:0
+   >=dev-libs/glib-2.46:2[dbus]
+   >=dev-libs/libxml2-2.7.3:2
+   >=gnome-base/gnome-desktop-2.91.3:3=
+   >=gnome-base/gsettings-desktop-schemas-2.91.92
+   >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+   >=media-libs/libcanberra-0.25[gtk3]
+   >=net-libs/libsoup-2.42:2.4
+   >=net-libs/webkit-gtk-2.16.0:4
+   >=x11-libs/cairo-1.9.15:=[glib]
+   >=x11-libs/gdk-pixbuf-2.24:2
+   >=x11-libs/gtk+-3.22:3
+   >=x11-libs/libnotify-0.7:=
+   >=x11-misc/shared-mime-info-0.22
+
+   >=app-text/iso-codes-0.49
+   dev-libs/atk
+   gnome-base/dconf
+   >=dev-libs/libical-3.0.2:=
+   x11-libs/libSM
+   x11-libs/libICE
+
+   archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+   geolocation? (
+   >=media-libs/libchamplain-0.12:0.12[gtk]
+   >=media-libs/clutter-1.0.0:1.0
+   >=media-libs/clutter-gtk-0.90:1.0
+   >=sci-geosciences/geocode-glib-3.10.0
+   x11-libs/mx:1.0 )
+   ldap? ( >=net-nds/openldap-2:= )
+   spell? ( app-text/gtkspell:3 )
+   ssl? (
+   >=dev-libs/nspr-4.6.1:=
+   >=dev-libs/nss-3.11:= )
+   weather? ( >=dev-libs/libgweather-3.10:2= )
+   ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.1.2
+   dev-util/gdbus-codegen
+   dev-util/glib-utils
+   dev-util/itstool
+   gtk-doc? ( dev-util/gtk-doc
+   app-text/docbook-xml-dtd:4.3 )
+   >=dev-util/intltool-0.40.0
+   >=sys-devel/gettext-0.18.3
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   bogofilter? ( mail-filter/bogofilter )
+   highlight? ( app-text/highlight )
+   spamassassin? ( mail-filter/spamassassin )
+   !gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double 
default_src_prepare
+# call; if needed, set them after cmake-utils_src_prepare call, if that works
+
+src_prepare() {
+   eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+   eapply "${FILESDIR}"/${PV}-webkitgtk-2.26-compat.patch # Don't use with 
3.34, it should be compatible without this hack.
+   cmake-utils_src_prepare
+   gnome2_src_prepare
+}
+
+src_configure() {
+   # Use NSS/NSPR only if 'ssl' is enabled.
+   local mycmakeargs=(
+   -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+   -DENABLE_SCHEMAS_COMPILE=OFF
+   -DENABLE_GTK_DOC=$(usex gtk-doc)
+   -DWITH_OPENLDAP=$(usex ldap)
+   -DENABLE_SMIME=$(usex ssl)
+   -DENABLE_GNOME_DESKTOP=ON
+   -DWITH_ENCHANT_VERSION=1
+ 

[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/, mail-client/evolution/

2019-09-07 Thread Mart Raudsepp
commit: 531e80bd475132687f17641d2d6f2fc781416ffe
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Sep  7 22:04:07 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Sep  7 22:08:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531e80bd

mail-client/evolution: bump to 3.32.4

Closes: https://bugs.gentoo.org/689582
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-client/evolution/Manifest |   1 +
 mail-client/evolution/evolution-3.32.4.ebuild  | 154 +
 .../evolution/files/3.32.4-gtk-doc-fix1.patch  |  88 
 .../evolution/files/3.32.4-gtk-doc-fix2.patch  |  29 
 4 files changed, 272 insertions(+)

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5301d9a2432..c2e8d4461e2 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1 +1,2 @@
 DIST evolution-3.30.5.tar.xz 11995960 BLAKE2B 
4a2ac539e88467148dd3be2bf2607be55ea39dfb0ceb89183a6f4fa3ee66c1973690c4e540a7405743c202aa777ad9aa147600390e909ffc93cb2dae1ebb62d9
 SHA512 
1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1
+DIST evolution-3.32.4.tar.xz 11793452 BLAKE2B 
bb009a5881cca6724b804a1203d393003f92ef9f6a8fa9692fc42344224b0b2f5def5c05160d46bbf7f76b9ae9bfa1737f78207aee7038540f410df57f7a76cd
 SHA512 
a09ef7e39a73449a8a897c430fb97aadac01790d350b21e456d86cc785b67bdc2b542771ef9c6daa160fc0c1946b4a4e3eb9429a8ad1d69284698cbdb0ac4931

diff --git a/mail-client/evolution/evolution-3.32.4.ebuild 
b/mail-client/evolution/evolution-3.32.4.ebuild
new file mode 100644
index 000..d83be2ff5b8
--- /dev/null
+++ b/mail-client/evolution/evolution-3.32.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution";
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin 
spell ssl +weather ytnef"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+COMMON_DEPEND="
+   >=app-crypt/gcr-3.4:=[gtk]
+   >=app-text/enchant-1.6.0:0
+   >=dev-libs/glib-2.46:2[dbus]
+   >=dev-libs/libxml2-2.7.3:2
+   >=gnome-base/gnome-desktop-2.91.3:3=
+   >=gnome-base/gsettings-desktop-schemas-2.91.92
+   >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+   >=media-libs/libcanberra-0.25[gtk3]
+   >=net-libs/libsoup-2.42:2.4
+   >=net-libs/webkit-gtk-2.16.0:4
+   >=x11-libs/cairo-1.9.15:=[glib]
+   >=x11-libs/gdk-pixbuf-2.24:2
+   >=x11-libs/gtk+-3.22:3
+   >=x11-libs/libnotify-0.7:=
+   >=x11-misc/shared-mime-info-0.22
+
+   >=app-text/iso-codes-0.49
+   dev-libs/atk
+   gnome-base/dconf
+   >=dev-libs/libical-3.0.2:=
+   x11-libs/libSM
+   x11-libs/libICE
+
+   archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+   geolocation? (
+   >=media-libs/libchamplain-0.12:0.12[gtk]
+   >=media-libs/clutter-1.0.0:1.0
+   >=media-libs/clutter-gtk-0.90:1.0
+   >=sci-geosciences/geocode-glib-3.10.0
+   x11-libs/mx:1.0 )
+   ldap? ( >=net-nds/openldap-2:= )
+   spell? ( app-text/gtkspell:3 )
+   ssl? (
+   >=dev-libs/nspr-4.6.1:=
+   >=dev-libs/nss-3.11:= )
+   weather? ( >=dev-libs/libgweather-3.10:2= )
+   ytnef? ( net-mail/ytnef )
+"
+DEPEND="${COMMON_DEPEND}
+   app-text/docbook-xml-dtd:4.1.2
+   dev-util/gdbus-codegen
+   dev-util/glib-utils
+   dev-util/itstool
+   gtk-doc? ( dev-util/gtk-doc
+   app-text/docbook-xml-dtd:4.3 )
+   >=dev-util/intltool-0.40.0
+   >=sys-devel/gettext-0.18.3
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   bogofilter? ( mail-filter/bogofilter )
+   highlight? ( app-text/highlight )
+   spamassassin? ( mail-filter/spamassassin )
+   !gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desk

[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/

2019-07-20 Thread Aaron Bauman
commit: bf5b2b5712fdbb3a48492d64f0181ba5d28b140b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon May 20 17:20:35 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jul 20 19:38:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b2b57

mail-client/evolution: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 .../evolution/files/3.24.6-DESTDIR-honoring.patch  |  53 -
 .../evolution/files/3.24.6-libical3-compat.patch   | 265 -
 2 files changed, 318 deletions(-)

diff --git a/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch 
b/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
deleted file mode 100644
index 7e024c937e7..000
--- a/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From cb845f462072d1d1e4045eac5f16b4db1f552309 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Mon, 2 Oct 2017 19:22:41 +0200
-Subject: [PATCH] Bug 781645 - Skip GSettings schema compile and icon cache
- update when DESTDIR is set
-
-(cherry picked from commit b40001cac702a74f818afb3f38acf9521e9d7b62)

- cmake/modules/GLibTools.cmake | 8 +---
- cmake/modules/IconCache.cmake | 8 +---
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb827c8..f0be5586db 100644
 a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
-   if(_install_code)
-   # Compile gsettings schemas and ensure that all of them are in 
the place.
-   install(CODE
--  "execute_process(${_install_code}
--  COMMAND ${CMAKE_COMMAND} -E chdir . 
\"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
--  )")
-+  "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+  execute_process(${_install_code}
-+  COMMAND ${CMAKE_COMMAND} -E chdir . 
\"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+  )
-+  endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
-   endif(_install_code)
- endmacro(add_gsettings_schemas)
- 
-diff --git a/cmake/modules/IconCache.cmake b/cmake/modules/IconCache.cmake
-index 6f7f5f0f24..145b843f1d 100644
 a/cmake/modules/IconCache.cmake
-+++ b/cmake/modules/IconCache.cmake
-@@ -60,9 +60,11 @@ macro(add_icon_cache_files _destdir _fileslistvar)
- 
-   if(GTK_UPDATE_ICON_CACHE)
-   install(CODE
--  "execute_process(${_install_code}
--  COMMAND ${CMAKE_COMMAND} -E chdir . 
${_update_icon_cache_cmd}
--  )")
-+  "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+  execute_process(${_install_code}
-+  COMMAND ${CMAKE_COMMAND} -E chdir . 
${_update_icon_cache_cmd}
-+  )
-+  endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
-   endif(GTK_UPDATE_ICON_CACHE)
- endmacro(add_icon_cache_files)
- 
--- 
-2.15.1
-

diff --git a/mail-client/evolution/files/3.24.6-libical3-compat.patch 
b/mail-client/evolution/files/3.24.6-libical3-compat.patch
deleted file mode 100644
index a7e5da268ee..000
--- a/mail-client/evolution/files/3.24.6-libical3-compat.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From a1bfd863de7732d138a6cdd4c08c763f81560c34 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Wed, 23 Aug 2017 14:11:12 +0200
-Subject: [PATCH 1/2] Bug 786163 - [ECalModel] Do not convert UTC times to
- local time zone
-
-(cherry picked from commit 7a3abddc2f0b12916a607da27cbd6817f28de737)

- src/calendar/gui/e-cal-model.c | 27 ---
- 1 file changed, 27 deletions(-)
-
-diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
-index 582fd7f3ea..75bf60fb2f 100644
 a/src/calendar/gui/e-cal-model.c
-+++ b/src/calendar/gui/e-cal-model.c
-@@ -1943,32 +1943,6 @@ e_cal_model_get_component_index (ECalModel *model,
-   return -1;
- }
- 
--/* We do this check since the calendar items are downloaded from the server
-- * in the open_method, since the default timezone might not be set there. */
--static void
--ensure_dates_are_in_default_zone (ECalModel *model,
--  icalcomponent *icalcomp)
--{
--  icaltimetype dt;
--  icaltimezone *zone;
--
--  zone = e_cal_model_get_timezone (model);
--  if (!zone)
--  return;
--
--  dt = icalcomponent_get_dtstart (icalcomp);
--  if (dt.is_utc) {
--  dt = icaltime_convert_to_zone (dt, zone);
--  icalcomponent_set_dtstart (icalcomp, dt);
--  }
--
--  dt = icalcomponent_get_dtend (icalcomp);
--