callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debian/patches/31_no-audio-inline.patch: Doesn't apply cleanly

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@434 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2006-05-28 14:34:34 +00:00
parent a363bd8c25
commit 2af7ea94a9
2 changed files with 2 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -11,8 +11,9 @@ evolution (2.7.2-1) UNRELEASED; urgency=low
cleanly
* debian/patches/20_xulrunner.patch: Fixed upstream
* debian/patches/30_no-ipod-sync.patch: Doesn't apply cleanly
* debian/patches/31_no-audio-inline.patch: Doesn't apply cleanly
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 16:31:12 +0200
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 16:33:27 +0200
evolution (2.6.1-4) UNRELEASED; urgency=low

219
debian/patches/31_no-audio-inline.patch vendored
View File

@ -1,219 +0,0 @@
diff -ru evolution-2.6.1.orig/configure evolution-2.6.1/configure
--- evolution-2.6.1.orig/configure 2006-04-19 14:53:01.000000000 +0200
+++ evolution-2.6.1/configure 2006-04-19 14:55:40.000000000 +0200
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT BASE_VERSION UPGRADE_REVISION DEVELOPMENT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE localedir ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OS_WIN32_TRUE OS_WIN32_FALSE NO_UNDEFINED SOEXT ICONV_CFLAGS ICONV_LIBS PURIFY ENABLE_PURIFY_TRUE ENABLE_PURIFY_FALSE ENABLE_TEST_COMPONENT_TRUE ENABLE_TEST_COMPONENT_FALSE PKG_CONFIG ac_pt_PKG_CONFIG GIT_CFLAGS GIT_LIBS A11Y_CFLAGS A11Y_LIBS LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE ENABLE_NNTP_TRUE ENABLE_NNTP_FALSE ENABLE_IMAPP_TRUE ENABLE_IMAPP_FALSE ENABLE_IMAP4_TRUE ENABLE_IMAP4_FALSE PTHREAD_LIB THREADS_LIBS THREADS_CFLAGS REGEX_LIBS GTKHTML_CFLAGS GTKHTML_LIBS GTKHTML_DATADIR GNOME_PILOT_CFLAGS GNOME_PILOT_LIBS ENABLE_PILOT_CONDUITS_TRUE ENABLE_PILOT_CONDUITS_FALSE KRB5_CFLAGS KRB5_LDFLAGS KRB4_CFLAGS KRB4_LDFLAGS NSS_CFLAGS NSS_LIBS ENABLE_SMIME_TRUE ENABLE_SMIME_FALSE MANUAL_NSPR_CFLAGS MANUAL_NSPR_LIBS MANUAL_NSS_CFLAGS MANUAL_NSS_LIBS ENABLE_EXCHANGE_TRUE ENABLE_EXCHANGE_FALSE DTAPPINTEGRATE HAVE_DTAPPINTEGRATE_TRUE HAVE_DTAPPINTEGRATE_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS WARN_CFLAGS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS IDL_INCLUDES GTKHTML_REQUIRED GTKHTML_PACKAGE EDS_REQUIRED EDS_PACKAGE BONOBOUI_REQUIRED GNOME_VFS_REQUIRED GNOME_FULL_CFLAGS GNOME_FULL_LIBS EXTRA_GNOME_CFLAGS EXTRA_GNOME_LIBS CAMEL_CFLAGS CAMEL_LIBS CAMEL_GROUPWISE_CFLAGS CAMEL_GROUPWISE_LIBS MOZILLA_NSS_CFLAGS MOZILLA_NSS_LIBS CERT_UI_CFLAGS CERT_UI_LIBS E_NAME_CFLAGS E_NAME_LIBS E_UTIL_CFLAGS E_UTIL_LIBS TZDIALOG_CFLAGS TZDIALOG_LIBS E_WIDGETS_CFLAGS E_WIDGETS_LIBS IMPORTERS_CFLAGS IMPORTERS_LIBS LIBFILTER_CFLAGS LIBFILTER_LIBS NM_CFLAGS NM_LIBS NM_SUPPORT_GLIB_TRUE NM_SUPPORT_GLIB_FALSE NM_SUPPORT_TRUE NM_SUPPORT_FALSE SHELL_CFLAGS SHELL_LIBS EVOLUTION_ADDRESSBOOK_CFLAGS EVOLUTION_ADDRESSBOOK_LIBS EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS SOUPTEMP_CFLAGS SOUPTEMP_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS EVOLUTION_CALENDAR_CFLAGS EVOLUTION_CALENDAR_LIBS EVOLUTION_CALENDAR_CONDUIT_CFLAGS EVOLUTION_CALENDAR_CONDUIT_LIBS EVOLUTION_MAIL_CFLAGS EVOLUTION_MAIL_LIBS DATASERVER_EXEC_VERSION DATASERVER_IDL EVOLUTION_TEST_CFLAGS EVOLUTION_TEST_LIBS privlibdir privlibexecdir privdatadir privincludedir componentdir idldir serverdir evolutionuidir evolutionhelpdir imagesdir images16dir privsolibdir bindir_in_server_file privlibexecdir_in_server_file componentdir_in_server_file images48dir soundsdir gladedir etspecdir viewsdir privconduitdir INTERFACE_VERSION plugindir plugins_enabled all_plugins_base all_plugins_standard all_plugins_experimental GSTREAMER_CFLAGS GSTREAMER_LIBS NMN_CFLAGS NMN_LIBS DBUS_VERSION CAMEL_EXCHANGE_CFLAGS CAMEL_EXCHANGE_LIBS HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE DEFAULT_BINARY_TRUE DEFAULT_BINARY_FALSE HAVE_KDE_APPLNK_TRUE HAVE_KDE_APPLNK_FALSE KDE_APPLNK_DIR EVOLUTION_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT BASE_VERSION UPGRADE_REVISION DEVELOPMENT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE localedir ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL OS_WIN32_TRUE OS_WIN32_FALSE NO_UNDEFINED SOEXT ICONV_CFLAGS ICONV_LIBS PURIFY ENABLE_PURIFY_TRUE ENABLE_PURIFY_FALSE ENABLE_TEST_COMPONENT_TRUE ENABLE_TEST_COMPONENT_FALSE PKG_CONFIG ac_pt_PKG_CONFIG GIT_CFLAGS GIT_LIBS A11Y_CFLAGS A11Y_LIBS LDAP_CFLAGS LDAP_LIBS ENABLE_LDAP_TRUE ENABLE_LDAP_FALSE ENABLE_NNTP_TRUE ENABLE_NNTP_FALSE ENABLE_IMAPP_TRUE ENABLE_IMAPP_FALSE ENABLE_IMAP4_TRUE ENABLE_IMAP4_FALSE PTHREAD_LIB THREADS_LIBS THREADS_CFLAGS REGEX_LIBS GTKHTML_CFLAGS GTKHTML_LIBS GTKHTML_DATADIR GNOME_PILOT_CFLAGS GNOME_PILOT_LIBS ENABLE_PILOT_CONDUITS_TRUE ENABLE_PILOT_CONDUITS_FALSE KRB5_CFLAGS KRB5_LDFLAGS KRB4_CFLAGS KRB4_LDFLAGS NSS_CFLAGS NSS_LIBS ENABLE_SMIME_TRUE ENABLE_SMIME_FALSE MANUAL_NSPR_CFLAGS MANUAL_NSPR_LIBS MANUAL_NSS_CFLAGS MANUAL_NSS_LIBS ENABLE_EXCHANGE_TRUE ENABLE_EXCHANGE_FALSE DTAPPINTEGRATE HAVE_DTAPPINTEGRATE_TRUE HAVE_DTAPPINTEGRATE_FALSE GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS WARN_CFLAGS ORBIT_CONFIG ORBIT_IDL ORBIT_CFLAGS ORBIT_LIBS IDL_INCLUDES GTKHTML_REQUIRED GTKHTML_PACKAGE EDS_REQUIRED EDS_PACKAGE BONOBOUI_REQUIRED GNOME_VFS_REQUIRED GNOME_FULL_CFLAGS GNOME_FULL_LIBS EXTRA_GNOME_CFLAGS EXTRA_GNOME_LIBS CAMEL_CFLAGS CAMEL_LIBS CAMEL_GROUPWISE_CFLAGS CAMEL_GROUPWISE_LIBS MOZILLA_NSS_CFLAGS MOZILLA_NSS_LIBS CERT_UI_CFLAGS CERT_UI_LIBS E_NAME_CFLAGS E_NAME_LIBS E_UTIL_CFLAGS E_UTIL_LIBS TZDIALOG_CFLAGS TZDIALOG_LIBS E_WIDGETS_CFLAGS E_WIDGETS_LIBS IMPORTERS_CFLAGS IMPORTERS_LIBS LIBFILTER_CFLAGS LIBFILTER_LIBS NM_CFLAGS NM_LIBS NM_SUPPORT_GLIB_TRUE NM_SUPPORT_GLIB_FALSE NM_SUPPORT_TRUE NM_SUPPORT_FALSE SHELL_CFLAGS SHELL_LIBS EVOLUTION_ADDRESSBOOK_CFLAGS EVOLUTION_ADDRESSBOOK_LIBS EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS SOUPTEMP_CFLAGS SOUPTEMP_LIBS LIBSOUP_CFLAGS LIBSOUP_LIBS EVOLUTION_CALENDAR_CFLAGS EVOLUTION_CALENDAR_LIBS EVOLUTION_CALENDAR_CONDUIT_CFLAGS EVOLUTION_CALENDAR_CONDUIT_LIBS EVOLUTION_MAIL_CFLAGS EVOLUTION_MAIL_LIBS DATASERVER_EXEC_VERSION DATASERVER_IDL EVOLUTION_TEST_CFLAGS EVOLUTION_TEST_LIBS privlibdir privlibexecdir privdatadir privincludedir componentdir idldir serverdir evolutionuidir evolutionhelpdir imagesdir images16dir privsolibdir bindir_in_server_file privlibexecdir_in_server_file componentdir_in_server_file images48dir soundsdir gladedir etspecdir viewsdir privconduitdir INTERFACE_VERSION plugindir plugins_enabled all_plugins_base all_plugins_standard all_plugins_experimental NMN_CFLAGS NMN_LIBS DBUS_VERSION CAMEL_EXCHANGE_CFLAGS CAMEL_EXCHANGE_LIBS HTML_DIR GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE DEFAULT_BINARY_TRUE DEFAULT_BINARY_FALSE HAVE_KDE_APPLNK_TRUE HAVE_KDE_APPLNK_FALSE KDE_APPLNK_DIR EVOLUTION_DIR LIBOBJS LTLIBOBJS'
ac_subst_files='EVO_MARSHAL_RULE EVO_SERVER_RULE EVO_PLUGIN_RULE'
# Initialize some variables set by options.
@@ -1174,14 +1174,6 @@
ac_env_EVOLUTION_TEST_LIBS_value=$EVOLUTION_TEST_LIBS
ac_cv_env_EVOLUTION_TEST_LIBS_set=${EVOLUTION_TEST_LIBS+set}
ac_cv_env_EVOLUTION_TEST_LIBS_value=$EVOLUTION_TEST_LIBS
-ac_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
-ac_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
-ac_cv_env_GSTREAMER_CFLAGS_set=${GSTREAMER_CFLAGS+set}
-ac_cv_env_GSTREAMER_CFLAGS_value=$GSTREAMER_CFLAGS
-ac_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
-ac_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
-ac_cv_env_GSTREAMER_LIBS_set=${GSTREAMER_LIBS+set}
-ac_cv_env_GSTREAMER_LIBS_value=$GSTREAMER_LIBS
ac_env_NMN_CFLAGS_set=${NMN_CFLAGS+set}
ac_env_NMN_CFLAGS_value=$NMN_CFLAGS
ac_cv_env_NMN_CFLAGS_set=${NMN_CFLAGS+set}
@@ -1463,10 +1455,6 @@
C compiler flags for EVOLUTION_TEST, overriding pkg-config
EVOLUTION_TEST_LIBS
linker flags for EVOLUTION_TEST, overriding pkg-config
- GSTREAMER_CFLAGS
- C compiler flags for GSTREAMER, overriding pkg-config
- GSTREAMER_LIBS
- linker flags for GSTREAMER, overriding pkg-config
NMN_CFLAGS C compiler flags for NMN, overriding pkg-config
NMN_LIBS linker flags for NMN, overriding pkg-config
CAMEL_EXCHANGE_CFLAGS
@@ -33564,7 +33552,7 @@
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN"
all_plugins_base="$plugins_base_always sa-junk-plugin exchange-operations mono"
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments"
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline mailing-list-actions new-mail-notify default-mailer import-ics-attachments"
plugins_standard="$plugins_standard_always"
all_plugins_standard="$plugins_standard"
@@ -33621,118 +33609,6 @@
-
-
-
-if echo ${plugins_enabled} | grep "audio-inline" > /dev/null
-then
- if ${PKG_CONFIG} --exists gstreamer-0.8
- then
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for GSTREAMER_CFLAGS" >&5
-echo $ECHO_N "checking for GSTREAMER_CFLAGS... $ECHO_C" >&6
-if test "${pkg_cv_GSTREAMER_CFLAGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$ac_cv_env_GSTREAMER_CFLAGS_set" = "xset"; then
- pkg_cv_GSTREAMER_CFLAGS=$ac_cv_env_GSTREAMER_CFLAGS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gstreamer-0.8\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "gstreamer-0.8" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-else
- pkg_failed=untried
-fi
-fi
-echo "$as_me:$LINENO: result: $pkg_cv_GSTREAMER_CFLAGS" >&5
-echo "${ECHO_T}$pkg_cv_GSTREAMER_CFLAGS" >&6
-echo "$as_me:$LINENO: checking for GSTREAMER_LIBS" >&5
-echo $ECHO_N "checking for GSTREAMER_LIBS... $ECHO_C" >&6
-if test "${pkg_cv_GSTREAMER_LIBS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$ac_cv_env_GSTREAMER_LIBS_set" = "xset"; then
- pkg_cv_GSTREAMER_LIBS=$ac_cv_env_GSTREAMER_LIBS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"gstreamer-0.8\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "gstreamer-0.8" >/dev/null 2>&1) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.8" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-else
- pkg_failed=untried
-fi
-fi
-echo "$as_me:$LINENO: result: $pkg_cv_GSTREAMER_LIBS" >&5
-echo "${ECHO_T}$pkg_cv_GSTREAMER_LIBS" >&6
-
-if test $pkg_failed = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.8"`
- # Put the nasty error message in config.log where it belongs
- echo "$GSTREAMER_PKG_ERRORS" 1>&5
-
- { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.8) 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 GSTREAMER_CFLAGS and GSTREAMER_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 (gstreamer-0.8) 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 GSTREAMER_CFLAGS and GSTREAMER_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GSTREAMER_CFLAGS and GSTREAMER_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GSTREAMER_CFLAGS and GSTREAMER_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-else
- GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
- GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
- :
-fi
-
-
- else
- plugins_enabled=`echo $plugins_enabled | sed -e "s/audio-inline//g"`
- echo "warning: gstreamer was not found, audio-inline plugin will not be built."
- echo "you are probably missing gstreamer-devel package."
- fi
-fi
-
if echo ${plugins_enabled} | grep "new-mail-notify" > /dev/null ; then
if ${PKG_CONFIG} --exists dbus-glib-1 ; then
@@ -35428,8 +35304,6 @@
s,@all_plugins_base@,$all_plugins_base,;t t
s,@all_plugins_standard@,$all_plugins_standard,;t t
s,@all_plugins_experimental@,$all_plugins_experimental,;t t
-s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t
-s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t
s,@NMN_CFLAGS@,$NMN_CFLAGS,;t t
s,@NMN_LIBS@,$NMN_LIBS,;t t
s,@DBUS_VERSION@,$DBUS_VERSION,;t t
diff -ru evolution-2.6.1.orig/configure.in evolution-2.6.1/configure.in
--- evolution-2.6.1.orig/configure.in 2006-04-19 14:53:01.000000000 +0200
+++ evolution-2.6.1/configure.in 2006-04-19 14:54:17.000000000 +0200
@@ -1417,7 +1417,7 @@
plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN"
all_plugins_base="$plugins_base_always sa-junk-plugin exchange-operations mono"
-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer import-ics-attachments"
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline mailing-list-actions new-mail-notify default-mailer import-ics-attachments"
plugins_standard="$plugins_standard_always"
all_plugins_standard="$plugins_standard"
@@ -1467,23 +1467,6 @@
AC_SUBST(all_plugins_standard)
AC_SUBST(all_plugins_experimental)
-if echo ${plugins_enabled} | grep "audio-inline" > /dev/null
-then
- if ${PKG_CONFIG} --exists gstreamer-0.8
- then
- dnl *********************
- dnl gstreamer
- dnl *********************
- PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.8)
- AC_SUBST(GSTREAMER_CFLAGS)
- AC_SUBST(GSTREAMER_LIBS)
- else
- plugins_enabled=`echo $plugins_enabled | sed -e "s/audio-inline//g"`
- echo "warning: gstreamer was not found, audio-inline plugin will not be built."
- echo "you are probably missing gstreamer-devel package."
- fi
-fi
-
if echo ${plugins_enabled} | grep "new-mail-notify" > /dev/null ; then
if ${PKG_CONFIG} --exists dbus-glib-1 ; then
dnl **************************************************
@@ -1695,7 +1678,6 @@
plugins/calendar-weather/Makefile
plugins/plugin-manager/Makefile
plugins/bbdb/Makefile
-plugins/audio-inline/Makefile
plugins/mail-to-meeting/Makefile
plugins/mail-to-task/Makefile
plugins/mail-remote/Makefile