diff options
| author |   Tom Martin <slarti@gentoo.org> | 2006-04-08 10:51:45 +0000 |
|---|---|---|
| committer | Tom Martin <slarti@gentoo.org> | 2006-04-08 10:51:45 +0000 |
| commit | 74e8b0389709f8c464a386de011265c0b46798f1 (patch) | |
| tree | ff592c4a6c4496c48c712b8b24a44f0e26f38f48 /mail-client/mail-notification/files | |
| parent | Fixing compilation on gcc-4.1 (diff) | |
| download | historical-74e8b0389709f8c464a386de011265c0b46798f1.tar.gz historical-74e8b0389709f8c464a386de011265c0b46798f1.tar.bz2 historical-74e8b0389709f8c464a386de011265c0b46798f1.zip | |
Add a few ebuild fixes for Evolution 2.6; thanks to Ben Davis <ben@xsusio.com> in bug #127430. The ebuilds should now scale better to future versions of Evolution.
Package-Manager: portage-2.1_pre7-r4
Diffstat (limited to 'mail-client/mail-notification/files')
| -rw-r--r-- | mail-client/mail-notification/files/mail-notification-2.0-evolution-2.6.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.6.diff b/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.6.diff new file mode 100644 index 000000000000..2b853f5569a1 --- /dev/null +++ b/mail-client/mail-notification/files/mail-notification-2.0-evolution-2.6.diff @@ -0,0 +1,52 @@ +--- configure.orig Mon Oct 24 10:40:20 2005 ++++ configure Mon Oct 24 10:40:46 2005 +@@ -24784,12 +24784,12 @@ + if test "x$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_set" = "xset"; then + pkg_cv_EVOLUTION_PLUGIN_CFLAGS=$ac_cv_env_EVOLUTION_PLUGIN_CFLAGS_value + elif test -n "$PKG_CONFIG"; then +- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 +- ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24807,12 +24807,12 @@ + if test "x$ac_cv_env_EVOLUTION_PLUGIN_LIBS_set" = "xset"; then + pkg_cv_EVOLUTION_PLUGIN_LIBS=$ac_cv_env_EVOLUTION_PLUGIN_LIBS_value + elif test -n "$PKG_CONFIG"; then +- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 +- ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 ++ if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5 ++ ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null` ++ pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -24824,7 +24824,7 @@ + echo "${ECHO_T}$pkg_cv_EVOLUTION_PLUGIN_LIBS" >&6 + + if test $pkg_failed = yes; then +- EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"` ++ EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"` + # Put the nasty error message in config.log where it belongs + echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5 + +@@ -24841,7 +24841,7 @@ + if test $found = yes; then + echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5 + echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6 +- evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null` ++ evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 2>/dev/null` + if test -n "$evolution_plugindir"; then + echo "$as_me:$LINENO: result: $evolution_plugindir" >&5 + echo "${ECHO_T}$evolution_plugindir" >&6 |