From dae44b3a6147fe4276c6e91abcd32952cc1740f6 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Wed, 4 Nov 2026 19:59:48 +0100 Subject: [PATCH] Update --- gnome-extra/evolution-data-server/Manifest | 1 + .../evolution-data-server-3.62.1.ebuild | 170 ++++++++++++++++++ .../files/3.36.5-gtk-doc-1.32-compat.patch | 32 ---- .../files/3.50.2-c99.patch | 27 --- 4 files changed, 171 insertions(+), 59 deletions(-) create mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.62.1.ebuild delete mode 100755 gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch delete mode 100644 gnome-extra/evolution-data-server/files/3.50.2-c99.patch diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index a27c032..347a58c 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1 +1,2 @@ DIST evolution-data-server-3.60.2.tar.xz 5237332 BLAKE2B a04811cc12a4ea4a1cbfe1d973e7c45c3fa3ebc65d84494633683c6115758d93bc295b10e983123e5f0c0a986580a321c642627c7dc54f17f988a65cfc301ba3 SHA512 a471016ca1f5500009487ac66730b3a018d382c8fdc26f409c5cfaaf8924d58aa497c1073d179498089264e3f8b9da01557c8e7a69ed1eefdfdbcd4ac54c4505 +DIST evolution-data-server-3.62.1.tar.xz 5369244 BLAKE2B fe3d9a9408525b83590d4fc5032d7994d77376dce4c2f6a51e156dd8c7859ecf02d7be349bda89206c4f1bf1fefca65007efdbe7d581c8fe74f8c215e0b7f334 SHA512 dd204d69f365f702e3c2207cdbb1cccfb33adc6f46088338ce6b1c2343e80dc0160449f11c7ffc33a23d590a5bc4a8b7b3e67c8bad3351e81409471e24df9df9 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.62.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.62.1.ebuild new file mode 100644 index 0000000..28345b5 --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.62.1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake db-use flag-o-matic gnome2 locale-utils vala virtualx + +DESCRIPTION="Evolution groupware backend" +HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.gnome.org/GNOME/evolution-data-server" + +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" + +# 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 +SLOT="0/68-11-21-5-3-27-2-28-4-0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos +oauth-gtk3 oauth-gtk4 sound vala +weather phonenumber" +REQUIRED_USE=" + oauth-gtk3? ( gtk ) + oauth-gtk4? ( gtk ) + vala? ( introspection ) +" + +# 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[introspection] + + dev-libs/icu:= + virtual/zlib:= + virtual/libiconv + + berkdb? ( >=sys-libs/db-4:= ) + gtk? ( + >=x11-libs/gtk+-3.20:3 + >=gui-libs/gtk-4.4:4 + sound? ( + || ( + 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-1.82.0-r2:= ) + kerberos? ( virtual/krb5:= ) + ldap? ( >=net-nds/openldap-2:= ) + weather? ( >=dev-libs/libgweather-4.2.0:4= ) + phonenumber? ( >=dev-libs/libphonenumber-8.12.39 ) +" +DEPEND="${RDEPEND} + vala? ( $(vala_depend) + >=net-libs/libsoup-3.1.1:3.0[vala] + dev-libs/libical[vala] + ) +" +BDEPEND=" + >=dev-util/gdbus-codegen-2.80.5-r1 + 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 +" + +# 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 + + # 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=$(usex phonenumber "${EPREFIX}"/usr/$(get_libdir) "") + -DENABLE_SMIME=ON + -DENABLE_GTK=$(usex gtk) + -DENABLE_GTK4=$(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) + ) + if use gtk && use sound; then + mycmakeargs+=( -DENABLE_CANBERRA=ON ) + else + mycmakeargs+=( -DENABLE_CANBERRA=OFF ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_test() { + local -x LOCPATH + elocale_gen en_US.UTF-8 + 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.36.5-gtk-doc-1.32-compat.patch b/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch deleted file mode 100755 index 3a202be..0000000 --- a/gnome-extra/evolution-data-server/files/3.36.5-gtk-doc-1.32-compat.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -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 - 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 44b1b1d..0000000 --- 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 -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 - 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