From fc24d502ab986a268bddd38bf2dd006a40050a21 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Thu, 11 Nov 2021 12:21:25 +0100 Subject: [PATCH] Version bump --- gnome-extra/evolution-data-server/Manifest | 2 +- ...ld => evolution-data-server-3.42.1.ebuild} | 26 +++++--- .../files/3.42.1-fix-build.patch | 28 ++++++++ .../files/3.42.1-fix-calendar-crash.patch | 64 +++++++++++++++++++ 4 files changed, 111 insertions(+), 9 deletions(-) rename gnome-extra/evolution-data-server/{evolution-data-server-3.40.4.ebuild => evolution-data-server-3.42.1.ebuild} (85%) create mode 100644 gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch create mode 100644 gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 6efe56f..6d56b24 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1 +1 @@ -DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5 +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.40.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild similarity index 85% rename from gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild rename to gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild index 1728d06..e1e62a1 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.4.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild @@ -11,21 +11,22 @@ 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 +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 phonenumber" +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" +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 -gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]" +# 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.46:2 + >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= @@ -47,9 +48,6 @@ RDEPEND=" >=net-libs/webkit-gtk-2.28.0:4 ${gdata_depend} ) - phonenumber? ( - >=dev-libs/libphonenumber-8.12.24 - ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ${gdata_depend} ) @@ -57,11 +55,16 @@ RDEPEND=" kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) + phonenumber? ( + >=dev-libs/libphonenumber-8.12.24 + ) " 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=" @@ -87,6 +90,9 @@ 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});" \ @@ -153,3 +159,7 @@ src_install() { dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema fi } + + 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 0000000..a0fde02 --- /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 +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 + #include ++#include + + #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 0000000..011e8bd --- /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 +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 +