From 013635213f8032704e1ec9ae01e9303e63a2efbb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Mar 2024 00:44:50 +0000 Subject: gentoo auto-resync : 10:03:2024 - 00:44:50 --- mail-client/Manifest.gz | Bin 3385 -> 3384 bytes mail-client/evolution/Manifest | 2 + mail-client/evolution/evolution-3.50.4-r1.ebuild | 154 +++++++++++++++++++++++ mail-client/evolution/files/3.50.4-fix-lto.patch | 125 ++++++++++++++++++ 4 files changed, 281 insertions(+) create mode 100644 mail-client/evolution/evolution-3.50.4-r1.ebuild create mode 100644 mail-client/evolution/files/3.50.4-fix-lto.patch (limited to 'mail-client') diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz index bb9c85b59c5b..219dd51ac772 100644 Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index c0589ceb8955..ae4b51a10502 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -1,5 +1,7 @@ +AUX 3.50.4-fix-lto.patch 3234 BLAKE2B edca53818281f596f01fe80b6bd4c6acaea2c12458e3b54b6559ae34894081cf64b78f6c2294a0efb26feb495fb1a872ddbb0e15b21ab04332223f6fab03591c SHA512 d39fbd78ae54d1ca04c83f729a0153ae9c2e1ef7dfd19b87ad4573d5ffe7739de566a0ff4dbf86355fb84add16497b619d0ca5d28eaf85f4b1ca07ad9a109a46 DIST evolution-3.50.2.tar.xz 13510112 BLAKE2B c30b6ecf4a4de45856137e82e7ff15072d96093a62ae7903afe10d28f8a02c7ad2c617b6d5992699e1e3fbe9501fc6bd1dc11b9e9d464aa28c4b6d8fd46ee69d SHA512 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87 DIST evolution-3.50.4.tar.xz 13512624 BLAKE2B 3288bf3286a7c28476e5e95b9ded6d1004d7a8f73dd162a47b755a48966d30668379a6c65d462fc05d2a1c2b8b9426e39a42f80ccaa6b3927a4efd9e92b0dad7 SHA512 857e219df65dab3182b26f5751bfec68d532af11c3e3565bf288d63e5298c9bb9aec4e293769da46083213da79c41790ca624e843e0f2779a75f581d607d2109 EBUILD evolution-3.50.2.ebuild 4119 BLAKE2B ca1a868a7f4244c7827d7cd3a6806594c89b4df9d2d8af89bd4527cfe3c8dad84d8d0662d81ed80e671eab4e642af1149dfcf97fe7ddf30eeab38d1e4f1b643e SHA512 24c114aa3e85fd17ac1a2f664df6762174f680305eb47b08634ba6286bc4b046d19a3e2b000a46e648bdf5998117ac2b55f5803b16e5cef2118f48be21d6c277 +EBUILD evolution-3.50.4-r1.ebuild 4262 BLAKE2B bd153a7d31c3fba927464d3f4183af04f3a35788f0734b4291d0f6cc4e6dbefbd41761cf1580e796fd9d92135b113f942c977136c202ade9b58fd5f0d145d972 SHA512 22fc9c05fe8ea72ca9f89b67efa0680a7fa668a70bb1d63cf14bc6c347d6e22f051dfa0c5419c7ee95469f35f21e2c96be8419f1279ad8fb234853dbe62b6634 EBUILD evolution-3.50.4.ebuild 4122 BLAKE2B 8aeeed8e13903b3deba9564595cc0b9063a2d04426229098286e0f604747b7779d432c300251d88c7655745ee9b5cc269cb064b4ebbeea341c5300db379f9694 SHA512 1b45d9dc814fe52dd1628363b5d7cac9791a6e64d1b9c1ee69c29de501dc239454a8b2877d299be711532fab99f70e4ecf2528c070e0683405de6eca7a295a16 MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405 diff --git a/mail-client/evolution/evolution-3.50.4-r1.ebuild b/mail-client/evolution/evolution-3.50.4-r1.ebuild new file mode 100644 index 000000000000..71d2709c285a --- /dev/null +++ b/mail-client/evolution/evolution-3.50.4-r1.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake gnome2 readme.gentoo-r1 + +DESCRIPTION="Integrated mail, addressbook and calendaring functionality" +HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution" + +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP" +SLOT="2.0" + +IUSE="archive +bogofilter geolocation gtk-doc highlight ldap selinux spamassassin spell ssl +weather ytnef" + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + +# glade-3 support is for maintainers only per configure.ac +# pst is not mature enough and changes API/ABI frequently +# dconf explicitly needed for backup plugin +# gnome-desktop support is optional with --enable-gnome-desktop +# automagic libunity dep +# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk +DEPEND=" + >=app-crypt/libsecret-0.5 + >=app-text/enchant-2.2.0:2 + >=dev-db/sqlite-3.7.17:3 + >=dev-libs/glib-2.66:2[dbus] + >=dev-libs/libxml2-2.7.3:2 + >=gnome-base/gnome-desktop-2.91.3:3= + >=gnome-base/gsettings-desktop-schemas-2.91.92 + >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?] + >=media-libs/libcanberra-0.25[gtk3] + >=net-libs/libsoup-3.0:3.0 + >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] + >=x11-libs/cairo-1.9.15[glib] + >=x11-libs/gdk-pixbuf-2.24:2 + >=x11-libs/gtk+-3.22:3 + >=x11-libs/libnotify-0.7 + >=x11-misc/shared-mime-info-0.22 + + app-text/cmark:= + >=app-text/iso-codes-0.49 + >=app-accessibility/at-spi2-core-2.46.0:2 + + gnome-base/dconf + x11-libs/libSM + x11-libs/libICE + + archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) + bogofilter? ( mail-filter/bogofilter ) + geolocation? ( + >=media-libs/libchamplain-0.12.21:0.12[gtk] + >=media-libs/clutter-1.0.0:1.0 + >=media-libs/clutter-gtk-0.90:1.0 + >=sci-geosciences/geocode-glib-3.26.3:2 ) + ldap? ( >=net-nds/openldap-2:= ) + spamassassin? ( mail-filter/spamassassin ) + spell? ( >=app-text/gspell-1.8:= ) + ssl? ( + >=dev-libs/nspr-4.6.1 + >=dev-libs/nss-3.11 + ) + weather? ( + >=dev-libs/libgweather-4.2.0:4= + >=sci-geosciences/geocode-glib-3.26.3:2 + ) + ytnef? ( net-mail/ytnef ) +" +RDEPEND="${DEPEND} + highlight? ( app-text/highlight ) + selinux? ( sec-policy/selinux-evolution ) +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + gtk-doc? ( dev-util/gtk-doc + app-text/docbook-xml-dtd:4.3 ) + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="To change the default browser if you are not using GNOME, edit +~/.local/share/applications/mimeapps.list so it includes the +following content: + +[Default Applications] +x-scheme-handler/http=firefox.desktop +x-scheme-handler/https=firefox.desktop + +(replace firefox.desktop with the name of the appropriate .desktop +file from /usr/share/applications if you use a different browser)." + +# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare +# call; if needed, set them after cmake_src_prepare call, if that works + +src_prepare() { + cmake_src_prepare + gnome2_src_prepare + # Fix launching when built with ThinLTO - https://gitlab.gnome.org/GNOME/evolution/-/issues/2646 + eapply "${FILESDIR}"/${PV}-fix-lto.patch +} + +src_configure() { + # Use NSS/NSPR only if 'ssl' is enabled. + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DENABLE_SCHEMAS_COMPILE=OFF + -DENABLE_GTK_DOC=$(usex gtk-doc) + -DWITH_OPENLDAP=$(usex ldap) + -DENABLE_SMIME=$(usex ssl) + -DENABLE_GNOME_DESKTOP=ON + -DWITH_ENCHANT_VERSION=2 + -DENABLE_CANBERRA=ON + -DENABLE_AUTOAR=$(usex archive) + -DWITH_HELP=ON + -DENABLE_YTNEF=OFF + -DWITH_BOGOFILTER=$(usex bogofilter) + -DWITH_SPAMASSASSIN=$(usex spamassassin) + -DENABLE_GSPELL=$(usex spell) + -DENABLE_TEXT_HIGHLIGHT=$(usex highlight) + -DENABLE_WEATHER=$(usex weather) + -DENABLE_CONTACT_MAPS=$(usex geolocation) + -DENABLE_YTNEF=$(usex ytnef) + -DENABLE_PST_IMPORT=OFF + -DWITH_GLADE_CATALOG=OFF + -DENABLE_MARKDOWN=ON + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_test() { + cmake_src_test +} + +src_install() { + cmake_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog +} diff --git a/mail-client/evolution/files/3.50.4-fix-lto.patch b/mail-client/evolution/files/3.50.4-fix-lto.patch new file mode 100644 index 000000000000..0011732ab0cf --- /dev/null +++ b/mail-client/evolution/files/3.50.4-fix-lto.patch @@ -0,0 +1,125 @@ +From ab3ddc14896077881df7ffdeddc90d749de8e4ff Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Wed, 7 Feb 2024 16:05:07 +0100 +Subject: [PATCH] I#2646 - rss: Build common code as a shared private library + +Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2646 +--- + src/modules/rss/CMakeLists.txt | 39 ++++++++++++++++++++++++ + src/modules/rss/camel/CMakeLists.txt | 13 +++++--- + src/modules/rss/evolution/CMakeLists.txt | 5 +-- + 3 files changed, 49 insertions(+), 8 deletions(-) + +diff --git a/src/modules/rss/CMakeLists.txt b/src/modules/rss/CMakeLists.txt +index b7442fd613..6c65d36195 100644 +--- a/src/modules/rss/CMakeLists.txt ++++ b/src/modules/rss/CMakeLists.txt +@@ -1,2 +1,41 @@ ++pkg_check_modules(LIBEDATASERVER libedataserver-1.2 REQUIRED) ++pkg_check_modules(CAMEL camel-1.2 REQUIRED) ++ ++set(SOURCES ++ camel-rss-store-summary.c ++ camel-rss-store-summary.h ++ e-rss-parser.h ++ e-rss-parser.c ++) ++ ++add_library(evolution-rss-common SHARED ++ ${SOURCES} ++) ++ ++target_compile_definitions(evolution-rss-common PRIVATE ++ -DG_LOG_DOMAIN=\"evolution-rss-common\" ++) ++ ++target_compile_options(evolution-rss-common PUBLIC ++ ${CAMEL_CFLAGS} ++ ${LIBEDATASERVER_CFLAGS} ++) ++ ++target_include_directories(evolution-rss-common PUBLIC ++ ${CMAKE_BINARY_DIR} ++ ${CMAKE_CURRENT_SOURCE_DIR} ++ ${CAMEL_INCLUDE_DIRS} ++ ${LIBEDATASERVER_INCLUDE_DIRS} ++) ++ ++target_link_libraries(evolution-rss-common ++ ${CAMEL_LDFLAGS} ++ ${LIBEDATASERVER_LDFLAGS} ++) ++ ++install(TARGETS evolution-rss-common ++ DESTINATION ${privsolibdir} ++) ++ + add_subdirectory(camel) + add_subdirectory(evolution) +diff --git a/src/modules/rss/camel/CMakeLists.txt b/src/modules/rss/camel/CMakeLists.txt +index ae828a7c43..b1e858b093 100644 +--- a/src/modules/rss/camel/CMakeLists.txt ++++ b/src/modules/rss/camel/CMakeLists.txt +@@ -2,6 +2,10 @@ pkg_check_modules(LIBEDATASERVER libedataserver-1.2 REQUIRED) + pkg_check_modules(CAMEL camel-1.2 REQUIRED) + pkg_check_variable(camel_providerdir camel-1.2 camel_providerdir) + ++set(DEPENDENCIES ++ evolution-rss-common ++) ++ + set(sources + camel-rss-folder.c + camel-rss-folder.h +@@ -12,14 +16,14 @@ set(sources + camel-rss-settings.h + camel-rss-store.c + camel-rss-store.h +- ../camel-rss-store-summary.c +- ../camel-rss-store-summary.h +- ../e-rss-parser.h +- ../e-rss-parser.c + ) + + add_library(camelrss MODULE ${sources}) + ++add_dependencies(camelrss ++ ${DEPENDENCIES} ++) ++ + target_compile_definitions(camelrss PRIVATE + -DG_LOG_DOMAIN=\"camel-rss-provider\" + ) +@@ -37,6 +41,7 @@ target_include_directories(camelrss PUBLIC + ) + + target_link_libraries(camelrss ++ ${DEPENDENCIES} + ${CAMEL_LDFLAGS} + ${LIBEDATASERVER_LDFLAGS} + ) +diff --git a/src/modules/rss/evolution/CMakeLists.txt b/src/modules/rss/evolution/CMakeLists.txt +index b9cea767e2..93737f8dc9 100644 +--- a/src/modules/rss/evolution/CMakeLists.txt ++++ b/src/modules/rss/evolution/CMakeLists.txt +@@ -1,5 +1,6 @@ + set(extra_deps + evolution-mail ++ evolution-rss-common + evolution-shell + ) + set(sources +@@ -10,10 +11,6 @@ set(sources + e-rss-shell-view-extension.c + module-rss.c + module-rss.h +- ../camel-rss-store-summary.c +- ../camel-rss-store-summary.h +- ../e-rss-parser.c +- ../e-rss-parser.h + ) + set(extra_defines) + set(extra_cflags) +-- +GitLab + -- cgit v1.2.3