public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/
@ 2015-12-21  8:14 Gilles Dartiguelongue
  0 siblings, 0 replies; 5+ messages in thread
From: Gilles Dartiguelongue @ 2015-12-21  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     06b189ea18de70381b36aa97fbc18c4c403d5d6f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 07:55:20 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 08:14:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b189ea

gnome-extra/evolution-ews: drop old revisions

Package-Manager: portage-2.2.26

 gnome-extra/evolution-ews/Manifest                 |  2 -
 .../evolution-ews/evolution-ews-3.16.3-r1.ebuild   | 47 ----------------------
 .../evolution-ews/evolution-ews-3.16.4.ebuild      | 41 -------------------
 .../files/evolution-ews-3.16.3-localedir.patch     | 25 ------------
 4 files changed, 115 deletions(-)

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index cdad3ae..aebec29 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,6 +1,4 @@
 DIST evolution-ews-3.12.11.tar.xz 663288 SHA256 adbf4efd25e9c2df823a20d14f45027bacbaf14d57ffb5978ae4d33184315e83 SHA512 4756a185c55118622cff175c3fa8d4a2ae3e82ff926542dfd88d299a7f82e23dc90f66de0ce7e97db8a79dbd2a07d635ab9bdc8fac8f0be3bf10d5efb77a067e WHIRLPOOL 5802f9df6bf3d79c23238672da643cc781c048b1a2b0d4ee20dc6348c998a656567ccca8299ad8aa00e537c82e11fb9e26770d78adb70cf7a6030e802521ac22
-DIST evolution-ews-3.16.3.tar.xz 683876 SHA256 529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 SHA512 462b2c77033b351ddcd72ef4b4f7d8d5e4f7782d1ff4d25760d31fb7c0c1ed303fdc47063932961810b103204a59eccd91d4c888554010cd64c46be5eaeb53d9 WHIRLPOOL 56ff69cc1341ab9a7b38cdc8091dc15c3bba72226105f9fd907d800cffbeefe83555732c3e70d7edd76bdf6f9132e9621fd00252bf4a794198c7608c347af1a4
-DIST evolution-ews-3.16.4.tar.xz 684676 SHA256 fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4 SHA512 62b03cd7f6ddd648d781dafe4a40b0d128edfe21d6a28e15e8c1e70069c694bf1b66dbf9ede0613ca8ca08b234bae2f83280152f80afcdacd01decffdf07808f WHIRLPOOL cbcb1723779563680e3006c5149c83189d8cde0558a42d716389641be9d52147bd71b0e1259f36a3467fa8d83123c78f8bb01cfd6393bd7e4c4953794c7df716
 DIST evolution-ews-3.16.5.tar.xz 684684 SHA256 d67e0cbf94800fb7035205bf8fd61ae1413ae7ba79265f8750fde1e7fb25eb58 SHA512 f046f3e0581cd21441b3737ff2fdd7cc3fa1333c3de8c3cf0be48f39239985cb68cbbd04089a84fa5f31ef84cc4100cf8a9ac0d1e6e261522f6e5305e505c0c7 WHIRLPOOL 960c84417c0b6a4374e5f063619c5495afc3b8eb0902b452021513c3a25fa1af148a71b3adbc19b915c857a4337f97de4eb0dac098db97a14e4ec362e36b0f28
 DIST evolution-ews-3.18.2.tar.xz 702672 SHA256 cc7c767f327dbaeb7961139d98ea17b1685c3584c728bb967140ae6c68458a9f SHA512 27d730a41c9e55ccc29b19060486253b50db190d41f634ad3ea4032e29b9f43867598e684947a1894dde6ab7731faed68e407ec69f10f1ae759a0537c1a88255 WHIRLPOOL 50fed90d8fd54b708ac83260d2d4ff25d2ab0782292fadedae1b9ff36ef19727b77775d5575e63129d5a70d94312d3277bd55952a653d0964d5a1d2fd081fc8a
 DIST evolution-ews-3.18.3.tar.xz 703116 SHA256 b42dd81dfa1db4cdccff5a14a8f233b2b85d26033b585bcad9122d7ccd2b3b13 SHA512 daa77c2b4f3bcc8c1f56d5e1904b7d4b826ef61298ecce9d6b69e389523071b4da54ee04d73af196d8fed0ccf93a26b8fd32e2f85e2d9f3392da7689b62d7291 WHIRLPOOL a2bb480aa6c56bf8735238653b5645eedd1bd56657027d08b35b2bd76820e8e7190c1b799c1b004656c5c783f015d9ff861519bd092d8957053b6125285a5da9

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
deleted file mode 100644
index a1e8b9e..0000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.40:2
-	dev-libs/libical:0=
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-src_prepare() {
-	# Install locales in proper dir (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.16.3-localedir.patch
-	eautoreconf
-}
-
-src_configure() {
-	# We don't have libmspack, needing internal lzx
-	gnome2_src_configure \
-		--with-internal-lzx \
-		$(use_enable test tests)
-}

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild
deleted file mode 100644
index f511fc9..0000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.40:2
-	dev-libs/libical:0=
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-src_configure() {
-	# We don't have libmspack, needing internal lzx
-	gnome2_src_configure \
-		--with-internal-lzx \
-		$(use_enable test tests)
-}

diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
deleted file mode 100644
index e04d7ba..0000000
--- a/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6f6bdc4b755ff2089d645ce1b2d09114fa72a1f9 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 11 Jun 2015 10:11:15 +0200
-Subject: configure.ac: Do not override localedir variable
-
-It could place locale files into $PREFIX/locale, instead of $PREFIX/share/locale.
-The change follows bug 703732.
-
-diff --git a/configure.ac b/configure.ac
-index 1d4d746..ede1ef2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -199,9 +199,6 @@ GETTEXT_PACKAGE=evolution-ews
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
- 
--localedir='$(prefix)/$(DATADIRNAME)/locale'
--AC_SUBST(localedir)
--
- dnl ****************************
- dnl Initialize libtool
- dnl ****************************
--- 
-cgit v0.10.2
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/
@ 2018-01-08 12:57 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-01-08 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     02a7d7bfd2ae6022b1e7590a7ae873c3b3f95933
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 12:34:57 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 12:57:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02a7d7bf

gnome-extra/evolution-ews: bump to 3.24.6, fresh install fix, libical3 compat

Bump, patch to honor DESTDIR and not update caches when set (might cause sandbox
violation for us and is generally wrong), patches for libical:0/3 compatibility.

Bug: https://bugs.gentoo.org/628460
Closes: https://bugs.gentoo.org/639126
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 gnome-extra/evolution-ews/Manifest                 |  1 +
 .../evolution-ews/evolution-ews-3.24.6.ebuild      | 66 ++++++++++++++++++++++
 .../files/3.24.6-DESTDIR-honoring.patch            | 33 +++++++++++
 .../files/3.24.6-libical3-compat.patch             | 44 +++++++++++++++
 4 files changed, 144 insertions(+)

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 645e932981e..cda9aee0b9f 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,2 +1,3 @@
 DIST evolution-ews-3.22.6.tar.xz 715320 BLAKE2B abd68ffce9a2b723a72e26d5c0991060c377f930c3f34e2f9244dfb53c449bc92d8e0bca60b64993369fe00370fb60920e405355c3fbe63b846e279de785045c SHA512 6b93faa67a6f546142b023086bf54ac34d6c7c4320ee136f58cc0ea5a018811af2080d5945c4dc68c89555a35a4194b2f92bd839b2142ae63690e94ed895b40e
 DIST evolution-ews-3.24.5.tar.xz 488116 BLAKE2B 8144f1eae7440993c2bedd76e5cdfb3354b32bb1b1093bf24f23c12ca8a36e076950dc015f89966532d6c5ee491262a979cc9bff47cba5146c08989becd2fb95 SHA512 eaa5096c09686dade6f1efddea2b706a73c292b06b473b0f2ef1ba15eb5a3d685678416a0f1de40296beaa893d5dc91b944a440440dba489df67a944342f2f17
+DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
new file mode 100644
index 00000000000..1c2d3ee514d
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit cmake-utils gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.46:2
+	dev-libs/libical:0=
+	>=dev-libs/libmspack-0.4
+	>=dev-libs/libxml2-2
+	>=gnome-extra/evolution-data-server-3.24.7:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.42:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( net-libs/uhttpmock )
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+}

diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
new file mode 100644
index 00000000000..c74df6bce52
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
@@ -0,0 +1,33 @@
+From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 2 Oct 2017 19:24:57 +0200
+Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is
+ set
+
+(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f)
+---
+ cmake/modules/GLibTools.cmake | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
+index fc8eb82..f0be558 100644
+--- a/cmake/modules/GLibTools.cmake
++++ b/cmake/modules/GLibTools.cmake
+@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
+ 	if(_install_code)
+ 		# Compile gsettings schemas and ensure that all of them are in the place.
+ 		install(CODE
+-			"execute_process(${_install_code}
+-				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
+-			)")
++			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
++				execute_process(${_install_code}
++					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
++				)
++			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
+ 	endif(_install_code)
+ endmacro(add_gsettings_schemas)
+ 
+-- 
+2.15.1
+

diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
new file mode 100644
index 00000000000..001e35630e9
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
@@ -0,0 +1,44 @@
+From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Mon, 8 Jan 2018 14:23:49 +0200
+Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc
+
+The structure member is going to be removed from libical3 and the
+function is available for a long time, thus it's safe to replace
+the usage in the code.
+
+(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595)
+---
+ src/calendar/e-cal-backend-ews-utils.c | 2 +-
+ src/calendar/e-cal-backend-ews.c       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
+index 41d77b4..a46b1e3 100644
+--- a/src/calendar/e-cal-backend-ews-utils.c
++++ b/src/calendar/e-cal-backend-ews-utils.c
+@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg,
+ 	gchar *tz_ident = NULL;
+ 
+ 	if (with_timezone) {
+-		if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
++		if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
+ 			tz_ident = g_strdup ("Z");
+ 		} else {
+ 			gint offset, is_daylight, hrs, mins;
+diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
+index 50dd5ae..29e488f 100644
+--- a/src/calendar/e-cal-backend-ews.c
++++ b/src/calendar/e-cal-backend-ews.c
+@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend,
+ 			struct icaltimetype dtstart;
+ 
+ 			dtstart = icalproperty_get_dtstart (prop);
+-			if (dtstart.is_utc)
++			if (icaltime_is_utc (dtstart))
+ 				tzid = "UTC";
+ 		}
+ 	}
+-- 
+2.15.1
+


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/
@ 2019-05-18 22:08 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-05-18 22:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c62c50b3f349dc677ff2ce8bca401c7d440a453f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 21:51:46 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 21:52:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c62c50b3

gnome-extra/evolution-ews: remove old

Bug: https://bugs.gentoo.org/678070
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/evolution-ews/Manifest                 |  1 -
 .../evolution-ews/evolution-ews-3.24.6.ebuild      | 66 ----------------------
 .../files/3.24.6-DESTDIR-honoring.patch            | 33 -----------
 .../files/3.24.6-libical3-compat.patch             | 44 ---------------
 4 files changed, 144 deletions(-)

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 98d75db9509..5e43bcb9f64 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,2 @@
-DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
 DIST evolution-ews-3.30.5-certificate-validation.patch.xz 6928 BLAKE2B eb1f070797231f14cc71cce2f19a0dc925edc0f67eca9267568c835e878d9f1567aaad7dd8a14c88abb047af8db8220239c78d62387329c9d38e5c5eda21822b SHA512 2d4fa5f9c24bf92ab4e5105cc5d265907e8af760d7c969ffdf74d090795948e1f9e0e84f5d051c2a6c4324ed49cc2c23f23ebdccf67fa8baab965c612ad807e6
 DIST evolution-ews-3.30.5.tar.xz 525252 BLAKE2B 510666cdf6bdb95e73799256daa9b4c753ed70de71798d3acb73eb55c30158a7b6b56fe7617150ec0a1f5ce20676da8a3ab4608fca06f009ea16fbc234770736 SHA512 6b17fd73b461e0ddd725ee87c854fca45fbc14f10922a60aff5a9a25b56728f1f16a0d3196b4bc3cba83e75655c15244c3bf2442fa17449c7466ab95371e93d7

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
deleted file mode 100644
index dd21ac33a3b..00000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.46:2
-	dev-libs/libical:0=
-	>=dev-libs/libmspack-0.4
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-3.24.7:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
-	"${FILESDIR}"/${PV}-libical3-compat.patch
-)
-
-src_prepare() {
-	gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}

diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
deleted file mode 100644
index c74df6bce52..00000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Oct 2017 19:24:57 +0200
-Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is
- set
-
-(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f)
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb82..f0be558 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- 	if(_install_code)
- 		# Compile gsettings schemas and ensure that all of them are in the place.
- 		install(CODE
--			"execute_process(${_install_code}
--				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
--			)")
-+			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+				execute_process(${_install_code}
-+					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+				)
-+			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- 	endif(_install_code)
- endmacro(add_gsettings_schemas)
- 
--- 
-2.15.1
-

diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
deleted file mode 100644
index 001e35630e9..00000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 8 Jan 2018 14:23:49 +0200
-Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical3 and the
-function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595)
----
- src/calendar/e-cal-backend-ews-utils.c | 2 +-
- src/calendar/e-cal-backend-ews.c       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
-index 41d77b4..a46b1e3 100644
---- a/src/calendar/e-cal-backend-ews-utils.c
-+++ b/src/calendar/e-cal-backend-ews-utils.c
-@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg,
- 	gchar *tz_ident = NULL;
- 
- 	if (with_timezone) {
--		if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
-+		if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
- 			tz_ident = g_strdup ("Z");
- 		} else {
- 			gint offset, is_daylight, hrs, mins;
-diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
-index 50dd5ae..29e488f 100644
---- a/src/calendar/e-cal-backend-ews.c
-+++ b/src/calendar/e-cal-backend-ews.c
-@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend,
- 			struct icaltimetype dtstart;
- 
- 			dtstart = icalproperty_get_dtstart (prop);
--			if (dtstart.is_utc)
-+			if (icaltime_is_utc (dtstart))
- 				tzid = "UTC";
- 		}
- 	}
--- 
-2.15.1
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/
@ 2021-04-18  5:24 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-04-18  5:24 UTC (permalink / raw
  To: gentoo-commits

commit:     8b7bcc8fd0b8d8c96313911bc04f7fac98517c6a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 05:23:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 05:24:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7bcc8f

gnome-extra/evolution-ews: fix build with CMake 3.20.1

Closes: https://bugs.gentoo.org/783603
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../evolution-ews/evolution-ews-3.38.4.ebuild      |  3 +
 .../evolution-ews/evolution-ews-3.40.0.ebuild      |  3 +
 .../files/evolution-ews-3.38.4-cmake-3.20.1.patch  | 71 ++++++++++++++++++++++
 3 files changed, 77 insertions(+)

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
index 5a472956bac..adff76ede31 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )"
 # call; if needed, set them after cmake_src_prepare call, if that works
 src_prepare() {
 	cmake_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
index 2088827c202..394ab53f034 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )"
 # call; if needed, set them after cmake_src_prepare call, if that works
 src_prepare() {
 	cmake_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
new file mode 100644
index 00000000000..050bacd7628
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch
@@ -0,0 +1,71 @@
+https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303ec319539add2f0ba5331c2dab9d23c7.patch
+https://bugs.gentoo.org/783603
+
+From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 14 Apr 2021 16:58:08 +0200
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
+
+CMake 3.20.1 errors out with:
+
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
+   variable name cannot be empty
+ Call Stack (most recent call first):
+   CMakeLists.txt:152 (add_printable_variable)
+
+Change how the parameter value is compared, to fix it.
+--- a/cmake/modules/PrintableOptions.cmake
++++ b/cmake/modules/PrintableOptions.cmake
+@@ -19,40 +19,40 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_filepath _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "filepath variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+-- 
+GitLab


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/
@ 2024-09-20 17:42 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2024-09-20 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     83e899515f55491ed2aa88c6f0fd1bbb15fc1892
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 17:31:35 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 17:42:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e89951

gnome-extra/evolution-ews: drop 3.50.3-r1, 3.52.2

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 gnome-extra/evolution-ews/Manifest                 |  2 -
 .../evolution-ews/evolution-ews-3.50.3-r1.ebuild   | 76 ----------------------
 .../evolution-ews/evolution-ews-3.52.2.ebuild      | 72 --------------------
 .../files/3.50.3-fix-overlinking.patch             | 73 ---------------------
 4 files changed, 223 deletions(-)

diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index 1ee1ce9aef91..199ed6c77bd5 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,4 +1,2 @@
 DIST evolution-ews-3.50.2.tar.xz 707800 BLAKE2B 18241eff067658af2f4620af87dea1c9c7c62476bbf9bf259addf15868a3b7e3f156dc952f21af2cad7ba6c2da9fd348b8733e5887f4276ad7eeeca8f9088476 SHA512 9aa4bb023922e39132a0ac3171d95f8362116960aa14dcb961b31ad242e6d7bcf2e946f19aea2c6f9a5324ca0954731264594a27fbb2b0e2cc38eca0cf441108
-DIST evolution-ews-3.50.3.tar.xz 708336 BLAKE2B e8fe4e2a6539142847d6610a61e2f57a83d604946270cd7b23d7e34fa89a38f644a05e452bbc03a6d96553936a38719afb7296eed03c7134735f937943d57114 SHA512 12c7fbe72f375837f185d4c8dbcb2167d327a0ad4b2ca822e4e5349d561e996e7a7405c6f8d36ceeddff0015286117db66a65d2756003aa8ca96948d7826e51f
-DIST evolution-ews-3.52.2.tar.xz 721964 BLAKE2B 53962e66f12e660f15c6fb300f30545d2380d5d12a1bce59ba64a44c7cefbdfaee2e1fa319e31e4c4c21cfd462e2c02aa96ee8efe78d4771bd8429aa18e89136 SHA512 b92db18b347c19fab15097aa7cedef876ca13364ece0ff2836cf6160bb2eb2ceb8d7eeaf9bada0369776ea32edca6938952a0dea04b229afd9690c744e16616c
 DIST evolution-ews-3.52.4.tar.xz 724244 BLAKE2B 35b78fa600e06c18cecee8c43941e77b3645a7d4487d72d989da62a0c7acab83f2adf4363c761d7e313f42175f341d63ec7709003599bf5b37e80424cc76d67c SHA512 017dbe28ba6524cdad1582cebd00fb675c75f52cac5875c756be0f402d4a0dd4a83e60b7ee0a2f71211eac49c04bba924e3d71775dce1e55fdcd372b1ac3747d

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
deleted file mode 100644
index 3fee01d4d062..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.50.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# 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 wrongly linking in GTK3 webkit without --as-needed, which breaks GTK4 evolution-data-server apps like gnome-contacts
-	eapply "${FILESDIR}"/${PV}-fix-overlinking.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
-}

diff --git a/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild
deleted file mode 100644
index aa6c1306dab2..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.52.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/evolution/-/wikis/home https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/libical-3.0.5:0=[glib]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-3.0:3.0
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( >=net-libs/uhttpmock-0.9:1.0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# 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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	# -j1: https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/522
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" "gnome-extra/evolution-data-server[oauth-gtk3]"
-}

diff --git a/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch b/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
deleted file mode 100644
index 7628390f27f8..000000000000
--- a/gnome-extra/evolution-ews/files/3.50.3-fix-overlinking.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c9e8707d024048ea595d825ed08833c9aa6bff37 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 4 Mar 2024 18:02:54 +0100
-Subject: [PATCH] build: Correct overlinking on the m365 part
-
-This can bring in gtk3 and other UI-specific libs into the background processes,
-when the compiler does not filter them out, which can happen with clang.
-
-Related to https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/222
----
- src/Microsoft365/calendar/CMakeLists.txt | 3 ---
- src/Microsoft365/common/CMakeLists.txt   | 3 ---
- 2 files changed, 6 deletions(-)
-
-diff --git a/src/Microsoft365/calendar/CMakeLists.txt b/src/Microsoft365/calendar/CMakeLists.txt
-index 676e2d7f..60801886 100644
---- a/src/Microsoft365/calendar/CMakeLists.txt
-+++ b/src/Microsoft365/calendar/CMakeLists.txt
-@@ -27,7 +27,6 @@ target_compile_definitions(ecalbackendmicrosoft365 PRIVATE
- 
- target_compile_options(ecalbackendmicrosoft365 PUBLIC
- 	${CAMEL_CFLAGS}
--	${EVOLUTION_CALENDAR_CFLAGS}
- 	${LIBEBACKEND_CFLAGS}
- 	${LIBECAL_CFLAGS}
- 	${LIBEDATACAL_CFLAGS}
-@@ -41,7 +40,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
- 	${CMAKE_SOURCE_DIR}/src/Microsoft365
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CAMEL_INCLUDE_DIRS}
--	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
- 	${LIBEBACKEND_INCLUDE_DIRS}
- 	${LIBECAL_INCLUDE_DIRS}
- 	${LIBEDATACAL_INCLUDE_DIRS}
-@@ -51,7 +49,6 @@ target_include_directories(ecalbackendmicrosoft365 PUBLIC
- target_link_libraries(ecalbackendmicrosoft365
- 	${DEPENDENCIES}
- 	${CAMEL_LDFLAGS}
--	${EVOLUTION_CALENDAR_LDFLAGS}
- 	${LIBEBACKEND_LDFLAGS}
- 	${LIBECAL_LDFLAGS}
- 	${LIBEDATACAL_LDFLAGS}
-diff --git a/src/Microsoft365/common/CMakeLists.txt b/src/Microsoft365/common/CMakeLists.txt
-index 1b81e6ea..def3d020 100644
---- a/src/Microsoft365/common/CMakeLists.txt
-+++ b/src/Microsoft365/common/CMakeLists.txt
-@@ -31,7 +31,6 @@ target_compile_definitions(evolution-microsoft365 PRIVATE
- 
- target_compile_options(evolution-microsoft365 PUBLIC
- 	${CAMEL_CFLAGS}
--	${EVOLUTION_CALENDAR_CFLAGS}
- 	${JSON_GLIB_CFLAGS}
- 	${LIBEBACKEND_CFLAGS}
- 	${LIBECAL_CFLAGS}
-@@ -48,7 +47,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CMAKE_CURRENT_SOURCE_DIR}
- 	${CAMEL_INCLUDE_DIRS}
--	${EVOLUTION_CALENDAR_INCLUDE_DIRS}
- 	${JSON_GLIB_INCLUDE_DIRS}
- 	${LIBEBACKEND_INCLUDE_DIRS}
- 	${LIBECAL_INCLUDE_DIRS}
-@@ -59,7 +57,6 @@ target_include_directories(evolution-microsoft365 PUBLIC
- 
- target_link_libraries(evolution-microsoft365
- 	${CAMEL_LDFLAGS}
--	${EVOLUTION_CALENDAR_LDFLAGS}
- 	${JSON_GLIB_LDFLAGS}
- 	${LIBEBACKEND_LDFLAGS}
- 	${LIBECAL_LDFLAGS}
--- 
-2.43.0
-


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-20 17:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-21  8:14 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-ews/, gnome-extra/evolution-ews/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2018-01-08 12:57 Mart Raudsepp
2019-05-18 22:08 Mart Raudsepp
2021-04-18  5:24 Sam James
2024-09-20 17:42 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox