Revision

107456

Author

jeremyhu@macports.org

Date

2013-06-29 13:42:16 -0700 (Sat, 29 Jun 2013)

Log Message

evolution-data-server: Fix build failures (missing gthread-2.0 dependency)

Modified Paths

• trunk/dports/gnome/evolution-data-server/Portfile
• trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff

Diff

--- trunk/dports/gnome/evolution-data-server/Portfile	2013-06-29 20:27:51 UTC (rev 107455)
+++ trunk/dports/gnome/evolution-data-server/Portfile	2013-06-29 20:42:16 UTC (rev 107456)
@@ -5,6 +5,7 @@
 
 name            evolution-data-server
 version         2.32.3
+
 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 \

--- trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff	2013-06-29 20:27:51 UTC (rev 107455)
+++ trunk/dports/gnome/evolution-data-server/files/patch-configure.ac.diff	2013-06-29 20:42:16 UTC (rev 107456)
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2011-04-21 12:35:37.000000000 -0700
-+++ configure.ac	2013-05-09 15:04:51.000000000 -0700
-@@ -20,7 +20,7 @@
++++ configure.ac	2013-06-29 13:30:30.000000000 -0700
+@@ -20,7 +20,7 @@ m4_define([api_version], [1.2])
  dnl Autoconf / Automake Initialization
  AC_PREREQ(2.58)
  AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
@@ -9,7 +9,7 @@
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_SRCDIR(README)
  AC_CONFIG_HEADERS(config.h)
-@@ -164,8 +164,7 @@
+@@ -164,8 +164,7 @@ dnl ******************************
  dnl Compiler Warning Flags
  dnl ******************************
  AS_COMPILER_FLAGS(WARNING_FLAGS,
@@ -19,7 +19,7 @@
  	-DGDK_PIXBUF_DISABLE_DEPRECATED
  	-DGTK_DISABLE_DEPRECATED
  	-DG_DISABLE_SINGLE_INCLUDES
-@@ -199,7 +198,7 @@
+@@ -199,7 +198,7 @@ dnl	-Wstrict-aliasing=2
  AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
  AC_SUBST(AM_CPPFLAGS)
  
@@ -28,7 +28,13 @@
  
  dnl ******************************
  dnl Initialize maintainer mode
-@@ -325,11 +324,13 @@
+@@ -320,16 +319,19 @@ dnl ***********************************
+ PKG_CHECK_MODULES(GNOME_PLATFORM,
+ 	[gio-2.0 >= glib_minimum_version
+ 	$GTK_MODULE
++	gthread-2.0 >= glib_minimum_version
+ 	gconf-2.0 >= gconf_minimum_version
+ 	libxml-2.0 >= libxml_minimum_version
  	libsoup-2.4 >= libsoup_minimum_version
  	libgdata >= libgdata_minimum_version])
  
@@ -45,7 +51,7 @@
  
  LIBICAL_REQUIRED=libical_minimum_version
  AC_SUBST(LIBICAL_REQUIRED)
-@@ -337,8 +338,8 @@
+@@ -337,8 +339,8 @@ AC_SUBST(LIBICAL_REQUIRED)
  dnl ******************************
  dnl regex check
  dnl ******************************
@@ -56,7 +62,7 @@
  			AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
  			[AC_MSG_ERROR([No regex library found])])])
  AC_SUBST(REGEX_LIBS)
-@@ -351,8 +352,8 @@
+@@ -351,8 +353,8 @@ AC_ARG_WITH([libdb],
  	[Prefix where libdb is installed]),
  	[libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
  
@@ -67,3 +73,12 @@
  
  AC_MSG_CHECKING([Berkeley DB])
  save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
+@@ -1283,7 +1285,7 @@ dnl ******************************
+ LIBSOUP_REQUIRED=libsoup_minimum_version
+ AC_SUBST(LIBSOUP_REQUIRED)
+ 
+-EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.4)
++EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.4 gthread-2.0)
+ AC_SUBST(SOUP_CFLAGS)
+ AC_SUBST(SOUP_LIBS)
+