Attachment 312272 Details for Bug 456113 – bye-bye-camel.patch

[patch] bye-bye-camel.patch

bye-bye-camel.patch (text/plain), 4.65 KB, created by Daniel Drake on 2008-07-21 15:54:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Drake

Created: 2008-07-21 15:54:41 UTC

Size: 4.65 KB

patch

obsolete

>Index: totem-pl-parser-2.23.2/plparse/totem-pl-parser.c
>===================================================================
>--- totem-pl-parser-2.23.2.orig/plparse/totem-pl-parser.c
>+++ totem-pl-parser-2.23.2/plparse/totem-pl-parser.c
>@@ -103,7 +103,9 @@
> #ifndef TOTEM_PL_PARSER_MINI
> #include <gobject/gvaluecollector.h>
> #include <gtk/gtk.h>
>+#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT
> #include <camel/camel-mime-utils.h>
>+#endif
> 
> #include "totem-pl-parser.h"
> #include "totemplparser-marshal.h"
>@@ -1733,7 +1735,11 @@ totem_pl_parser_parse_date (const char *
> 	D(g_message ("Failed to parse duration '%s' using the ISO8601 parser", date_str));
> 
> 	/* Fall back to RFC 2822 date parsing */
>+#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT
> 	return camel_header_decode_date (date_str, NULL);
>+#else
>+	return 0;
>+#endif
> }
> 
> #endif /* !TOTEM_PL_PARSER_MINI */
>Index: totem-pl-parser-2.23.2/configure
>===================================================================
>--- totem-pl-parser-2.23.2.orig/configure
>+++ totem-pl-parser-2.23.2/configure
>@@ -22062,12 +22062,12 @@ if test -n "$TOTEM_PLPARSER_CFLAGS"; the
>     pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS"
>  elif test -n "$PKG_CONFIG"; then
>     if test -n "$PKG_CONFIG" && \
>-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5
>-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null`
>+  pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
> else
>   pkg_failed=yes
> fi
>@@ -22078,12 +22078,12 @@ if test -n "$TOTEM_PLPARSER_LIBS"; then
>     pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS"
>  elif test -n "$PKG_CONFIG"; then
>     if test -n "$PKG_CONFIG" && \
>-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5
>-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-  pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null`
>+  pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
> else
>   pkg_failed=yes
> fi
>@@ -22101,14 +22101,14 @@ else
>         _pkg_short_errors_supported=no
> fi
>         if test $_pkg_short_errors_supported = yes; then
>-	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1`
>+	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1`
>         else
>-	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1`
>+	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1`
>         fi
> 	# Put the nasty error message in config.log where it belongs
> 	echo "$TOTEM_PLPARSER_PKG_ERRORS" >&5
> 
>-	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met:
>+	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met:
> 
> $TOTEM_PLPARSER_PKG_ERRORS
> 
>@@ -22119,7 +22119,7 @@ Alternatively, you may set the environme
> and TOTEM_PLPARSER_LIBS to avoid the need to call pkg-config.
> See the pkg-config man page for more details.
> " >&5
>-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met:
>+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met:
> 
> $TOTEM_PLPARSER_PKG_ERRORS
>

Actions: View | Diff

Attachments on bug 456113: 312272 | 312273