* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2019-12-23 21:34 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2019-12-23 21:34 UTC (permalink / raw
To: gentoo-commits
commit: c6f1839827402dac6aa38cd2db521bbb7f5050af
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 23 21:31:04 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 21:31:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f18398
gnome-extra/evolution-data-server: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 -
.../evolution-data-server-3.30.5-r1.ebuild | 153 ---------------------
.../files/3.30.5-collection-auth.patch | 35 -----
3 files changed, 189 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 928b0930da7..7f1ce22c577 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,2 @@
-DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7
DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
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
deleted file mode 100644
index 38777837678..00000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{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 ~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
deleted file mode 100644
index 5d1c2780162..00000000000
--- a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2025-01-25 16:49 Pacho Ramos
0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos @ 2025-01-25 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 475dfda1604cf21063b8e9370846ed76f768e17a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 16:37:04 2025 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 16:48:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475dfda1
gnome-extra/evolution-data-server: drop 3.50.2-r2, 3.50.4-r1
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
| 2 -
.../evolution-data-server-3.50.2-r2.ebuild | 167 ---------------------
.../evolution-data-server-3.50.4-r1.ebuild | 167 ---------------------
.../evolution-data-server/files/3.50.2-c99.patch | 27 ----
4 files changed, 363 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 20a7beeeeaa7..8b8fafb73b9f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,4 +1,2 @@
-DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610
-DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed
DIST evolution-data-server-3.52.4.tar.xz 5055252 BLAKE2B e493f16700533e97440a13dead51bb4654fbbb0345718eeb91e1e052f9599ededacb6e6693fa9de3d68288a6472503ab3a01cab4ac27be8cfc2d693389021aa0 SHA512 2847a15f7cb5b41cce94565a06f7baa02d8dd40241d59029ccebeb21215500ca6f1ac978f1142bde9348917f0534e181e2f7011ed245b6e7a6b1afda9975cfef
DIST evolution-data-server-3.54.3.tar.xz 5099688 BLAKE2B 4dd96cd75adbcb1703c4506ae01be4728f90bc1d8ec201f4aea9a44fb46b2f748db82343ea368c2ecd7a87f55b4e46c6ffdcd085b5329683d00828a23f5aedb6 SHA512 071f4f8185d74712ac57532adb15ecd68feb99f780f36d4751730d16cd57e44bcfd8ecf2ed6995326775ee049bba0da9971f5f42fba43e2d76f9c26865d7f014
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r2.ebuild
deleted file mode 100644
index 0597f8150b97..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.50.2-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 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 ~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-gtk3
- >=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() {
- # bug #944075
- append-cflags -std=gnu17
-
- # /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() {
- # -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
- virtx cmake_src_test -j1
-}
-
-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/evolution-data-server-3.50.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.4-r1.ebuild
deleted file mode 100644
index 38d19619d917..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.50.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 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 ~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-gtk3
- >=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() {
- # bug #944075
- append-cflags -std=gnu17
-
- # /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() {
- # -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
- virtx cmake_src_test -j1
-}
-
-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
deleted file mode 100644
index 44b1b1de67ee..000000000000
--- a/gnome-extra/evolution-data-server/files/3.50.2-c99.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2024-02-11 14:21 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2024-02-11 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 53da01695cd7986c7866989d19e43f0315c9611e
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 14:15:00 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 14:21:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53da0169
gnome-extra/evolution-data-server: drop 3.48.4-r1, 3.50.3
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 2 -
.../evolution-data-server-3.48.4-r1.ebuild | 145 -------------------
.../evolution-data-server-3.50.3.ebuild | 160 ---------------------
.../files/3.48.4-aliasing-fix.patch | 37 -----
4 files changed, 344 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index b053d4e15873..a1c195bc75df 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,4 +1,2 @@
-DIST evolution-data-server-3.48.4.tar.xz 4906356 BLAKE2B 13cbd21d8f6829d052227d3d328439d5f00a2cda2384ffeace791a563ed8acdcd707729ae032dbdbe16e530b2e6205c006412f1cbaa03e8fb6d669c2c75d67bd SHA512 35bc6653efdb70a110f39499945516408090f101319a3080c87f6e14f886e0f9283225c4c5b6a4c2af418b9928c5eb7fba2d319481c81af1fa87f7dd930f7215
DIST evolution-data-server-3.50.2.tar.xz 4964152 BLAKE2B 7279a5bcb0399fdcce723336a052dca13efa6f0af6ef7371b7cb8e76fbd7e1b0313e7f677cea530de62a93770c35887fd70bac551338f9a89860e2529b1f1519 SHA512 9e2a34e06a446ae142535072a3d6916e31b7be987b114c111fb0687fa32a3fe4085ba5a09ccd77fb395d107e5c673130dc770bae74a50fdb566c91cd9de85610
-DIST evolution-data-server-3.50.3.tar.xz 4964556 BLAKE2B ddc37e2f1bfbcfbb1150a4fa89d5ffe1000c1f3e3b3f588f3f66d855986082c06034e87c2c4326bd4a8636eb22f078268883373235b816d55516fe83f999f623 SHA512 7c7142bd56846610a63b447a20dd6001bbebe146fed815230fa51ceb10d166975b1c9e49967ee87c90d5e70b598a76363885acadc6da0d314453a86546eb3064
DIST evolution-data-server-3.50.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed
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
deleted file mode 100644
index 5a6c3d1c0a73..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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/evolution-data-server-3.50.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.50.3.ebuild
deleted file mode 100644
index b28a6b0606eb..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.50.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2024 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.48.4-aliasing-fix.patch b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
deleted file mode 100644
index a451c6f5bc7c..000000000000
--- a/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2021-12-09 17:11 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2021-12-09 17:11 UTC (permalink / raw
To: gentoo-commits
commit: e4a6eaf455cd78fd0d8d2cfa50d83fa05a21693f
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 14:49:25 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 17:08:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4a6eaf4
gnome-extra/evolution-data-server: remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 3 -
.../evolution-data-server-3.40.3.ebuild | 152 --------------------
.../evolution-data-server-3.42.0.ebuild | 155 --------------------
.../evolution-data-server-3.42.1.ebuild | 158 ---------------------
.../files/3.42.1-fix-build.patch | 28 ----
.../files/3.42.1-fix-calendar-crash.patch | 64 ---------
6 files changed, 560 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index a62123c64c6a..7b7cc5947815 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,2 @@
-DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
-DIST evolution-data-server-3.42.0.tar.xz 4614616 BLAKE2B 801e1a71c10af4f7c8b2e8478631ed76269170b01bb30dca296da7b151041981e0f45f9a69fe4873f503d0d38b7e6fdf50c6a7006d001af7d16663478a102b6e SHA512 44e4a45ac7779fd5a336aa84b8e23926cc861c1a3d1ca5629a4997a8783415eca1f6bdcef4fa6ed10e5417a64eef31dbe9edbf027954a653f4c22e25c90f16c1
-DIST evolution-data-server-3.42.1.tar.xz 4621996 BLAKE2B d5d163503b34cad06d03eb7711b3de4d2b0101ac7718f41e060efcc8189a0aa3654d435015a6c06f87e922e320c4032d8e1d31280095989f45d38744e92b85df SHA512 8e0673af07b00e1d658b98b811312a57368e634d7a1e11ece6af02794d8e4743cd496dbd4ea9e6a1f1c8b0b55a242296f36342f5827521e903794814bcaacff8
DIST evolution-data-server-3.42.2.tar.xz 4622324 BLAKE2B e321302c64317773122701a40f9ac418165e6fa98500481b73e05fcb86f71974de1469ade4d0aa42c6e9a0cae73e570a8abc0f70b846de72fa20305d2296273d SHA512 a0329180bac12d9723efd42938335ae46492cdd774358c411e89de3ef34b4d2cdbdb77fb13d8e1ad27a89f9bf64d2f78f3e25e54fbbaa9076dab2d866705de05
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
deleted file mode 100644
index 5219b100f94f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake db-use flag-o-matic gnome2 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-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so 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 ~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
-gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]"
-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.8:=[glib,introspection?]
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=net-libs/libsoup-2.58: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.16:3
- >=media-libs/libcanberra-0.25[gtk3]
- )
- oauth? (
- >=dev-libs/json-glib-1.0.4
- >=net-libs/webkit-gtk-2.28.0: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}
- vala? ( $(vala_depend)
- net-libs/libsoup:2.4[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? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
- use vala && vala_src_prepare
- cmake_src_prepare
- gnome2_src_prepare
-
- eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.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)"
-
- 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)
- -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_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/evolution-data-server-3.42.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild
deleted file mode 100644
index 42b2525574f3..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake db-use flag-o-matic gnome2 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/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so 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 ~riscv ~sparc ~x86 ~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
-# glib-2.70 for build-time optional GPowerProfileMonitor
-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.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-2.58: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.16:3
- >=media-libs/libcanberra-0.25[gtk3]
- )
- oauth? (
- >=dev-libs/json-glib-1.0.4
- >=net-libs/webkit-gtk-2.28.0: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}
- vala? ( $(vala_depend)
- net-libs/libsoup:2.4[vala]
- dev-libs/libical[vala]
- oauth? ( dev-libs/libgdata[vala] )
- gnome-online-accounts? ( dev-libs/libgdata[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? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
- use vala && vala_src_prepare
- cmake_src_prepare
- gnome2_src_prepare
-
- eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.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)"
-
- 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)
- -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_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/evolution-data-server-3.42.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
deleted file mode 100644
index d13cfee8d20c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake db-use flag-o-matic gnome2 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/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so 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 ~riscv ~sparc ~x86 ~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
-# glib-2.70 for build-time optional GPowerProfileMonitor
-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.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-2.58: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.16:3
- >=media-libs/libcanberra-0.25[gtk3]
- )
- oauth? (
- >=dev-libs/json-glib-1.0.4
- >=net-libs/webkit-gtk-2.28.0: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}
- vala? ( $(vala_depend)
- net-libs/libsoup:2.4[vala]
- dev-libs/libical[vala]
- oauth? ( dev-libs/libgdata[vala] )
- gnome-online-accounts? ( dev-libs/libgdata[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? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
- use vala && vala_src_prepare
- cmake_src_prepare
- gnome2_src_prepare
-
- eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
- # From gnome-41 branch:
- eapply "${FILESDIR}"/${PV}-fix-build.patch
- eapply "${FILESDIR}"/${PV}-fix-calendar-crash.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)"
-
- 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)
- -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_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.42.1-fix-build.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
deleted file mode 100644
index a0fde022765b..000000000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c802adfdc5e16f3fc210e8e83bb3b972cd8fdc86 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 1 Nov 2021 16:10:13 +0100
-Subject: [PATCH 1/2] I#364 - Camel: Add a missing header include into
- camel-hostname-utils.c
-
-Change suggested by Rainer Herzog.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/364
----
- src/camel/camel-hostname-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/camel/camel-hostname-utils.c b/src/camel/camel-hostname-utils.c
-index 723c81d14..8d8d179e6 100644
---- a/src/camel/camel-hostname-utils.c
-+++ b/src/camel/camel-hostname-utils.c
-@@ -24,6 +24,7 @@
-
- #include <unicode/uchar.h>
- #include <unicode/uscript.h>
-+#include <unicode/ustring.h>
-
- #include "camel-string-utils.h"
- #include "camel-hostname-utils.h"
---
-2.32.0
-
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
deleted file mode 100644
index 011e8bd0b99a..000000000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7cbcdd3974abf7135617b1e9a230b4a9f5d829c6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 4 Nov 2021 17:00:20 +0100
-Subject: [PATCH 2/2] I#365 - Calendar: Crash on local calandar file change
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/365
----
- src/calendar/backends/file/e-cal-backend-file.c | 1 +
- src/calendar/backends/http/e-cal-backend-http.c | 7 ++++++-
- src/calendar/libecal/e-cal-component.c | 2 ++
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index f40bf807c..79ae53632 100644
---- a/src/calendar/backends/file/e-cal-backend-file.c
-+++ b/src/calendar/backends/file/e-cal-backend-file.c
-@@ -904,6 +904,7 @@ scan_vcalendar (ECalBackendFile *cbfile)
- if (e_cal_component_set_icalcomponent (comp, icomp)) {
- /* Thus it's not freed while being used in the 'comp' */
- g_object_ref (icomp);
-+ i_cal_object_set_owner (I_CAL_OBJECT (icomp), G_OBJECT (priv->vcalendar));
-
- check_dup_uid (cbfile, comp);
-
-diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
-index a7e930ca0..bfe9b4554 100644
---- a/src/calendar/backends/http/e-cal-backend-http.c
-+++ b/src/calendar/backends/http/e-cal-backend-http.c
-@@ -477,13 +477,18 @@ ecb_http_get_changes_sync (ECalMetaBackend *meta_backend,
- } else {
- iter = i_cal_component_begin_component (maincomp, I_CAL_VCALENDAR_COMPONENT);
- subcomp = i_cal_comp_iter_deref (iter);
-+ if (subcomp)
-+ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (maincomp));
- }
-
- while (subcomp && success) {
- ICalComponent *next_subcomp = NULL;
-
-- if (iter)
-+ if (iter) {
- next_subcomp = i_cal_comp_iter_next (iter);
-+ if (next_subcomp)
-+ i_cal_object_set_owner (I_CAL_OBJECT (next_subcomp), G_OBJECT (maincomp));
-+ }
-
- if (i_cal_component_isa (subcomp) == I_CAL_VCALENDAR_COMPONENT) {
- success = e_cal_meta_backend_gather_timezones_sync (meta_backend, subcomp, TRUE, cancellable, error);
-diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
-index a3dddcc8f..c7629813a 100644
---- a/src/calendar/libecal/e-cal-component.c
-+++ b/src/calendar/libecal/e-cal-component.c
-@@ -95,6 +95,8 @@ foreach_subcomponent (ICalComponent *icalcomp,
- while (subcomp) {
- ICalComponent *next_subcomp;
-
-+ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (icalcomp));
-+
- next_subcomp = i_cal_comp_iter_next (iter);
-
- if (!func (icalcomp, subcomp, user_data)) {
---
-2.32.0
-
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2021-11-05 13:36 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2021-11-05 13:36 UTC (permalink / raw
To: gentoo-commits
commit: f0ae631080260122958819b093615dc7f93cab33
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 13:26:56 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 13:33:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ae6310
gnome-extra/evolution-data-server: bump to 3.42.1
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 +
.../evolution-data-server-3.42.1.ebuild | 158 +++++++++++++++++++++
.../files/3.42.1-fix-build.patch | 28 ++++
.../files/3.42.1-fix-calendar-crash.patch | 64 +++++++++
4 files changed, 251 insertions(+)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index b1126d05a0c..b26a9057c85 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,4 @@
DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
DIST evolution-data-server-3.42.0.tar.xz 4614616 BLAKE2B 801e1a71c10af4f7c8b2e8478631ed76269170b01bb30dca296da7b151041981e0f45f9a69fe4873f503d0d38b7e6fdf50c6a7006d001af7d16663478a102b6e SHA512 44e4a45ac7779fd5a336aa84b8e23926cc861c1a3d1ca5629a4997a8783415eca1f6bdcef4fa6ed10e5417a64eef31dbe9edbf027954a653f4c22e25c90f16c1
+DIST evolution-data-server-3.42.1.tar.xz 4621996 BLAKE2B d5d163503b34cad06d03eb7711b3de4d2b0101ac7718f41e060efcc8189a0aa3654d435015a6c06f87e922e320c4032d8e1d31280095989f45d38744e92b85df SHA512 8e0673af07b00e1d658b98b811312a57368e634d7a1e11ece6af02794d8e4743cd496dbd4ea9e6a1f1c8b0b55a242296f36342f5827521e903794814bcaacff8
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
new file mode 100644
index 00000000000..d13cfee8d20
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 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/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so 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 ~riscv ~sparc ~x86 ~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
+# glib-2.70 for build-time optional GPowerProfileMonitor
+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.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-2.58: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.16:3
+ >=media-libs/libcanberra-0.25[gtk3]
+ )
+ oauth? (
+ >=dev-libs/json-glib-1.0.4
+ >=net-libs/webkit-gtk-2.28.0: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}
+ vala? ( $(vala_depend)
+ net-libs/libsoup:2.4[vala]
+ dev-libs/libical[vala]
+ oauth? ( dev-libs/libgdata[vala] )
+ gnome-online-accounts? ( dev-libs/libgdata[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? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ use vala && vala_src_prepare
+ cmake_src_prepare
+ gnome2_src_prepare
+
+ eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+ # From gnome-41 branch:
+ eapply "${FILESDIR}"/${PV}-fix-build.patch
+ eapply "${FILESDIR}"/${PV}-fix-calendar-crash.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)"
+
+ 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)
+ -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_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.42.1-fix-build.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
new file mode 100644
index 00000000000..a0fde022765
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
@@ -0,0 +1,28 @@
+From c802adfdc5e16f3fc210e8e83bb3b972cd8fdc86 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 1 Nov 2021 16:10:13 +0100
+Subject: [PATCH 1/2] I#364 - Camel: Add a missing header include into
+ camel-hostname-utils.c
+
+Change suggested by Rainer Herzog.
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/364
+---
+ src/camel/camel-hostname-utils.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/camel/camel-hostname-utils.c b/src/camel/camel-hostname-utils.c
+index 723c81d14..8d8d179e6 100644
+--- a/src/camel/camel-hostname-utils.c
++++ b/src/camel/camel-hostname-utils.c
+@@ -24,6 +24,7 @@
+
+ #include <unicode/uchar.h>
+ #include <unicode/uscript.h>
++#include <unicode/ustring.h>
+
+ #include "camel-string-utils.h"
+ #include "camel-hostname-utils.h"
+--
+2.32.0
+
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
new file mode 100644
index 00000000000..011e8bd0b99
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
@@ -0,0 +1,64 @@
+From 7cbcdd3974abf7135617b1e9a230b4a9f5d829c6 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 4 Nov 2021 17:00:20 +0100
+Subject: [PATCH 2/2] I#365 - Calendar: Crash on local calandar file change
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/365
+---
+ src/calendar/backends/file/e-cal-backend-file.c | 1 +
+ src/calendar/backends/http/e-cal-backend-http.c | 7 ++++++-
+ src/calendar/libecal/e-cal-component.c | 2 ++
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
+index f40bf807c..79ae53632 100644
+--- a/src/calendar/backends/file/e-cal-backend-file.c
++++ b/src/calendar/backends/file/e-cal-backend-file.c
+@@ -904,6 +904,7 @@ scan_vcalendar (ECalBackendFile *cbfile)
+ if (e_cal_component_set_icalcomponent (comp, icomp)) {
+ /* Thus it's not freed while being used in the 'comp' */
+ g_object_ref (icomp);
++ i_cal_object_set_owner (I_CAL_OBJECT (icomp), G_OBJECT (priv->vcalendar));
+
+ check_dup_uid (cbfile, comp);
+
+diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
+index a7e930ca0..bfe9b4554 100644
+--- a/src/calendar/backends/http/e-cal-backend-http.c
++++ b/src/calendar/backends/http/e-cal-backend-http.c
+@@ -477,13 +477,18 @@ ecb_http_get_changes_sync (ECalMetaBackend *meta_backend,
+ } else {
+ iter = i_cal_component_begin_component (maincomp, I_CAL_VCALENDAR_COMPONENT);
+ subcomp = i_cal_comp_iter_deref (iter);
++ if (subcomp)
++ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (maincomp));
+ }
+
+ while (subcomp && success) {
+ ICalComponent *next_subcomp = NULL;
+
+- if (iter)
++ if (iter) {
+ next_subcomp = i_cal_comp_iter_next (iter);
++ if (next_subcomp)
++ i_cal_object_set_owner (I_CAL_OBJECT (next_subcomp), G_OBJECT (maincomp));
++ }
+
+ if (i_cal_component_isa (subcomp) == I_CAL_VCALENDAR_COMPONENT) {
+ success = e_cal_meta_backend_gather_timezones_sync (meta_backend, subcomp, TRUE, cancellable, error);
+diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
+index a3dddcc8f..c7629813a 100644
+--- a/src/calendar/libecal/e-cal-component.c
++++ b/src/calendar/libecal/e-cal-component.c
+@@ -95,6 +95,8 @@ foreach_subcomponent (ICalComponent *icalcomp,
+ while (subcomp) {
+ ICalComponent *next_subcomp;
+
++ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (icalcomp));
++
+ next_subcomp = i_cal_comp_iter_next (iter);
+
+ if (!func (icalcomp, subcomp, user_data)) {
+--
+2.32.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2020-08-09 7:22 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2020-08-09 7:22 UTC (permalink / raw
To: gentoo-commits
commit: d849945a3cdffa402337ed5b85b72400df80c4ee
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 15:30:30 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Aug 9 07:22:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d849945a
gnome-extra/evolution-data-server: bump to 3.36.5, fix USE=gtk-doc build
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 +
.../evolution-data-server-3.36.5.ebuild | 150 +++++++++++++++++++++
.../files/3.36.5-gtk-doc-1.32-compat.patch | 32 +++++
3 files changed, 183 insertions(+)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 04a74512747..0659915be7c 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1 +1,2 @@
DIST evolution-data-server-3.36.4.tar.xz 4636308 BLAKE2B d701e2220de9aa68a1c5e112de16675c53a33e31441fbfd88d6ac7afa08d60faa3c06d74ee4161f3329b1ba93950f97f32d3cf5714a0de68560053b506425707 SHA512 dea044e12aac92f1cfde18c10f793b75e68e40e27fb9b299c6bdb91e6f19df4224bda7ed32d54a8b8dd517580b69929cff6be0b340e377dbc3bda5c4860f5a3b
+DIST evolution-data-server-3.36.5.tar.xz 4636800 BLAKE2B 5708ec1f064b723cb5421dad50145d2377c2c683ef37fe82d24b6f27a895b89e43c55ae6c900797d477b1af052e0cc6381649c790744d8591010d928822917f1 SHA512 65ec23a665e3a547b10ad6a6be5f0533db269406c3e8db64a63cffb8e1b410e83b9c39bd7cd5dac5ecd5cf61ef96dc529ba1bd00ad0a09b3bf2c4e98f3d156e3
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
new file mode 100644
index 00000000000..39aaaae43b5
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.36.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 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-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so 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 ~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
+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.8:=[glib,introspection?]
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=net-libs/libsoup-2.58: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}
+ 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
+ vala? ( $(vala_depend)
+ net-libs/libsoup:2.4[vala]
+ dev-libs/libical[vala]
+ )
+"
+
+# 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 )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+ use vala && vala_src_prepare
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+
+ eapply "${FILESDIR}"/${PV}-gtk-doc-1.32-compat.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)"
+
+ 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)
+ -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.36.5-gtk-doc-1.32-compat.patch b/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch
new file mode 100644
index 00000000000..3a202bee154
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch
@@ -0,0 +1,32 @@
+From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 8 Aug 2020 18:59:25 +0300
+Subject: [PATCH] I#158 - Workaround build error with gtk-doc-1.32
+
+---
+ src/calendar/libecal/e-cal-time-util.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
+index 8acb13061..11c9d3369 100644
+--- a/src/calendar/libecal/e-cal-time-util.h
++++ b/src/calendar/libecal/e-cal-time-util.h
+@@ -150,6 +150,7 @@ void time_to_gdate_with_zone (GDate *date,
+ * struct tm manipulation
+ **************************************************************************/
+
++#ifndef __GTK_DOC_IGNORE__
+ struct tm e_cal_util_icaltime_to_tm
+ (const ICalTime *itt);
+ struct tm e_cal_util_icaltime_to_tm_with_zone
+@@ -159,6 +160,7 @@ struct tm e_cal_util_icaltime_to_tm_with_zone
+ ICalTime * e_cal_util_tm_to_icaltime
+ (struct tm *tm,
+ gboolean is_date);
++#endif
+
+ G_END_DECLS
+
+--
+2.20.1
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2019-09-07 22:09 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2019-09-07 22:09 UTC (permalink / raw
To: gentoo-commits
commit: a05460c8b8328d896b4d6fecaba3eb7066ec3267
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 7 15:06:28 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 22:08:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05460c8
gnome-extra/evolution-data-server: bump to 3.32.4
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 +
.../evolution-data-server-3.32.4.ebuild | 153 +++++++++++++++++++++
.../files/3.32.4-gtk-doc-fix1.patch | 88 ++++++++++++
.../files/3.32.4-gtk-doc-fix2.patch | 29 ++++
4 files changed, 271 insertions(+)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 6e514e69b7e..2ee2362be1c 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1 +1,2 @@
DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
+DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
new file mode 100644
index 00000000000..f2100b28c06
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.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_{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-24" # subslot = libcamel-1.2/libedataserver-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
+ app-text/docbook-xml-dtd:4.1.2 )
+ >=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}-gtk-doc-fix{1,2}.patch
+ 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)
+ -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.32.4-gtk-doc-fix1.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch
new file mode 100644
index 00000000000..54a5fc714de
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix1.patch
@@ -0,0 +1,88 @@
+From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw@src.gnome.org>
+Date: Mon, 22 Jul 2019 16:06:21 +0800
+Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line
+
+When a library provides no way to find linker flags for linking with it,
+the build system usually depends on the user to necessary put -L flags
+in LDFLAGS environment variable in order to find it. However, GtkDoc
+module constructs the command line by itself, and it forgets to add
+LDFLAGS to the command line of gtkdoc-scangobj.
+
+It is especially important to include LDFLAGS on non-GNU systems. For
+example, FreeBSD libc doesn't include a gettext implementation. GLib
+requires gettext, and it pulls in an external gettext runtime for it.
+However, gettext-runtime doesn't include a .pc file, so LDFLAGS is
+required if gettext-runtime isn't installed in the same prefix as GLib.
+Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can
+result in a linking error because -lintl cannot be found.
+
+In evolution-data-server we are lucky most of the time because it
+depends on a lot of external libraries. These external libraries are
+likely to be installed in the same prefix as gettext-runtime, so not
+using LDFLAGS doesn't cause linking failure because required flags are
+already pulled in by other libraries. In fact, this problem was found
+when building libical, which uses a similar GtkDoc.cmake file.
+
+In addition to the change to include LDFLAGS, this commit also changes
+the following things:
+
+ - Instead of constructing _scangobj_ldflags in reverse order, do it in
+ normal order. Appending is easier to understand than prepending, and
+ the linker also interprets -L and -l flags in normal order.
+
+ - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment
+ says, and it is expected to work because we no longer constructs
+ _scangobj_ldflags in reverse order.
+
+Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
+---
+ cmake/modules/GtkDoc.cmake | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
+index cc6cc007a..0ba1a7a78 100644
+--- a/cmake/modules/GtkDoc.cmake
++++ b/cmake/modules/GtkDoc.cmake
+@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ list(APPEND _scangobj_deps ${opt})
+ endforeach(opt)
+
+- # Add them as the last, thus in-tree headers/libs have precedence
++ # Add it as the last, thus in-tree headers have precedence
+ list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
+- list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR})
+
+ if(_scangobj_deps)
+ list(REMOVE_DUPLICATES _scangobj_deps)
+@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ if(NOT _output_name)
+ set(_output_name ${opt})
+ endif(NOT _output_name)
+- set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}")
++ set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}")
+
+ if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY"))
+ set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>")
+@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ endif(TARGET ${opt})
+ endforeach(opt)
+
++ # Add extra flags from LDFLAGS environment variable
++ set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}")
++
+ foreach(opt IN LISTS _scangobj_deps)
+ if(NOT TARGET ${opt})
+ set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
+ endif(NOT TARGET ${opt})
+ endforeach(opt)
+
++ # Add it as the last, thus in-tree libs have precedence
++ set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}")
++
+ set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
+
+ if(NOT (_scangobj_cflags STREQUAL ""))
+--
+2.20.1
+
diff --git a/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch
new file mode 100644
index 00000000000..56e66eae893
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.32.4-gtk-doc-fix2.patch
@@ -0,0 +1,29 @@
+From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 5 Aug 2019 12:55:23 +0200
+Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line
+
+The LDFLAGS could imply certain compile options being used (like -fPIC),
+but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation
+could fail.
+
+Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
+---
+ cmake/modules/GtkDoc.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
+index 0ba1a7a78..2dfc4d691 100644
+--- a/cmake/modules/GtkDoc.cmake
++++ b/cmake/modules/GtkDoc.cmake
+@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+
+ # Add it as the last, thus in-tree headers have precedence
+ list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
++ list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
+
+ if(_scangobj_deps)
+ list(REMOVE_DUPLICATES _scangobj_deps)
+--
+2.20.1
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2019-05-18 22:08 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2019-05-18 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 1c4453fee3b64e7a3205de9c4af738abfbd8c89d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 21:59:33 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 21:59:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c4453fe
gnome-extra/evolution-data-server: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 2 -
.../evolution-data-server-3.24.7.ebuild | 153 ---------------------
.../evolution-data-server-3.26.6.ebuild | 151 --------------------
.../files/3.24.7-DESTDIR-honoring.patch | 31 -----
.../files/3.24.7-libical3-compat.patch | 146 --------------------
.../evolution-data-server/files/icu61-compat.patch | 38 -----
| 3 -
7 files changed, 524 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 04baf3ba2ca..6e514e69b7e 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1 @@
-DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
-DIST evolution-data-server-3.26.6.tar.xz 4406676 BLAKE2B d12fcc412736b505a30254a55763ffec68c1d8cd810fe62c82d7dd5947047caf7c296ccf8103b4a06496dbae38aa55ba9d071dc02442872274e2955d662be4cf SHA512 17522a19d9b4d19f89ccb67c76a89d599377eba36cf6dbe9fbc88fb162947b0208eaf1b4b6b5c4e9850dadf7e6ffea5161ba149b308415e94afc745bc1a448a7
DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
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
deleted file mode 100644
index bfb034cf6c5..00000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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_{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
- "${FILESDIR}"/icu61-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/evolution-data-server-3.26.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
deleted file mode 100644
index 9ddece888ac..00000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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_{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="berkdb +gnome-online-accounts +gtk gtk-doc 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-2.0:=
- >=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/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}"/icu61-compat.patch
- 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_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 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_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
deleted file mode 100644
index a3a3d470b98..00000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 8f574b0f8d9..00000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-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
-
diff --git a/gnome-extra/evolution-data-server/files/icu61-compat.patch b/gnome-extra/evolution-data-server/files/icu61-compat.patch
deleted file mode 100644
index 2b5b76afd73..00000000000
--- a/gnome-extra/evolution-data-server/files/icu61-compat.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001
-From: Hussam Al-Tayeb <me@hussam.eu.org>
-Date: Mon, 16 Apr 2018 13:38:33 +0200
-Subject: [PATCH] Bug 795295 - Fails to compile after icu 61.1 upgrade
- (icu::UnicodeString)
-
----
- src/libedataserver/e-alphabet-index-private.cpp | 1 +
- src/libedataserver/e-transliterator-private.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
-index d3e44f488..a789f4409 100644
---- a/src/libedataserver/e-alphabet-index-private.cpp
-+++ b/src/libedataserver/e-alphabet-index-private.cpp
-@@ -36,6 +36,7 @@
-
- using icu::AlphabeticIndex;
- using icu::Locale;
-+using icu::UnicodeString;
-
- struct _EAlphabetIndex {
- AlphabeticIndex *priv;
-diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
-index bb15593d5..6f1d89c8d 100644
---- a/src/libedataserver/e-transliterator-private.cpp
-+++ b/src/libedataserver/e-transliterator-private.cpp
-@@ -35,6 +35,7 @@
- #include <unicode/translit.h>
-
- using icu::Transliterator;
-+using icu::UnicodeString;
-
- struct _ETransliterator {
- Transliterator *priv;
---
-2.18.0
-
--git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index 73fefb95827..b2c06af5a42 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -6,11 +6,8 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="api-doc-extras">Build documentation for private APIs</flag>
<flag name="berkdb"><pkg>sys-libs/db</pkg> support needed to migrate old (pre-3.13 evolution versions) addressbook data</flag>
<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</flag>
- <flag name="google">Enable internal Google authentication support. If gnome-online-accounts is enabled and used, this is not necessary,
- but both can be supported at the same time with different setup at runtime</flag>
<flag name="oauth">Enable internal OAuth2 authentication support for Google and Outlook.com.
If gnome-online-accounts is enabled and used, this is not necessary,
but both can be supported at the same time with different setup at runtime</flag>
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2018-09-20 7:42 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2018-09-20 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 76c4e3ee7ae45255d6078eb8d4338d39371c4951
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 07:41:39 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 20 07:41:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c4e3ee
gnome-extra/evolution-data-server: fix compatibility with dev-libs/icu 61 and 62
Fixes: https://bugs.gentoo.org/666544
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../evolution-data-server-3.24.7.ebuild | 1 +
.../evolution-data-server-3.26.6.ebuild | 5 ++-
.../evolution-data-server/files/icu61-compat.patch | 38 ++++++++++++++++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
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
index cfc4ff4b4e9..6047dfa5c70 100644
--- 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
@@ -76,6 +76,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
"${FILESDIR}"/${PV}-libical3-compat.patch
+ "${FILESDIR}"/icu61-compat.patch
)
pkg_setup() {
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
index c48dbec871b..e38990e8c24 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.26.6.ebuild
@@ -78,10 +78,9 @@ pkg_setup() {
python-any-r1_pkg_setup
}
-# 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
-
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
src_prepare() {
+ eapply "${FILESDIR}"/icu61-compat.patch
use vala && vala_src_prepare
cmake-utils_src_prepare
gnome2_src_prepare
diff --git a/gnome-extra/evolution-data-server/files/icu61-compat.patch b/gnome-extra/evolution-data-server/files/icu61-compat.patch
new file mode 100644
index 00000000000..2b5b76afd73
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/icu61-compat.patch
@@ -0,0 +1,38 @@
+From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001
+From: Hussam Al-Tayeb <me@hussam.eu.org>
+Date: Mon, 16 Apr 2018 13:38:33 +0200
+Subject: [PATCH] Bug 795295 - Fails to compile after icu 61.1 upgrade
+ (icu::UnicodeString)
+
+---
+ src/libedataserver/e-alphabet-index-private.cpp | 1 +
+ src/libedataserver/e-transliterator-private.cpp | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
+index d3e44f488..a789f4409 100644
+--- a/src/libedataserver/e-alphabet-index-private.cpp
++++ b/src/libedataserver/e-alphabet-index-private.cpp
+@@ -36,6 +36,7 @@
+
+ using icu::AlphabeticIndex;
+ using icu::Locale;
++using icu::UnicodeString;
+
+ struct _EAlphabetIndex {
+ AlphabeticIndex *priv;
+diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
+index bb15593d5..6f1d89c8d 100644
+--- a/src/libedataserver/e-transliterator-private.cpp
++++ b/src/libedataserver/e-transliterator-private.cpp
+@@ -35,6 +35,7 @@
+ #include <unicode/translit.h>
+
+ using icu::Transliterator;
++using icu::UnicodeString;
+
+ struct _ETransliterator {
+ Transliterator *priv;
+--
+2.18.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2017-03-20 17:05 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2017-03-20 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 5b6a203b43e29fa47705a4f45d7a18ee077590b8
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 17:03:07 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 17:04:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6a203b
gnome-extra/evolution-data-server: remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.1
| 2 -
.../evolution-data-server-3.22.4.ebuild | 133 --------------------
.../evolution-data-server-3.22.6-r1.ebuild | 135 ---------------------
.../files/3.22.4-gperf-3.1.patch | 24 ----
.../files/3.22.4-imap-notify.patch | 27 -----
5 files changed, 321 deletions(-)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index dab7785360a..c214f3c385a 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,4 +1,2 @@
DIST evolution-data-server-3.20.6.tar.xz 5069584 SHA256 c9280149477cc0c75c20214814cfc54f0e5827c40080dadbbe4b4188479913aa SHA512 0526e64c407bd569b8fb45faeb902cdc15e46e5020c4187d76102f8e0b3173fdd0a742383cfed8de0351dd719c2ad33b39c7d4cd656312d07526ae8b85198dbc WHIRLPOOL e229d245ae79c6ecc2910bc6f110314e568d6afc546157af4e2a98be85e67ac1615f4085f3a4df2a94e658881ef6aa1c6d336b4ae3211bd0a85b2a81eef64f91
-DIST evolution-data-server-3.22.4.tar.xz 5559372 SHA256 0c9c64f209bfd50dbace342ab3b673bcea74ad5fe01a7bc87c1a98d997349cb8 SHA512 38773c4ac65e69b02fd6d5abb0db843f038c383391e1c1006e54bda518f89741b6637f480d70e3cd79b31a812190d55ceec5c8b187d62d9ce582b0d6c362850c WHIRLPOOL d7808803328fcdcaab60934f7b674c599c04242bf6edd751cdc32de99b672a5f6d91b0f48bd42596c66400c09a73e26340b443216118667bfa58ca0fd5cb7cb8
-DIST evolution-data-server-3.22.6.tar.xz 5566420 SHA256 0a69b9d2c03f7a6f68abbd7c7f8c76d333aca9e6102e796d88daed3284e91ca6 SHA512 b3b2efce558fe1f11d4fe6a6f4c7ef875ef5e5498e23a37d5a32e90731aded0199b3c8c5adbc09e083b33875b62ce6e084f0184a162dbdd05b0141a40a1f5a94 WHIRLPOOL 1be4378e756855eeb06b406c4823e59598db2cf9aee829bb28a1c6ee259f2cdb346eab6f46c5f7a6c554c77b5ee0547b0fa62dd883ac98e9060dfe6895a934b8
DIST evolution-data-server-3.22.7.tar.xz 5564924 SHA256 43127fe1f190873c73e13a4cada6cfe47870f1cc962e540a682cca123d959203 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44 WHIRLPOOL 83b3e667048bda6373c8002a506ea796f8813fd95f88006f634e054038693bbc69f8c436d0310820f1548107a102ccd5a354828691cebf270e6f743c65aa4115
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
deleted file mode 100644
index b4d3349e69a..00000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 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} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit 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/59" # 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 ~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.15.1 is required for google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-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/libgdata-0.10:=
- >=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
- >=dev-libs/libgdata-0.15.1:=
- >=net-libs/webkit-gtk-2.11.91:4
- )
- 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.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
- >=gnome-base/gnome-common-2
- >=sys-devel/gettext-0.17
- 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"
-
-# From gnome-3-22 branch, will be included in 3.22.5 release
-PATCHES=(
- "${FILESDIR}"/${PV}-gperf-3.1.patch
- "${FILESDIR}"/${PV}-imap-notify.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-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
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable google google-auth) \
- $(use_enable google) \
- $(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-largefile \
- --enable-smime \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- virtx emake check
-}
-
-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
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.6-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.6-r1.ebuild
deleted file mode 100644
index bd14ba82162..00000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.6-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 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} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit 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/59" # 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 ~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
- >=gnome-base/gnome-common-2
- >=sys-devel/gettext-0.17
- 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"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-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 gdata_flag
- if use google || use gnome-online-accounts; then
- gdata_flag="--enable-google"
- else
- gdata_flag="--disable-google"
- fi
-
- # phonenumber does not exist in tree
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable google google-auth) \
- ${gdata_flag} \
- $(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-largefile \
- --enable-smime \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- virtx emake check
-}
-
-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
-}
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch b/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch
deleted file mode 100644
index e43dd08ae2c..00000000000
--- a/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 60d1cbbdc49ea254e30303d936e8f2b6b136afe4 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 6 Feb 2017 18:30:49 +0100
-Subject: Bug 778222 - Fix a build break with gperf 3.1
-
----
- camel/providers/imapx/camel-imapx-tokens.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
-index ed278bd..61c7115 100644
---- a/camel/providers/imapx/camel-imapx-tokens.txt
-+++ b/camel/providers/imapx/camel-imapx-tokens.txt
-@@ -1,7 +1,6 @@
- /* This contains all of the keywords we care about. These
- can be converted to an id very efficiently */
- struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
--struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
- %%
- ALERT, IMAPX_ALERT
- ALREADYEXISTS, IMAPX_ALREADYEXISTS
---
-cgit v0.12
-
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch b/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch
deleted file mode 100644
index ff6aacc75ee..00000000000
--- a/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d830ed06a4bc4313a1f08b6fe47291d02639e04 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 6 Feb 2017 19:58:54 +0100
-Subject: Bug 778069 - UI not updated after IMAP NOTIFY notifications
-
----
- camel/providers/imapx/camel-imapx-server.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index 6b23a9a..09735fa 100644
---- a/camel/providers/imapx/camel-imapx-server.c
-+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -1685,6 +1685,10 @@ imapx_untagged_status (CamelIMAPXServer *is,
- if (mailbox != NULL) {
- camel_imapx_mailbox_handle_status_response (mailbox, response);
- camel_imapx_store_emit_mailbox_updated (imapx_store, mailbox);
-+
-+ if (camel_imapx_server_is_in_idle (is))
-+ g_signal_emit (is, signals[REFRESH_MAILBOX], 0, mailbox);
-+
- g_object_unref (mailbox);
- }
-
---
-cgit v0.12
-
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/
@ 2017-02-06 21:21 Mart Raudsepp
0 siblings, 0 replies; 11+ messages in thread
From: Mart Raudsepp @ 2017-02-06 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 68749a19eec8adb162011539fbbd05cf7f02d3d2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 6 21:17:50 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 21:21:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68749a19
gnome-extra/evolution-data-server: bump to 3.22.4 and fix IMAP NOTIFY extension
The gperf-3.1 patch doesn't seem to be needed, as it works with gperf-3.1
without it, but include it just in case (gperf-3.0.4 generated version looks to
be included in the tarball, and so used instead unless we regenerate).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| 1 +
.../evolution-data-server-3.22.4.ebuild | 134 +++++++++++++++++++++
.../files/3.22.4-gperf-3.1.patch | 24 ++++
.../files/3.22.4-imap-notify.patch | 27 +++++
4 files changed, 186 insertions(+)
--git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 42fff60..9371b56 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,4 @@
DIST evolution-data-server-3.20.5.tar.xz 5067732 SHA256 0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e SHA512 8376331ae0ee96013d5c61b1da92393486d0eb9e0fed63199d4b6c28d92cb6d9dc45826fd65b476d894141d507742e8574168bc99b8704bebe8b39bbd297606e WHIRLPOOL 3c3417603bd2a18c7a3370e32af7f1581fc399ebe6f721d0ac678a5978d667b58df2927eb02f240b4c2f139133e06f25e13a47879b7b7a470cd1283a186bba10
DIST evolution-data-server-3.20.6.tar.xz 5069584 SHA256 c9280149477cc0c75c20214814cfc54f0e5827c40080dadbbe4b4188479913aa SHA512 0526e64c407bd569b8fb45faeb902cdc15e46e5020c4187d76102f8e0b3173fdd0a742383cfed8de0351dd719c2ad33b39c7d4cd656312d07526ae8b85198dbc WHIRLPOOL e229d245ae79c6ecc2910bc6f110314e568d6afc546157af4e2a98be85e67ac1615f4085f3a4df2a94e658881ef6aa1c6d336b4ae3211bd0a85b2a81eef64f91
DIST evolution-data-server-3.22.3.tar.xz 5558616 SHA256 0c58dfc2bdd72ea5bef65e2ef9f2969c8ceef253d3e3150a894647a00d69cf4f SHA512 17a8cb07cc516925a8cc27798d61935ddd0de2074f7a245283aec8932cd1f023c2c0cd5339b5896984656a560865017ea9df9d77e80deb7fc1f432a82f5ba935 WHIRLPOOL f0ccfcf0080b785c5d35fd2afe072922c9538a10a60666459171e2b9d79e42ee30be2dd766abe1ffdca026a1f9f43b1764b60fc3dc1d5453bc3f55ce863ed36b
+DIST evolution-data-server-3.22.4.tar.xz 5559372 SHA256 0c9c64f209bfd50dbace342ab3b673bcea74ad5fe01a7bc87c1a98d997349cb8 SHA512 38773c4ac65e69b02fd6d5abb0db843f038c383391e1c1006e54bda518f89741b6637f480d70e3cd79b31a812190d55ceec5c8b187d62d9ce582b0d6c362850c WHIRLPOOL d7808803328fcdcaab60934f7b674c599c04242bf6edd751cdc32de99b672a5f6d91b0f48bd42596c66400c09a73e26340b443216118667bfa58ca0fd5cb7cb8
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
new file mode 100644
index 00000000..c96aff5
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit 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/59" # 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 ~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.15.1 is required for google tasks
+# berkdb needed only for migrating old calendar data, bug #519512
+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/libgdata-0.10:=
+ >=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
+ >=dev-libs/libgdata-0.15.1:=
+ >=net-libs/webkit-gtk-2.11.91:4
+ )
+ 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.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
+ >=gnome-base/gnome-common-2
+ >=sys-devel/gettext-0.17
+ 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"
+
+# From gnome-3-22 branch, will be included in 3.22.5 release
+PATCHES=(
+ "${FILESDIR}"/${PV}-gperf-3.1.patch
+ "${FILESDIR}"/${PV}-imap-notify.patch
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+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
+ gnome2_src_configure \
+ $(use_enable api-doc-extras gtk-doc) \
+ $(use_with api-doc-extras private-docs) \
+ $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gtk) \
+ $(use_enable google google-auth) \
+ $(use_enable google) \
+ $(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-largefile \
+ --enable-smime \
+ --with-systemduserunitdir="$(systemd_get_userunitdir)" \
+ --without-phonenumber \
+ --disable-examples \
+ --disable-uoa
+}
+
+src_test() {
+ unset ORBIT_SOCKETDIR
+ unset SESSION_MANAGER
+ virtx emake check
+}
+
+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
+}
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch b/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch
new file mode 100644
index 00000000..e43dd08
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.22.4-gperf-3.1.patch
@@ -0,0 +1,24 @@
+From 60d1cbbdc49ea254e30303d936e8f2b6b136afe4 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 6 Feb 2017 18:30:49 +0100
+Subject: Bug 778222 - Fix a build break with gperf 3.1
+
+---
+ camel/providers/imapx/camel-imapx-tokens.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/camel/providers/imapx/camel-imapx-tokens.txt b/camel/providers/imapx/camel-imapx-tokens.txt
+index ed278bd..61c7115 100644
+--- a/camel/providers/imapx/camel-imapx-tokens.txt
++++ b/camel/providers/imapx/camel-imapx-tokens.txt
+@@ -1,7 +1,6 @@
+ /* This contains all of the keywords we care about. These
+ can be converted to an id very efficiently */
+ struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
+-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
+ %%
+ ALERT, IMAPX_ALERT
+ ALREADYEXISTS, IMAPX_ALREADYEXISTS
+--
+cgit v0.12
+
diff --git a/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch b/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch
new file mode 100644
index 00000000..ff6aacc
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/3.22.4-imap-notify.patch
@@ -0,0 +1,27 @@
+From 5d830ed06a4bc4313a1f08b6fe47291d02639e04 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 6 Feb 2017 19:58:54 +0100
+Subject: Bug 778069 - UI not updated after IMAP NOTIFY notifications
+
+---
+ camel/providers/imapx/camel-imapx-server.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
+index 6b23a9a..09735fa 100644
+--- a/camel/providers/imapx/camel-imapx-server.c
++++ b/camel/providers/imapx/camel-imapx-server.c
+@@ -1685,6 +1685,10 @@ imapx_untagged_status (CamelIMAPXServer *is,
+ if (mailbox != NULL) {
+ camel_imapx_mailbox_handle_status_response (mailbox, response);
+ camel_imapx_store_emit_mailbox_updated (imapx_store, mailbox);
++
++ if (camel_imapx_server_is_in_idle (is))
++ g_signal_emit (is, signals[REFRESH_MAILBOX], 0, mailbox);
++
+ g_object_unref (mailbox);
+ }
+
+--
+cgit v0.12
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-01-25 16:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-23 21:34 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/, gnome-extra/evolution-data-server/files/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2025-01-25 16:49 Pacho Ramos
2024-02-11 14:21 Mart Raudsepp
2021-12-09 17:11 Mart Raudsepp
2021-11-05 13:36 Mart Raudsepp
2020-08-09 7:22 Mart Raudsepp
2019-09-07 22:09 Mart Raudsepp
2019-05-18 22:08 Mart Raudsepp
2018-09-20 7:42 Mart Raudsepp
2017-03-20 17:05 Mart Raudsepp
2017-02-06 21:21 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox