From d21db05dc8ccc30e4ef8651f9462b2ede083d4a2 Mon Sep 17 00:00:00 2001 From: Marcin Banasiak Date: Fri, 16 Oct 2009 15:28:57 +0000 Subject: [PATCH] - updated for 2.28.0 Changed files: evolution-gnome-icon-theme.patch -> 1.3 evolution-nolibs.patch -> 1.2 --- evolution-gnome-icon-theme.patch | 20 ++++++++++++-------- evolution-nolibs.patch | 17 +++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/evolution-gnome-icon-theme.patch b/evolution-gnome-icon-theme.patch index 59bc739..f19aadd 100644 --- a/evolution-gnome-icon-theme.patch +++ b/evolution-gnome-icon-theme.patch @@ -1,11 +1,15 @@ -diff -urN evolution-2.11.92/configure.in evolution-2.11.92.new/configure.in ---- evolution-2.11.92/configure.in 2007-09-03 08:49:02.000000000 +0200 -+++ evolution-2.11.92.new/configure.in 2007-09-08 22:03:17.000000000 +0200 -@@ -465,7 +465,6 @@ - dnl ************************************************** - dnl * Gnome Icon Theme - dnl ************************************************** --PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version) +diff -urN evolution-2.28.0/configure.ac evolution-2.28.0.new/configure.ac +--- evolution-2.28.0/configure.ac 2009-09-14 12:33:31.000000000 +0200 ++++ evolution-2.28.0.new/configure.ac 2009-10-15 15:03:52.196822533 +0200 +@@ -519,11 +519,6 @@ + AC_CHECK_FUNCS(statfs) dnl ************************************************** +-dnl * Gnome Icon Theme +-dnl ************************************************** +-PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) +- +-dnl ************************************************** dnl * Accessibility support + dnl ************************************************** + PKG_CHECK_MODULES([A11Y], [atk]) diff --git a/evolution-nolibs.patch b/evolution-nolibs.patch index f002d0d..98432c8 100644 --- a/evolution-nolibs.patch +++ b/evolution-nolibs.patch @@ -1,13 +1,14 @@ ---- evolution-1.4.0/acinclude.m4.orig Mon Apr 7 17:41:13 2003 -+++ evolution-1.4.0/acinclude.m4 Thu Jul 10 11:50:10 2003 -@@ -129,9 +129,9 @@ - AC_MSG_ERROR(evolution requires OpenLDAP version >= 2) +diff -urN evolution-2.28.0/m4/evo_ldap_check.m4 evolution-2.28.0.new/m4/evo_ldap_check.m4 +--- evolution-2.28.0/m4/evo_ldap_check.m4 2009-08-11 13:50:27.000000000 +0200 ++++ evolution-2.28.0.new/m4/evo_ldap_check.m4 2009-10-15 15:01:56.206824013 +0200 +@@ -55,9 +55,9 @@ + AC_MSG_ERROR([evolution requires OpenLDAP version >= 2]) fi -- AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") -- AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket") -- AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl") -+ dnl AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv") +- AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"]) +- AC_CHECK_LIB(socket, bind, [LDAP_LIBS="$LDAP_LIBS -lsocket"]) +- AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"]) ++ dnl AC_CHECK_LIB(resolv, res_query, [LDAP_LIBS="-lresolv"]) + AC_CHECK_FUNC(bind, , [AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")]) + AC_CHECK_FUNC(gethostbyaddr, , [AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")]) AC_CHECK_LIB(lber, ber_get_tag, [ -- 2.44.0