fada318095
- New BR: libgweather-devel - Remove patch for GNOME bug #552583 (fixed upstream). - Bump the gtkhtml and gtk2 minimum versions.
74 lines
4.7 KiB
Diff
74 lines
4.7 KiB
Diff
diff -up evolution-2.25.3.1/configure.in.libgweather evolution-2.25.3.1/configure.in
|
|
--- evolution-2.25.3.1/configure.in.libgweather 2008-12-15 11:50:21.000000000 -0500
|
|
+++ evolution-2.25.3.1/configure.in 2008-12-15 11:50:57.000000000 -0500
|
|
@@ -43,7 +43,7 @@ m4_define([dbus_minimum_version], [1.0.0
|
|
m4_define([hal_minimum_version], [0.5.4])
|
|
m4_define([libnotify_minimum_version], [0.3.0])
|
|
m4_define([gnome_pilot_minimum_version], [2.0.15])
|
|
-m4_define([gweather_minimum_version], [2.25.3])
|
|
+m4_define([gweather_minimum_version], [2.25.2])
|
|
|
|
# GNOME Documentation
|
|
GNOME_DOC_INIT
|
|
diff -up evolution-2.25.3.1/configure.libgweather evolution-2.25.3.1/configure
|
|
--- evolution-2.25.3.1/configure.libgweather 2008-12-15 11:50:26.000000000 -0500
|
|
+++ evolution-2.25.3.1/configure 2008-12-15 11:52:43.000000000 -0500
|
|
@@ -32935,11 +32935,11 @@ if test -n "$LIBGWEATHER_CFLAGS"; then
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5
|
|
- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5
|
|
+ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; then
|
|
- pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.3" 2>/dev/null`
|
|
+ pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.2" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -32950,12 +32950,12 @@ if test -n "$LIBGWEATHER_LIBS"; then
|
|
pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
|
|
elif test -n "$PKG_CONFIG"; then
|
|
if test -n "$PKG_CONFIG" && \
|
|
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5
|
|
- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5
|
|
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.2\"") >&5
|
|
+ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5
|
|
ac_status=$?
|
|
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
(exit $ac_status); }; then
|
|
- pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.3" 2>/dev/null`
|
|
+ pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.2" 2>/dev/null`
|
|
else
|
|
pkg_failed=yes
|
|
fi
|
|
@@ -32973,21 +32973,21 @@ else
|
|
_pkg_short_errors_supported=no
|
|
fi
|
|
if test $_pkg_short_errors_supported = yes; then
|
|
- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.3" 2>&1`
|
|
+ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.2" 2>&1`
|
|
else
|
|
- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.3" 2>&1`
|
|
+ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.2" 2>&1`
|
|
fi
|
|
# Put the nasty error message in config.log where it belongs
|
|
echo "$LIBGWEATHER_PKG_ERRORS" >&5
|
|
|
|
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
|
$as_echo "no" >&6; }
|
|
- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
|
|
-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
|
|
+ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
|
|
+$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
elif test $pkg_failed = untried; then
|
|
- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
|
|
-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
|
|
+ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
|
|
+$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
|
|
{ (exit 1); exit 1; }; }
|
|
else
|
|
LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS
|