diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 1c38381..295e2fc 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,3 +1,3 @@ -DIST evolution-data-server-3.48.2.tar.xz 4906316 BLAKE2B 445898a5c2e02a1ab27deeaf9063853216d3cb5d166a799b36c581f0c20ff13e0bd66272ce9389088fc59640eb230afb20cd1628332bc20527b16c61ba97c43c SHA512 3ea976bcb28c5cfa7da3c29942d5313c7e8107590d6cd73f896fa9e5e79e14264772a5a1a22a0f2a5fee0110ef1d8e15677986ab13103791300c7800d6485380 -DIST evolution-data-server-3.48.3.tar.xz 4906344 BLAKE2B 718978d97c0e147c3df972671f67dcf501cbaf10a36d5479cbc0ce416a8fbd43a8a66af8b1c57d01903de4c574a0b905e69ce1ce918437802cbb368723914e38 SHA512 232c3e3a3b90021b3e8ced05488b1505904b51c1d65b76d805aeac3a7b40cae9c3748f840b3a88cb9a17e7c1348bbe7dc16209eae59c92e997dc4a7dfcfa49ca -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.4.tar.xz 4964564 BLAKE2B 7e3cf51856a1b12fcbd7e0b6ab98b8616c6e6047afb7fc59f8366920177c30b4d18f58cdd11825e81054ef46d61d3addf9eb646310510ba44f60bc5a2c2abe50 SHA512 e83f4222615d518e536a622808896b1da7e425e90d9b3c3545c6b850f955bd6d4b4a6815904fcdcfa373b3c01a6ce61377e259bc740941fc3f641e60eddacaed +DIST evolution-data-server-3.52.1.tar.xz 5048124 BLAKE2B 6dd6dc89c7efb7484c075cc51c5e2056ee62a50b810e479f39d04fe62f1a095e49783c20d23372efed954d7f9b78681b7af45389410f2cffb53af8ab2cd22bb3 SHA512 67f08fc3c8f7393fa66dc91f6fb33aa17644eb036d6c3552c3e7b30f128756b9e232cbf2a38eab43d0451699bb8799d9a869198bd9c293c0e2456b8e00339286 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild similarity index 77% rename from gnome-extra/evolution-data-server/evolution-data-server-3.48.4.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild index f5a5a36..63b1429 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.52.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,15 +6,16 @@ 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" +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" -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 +SLOT="0/64-11-21-4-3-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 phonenumber" +IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth-gtk3 oauth-gtk4 vala +weather phonenumber" REQUIRED_USE=" - oauth? ( gtk ) + oauth-gtk3? ( gtk ) + oauth-gtk4? ( gtk ) vala? ( introspection ) " @@ -43,10 +44,8 @@ RDEPEND=" >=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 - ) + 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:= ) @@ -65,8 +64,11 @@ 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 ) + 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 @@ -77,6 +79,17 @@ BDEPEND=" # 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 @@ -99,6 +112,7 @@ src_configure() { # 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 @@ -112,8 +126,8 @@ src_configure() { -DENABLE_GTK=$(usex gtk) -DENABLE_GTK4=$(usex gtk) -DENABLE_CANBERRA=$(usex gtk) - -DENABLE_OAUTH2_WEBKITGTK=$(usex oauth) - -DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth) + -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) @@ -122,6 +136,7 @@ src_configure() { -DENABLE_WEATHER=$(usex weather) -DENABLE_LARGEFILE=ON -DENABLE_VALA_BINDINGS=$(usex vala) + -DENABLE_TESTS=$(usex test) ) cmake_src_configure } diff --git a/gnome-extra/evolution-data-server/files/3.50.2-c99.patch b/gnome-extra/evolution-data-server/files/3.50.2-c99.patch new file mode 100644 index 0000000..44b1b1d --- /dev/null +++ b/gnome-extra/evolution-data-server/files/3.50.2-c99.patch @@ -0,0 +1,27 @@ +https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/55558d3c23e68aada59c5deb59a664aea263f075 + +From 55558d3c23e68aada59c5deb59a664aea263f075 Mon Sep 17 00:00:00 2001 +From: Milan Crha +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 diff --git a/net-voip/gnome-calls/gnome-calls-46.0.ebuild b/net-voip/gnome-calls/gnome-calls-46.0.ebuild index aeece31..85f4b16 100755 --- a/net-voip/gnome-calls/gnome-calls-46.0.ebuild +++ b/net-voip/gnome-calls/gnome-calls-46.0.ebuild @@ -32,7 +32,7 @@ DEPEND=" gui-libs/libadwaita gnome-extra/gnome-contacts >=gui-libs/gtk-4.12.5 - gnome-extra/evolution-data-server + gnome-extra/evolution-data-server[phonenumber] " RDEPEND="${DEPEND}"