[154352] users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server

devans at macports.org devans at macports.org
Fri Oct 28 14:00:24 CEST 2016


Revision: 154352
          https://trac.macports.org/changeset/154352
Author:   devans at macports.org
Date:     2016-10-28 14:00:24 +0200 (Fri, 28 Oct 2016)
Log Message:
-----------
GNOME-3/unstable: evolution-data-server, copy from stable and update to unstable version 3.23.1, now builds using cmake rather than autotools, use gnome unstable livecheck, configures but build fails.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff

Added Paths:
-----------
    users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/

Removed Paths:
-------------
    users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh

Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/Portfile	2016-10-27 01:52:09 UTC (rev 154308)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/Portfile	2016-10-28 12:00:24 UTC (rev 154352)
@@ -2,10 +2,12 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           gobject_introspection 1.0
+PortGroup           cmake 1.0
 
+cmake.out_of_source yes
+
 name                evolution-data-server
-version             3.22.1
+version             3.23.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Addressbook and calender libs for GNOME.
 long_description    Evolution Data Server provides a central location for \
@@ -19,66 +21,62 @@
 
 use_xz              yes
 
-checksums           rmd160  cfbf4543871d1d47e7856d94a99760a065193f19 \
-                    sha256  5ea1a25c26c2b5587b912661fc0eadf0ef8bc89ec01be9bb23cfffdf30ab41d9
+checksums           rmd160  81017a5d458c4925b99f3cc53642b47e5ed52b72 \
+                    sha256  f1f6b2162b0ee22e161376e7328cee0bebf308624f7f1b3eff0e37f14748151c
 
-depends_build       port:pkgconfig \
-                    port:intltool \
-                    port:gtk-doc \
-                    port:gnome-common \
-                    port:autoconf \
-                    port:automake \
-                    port:libtool
+depends_build-append \
+                    port:pkgconfig \
+                    port:intltool
 
 depends_lib         port:gtk3 \
-                    port:libxml2 \
-                    port:libsoup \
-                    port:libsecret \
                     port:gcr \
+                    port:gnome-online-accounts \
+                    port:gobject-introspection \
+                    port:icu \
+                    port:kerberos5 \
+                    port:libgdata \
+                    port:libgweather \
+                    port:libical \
                     port:libiconv \
+                    port:libsecret \
+                    port:libsoup \
+                    port:libxml2 \
                     port:nss \
                     port:nspr \
-                    port:libgweather \
-                    port:libical \
-                    port:libgdata \
-                    port:gnome-online-accounts \
+                    port:openldap \
                     port:sqlite3 \
                     port:vala \
                     port:db53 \
-                    port:icu
 
-gobject_introspection yes
+patchfiles          patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
 
-patchfiles          patch-configure.ac.diff \
-                    patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
-
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
-post-patch {
-    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
-}
+#post-patch {
+#    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
+#}
 
-configure.cmd       ./autogen.sh
+#configure.env-append \
+#                    DB_CFLAGS="-I${prefix}/include/db53" \
+#                    DB_LIBS="-L${prefix}/lib/db53 -ldb"
 
-configure.env-append \
-                    DB_CFLAGS="-I${prefix}/include/db53" \
-                    DB_LIBS="-L${prefix}/lib/db53 -ldb"
+configure.args-append \
+                    -DENABLE_SCHEMAS_COMPILE=OFF \
+                    -DENABLE_GTK_DOC=OFF \
+                    -DENABLE_UOA=OFF \
+                    -DWITH_OPENLDAP=OFF \
+                    -DENABLE_INSTALLED_TESTS=OFF \
+                    -DENABLE_INTROSPECTION=ON \
+                    -DENABLE_SMIME=ON \
+                    -DENABLE_GTK=ON \
+                    -DENABLE_GOOGLE_AUTH=ON \
+                    -DENABLE_EXAMPLES=ON \
+                    -DENABLE_GOA=ON \
+                    -DENABLE_IPV6=ON \
+                    -DENABLE_WEATHER=ON \
+                    -DENABLE_GOOGLE=ON \
+                    -DENABLE_VALA_BINDINGS=ON
 
-configure.args      --enable-smime \
-                    --enable-ipv6 \
-                    --enable-weather \
-                    --enable-google \
-                    --enable-goa \
-                    --enable-vala-bindings \
-                    --with-nspr-includes=${prefix}/include/nspr  \
-                    --with-nspr-libs=${prefix}/lib/nspr  \
-                    --with-nss-includes=${prefix}/include/nss \
-                    --with-nss-libs=${prefix}/lib/nss \
-                    --with-krb5=/usr \
-                    --disable-uoa \
-                    --disable-silent-rules \
-                    --disable-schemas-compile
-
 #
 # port nss is not universal
 #
@@ -88,10 +86,10 @@
 variant phonenumber description {Phone number parsing/validation using libphonenumber} {
     depends_lib-append          port:libphonenumber-cpp
     configure.cxxflags-append   -DI18N_PHONENUMBERS_USE_BOOST
-    configure.args-append       --with-phonenumber=${prefix}/lib
+    configure.args-append       -DWITH_PHONENUMBER=ON
 }
 
-default_variants    +phonenumber
+#default_variants    +phonenumber
 
 post-activate    {
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
@@ -107,4 +105,4 @@
     }
 }
 
-livecheck.type      gnome
+livecheck.type      gnome-with-unstable

Deleted: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/autogen.sh	2016-10-27 01:52:09 UTC (rev 154308)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/autogen.sh	2016-10-28 12:00:24 UTC (rev 154352)
@@ -1,43 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/ChangeLog \
-  && test -d $srcdir/calendar) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level evolution-data-server directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd $srcdir
-
-check_exists() {
-	variable=`which $1`
-
-	if test -z $variable; then
-		echo "*** No $1 found, please intall it ***" >&2
-		exit 1
-	fi
-}
-
-check_exists aclocal
-check_exists autoreconf
-check_exists gtkdocize
-check_exists intltoolize
-
-m4dir=`autoconf --trace 'AC_CONFIG_MACRO_DIR:$1'`
-if [ -n "$m4dir" ]; then
-	mkdir -p $m4dir
-fi
-
-aclocal -I m4 || exit $?
-gtkdocize --copy || exit $?
-intltoolize --force --copy --automake || exit $?
-autoreconf --verbose --force --install -Wno-portability || exit $?
-
-cd $olddir
-test -n "$NOCONFIGURE" || "$srcdir/configure" --disable-maintainer-mode "$@"

Modified: users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff	2016-10-27 01:52:09 UTC (rev 154308)
+++ users/devans/GNOME-3/unstable/dports/gnome/evolution-data-server/files/patch-addressbook-libebook-contacts-e-phone-number-private.cpp.diff	2016-10-28 12:00:24 UTC (rev 154352)
@@ -1,6 +1,6 @@
---- addressbook/libebook-contacts/e-phone-number-private.cpp.orig	2014-11-19 05:53:26.000000000 -0800
-+++ addressbook/libebook-contacts/e-phone-number-private.cpp	2014-11-28 13:09:52.000000000 -0800
-@@ -120,9 +120,13 @@
+--- src/addressbook/libebook-contacts/e-phone-number-private.cpp.orig	2014-11-19 05:53:26.000000000 -0800
++++ src/addressbook/libebook-contacts/e-phone-number-private.cpp	2014-11-28 13:09:52.000000000 -0800
+@@ -118,9 +118,13 @@
  	/* Extract two-letter country code from current locale id if needed.
  	 * From outside this is a C library, so we better consult the
           * C infrastructure instead of std::locale, which might divert. */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161028/baef16ba/attachment-0002.html>


More information about the macports-changes mailing list