evolution-1.3.5.1 patches

["Joseph E. Sacco, PhD" <joseph_sacco comcast net>]

The evolution configuration file looks for mozilla-nss and mozilla-nspr
rather than for firefox-nss and firefox-nspr. "We" corrected this
"problem" for evolution-data-server so "we" might as well correct it for
evolution.  The patched files are attached below.

NOTE:
The path to the firefox libraries will still have to be added to
LD_LIBRARY_PATH.

-Joseph

-- 
joseph_sacco [at] comcast [dot] net

2271c695677a8bf8c3c96ec883a05d12  download/evolution-2.3.5.1.tar.bz2
cf33e0e81c13ebed6572b276bfa1e974  download/garnome-fixes.diff

--- evolution-2.3.5.1/configure-	2005-07-24 12:23:07.000000000 -0400
+++ evolution-2.3.5.1/configure	2005-07-24 12:24:33.000000000 -0400
@@ -28486,7 +28486,7 @@ if test "x${enable_nss}" = "xyes" || tes
 		check_manually="no"
 	fi
 
-	if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
+	if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists firefox-nss`; then
 
 pkg_failed=no
 echo "$as_me:$LINENO: checking for NSS_CFLAGS" >&5
@@ -28497,12 +28497,12 @@ else
   if test "x$ac_cv_env_NSS_CFLAGS_set" = "xset"; then
 	pkg_cv_NSS_CFLAGS=$ac_cv_env_NSS_CFLAGS_value
 elif test -n "$PKG_CONFIG"; then
-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"mozilla-nss\" >/dev/null 2>&1") >&5
-  ($PKG_CONFIG --exists "mozilla-nss" >/dev/null 2>&1) 2>&5
+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"firefox-nss\" >/dev/null 2>&1") >&5
+  ($PKG_CONFIG --exists "firefox-nss" >/dev/null 2>&1) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-		pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-nss" 2>/dev/null`
+		pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "firefox-nss" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -28520,12 +28520,12 @@ else
   if test "x$ac_cv_env_NSS_LIBS_set" = "xset"; then
 	pkg_cv_NSS_LIBS=$ac_cv_env_NSS_LIBS_value
 elif test -n "$PKG_CONFIG"; then
-	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"mozilla-nss\" >/dev/null 2>&1") >&5
-  ($PKG_CONFIG --exists "mozilla-nss" >/dev/null 2>&1) 2>&5
+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"firefox-nss\" >/dev/null 2>&1") >&5
+  ($PKG_CONFIG --exists "firefox-nss" >/dev/null 2>&1) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-		pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "mozilla-nss" 2>/dev/null`
+		pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "firefox-nss" 2>/dev/null`
 	else
 		pkg_failed=yes
 	fi
@@ -28537,18 +28537,18 @@ echo "$as_me:$LINENO: result: $pkg_cv_NS
 echo "${ECHO_T}$pkg_cv_NSS_LIBS" >&6
 
 if test $pkg_failed = yes; then
-	NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-nss"`
+	NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-nss"`
 	# Put the nasty error message in config.log where it belongs
 	echo "$NSS_PKG_ERRORS" 1>&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (mozilla-nss) were not met.
+	{ { echo "$as_me:$LINENO: error: Package requirements (firefox-nss) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
 Alternatively you may set the NSS_CFLAGS and NSS_LIBS environment variables
 to avoid the need to call pkg-config.  See the pkg-config man page for
 more details." >&5
-echo "$as_me: error: Package requirements (mozilla-nss) were not met.
+echo "$as_me: error: Package requirements (firefox-nss) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
@@ -28593,8 +28593,8 @@ _ACEOF
 
 				msg_smime="yes (Mozilla NSS)"
 			fi
-			mozilla_nspr="mozilla-nspr"
-			mozilla_nss="mozilla-nss"
+			mozilla_nspr="firefox-nspr"
+			mozilla_nss="firefox-nss"
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_NSS 1

GARNAME = evolution
GARVERSION = 2.3.5.1
CATEGORIES = desktop
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
PATCHFILES = garnome-fixes.diff

LIBDEPS = desktop/libsoup desktop/evolution-data-server desktop/gtkhtml office/gnome-pilot-conduits office/gnome-spell freedesktop/dbus #mono/mono

DESCRIPTION = evolution
MAINTAINER = Karsten Br�elmann <guenther rudersport de>
define BLURB
The Evolution Groupware / Personal Information Manager Suite
endef

CONFIGURE_SCRIPTS = $(WORKSRC)/configure
BUILD_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = $(WORKSRC)/Makefile

CONFIGURE_ARGS = $(DIRPATHS) --enable-pilot-conduits=yes --enable-nss --disable-openssl --with-openldap --without-openssl-includes --without-openssl-libs --without-kde-applnk-path

include ../category.mk

CONFIGURE_ARGS := $(shell echo $(CONFIGURE_ARGS) | sed 's,--disable-debug,--enable-debug,')