system/evolution-data-server: Updated to 3.44.1

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 94 insertions, 18 deletions

diff --git a/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch b/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch
new file mode 100644
index 0000000000000..3a202bee154ed
--- /dev/null
+++ b/system/evolution-data-server/3.36.5-gtk-doc-1.32-compat.patch
@@ -0,0 +1,32 @@
+From 24c7ca17eaf69211b75f2882c11aeff01a3cad01 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 8 Aug 2020 18:59:25 +0300
+Subject: [PATCH] I#158 - Workaround build error with gtk-doc-1.32
+
+---
+ src/calendar/libecal/e-cal-time-util.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calendar/libecal/e-cal-time-util.h b/src/calendar/libecal/e-cal-time-util.h
+index 8acb13061..11c9d3369 100644
+--- a/src/calendar/libecal/e-cal-time-util.h
++++ b/src/calendar/libecal/e-cal-time-util.h
+@@ -150,6 +150,7 @@ void		time_to_gdate_with_zone	(GDate *date,
+  * struct tm manipulation
+  **************************************************************************/
+ 
++#ifndef __GTK_DOC_IGNORE__
+ struct tm	e_cal_util_icaltime_to_tm
+ 					(const ICalTime *itt);
+ struct tm	e_cal_util_icaltime_to_tm_with_zone
+@@ -159,6 +160,7 @@ struct tm	e_cal_util_icaltime_to_tm_with_zone
+ ICalTime *	e_cal_util_tm_to_icaltime
+ 					(struct tm *tm,
+ 					 gboolean is_date);
++#endif
+ 
+ G_END_DECLS
+ 
+-- 
+2.20.1
+
diff --git a/system/evolution-data-server/README b/system/evolution-data-server/README
index 4324a69b038f0..5ffa024ca8898 100644
--- a/system/evolution-data-server/README
+++ b/system/evolution-data-server/README
@@ -11,8 +11,12 @@ a shared library, which will be loaded by evolution-data-server on
 startup. 
 
 Below variables can be used to configure the build:
-    INTROSPECTION=YES : Enable GObject introspection
-    VALA=YES          : Generate VALA bindings
-    GTKDOC=YES        : Use gtk-doc to build documentation
-    TESTS=YES         : Enable installed tests
-    GCOV=YES          : Enable build with GCOV code coverage
+    INTROSPECTION=yes : Enable GObject introspection
+                        the dependecies must be compiled with 
+                        introspection or the build will fail.
+    VALA=yes          : Generate VALA bindings
+                        Requires INTROSPECTION=YES
+    GTKDOC=yes        : Use gtk-doc to build documentation
+    TESTS=yes         : Enable installed tests
+    GCOV=yes          : Enable build with GCOV code coverage
+                        Requires gcov
diff --git a/system/evolution-data-server/evolution-data-server.SlackBuild b/system/evolution-data-server/evolution-data-server.SlackBuild
index 0a697b6889389..f609140b197f0 100644
--- a/system/evolution-data-server/evolution-data-server.SlackBuild
+++ b/system/evolution-data-server/evolution-data-server.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=evolution-data-server
-VERSION=${VERSION:-3.44.0}
+VERSION=${VERSION:-3.44.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -49,6 +49,38 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
+if [ "$VALA" = "yes" ]; then
+  VALAP="YES"
+  INTROSPECTION="yes"
+else
+  VALAP="NO"
+fi
+
+if [ "$INTROSPECTION" = "yes" ]; then
+  INTROSPECTIONP="YES"
+else
+  INTROSPECTIONP="NO"
+fi
+
+if [ "$GTKDOC" = "yes" ]; then
+  GTKDOCP="YES"
+else
+  GTKDOCP="NO"
+fi
+
+if [ "$TESTS" = "yes" ]; then
+  TESTSP="YES"
+else
+  TESTSP="NO"
+fi
+
+if [ "$GCOV" = "yes" ]; then
+  GCOVP="YES"
+else
+  GCOVP="NO"
+fi
+
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -82,6 +114,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+#This is patch to fix build with gtkdoc from Gentoo
+patch -p1 < $CWD/3.36.5-gtk-doc-1.32-compat.patch
+
 mkdir -p build
 cd build
   cmake \
@@ -90,28 +125,33 @@ cd build
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONF_INSTALL_DIR=/etc \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DENABLE_INTROSPECTION="$INTROSPECTION" \
+    -DENABLE_INTROSPECTION="$INTROSPECTIONP" \
     -DENABLE_UOA=OFF \
-    -DENABLE_VALA_BINDINGS="$VALA" \
-    -DENABLE_INSTALLED_TESTS="$TESTS" \
+    -DENABLE_VALA_BINDINGS="$VALAP" \
+    -DENABLE_INSTALLED_TESTS="$TESTSP" \
     -DENABLE_GOOGLE=ON \
     -DENABLE_GOOGLE_AUTH=ON \
     -DWITH_LDAP=ON \
-    -DENABLE_GTK_DOC="$GTKDOC" \
+    -DWITH_GWEATHER4=ON \
+    -DENABLE_GTK_DOC="$GTKDOCP" \
     -DWITH_SYSTEMDUSERUNITDIR=no \
     -DENABLE_GOA=ON \
     -DENABLE_GTK=ON \
-    -DENABLE_CODE_COVERAGE="$GCOV" \
+    -DENABLE_CODE_COVERAGE="$GCOVP" \
     -DENABLE_SMIME=ON \
     -DENABLE_IPV6=ON \
     -DBUILD_TESTING=OFF \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install/strip DESTDIR=$PKG
+    -DCMAKE_BUILD_TYPE=Release ..\
+    -G Ninja
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
 cd ..
 
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   COPYING NEWS ChangeLog MAINTAINERS README \
diff --git a/system/evolution-data-server/evolution-data-server.info b/system/evolution-data-server/evolution-data-server.info
index 670b1a74ef258..0ffd4fcb94514 100644
--- a/system/evolution-data-server/evolution-data-server.info
+++ b/system/evolution-data-server/evolution-data-server.info
@@ -1,10 +1,10 @@
 PRGNAM="evolution-data-server"
-VERSION="3.44.0"
+VERSION="3.44.1"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution/"
-DOWNLOAD="https://download.gnome.org/sources/evolution-data-server/3.44/evolution-data-server-3.44.0.tar.xz"
-MD5SUM="5bb506013a31afc28bc54721797f74fd"
+DOWNLOAD="https://download.gnome.org/sources/evolution-data-server/3.44/evolution-data-server-3.44.1.tar.xz"
+MD5SUM="2cb515e29985edcd490fc206385e5b1d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnome-online-accounts libgweather libgdata"
+REQUIRES="gnome-online-accounts libgweather4 libgdata"
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"