diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-01-17 09:34:11 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-01-22 19:40:02 -0800 |
commit | db39cbcd42d523892012935f3d6972f62e4b0a35 (patch) | |
tree | 4b6b3336b8b8c58b34a32f63c8ce6348463e743b /meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch | |
parent | 8742b94ae895b58d0b179f6bb106a26cc2cb25ef (diff) | |
download | meta-openembedded-contrib-db39cbcd42d523892012935f3d6972f62e4b0a35.tar.gz |
evolution-data-server: update 3.2.3 -> 3.26.3
In recent meta-universe 3.2.3 started to fail with:
| camel-enumtypes.c:42:7: error: expected expression at end of input
| { 512, "CAMEL_FOLDER_SHARED_BY_ME", "shared-by-me" },
| ^
Instead of cleaning I decided to update. The following changed:
* eds builds with cmake instead of autotools
* musl: I checked src/time/strftime.c and it seems strftime does not support
'%l' / '%k'. musl-case was added to be a good boy but was not tested.
* remove 0001-imapx-Fix-signature-for-imapx_tokenise_struct.patch:
src/camel/providers/imapx/camel-imapx-tokens.txt has text-only format these days
* remove 0002-Fix-for-automake-1.12.x.patch: autotools was replaced by cmake
* remove 0003-Disable-Werror-for-automake.patch: autotools was replaced by cmake
* remove 0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch: autotools was replaced by cmake
* remove 0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch:
src/calendar/backends/caldav/e-cal-backend-caldav.c was reworked competely
* remove 0006-configure.ac-do-not-overwrite-localedir.patch: autotools was replaced by cmake
Tested: abiword build and run
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch deleted file mode 100644 index 1383347988..0000000000 --- a/meta-gnome/recipes-gnome/eds/evolution-data-server/0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2c73b588b9018cb59c666eae3a15fa1af42c56be Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 4 Aug 2013 10:57:08 +0200 -Subject: [PATCH 4/5] configure: Fix libical pkg-config trying to use host - paths - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - calendar/libecal/libecal.pc.in | 2 +- - configure.ac | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/calendar/libecal/libecal.pc.in b/calendar/libecal/libecal.pc.in -index fc6b359..d3435bb 100644 ---- a/calendar/libecal/libecal.pc.in -+++ b/calendar/libecal/libecal.pc.in -@@ -12,4 +12,4 @@ Description: Client library for evolution calendars - Version: @VERSION@ - Requires: libical >= @LIBICAL_REQUIRED@ libedataserver-1.2 gio-2.0 - Libs: -L${libdir} -lecal-1.2 --Cflags: -I${privincludedir} @LIBICAL_EXTRA_CFLAGS@ -+Cflags: -I${privincludedir} -diff --git a/configure.ac b/configure.ac -index 1c802ff..f1d4ce8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1351,7 +1351,8 @@ dnl to differentiate between <libical/ical.h> and <ical.h> - dnl We have fixed all our instances to use <libical/ical.h>. Until the .pc from - dnl libical is fixed, we have to work-around the buggy CFlags. - dnl ***** -- LIBICAL_EXTRA_CFLAGS=" -I`$PKG_CONFIG --variable=includedir libical` " -+ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$]) -+ LIBICAL_EXTRA_CFLAGS=" -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir libical` " - LIBICAL_EXTRA_LIBS="" - AC_SUBST(LIBICAL_EXTRA_CFLAGS) - AC_SUBST(LIBICAL_EXTRA_LIBS) --- -1.8.3.2 - |