From 7d52991b5dce3a07be15d3cbbf06abb3fc08cb9c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 21 Aug 2023 15:44:13 +0100 Subject: gentoo auto-resync : 21:08:2023 - 15:44:13 --- gnome-extra/Manifest.gz | Bin 11242 -> 11242 bytes gnome-extra/evolution-data-server/Manifest | 2 + .../evolution-data-server-3.48.4-r1.ebuild | 145 +++++++++++++++++++++ .../files/3.48.4-aliasing-fix.patch | 37 ++++++ 4 files changed, 184 insertions(+) create mode 100644 gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild create mode 100644 gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index 134356cc9d22..b25a5d146028 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 95f8fa295171..c29614676a55 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,7 +1,9 @@ AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5 +AUX 3.48.4-aliasing-fix.patch 1235 BLAKE2B 9bf57c58895057183692756afa0774f1d09d6e5ac3151a1c4d475834ed8763594265d336ec8b237c16476aafe29bdd5920d598d2990279a667586c87fec2fe90 SHA512 79e204b9bbe193281f4878f71895ff4741874b1746458897ece5e4eef5fdd71fc93523d814ba118aa8b17601aa494c71d0f4913591f116b0d38106e484783928 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 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 EBUILD evolution-data-server-3.48.3.ebuild 4194 BLAKE2B b9e8c0f5587d8abb5d5382d0c8fcf93f328b17f4a2d418035fb79eca678262f4b9ebafcd54dc1a55020278945e6060f9d6ac6d2ad67918919d0e37dce6a2eb83 SHA512 ffa3f6a9fd4a7c04be401d4689e3cdbe9c7cc4b6f55de8358870d7706790cd5ef05d7aee77b5343cd61119c02dd317952855ed5098fee2a3194eeedc208f8332 +EBUILD evolution-data-server-3.48.4-r1.ebuild 4245 BLAKE2B dde7700ff271e624512bf5e5d6bf7d439f00427f86cf9ef6d60dbae038c3ad402db2949b15350c91eaca3f7904f162aa42f8279eaaf86c52b2f00f89df619695 SHA512 958328697ad415e13aa6a49d60338a44ac59a2ed8e562426e07abdb3cd496cd9591b95164efee2a06cc071eab75554091cf34f0c9f536817c657a6df487c19a6 EBUILD evolution-data-server-3.48.4.ebuild 4197 BLAKE2B cd095ceb5232b6c64dda9b23d38a6862c040ee4dc13bce52f9346c9ac49c255078538d58cec90dd644955e5b0df7994c4d6baea306c4c242c542a0c648ef94f2 SHA512 5d65d9e0ab355cf97bb98b7bbacba5e3d5469b7860605a7c3f4f719e1aa3d275ff997493321f7027580f7dd2b5bc76a19385aace18a3dd3c0d7a300c5550e22b MISC metadata.xml 962 BLAKE2B 212d69424f3276f40cbd92843968374de95e0cf3b5263a0fe815628aa5fa9a3618c7104abbc0e4bb2f0a9ab6b36a674fffa36c6d020ae7ffb6fe34c6f3c035f0 SHA512 49350cc9ee65c76c248a99fb7adbfefcea02eb1c43673bb8e010af1fa78767dd2d99beb625a0164b2a2b8e8b366478b4dc1309c2044b77feb017f4bdeffa2d92 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild new file mode 100644 index 000000000000..d60119b96a31 --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.48.4-r1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake db-use flag-o-matic gnome2 vala virtualx + +DESCRIPTION="Evolution groupware backend" +HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server" + +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" +SLOT="0/64-11-21-4-2-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version + +IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather" +REQUIRED_USE=" + oauth? ( gtk ) + vala? ( introspection ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 +# glib-2.70 for build-time optional GPowerProfileMonitor +RDEPEND=" + >=app-crypt/libsecret-0.5[crypt] + >=dev-db/sqlite-3.7.17:3 + >=dev-libs/glib-2.70:2 + >=dev-libs/libical-3.0.8:=[glib,introspection?] + >=dev-libs/libxml2-2 + >=dev-libs/nspr-4.4 + >=dev-libs/nss-3.9 + >=net-libs/libsoup-3.1.1:3.0 + >=dev-libs/json-glib-1.0.4 + + dev-libs/icu:= + sys-libs/zlib:= + virtual/libiconv + + berkdb? ( >=sys-libs/db-4:= ) + gtk? ( + >=x11-libs/gtk+-3.20:3 + >=gui-libs/gtk-4.4:4 + >=media-libs/libcanberra-0.25[gtk3] + + oauth? ( + >=net-libs/webkit-gtk-2.34.0:4.1 + >=net-libs/webkit-gtk-2.39.90:6 + ) + ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + kerberos? ( virtual/krb5:= ) + ldap? ( >=net-nds/openldap-2:= ) + weather? ( >=dev-libs/libgweather-4.2.0:4= ) +" +DEPEND="${RDEPEND} + vala? ( $(vala_depend) + >=net-libs/libsoup-3.1.1:3.0[vala] + dev-libs/libical[vala] + ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gperf + gtk-doc? ( >=dev-util/gtk-doc-1.14 + app-text/docbook-xml-dtd:4.1.2 ) + >=dev-util/intltool-0.35.5 + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig +" + +# Some tests fail due to missing locales. +# Also, dbus tests are flaky, bugs #397975 #501834 +# It looks like a nightmare to disable those for now. +RESTRICT="!test? ( test )" + +# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call +src_prepare() { + use vala && vala_setup + cmake_src_prepare + gnome2_src_prepare + + eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch + eapply "${FILESDIR}"/3.48.4-aliasing-fix.patch + + # Make CMakeLists versioned vala enabled + sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ + -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ + -i "${S}"/CMakeLists.txt || die +} + +src_configure() { + # /usr/include/db.h is always db-1 on FreeBSD + # so include the right dir in CPPFLAGS + use berkdb && append-cppflags "-I$(db_includedir)" + + # phonenumber does not exist in tree + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DENABLE_GTK_DOC=$(usex gtk-doc) + -DWITH_PRIVATE_DOCS=$(usex gtk-doc) + -DENABLE_SCHEMAS_COMPILE=OFF + -DENABLE_INTROSPECTION=$(usex introspection) + -DWITH_KRB5=$(usex kerberos) + -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") + -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") + -DWITH_OPENLDAP=$(usex ldap) + -DWITH_PHONENUMBER=OFF + -DENABLE_SMIME=ON + -DENABLE_GTK=$(usex gtk) + -DENABLE_GTK4=$(usex gtk) + -DENABLE_CANBERRA=$(usex gtk) + -DENABLE_OAUTH2_WEBKITGTK=$(usex oauth) + -DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth) + -DENABLE_EXAMPLES=OFF + -DENABLE_GOA=$(usex gnome-online-accounts) + -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) + # ENABLE_BACKTRACES requires libdwarf ? + -DENABLE_IPV6=ON + -DENABLE_WEATHER=$(usex weather) + -DENABLE_LARGEFILE=ON + -DENABLE_VALA_BINDINGS=$(usex vala) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_test() { + virtx cmake_src_test +} + +src_install() { + cmake_src_install + + if use ldap; then + insinto /etc/openldap/schema + doins "${FILESDIR}"/calentry.schema + dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema + fi +} diff --git a/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch new file mode 100644 index 000000000000..a451c6f5bc7c --- /dev/null +++ b/gnome-extra/evolution-data-server/files/3.48.4-aliasing-fix.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/912720 +https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/484 +https://gitlab.gnome.org/GNOME/evolution/-/issues/2485 +https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/126 + +From 087226d29de3ef9070fb7436ca3dcc476cd9a9a5 Mon Sep 17 00:00:00 2001 +From: Enrik Berkhan +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 -- cgit v1.2.3