* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2015-11-09 11:25 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-11-09 11:25 UTC (permalink / raw
To: gentoo-commits
commit: c0bf3076c3014a6ee19a094a0b93bcb4b2fa6a4d
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 9 11:01:41 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 11:25:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bf3076
gnome-extra/evolution-data-server: Drop old
Package-Manager: portage-2.2.24
| 2 -
.../evolution-data-server-3.12.11.ebuild | 131 --------------------
.../evolution-data-server-3.16.4.ebuild | 137 ---------------------
.../evolution-data-server-3.16.4-goa-gmail.patch | 108 ----------------
4 files changed, 378 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index fe3626b..e15074f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,4 +1,2 @@
-DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
-DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2
DIST evolution-data-server-3.18.2.tar.xz 5410148 SHA256 5942fc1cf395acdc15425939d83824d861d01c57225ee3fc8c1d77009468ce9b SHA512 b90d7b53048dad2ac94e414e55f99eeb7695475c4db8c7d803206eabfe8a7b2a42a9c5083119e72fbe4ccc6afc8b120087da712dfc40c953bb66cb3bcbefe2f7 WHIRLPOOL 992b262ce926bdf176a5d5cb041e25e61be3609eedee1d35d7232afcc4e576da571bcef98a695cfa908b92c567c128a39846f528eb5ed51967e6535c976c2025
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
deleted file mode 100644
index dc7c25a..0000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/49" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- >=app-crypt/gcr-3.4
- >=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.5:=
- >=dev-libs/glib-2.36:2
- >=dev-libs/libgdata-0.10:=
- >=dev-libs/libical-0.43:=
- >=net-libs/libsoup-2.42:2.4
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=sys-libs/db-4:=
-
- dev-libs/icu:=
- sys-libs/zlib:=
- virtual/libiconv
-
- gtk? (
- >=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.2:3
- )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
- kerberos? ( virtual/krb5:= )
- ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/gperf
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-3.5.5
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
-
- # Fix relink issues in src_install
- ELTCONF="--reverse-deps"
-
- gnome2_src_prepare
-
- # Fix compilation flags crazyness, upstream bug #653157
- sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
- -i configure || die "sed failed"
-}
-
-src_configure() {
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
-
- # phonenumber does not exist in tree
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable introspection) \
- $(use_enable ipv6) \
- $(use_with kerberos krb5 "${EPREFIX}"/usr) \
- $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_with ldap openldap) \
- $(use_enable vala vala-bindings) \
- $(use_enable weather) \
- --enable-google \
- --enable-largefile \
- --enable-smime \
- --with-libdb="${EPREFIX}"/usr \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_install() {
- gnome2_src_install
-
- if use ldap; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema
- dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
deleted file mode 100644
index f9c7e62..0000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/52" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.15.1 is required for google tasks
-RDEPEND="
- >=app-crypt/gcr-3.4
- >=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.5:=
- >=dev-libs/glib-2.40:2
- >=dev-libs/libgdata-0.10:=
- >=dev-libs/libical-0.43:=
- >=net-libs/libsoup-2.42:2.4
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=sys-libs/db-4:=
-
- dev-libs/icu:=
- sys-libs/zlib:=
- virtual/libiconv
-
- gtk? (
- >=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.6:3
- )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- kerberos? ( virtual/krb5:= )
- ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/gperf
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-3.5.5
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# eautoreconf needs:
-# >=gnome-base/gnome-common-2
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
-
- # Fix relink issues in src_install
- ELTCONF="--reverse-deps"
-
- # Honor Google settings as defined in gnome-online-accounts (from 3.16 branch)
- epatch "${FILESDIR}"/${P}-goa-gmail.patch
-
- gnome2_src_prepare
-
- # Fix compilation flags crazyness, upstream bug #653157
- sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
- -i configure || die "sed failed"
-}
-
-src_configure() {
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- append-cppflags "-I$(db_includedir)"
-
- # phonenumber does not exist in tree
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable introspection) \
- $(use_enable ipv6) \
- $(use_with kerberos krb5 "${EPREFIX}"/usr) \
- $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_with ldap openldap) \
- $(use_enable vala vala-bindings) \
- $(use_enable weather) \
- --enable-google \
- --enable-largefile \
- --enable-smime \
- --with-libdb="${EPREFIX}"/usr \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_install() {
- gnome2_src_install
-
- if use ldap; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema
- dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- unset DISPLAY
- Xemake check
-}
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
deleted file mode 100644
index c5fc44e..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 14 Jul 2015 11:49:31 +0200
-Subject: Doesn't honor Google settings as defined in gnome-online-accounts
-
-Use mail-disabled, calendar-disabled and contacts-disabled properties,
-rather than rely on an interface addition/removal and a notification
-about the change.
-
-Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541
-
-diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-index e800c23..2f9be5e 100644
---- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
-+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
-@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding,
- return TRUE;
- }
-
--static gboolean
--gnome_online_accounts_object_is_non_null (GBinding *binding,
-- const GValue *source_value,
-- GValue *target_value,
-- gpointer unused)
--{
-- GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding));
-- ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding));
-- ESource *source;
-- ESourceGoa *goa_extension;
-- gpointer v_object;
--
-- v_object = g_value_get_object (source_value);
-- g_value_set_boolean (target_value, v_object != NULL);
--
-- g_return_val_if_fail (goa_object != NULL, TRUE);
-- g_return_val_if_fail (source_extension != NULL, TRUE);
--
-- source = e_source_extension_get_source (source_extension);
-- goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
--
-- if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) {
-- gchar *uri = NULL;
--
-- if (v_object && GOA_IS_CALENDAR (v_object))
-- uri = goa_calendar_dup_uri (v_object);
--
-- e_source_goa_set_calendar_url (goa_extension, uri);
--
-- g_free (uri);
-- } else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) {
-- gchar *uri = NULL;
--
-- if (v_object && GOA_IS_CONTACTS (v_object))
-- uri = goa_contacts_dup_uri (v_object);
--
-- e_source_goa_set_contacts_url (goa_extension, uri);
--
-- g_free (uri);
-- }
--
-- return TRUE;
--}
--
- static GoaObject *
- gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension,
- ESource *source)
-@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension,
- source_extension, "identity",
- G_BINDING_SYNC_CREATE);
-
-- e_binding_bind_property_full (
-- goa_object, "calendar",
-+ e_binding_bind_property (
-+ goa_account, "calendar-disabled",
- source_extension, "calendar-enabled",
-- G_BINDING_SYNC_CREATE,
-- gnome_online_accounts_object_is_non_null,
-- NULL,
-- NULL, (GDestroyNotify) NULL);
-+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
-
-- e_binding_bind_property_full (
-- goa_object, "contacts",
-+ e_binding_bind_property (
-+ goa_account, "contacts-disabled",
- source_extension, "contacts-enabled",
-- G_BINDING_SYNC_CREATE,
-- gnome_online_accounts_object_is_non_null,
-- NULL,
-- NULL, (GDestroyNotify) NULL);
-+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
-
-- e_binding_bind_property_full (
-- goa_object, "mail",
-+ e_binding_bind_property (
-+ goa_account, "mail-disabled",
- source_extension, "mail-enabled",
-- G_BINDING_SYNC_CREATE,
-- gnome_online_accounts_object_is_non_null,
-- NULL,
-- NULL, (GDestroyNotify) NULL);
-+ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
-
- g_clear_object (&goa_account);
- g_clear_object (&goa_calendar);
---
-cgit v0.10.2
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2018-01-08 12:57 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2018-01-08 12:57 UTC (permalink / raw
To: gentoo-commits
commit: 7e605439425d9d382896c8224064691e8cf6760b
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 11:13:40 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:57:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e605439
gnome-extra/evolution-data-server: bump to 3.24.7, fresh install fix, libical3 compat
Bump, patch to honor DESTDIR and not update caches when set (might cause sandbox
violation for us and be generally wrong), patches for libical:0/3 compatibility.
Bug: https://bugs.gentoo.org/628460
Package-Manager: Portage-2.3.19, Repoman-2.3.6
| 1 +
.../evolution-data-server-3.24.7.ebuild | 152 +++++++++++++++++++++
.../files/3.24.7-DESTDIR-honoring.patch | 31 +++++
.../files/3.24.7-libical3-compat.patch | 146 ++++++++++++++++++++
4 files changed, 330 insertions(+)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d481b5f9a47..45eaf7d0e19 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,2 +1,3 @@
DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
DIST evolution-data-server-3.24.6.tar.xz 4252940 BLAKE2B 42a0a39a8248628964cfd026e4b8bc3794e897f447aadb73e0e7870865314c47d6de11a1aa85d6e7fcb0a414a3552a74cb3012c8a6d4908b280ae7440e1154d7 SHA512 01eece83217e66ce7e08e333ceaf38bae226800dd8a015dda29583b0155b9f1fbef4f18d95a7127d08421cd27b3203d2b7cc6a3bc0b5adba1b06197c85be96e6
+DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
new file mode 100644
index 00000000000..9c317ebf417
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/60" # subslot = libcamel-1.2 soname version
+
+IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.7.17:=
+ >=dev-libs/glib-2.46:2
+ >=dev-libs/libical-0.43:=
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=net-libs/libsoup-2.42:2.4
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ berkdb? ( >=sys-libs/db-4:= )
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.10:3
+ )
+ google? (
+ >=dev-libs/json-glib-1.0.4
+ >=net-libs/webkit-gtk-2.11.91:4
+ ${gdata_depend}
+ )
+ gnome-online-accounts? (
+ >=net-libs/gnome-online-accounts-3.8:=
+ ${gdata_depend} )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ dev-util/gperf
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.35.5
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-DESTDIR-honoring.patch
+ "${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+
+ # Make CMakeLists versioned vala enabled
+ sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+ -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+ -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ local google_auth_enable
+ if use google || use gnome-online-accounts; then
+ google_auth_enable="ON"
+ else
+ google_auth_enable="OFF"
+ fi
+
+ # phonenumber does not exist in tree
+ local mycmakeargs=(
+ -DENABLE_GTK_DOC=$(usex api-doc-extras)
+ -DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DWITH_KRB5=$(usex kerberos)
+ -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+ -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_PHONENUMBER=OFF
+ -DENABLE_SMIME=ON
+ -DENABLE_GTK=$(usex gtk)
+ -DENABLE_GOOGLE_AUTH=${google_auth_enable}
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_GOA=$(usex gnome-online-accounts)
+ -DENABLE_UOA=OFF
+ -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+ # ENABLE_BACKTRACES requires libdwarf ?
+ -DENABLE_IPV6=$(usex ipv6)
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_GOOGLE=$(usex google)
+ -DENABLE_LARGEFILE=ON
+ -DENABLE_VALA_BINDINGS=$(usex vala)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ virtx cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use ldap; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
new file mode 100644
index 00000000000..a3a3d470b98
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
@@ -0,0 +1,31 @@
+From 5406fcda088be73f462e7d02d4a2ae56cc7329cc Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Oct 2017 19:20:36 +0200
+Subject: Bug 781645 - Skip GSettings schema compile when DESTDIR is set
+
+---
+ cmake/modules/GLibTools.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
+index fc8eb82..f0be558 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)
+
+--
+cgit v0.12
+
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
new file mode 100644
index 00000000000..8f574b0f8d9
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
@@ -0,0 +1,146 @@
+From dc5fc0e163421f5a01c3cdaab23ca2ea1eb3fae2 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 4 Oct 2017 11:48:48 +0200
+Subject: [PATCH 1/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
+
+The structure member is going to be removed from libical in the next release
+and the function is available for a long time, thus it's safe to replace
+the usage in the code.
+
+(cherry picked from commit f607f8628a28440374579531bc78848dfe0c782e)
+---
+ src/calendar/backends/contacts/e-cal-backend-contacts.c | 1 -
+ src/calendar/libecal/e-cal-component.c | 8 ++++----
+ src/calendar/libecal/e-cal-recur.c | 8 ++++----
+ src/calendar/libecal/e-cal-time-util.c | 3 +--
+ 4 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
+index d2b570885..cf2c62062 100644
+--- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
++++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
+@@ -699,7 +699,6 @@ cdate_to_icaltime (EContactDate *cdate)
+ ret.month = cdate->month;
+ ret.day = cdate->day;
+ ret.is_date = TRUE;
+- ret.is_utc = FALSE;
+ ret.zone = NULL;
+ ret.is_daylight = FALSE;
+
+diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
+index 65b530d1e..6d8a9814d 100644
+--- a/src/calendar/libecal/e-cal-component.c
++++ b/src/calendar/libecal/e-cal-component.c
+@@ -2522,7 +2522,7 @@ get_datetime (struct datetime *datetime,
+ * This makes the timezone code simpler. */
+ if (datetime->tzid_param)
+ dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
+- else if (dt->value && dt->value->is_utc)
++ else if (dt->value && icaltime_is_utc (*dt->value))
+ dt->tzid = g_strdup ("UTC");
+ else
+ dt->tzid = NULL;
+@@ -2559,9 +2559,9 @@ set_datetime (ECalComponent *comp,
+
+ /* If the TZID is set to "UTC", we set the is_utc flag. */
+ if (dt->tzid && !strcmp (dt->tzid, "UTC"))
+- dt->value->is_utc = 1;
+- else
+- dt->value->is_utc = 0;
++ dt->value->zone = icaltimezone_get_utc_timezone ();
++ else if (dt->value->zone == icaltimezone_get_utc_timezone ())
++ dt->value->zone = NULL;
+
+ if (datetime->prop) {
+ /* make sure no VALUE property is left if not needed */
+diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
+index 535d56c14..cad588c4d 100644
+--- a/src/calendar/libecal/e-cal-recur.c
++++ b/src/calendar/libecal/e-cal-recur.c
+@@ -195,7 +195,7 @@ ensure_timezone (icalcomponent *comp,
+ a different icalcomponent and cause use-after-free. */
+ tt->zone = NULL;
+
+- if (tt->is_utc)
++ if (icaltime_is_utc (*tt))
+ return TRUE;
+
+ tt->zone = default_timezone;
+@@ -435,7 +435,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ rrule.until.minute = 0;
+ rrule.until.second = 0;
+
+- if (!rrule.until.zone && !rrule.until.is_utc)
++ if (!rrule.until.zone && !icaltime_is_utc (rrule.until))
+ rrule.until.zone = dtstart.zone;
+ }
+
+@@ -542,7 +542,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ exrule.until.minute = 0;
+ exrule.until.second = 0;
+
+- if (!exrule.until.zone && !exrule.until.is_utc)
++ if (!exrule.until.zone && !icaltime_is_utc (exrule.until))
+ exrule.until.zone = dtstart.zone;
+ }
+
+@@ -586,7 +586,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
+ if (!success)
+ break;
+
+- if (!exdate.zone && !exdate.is_utc)
++ if (!exdate.zone && !icaltime_is_utc (exdate))
+ exdate.zone = dtstart.zone;
+
+ if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, &interval_start, &interval_end)) {
+diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
+index 7bcbc8ba1..914761cb0 100644
+--- a/src/calendar/libecal/e-cal-time-util.c
++++ b/src/calendar/libecal/e-cal-time-util.c
+@@ -763,9 +763,8 @@ tm_to_icaltimetype (struct tm *tm,
+
+ itt.day = tm->tm_mday;
+ itt.month = tm->tm_mon + 1;
+- itt.year = tm->tm_year+ 1900;
++ itt.year = tm->tm_year + 1900;
+
+- itt.is_utc = 0;
+ itt.is_date = is_date;
+
+ return itt;
+--
+2.15.1
+
+
+From fccd77cf4620ca76c4fd2bf7721e3fb7eaf55ec6 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 5 Oct 2017 13:50:08 +0200
+Subject: [PATCH 2/2] e-cal-recur.c:ensure_timezone(): Unset icaltimetype::zone
+ only if not UTC
+
+With a removal of icaltimetype::is_utc the icaltimetype::zone is used
+to determine whether it's UTC or not. That means that the icaltimetype::zone
+can be unset only if it's not the built-in UTC time zone.
+
+(cherry picked from commit 1f39ade8db00091d6fa4c752ccb70361ef0e8abc)
+---
+ src/calendar/libecal/e-cal-recur.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
+index cad588c4d..fc14fb15c 100644
+--- a/src/calendar/libecal/e-cal-recur.c
++++ b/src/calendar/libecal/e-cal-recur.c
+@@ -193,7 +193,8 @@ ensure_timezone (icalcomponent *comp,
+
+ /* Do not trust the 'zone' set on the structure, as it can come from
+ a different icalcomponent and cause use-after-free. */
+- tt->zone = NULL;
++ if (tt->zone != icaltimezone_get_utc_timezone ())
++ tt->zone = NULL;
+
+ if (icaltime_is_utc (*tt))
+ return TRUE;
+--
+2.15.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2019-02-27 12:43 Mart Raudsepp
0 siblings, 0 replies; 6+ messages in thread
From: Mart Raudsepp @ 2019-02-27 12:43 UTC (permalink / raw
To: gentoo-commits
commit: ca5f5ea5804f18ff2915a4dec97e80400d94419c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 27 12:09:20 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 12:39:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5f5ea5
gnome-extra/evolution-data-server: fix libgdata enabling logic, backport a patch
ENABLE_GOOGLE needs to be enabled if GOA or OAUTH2 to support
google tasks/calendars, not OAUTH2.
Backport a patch that is needed by a evolution-ews certificate
checking security fix.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../evolution-data-server-3.30.5-r1.ebuild | 153 +++++++++++++++++++++
.../files/3.30.5-collection-auth.patch | 35 +++++
2 files changed, 188 insertions(+)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
new file mode 100644
index 00000000000..df09ff1a91b
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62" # subslot = libcamel-1.2 soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.7.17:=
+ >=dev-libs/glib-2.46:2
+ >=dev-libs/libical-3.0.2:=
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=net-libs/libsoup-2.42:2.4
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ berkdb? ( >=sys-libs/db-4:= )
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.10:3
+ >=media-libs/libcanberra-0.25[gtk3]
+ )
+ oauth? (
+ >=dev-libs/json-glib-1.0.4
+ >=net-libs/webkit-gtk-2.11.91:4
+ ${gdata_depend}
+ )
+ gnome-online-accounts? (
+ >=net-libs/gnome-online-accounts-3.8:=
+ ${gdata_depend} )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gperf
+ gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+ >=dev-util/intltool-0.35.5
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ eapply "${FILESDIR}"/${PV}-collection-auth.patch # Prerequisite for evolution-ews cert checking fix
+ use vala && vala_src_prepare
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+
+ # Make CMakeLists versioned vala enabled
+ sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+ -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+ -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ local google_enable
+ if use oauth || use gnome-online-accounts; then
+ google_enable="ON"
+ else
+ google_enable="OFF"
+ fi
+
+ # phonenumber does not exist in tree
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DENABLE_GTK_DOC=$(usex gtk-doc)
+ -DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DWITH_KRB5=$(usex kerberos)
+ -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+ -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_PHONENUMBER=OFF
+ -DENABLE_SMIME=ON
+ -DENABLE_GTK=$(usex gtk)
+ -DENABLE_CANBERRA=$(usex gtk)
+ -DENABLE_OAUTH2=$(usex oauth)
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_GOA=$(usex gnome-online-accounts)
+ -DENABLE_UOA=OFF
+ -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+ # ENABLE_BACKTRACES requires libdwarf ?
+ -DENABLE_IPV6=$(usex ipv6)
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_GOOGLE=${google_enable}
+ -DENABLE_LARGEFILE=ON
+ -DENABLE_VALA_BINDINGS=$(usex vala)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_test() {
+ virtx cmake-utils_src_test
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use ldap; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch
new file mode 100644
index 00000000000..5d1c2780162
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch
@@ -0,0 +1,35 @@
+From 6672b8236139bd6ef41ecb915f4c72e2a052dba5 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 4 Dec 2018 18:19:30 +0100
+Subject: [PATCH] Let child source with 'none' authentication method use
+ collection source authentication
+
+That might be the same as having set NULL authentication method.
+
+Related to https://gitlab.gnome.org/GNOME/evolution-ews/issues/27
+---
+ src/libedataserver/e-data-server-util.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c
+index 47fd4d2ec..bd209c980 100644
+--- a/src/libedataserver/e-data-server-util.c
++++ b/src/libedataserver/e-data-server-util.c
+@@ -3259,11 +3259,13 @@ e_util_can_use_collection_as_credential_source (ESource *collection_source,
+ if (can_use_collection) {
+ gchar *method_source, *method_collection;
+
+- /* Also check the method; if different, then rather not use the collection */
++ /* Also check the method; if different, then rather not use the collection.
++ Consider 'none' method on the child as the same as the collection method. */
+ method_source = e_source_authentication_dup_method (auth_source);
+ method_collection = e_source_authentication_dup_method (auth_collection);
+
+ can_use_collection = !method_source || !method_collection ||
++ g_ascii_strcasecmp (method_source, "none") == 0 ||
+ g_ascii_strcasecmp (method_source, method_collection) == 0;
+
+ g_free (method_source);
+--
+2.17.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2021-04-16 13:17 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2021-04-16 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 3cdc3dea6eda714deba98fcf0ec07ff736a0eab7
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 13:15:40 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 13:17:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdc3dea
gnome-extra/evolution-data-server: Add patch for cmake-3.20 compat
Closes: https://bugs.gentoo.org/783138
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../evolution-data-server-3.38.4.ebuild | 1 +
...tions.cmake-Correct-variable-name-compari.patch | 75 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild
index 768516d9074..1638eb60d28 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild
@@ -84,6 +84,7 @@ src_prepare() {
gnome2_src_prepare
eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+ eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
# Make CMakeLists versioned vala enabled
sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
diff --git a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
new file mode 100644
index 00000000000..95546b6daaa
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch
@@ -0,0 +1,75 @@
+From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+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 ba1c9d0b7..339f1da4b 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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2023-08-21 12:06 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-08-21 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 2291736e5d1f2949b581bb87ce181dc8cb86bafb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 12:05:51 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 12:06:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2291736e
gnome-extra/evolution-data-server: backport date parsing fix (strict aliasing)
Closes: https://bugs.gentoo.org/912720
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../evolution-data-server-3.48.4-r1.ebuild | 145 +++++++++++++++++++++
.../files/3.48.4-aliasing-fix.patch | 37 ++++++
2 files changed, 182 insertions(+)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild
new file mode 100644
index 000000000000..d60119b96a31
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake db-use flag-o-matic gnome2 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/64-11-21-4-2-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
+REQUIRED_USE="
+ oauth? ( gtk )
+ vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+RDEPEND="
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.7.17:3
+ >=dev-libs/glib-2.70:2
+ >=dev-libs/libical-3.0.8:=[glib,introspection?]
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4
+ >=dev-libs/nss-3.9
+ >=net-libs/libsoup-3.1.1:3.0
+ >=dev-libs/json-glib-1.0.4
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ berkdb? ( >=sys-libs/db-4:= )
+ gtk? (
+ >=x11-libs/gtk+-3.20:3
+ >=gui-libs/gtk-4.4:4
+ >=media-libs/libcanberra-0.25[gtk3]
+
+ oauth? (
+ >=net-libs/webkit-gtk-2.34.0:4.1
+ >=net-libs/webkit-gtk-2.39.90:6
+ )
+ )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-4.2.0:4= )
+"
+DEPEND="${RDEPEND}
+ vala? ( $(vala_depend)
+ >=net-libs/libsoup-3.1.1:3.0[vala]
+ dev-libs/libical[vala]
+ )
+"
+BDEPEND="
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gperf
+ gtk-doc? ( >=dev-util/gtk-doc-1.14
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=dev-util/intltool-0.35.5
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="!test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ use vala && vala_setup
+ cmake_src_prepare
+ gnome2_src_prepare
+
+ eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+ eapply "${FILESDIR}"/3.48.4-aliasing-fix.patch
+
+ # Make CMakeLists versioned vala enabled
+ sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+ -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+ -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ # phonenumber does not exist in tree
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+ -DENABLE_GTK_DOC=$(usex gtk-doc)
+ -DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DWITH_KRB5=$(usex kerberos)
+ -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+ -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_PHONENUMBER=OFF
+ -DENABLE_SMIME=ON
+ -DENABLE_GTK=$(usex gtk)
+ -DENABLE_GTK4=$(usex gtk)
+ -DENABLE_CANBERRA=$(usex gtk)
+ -DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
+ -DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_GOA=$(usex gnome-online-accounts)
+ -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+ # ENABLE_BACKTRACES requires libdwarf ?
+ -DENABLE_IPV6=ON
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_LARGEFILE=ON
+ -DENABLE_VALA_BINDINGS=$(usex vala)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use ldap; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
new file mode 100644
index 000000000000..a451c6f5bc7c
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/912720
+https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/484
+https://gitlab.gnome.org/GNOME/evolution/-/issues/2485
+https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/126
+
+From 087226d29de3ef9070fb7436ca3dcc476cd9a9a5 Mon Sep 17 00:00:00 2001
+From: Enrik Berkhan <enrik.berkhan@inka.de>
+Date: Thu, 6 Jul 2023 15:44:53 +0000
+Subject: [PATCH] Camel MIME utils: fix aliasing issue in datetok
+
+Due to an aliasing issue, datetok() always returned NULL.
+
+With this change, the C aliasing rules will be respected. Further, next is no longer required to be the first element in struct _date_token.
+--- a/src/camel/camel-mime-utils.c
++++ b/src/camel/camel-mime-utils.c
+@@ -4160,7 +4160,7 @@ struct _date_token {
+ static struct _date_token *
+ datetok (const gchar *date)
+ {
+- struct _date_token *tokens = NULL, *token, *tail = (struct _date_token *) &tokens;
++ struct _date_token *tokens = NULL, *token, **tail = &tokens;
+ const gchar *start, *end;
+ guchar mask;
+
+@@ -4187,8 +4187,8 @@ datetok (const gchar *date)
+ token->len = end - start;
+ token->mask = mask;
+
+- tail->next = token;
+- tail = token;
++ *tail = token;
++ tail = &token->next;
+ }
+
+ if (*end)
+--
+GitLab
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2023-12-19 11:04 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-12-19 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 9564004be9c1a99aee370f92959bf978b467e0d1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 09:37:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:03:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9564004b
gnome-extra/evolution-data-server: modern C fix for configure
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../evolution-data-server-3.50.2-r1.ebuild | 160 +++++++++++++++++++++
.../evolution-data-server/files/3.50.2-c99.patch | 27 ++++
2 files changed, 187 insertions(+)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r1.ebuild
new file mode 100644
index 000000000000..0ae3db0eb739
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake db-use flag-o-matic gnome2 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/64-11-21-4-2-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 vala +weather"
+REQUIRED_USE="
+ oauth-gtk3? ( gtk )
+ oauth-gtk4? ( gtk )
+ vala? ( introspection )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+RDEPEND="
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.7.17:3
+ >=dev-libs/glib-2.70:2
+ >=dev-libs/libical-3.0.8:=[glib,introspection?]
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4
+ >=dev-libs/nss-3.9
+ >=net-libs/libsoup-3.1.1:3.0
+ >=dev-libs/json-glib-1.0.4
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ berkdb? ( >=sys-libs/db-4:= )
+ gtk? (
+ >=x11-libs/gtk+-3.20:3
+ >=gui-libs/gtk-4.4:4
+ >=media-libs/libcanberra-0.25[gtk3]
+
+ oauth-gtk3? ( >=net-libs/webkit-gtk-2.34.0:4.1 )
+ oauth-gtk4? ( >=net-libs/webkit-gtk-2.39.90:6 )
+ )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-4.2.0:4= )
+"
+DEPEND="${RDEPEND}
+ vala? ( $(vala_depend)
+ >=net-libs/libsoup-3.1.1:3.0[vala]
+ dev-libs/libical[vala]
+ )
+"
+BDEPEND="
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/gperf
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.14
+ dev-util/gi-docgen
+ app-text/docbook-xml-dtd:4.1.2
+ )
+ >=dev-util/intltool-0.35.5
+ >=sys-devel/gettext-0.18.3
+ virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="!test? ( test )"
+
+pkg_pretend() {
+ if has_version "gnome-extra/evolution-data-server[oauth(-)]" &&
+ ! use oauth-gtk3 && ! use oauth-gtk4
+ then
+ ewarn "The previous installed version of gnome-extra/evolution-data-server"
+ ewarn "had USE=oauth enabled that is now split into USE=oauth-gtk3"
+ ewarn "and USE=oauth-gtk4. Please consider enabling either (or both)"
+ ewarn "of these flags to preserve OAuth2 support."
+ fi
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ use vala && vala_setup
+ cmake_src_prepare
+ gnome2_src_prepare
+
+ eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+ eapply "${FILESDIR}"/3.50.2-c99.patch
+
+ # Make CMakeLists versioned vala enabled
+ sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+ -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+ -i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ use berkdb && append-cppflags "-I$(db_includedir)"
+
+ # phonenumber does not exist in tree
+ local mycmakeargs=(
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+# -DENABLE_GI_DOCGEN=$(usex gtk-doc)
+ -DENABLE_GTK_DOC=$(usex gtk-doc)
+ -DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+ -DENABLE_SCHEMAS_COMPILE=OFF
+ -DENABLE_INTROSPECTION=$(usex introspection)
+ -DWITH_KRB5=$(usex kerberos)
+ -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+ -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+ -DWITH_OPENLDAP=$(usex ldap)
+ -DWITH_PHONENUMBER=OFF
+ -DENABLE_SMIME=ON
+ -DENABLE_GTK=$(usex gtk)
+ -DENABLE_GTK4=$(usex gtk)
+ -DENABLE_CANBERRA=$(usex gtk)
+ -DENABLE_OAUTH2_WEBKITGTK=$(usex oauth-gtk3)
+ -DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth-gtk4)
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_GOA=$(usex gnome-online-accounts)
+ -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+ # ENABLE_BACKTRACES requires libdwarf ?
+ -DENABLE_IPV6=ON
+ -DENABLE_WEATHER=$(usex weather)
+ -DENABLE_LARGEFILE=ON
+ -DENABLE_VALA_BINDINGS=$(usex vala)
+ -DENABLE_TESTS=$(usex test)
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use ldap; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/calentry.schema
+ dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+ fi
+}
diff --git a/gnome-extra/evolution-data-server/files/3.50.2-c99.patch b/gnome-extra/evolution-data-server/files/3.50.2-c99.patch
new file mode 100644
index 000000000000..44b1b1de67ee
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.50.2-c99.patch
@@ -0,0 +1,27 @@
+https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/55558d3c23e68aada59c5deb59a664aea263f075
+
+From 55558d3c23e68aada59c5deb59a664aea263f075 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Fri, 1 Dec 2023 09:52:57 +0100
+Subject: [PATCH] build: Correct incompatible type warning from check for
+ I_CAL_EMAIL_PARAMETER
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 381a52b72..0b545e644 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -963,7 +963,7 @@ set(CMAKE_REQUIRED_LIBRARIES ${CALENDAR_LDFLAGS})
+ CHECK_C_SOURCE_COMPILES("#define LIBICAL_GLIB_UNSTABLE_API 1
+ #include <libical-glib/libical-glib.h>
+ int main(void) {
+- icalparameter *param;
++ ICalParameter *param;
+ param = i_cal_property_get_first_parameter (NULL, I_CAL_EMAIL_PARAMETER);
+ i_cal_parameter_get_email (param);
+ i_cal_parameter_new_email (NULL);
+--
+GitLab
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-19 11:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-16 13:17 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 11:04 Sam James
2023-08-21 12:06 Sam James
2019-02-27 12:43 Mart Raudsepp
2018-01-08 12:57 Mart Raudsepp
2015-11-09 11:25 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox