diff --git a/.cvsignore b/.cvsignore
index 77748c7..10c41ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-amarok-1.4.5.tar.bz2
+amarok-1.4.6.tar.bz2
diff --git a/amarok-1.4-engines-cfg.patch b/amarok-1.4-engines-cfg.patch
deleted file mode 100644
index 78b4ef2..0000000
--- a/amarok-1.4-engines-cfg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg
---- amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500
-+++ amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-16 12:15:31.000000000 -0500
-@@ -10,7 +10,7 @@
-
-
- Select the sound output plugin ("sink"). Their availability depends on the system configuration.
-- osssink
-+ autoaudiosink
-
-
-
diff --git a/amarok-1.4.1-gstreamer.patch b/amarok-1.4.1-gstreamer.patch
deleted file mode 100644
index 97e51af..0000000
--- a/amarok-1.4.1-gstreamer.patch
+++ /dev/null
@@ -1,279 +0,0 @@
---- ./amarok/src/engine/Makefile.in.gstreamer 2006-07-02 22:30:04.000000000 +0200
-+++ ./amarok/src/engine/Makefile.in 2006-07-08 14:53:39.000000000 +0200
-@@ -371,7 +371,8 @@
- void \
- $(XINE_ENGINE_SUBDIR) \
- $(NMM_ENGINE_SUBDIR) \
-- $(HELIX_ENGINE_SUBDIR)
-+ $(HELIX_ENGINE_SUBDIR) \
-+ gst10
-
- subdir = amarok/src/engine
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
---- ./configure.gstreamer 2006-07-02 22:29:34.000000000 +0200
-+++ ./configure 2006-07-08 14:58:28.000000000 +0200
-@@ -464,7 +464,7 @@
- # include
- #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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND TAGLIB_CONFIG taglib_includes taglib_libs RUBY XINE_CONFIG with_xine_TRUE with_xine_FALSE CFLAGS_XINE LIBS_XINE with_nmm_TRUE with_nmm_FALSE CFLAGS_NMM LDFLAGS_NMM PKG_CONFIG ALSALIB_CFLAGS ALSALIB_LIBS with_helix_TRUE with_helix_FALSE gl_libs SQLITE_CFLAGS SQLITE_LIBS LIB_SQLITE with_included_sqlite_TRUE with_included_sqlite_FALSE MYSQL_CONFIG enable_mysql_TRUE enable_mysql_FALSE mysql_includes mysql_libs POSTGRESQL_CONFIG enable_postgresql_TRUE enable_postgresql_FALSE postgresql_includes postgresql_libs XMMS_CONFIG xmms_cflags xmms_libs GTK_CONFIG gtk_cflags gtk_libs with_xmmswrapper_TRUE with_xmmswrapper_FALSE SDL_CONFIG sdl_cflags sdl_libs LIBVISUAL_CFLAGS LIBVISUAL_LIBS with_libvisual_TRUE with_libvisual_FALSE LIB_TUNEPIMP with_konqsidebar_TRUE with_konqsidebar_FALSE LIBNJB_CFLAGS LIBNJB_LIBS with_libnjb_TRUE with_libnjb_FALSE IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE MP4V2_INCLUDES MP4V2_LIBS with_mp4v2_TRUE with_mp4v2_FALSE TOPSUBDIRS amarok_SUBDIR_included_TRUE amarok_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN PKGCONFIGFOUND TAGLIB_CONFIG taglib_includes taglib_libs RUBY GST10_CFLAGS GST10_LIBS LIB_GST10 CFLAGS_GST10 GST10_MAJORMINOR with_gst10_TRUE with_gst10_FALSE XINE_CONFIG with_xine_TRUE with_xine_FALSE CFLAGS_XINE LIBS_XINE with_nmm_TRUE with_nmm_FALSE CFLAGS_NMM LDFLAGS_NMM PKG_CONFIG ALSALIB_CFLAGS ALSALIB_LIBS with_helix_TRUE with_helix_FALSE gl_libs SQLITE_CFLAGS SQLITE_LIBS LIB_SQLITE with_included_sqlite_TRUE with_included_sqlite_FALSE MYSQL_CONFIG enable_mysql_TRUE enable_mysql_FALSE mysql_includes mysql_libs POSTGRESQL_CONFIG enable_postgresql_TRUE enable_postgresql_FALSE postgresql_includes postgresql_libs XMMS_CONFIG xmms_cflags xmms_libs GTK_CONFIG gtk_cflags gtk_libs with_xmmswrapper_TRUE with_xmmswrapper_FALSE SDL_CONFIG sdl_cflags sdl_libs LIBVISUAL_CFLAGS LIBVISUAL_LIBS with_libvisual_TRUE with_libvisual_FALSE LIB_TUNEPIMP with_konqsidebar_TRUE with_konqsidebar_FALSE LIBNJB_CFLAGS LIBNJB_LIBS with_libnjb_TRUE with_libnjb_FALSE IFP_INCLUDES IFP_LIBS with_ifp_TRUE with_ifp_FALSE LIBGPOD_CFLAGS LIBGPOD_LIBS with_libgpod_TRUE with_libgpod_FALSE MP4V2_INCLUDES MP4V2_LIBS with_mp4v2_TRUE with_mp4v2_FALSE TOPSUBDIRS amarok_SUBDIR_included_TRUE amarok_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -32731,41 +32731,148 @@
- # BEGIN GSTREAMER-0.10 CHECK
- ###############################################################################
-
--#AC_ARG_WITH(gstreamer10,
--# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
--# [build_gstreamer10=$withval],
--# [build_gstreamer10=no]
--#)
--#
--#if test "$build_gstreamer10" != "no"; then
--# if test "$PKGCONFIGFOUND" = "yes" ; then
--# # check for GStreamer
--# dnl Now we're ready to ask for gstreamer libs and cflags
--# dnl And we can also ask for the right version of gstreamer
--# have_gst10=no
--#
--# GST10_MAJORMINOR=0.10
--# GST10_REQ=0.10.0
--#
--# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
--# have_gst10=yes,have_gst10=no)
--#
--# dnl Give error if we don't have gstreamer
--# if test "x$have_gst10" = "xno"; then
--# LIB_GST10=""
--# CFLAGS_GST10=""
--# else
--# LIB_GST10=$GST10_LIBS
--# CFLAGS_GST10=$GST10_CFLAGS
--# AC_SUBST(LIB_GST10)
--# AC_SUBST(CFLAGS_GST10)
--# AC_SUBST(GST10_MAJORMINOR)
--# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
--# fi
--# fi
--#fi
--#
--#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
-+# Check whether --with-gstreamer10 or --without-gstreamer10 was given.
-+if test "${with_gstreamer10+set}" = set; then
-+ withval="$with_gstreamer10"
-+ build_gstreamer10=$withval
-+else
-+ build_gstreamer10=no
-+
-+fi;
-+
-+if test "$build_gstreamer10" != "no"; then
-+ if test "$PKGCONFIGFOUND" = "yes" ; then
-+ # check for GStreamer
-+ have_gst10=no
-+
-+ GST10_MAJORMINOR=0.10
-+ GST10_REQ=0.10.0
-+
-+
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+
-+if test -n "$PKG_CONFIG"; then
-+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6
-+else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ echo "$as_me:$LINENO: checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" >&5
-+echo $ECHO_N "checking for gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR... $ECHO_C" >&6
-+
-+ if $PKG_CONFIG --exists "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR" ; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ succeeded=yes
-+
-+ echo "$as_me:$LINENO: checking GST10_CFLAGS" >&5
-+echo $ECHO_N "checking GST10_CFLAGS... $ECHO_C" >&6
-+ GST10_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
-+ echo "$as_me:$LINENO: result: $GST10_CFLAGS" >&5
-+echo "${ECHO_T}$GST10_CFLAGS" >&6
-+
-+ echo "$as_me:$LINENO: checking GST10_LIBS" >&5
-+echo $ECHO_N "checking GST10_LIBS... $ECHO_C" >&6
-+ GST10_LIBS=`$PKG_CONFIG --libs "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
-+ echo "$as_me:$LINENO: result: $GST10_LIBS" >&5
-+echo "${ECHO_T}$GST10_LIBS" >&6
-+ else
-+ GST10_CFLAGS=""
-+ GST10_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ GST10_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR"`
-+
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ have_gst10=yes
-+ else
-+ have_gst10=no
-+ fi
-+
-+
-+ if test "x$have_gst10" = "xno"; then
-+ LIB_GST10=""
-+ CFLAGS_GST10=""
-+ else
-+ LIB_GST10=$GST10_LIBS
-+ CFLAGS_GST10=$GST10_CFLAGS
-+
-+
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GSTREAMER10 1
-+_ACEOF
-+
-+ fi
-+ fi
-+fi
-+
-+
-+
-+if test x$have_gst10 = xyes; then
-+ with_gst10_TRUE=
-+ with_gst10_FALSE='#'
-+else
-+ with_gst10_TRUE='#'
-+ with_gst10_FALSE=
-+fi
-+
-
- ###############################################################################
- # END GSTREAMER-0.10 CHECK
-@@ -38052,7 +38159,7 @@
- # BEGIN DO_NOT_COMPILE CHECK
- ###############################################################################
-
--if test x$build_xine = xno -a x$build_helix = xno; then
-+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
-
- DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
- no_engine=yes
-@@ -38174,6 +38281,12 @@
- ac_config_files="$ac_config_files amarok/src/engine/void/Makefile"
-
- ac_config_files="$ac_config_files amarok/src/engine/xine/Makefile"
-+
-+ ac_config_files="$ac_config_files amarok/src/engine/gst10/Makefile"
-+
-+ ac_config_files="$ac_config_files amarok/src/engine/gst10/config/Makefile"
-+
-+ ac_config_files="$ac_config_files amarok/src/engine/gst10/equalizer/Makefile"
-
- ac_config_files="$ac_config_files amarok/src/images/Makefile"
-
-@@ -39084,6 +39197,9 @@
- "amarok/src/engine/nmm/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/nmm/icons/Makefile" ;;
- "amarok/src/engine/void/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/void/Makefile" ;;
- "amarok/src/engine/xine/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/xine/Makefile" ;;
-+ "amarok/src/engine/gst10/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/Makefile" ;;
-+ "amarok/src/engine/gst10/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/config/Makefile" ;;
-+ "amarok/src/engine/gst10/equalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/engine/gst10/equalizer/Makefile" ;;
- "amarok/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/Makefile" ;;
- "amarok/src/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/images/icons/Makefile" ;;
- "amarok/src/konquisidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES amarok/src/konquisidebar/Makefile" ;;
-@@ -39487,6 +39603,13 @@
- s,@taglib_includes@,$taglib_includes,;t t
- s,@taglib_libs@,$taglib_libs,;t t
- s,@RUBY@,$RUBY,;t t
-+s,@GST10_CFLAGS@,$GST10_CFLAGS,;t t
-+s,@GST10_LIBS@,$GST10_LIBS,;t t
-+s,@LIB_GST10@,$LIB_GST10,;t t
-+s,@CFLAGS_GST10@,$CFLAGS_GST10,;t t
-+s,@GST10_MAJORMINOR@,$GST10_MAJORMINOR,;t t
-+s,@with_gst10_TRUE@,$with_gst10_TRUE,;t t
-+s,@with_gst10_FALSE@,$with_gst10_FALSE,;t t
- s,@XINE_CONFIG@,$XINE_CONFIG,;t t
- s,@with_xine_TRUE@,$with_xine_TRUE,;t t
- s,@with_xine_FALSE@,$with_xine_FALSE,;t t
-@@ -40462,9 +40585,9 @@
- # echo " = - aKode-engine"
- # fi
-
--# if test x$have_gst10 != xyes; then
--# echo " = - GStreamer0.10-engine"
--# fi
-+ if test x$have_gst10 != xyes; then
-+ echo " = - GStreamer0.10-engine"
-+ fi
-
- if test x$build_xine != xyes; then
- echo " = - xine-engine"
-@@ -40531,9 +40654,9 @@
- # echo " = + aKode-engine"
- # fi
-
--# if test x$have_gst10 = xyes; then
--# echo " = + GStreamer0.10-engine"
--# fi
-+ if test x$have_gst10 = xyes; then
-+ echo " = + GStreamer0.10-engine"
-+ fi
-
- if test x$build_xine = xyes; then
- echo " = + xine-engine"
diff --git a/amarok-1.4.3-playlist_encoding.patch b/amarok-1.4.3-playlist_encoding.patch
deleted file mode 100644
index 1549996..0000000
--- a/amarok-1.4.3-playlist_encoding.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./amarok/src/playlist.cpp (Revision 583705)
-+++ ./amarok/src/playlist.cpp (Revision 583706)
-@@ -3188,6 +3188,7 @@
- stream << "\n";
-
- QTextStream fstream( &file );
-+ fstream.setEncoding( QTextStream::UnicodeUTF8 );
- fstream << buffer;
- }
-
diff --git a/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch b/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
deleted file mode 100644
index fde2e41..0000000
--- a/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: amarok-1.4.4/amark/src/amarok_proxy.rb
-===================================================================
---- amarok-1.4.4/amarok/src/amarok_proxy.rb (revision 609364)
-+++ amarok-1.4.4/amarok/src/amarok_proxy.rb (revision 609365)
-@@ -117,6 +117,11 @@
- def cp_to_empty_outward( income, output )
- myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}"
- income.each_line do |data|
-+ if data =~ /User-Agent: xine\/([0-9.]+)/
-+ version = $1.split(".").collect { |v| v.to_i }
-+ myputs("Found xine user agent version #{version.join(".")}")
-+ @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 )
-+ end
- myputs( data )
- data.chomp!
- safe_write( output, data )
-@@ -142,7 +147,7 @@
-
- def cp_all_inward( income, output )
- myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" )
-- if self.is_a?( LastFM ) and @engine == 'xine-engine'
-+ if self.is_a?( LastFM ) and @xineworkaround
- myputs( "Using buffer fill workaround." )
- filler = Array.new( 4096, 0 )
- safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block
diff --git a/amarok-1.4.4-libgpod-0.4.2.patch b/amarok-1.4.4-libgpod-0.4.2.patch
deleted file mode 100644
index f57f075..0000000
--- a/amarok-1.4.4-libgpod-0.4.2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- amarok-1.4.4/amarok/src/mediadevice/ipod/ipodmediadevice.cpp.mediatype 2006-10-26 16:40:20.000000000 -0400
-+++ amarok-1.4.4/amarok/src/mediadevice/ipod/ipodmediadevice.cpp 2006-12-14 16:22:41.000000000 -0500
-@@ -302,7 +302,7 @@
- track->genre = g_strdup( metaBundle.genre()->utf8() );
-
-
-- track->unk208 = 0x01; // for audio
-+ track->mediatype = 0x01; // for audio
- if(type=="wav")
- {
- track->filetype = g_strdup( "wav" );
-@@ -323,7 +323,7 @@
- #else
- track->flag3 |= 0x01; // remember current position in track
- #endif
-- track->unk208 = 0x08; // for audiobooks
-+ track->mediatype = 0x08; // for audiobooks
- }
- else if(type=="m4v" || type=="mp4v" || type=="mov" || type=="mpg" || type=="mp4")
- {
-@@ -331,7 +331,7 @@
- #ifdef HAVE_ITDB_SKIP_SHUFFLE_FLAG
- track->movie_flag = 0x01; // for videos
- #endif
-- track->unk208 = 0x02; // for videos
-+ track->mediatype = 0x02; // for videos
- }
- else if(type=="aa")
- {
-@@ -341,7 +341,7 @@
- #else
- track->flag3 |= 0x01; // remember current position in track
- #endif
-- track->unk208 = 0x08; // for audiobooks
-+ track->mediatype = 0x08; // for audiobooks
-
- TagLib::Audible::File f( QFile::encodeName( propertiesBundle.url().path() ) );
- TagLib::Audible::Tag *t = f.getAudibleTag();
-@@ -384,7 +384,7 @@
- #ifdef HAVE_ITDB_MARK_UNPLAYED
- track->mark_unplayed = podcastInfo->listened ? 0x01 : 0x02;
- #endif
-- track->unk208 = track->unk208==0x02 ? 0x06 : 0x04; // video or audio podcast
-+ track->mediatype = track->mediatype==0x02 ? 0x06 : 0x04; // video or audio podcast
- track->flag4 = 0x01; // also show description on iPod
- QString plaindesc = podcastInfo->description;
- plaindesc.replace( QRegExp("<[^>]*>"), "" );
diff --git a/amarok-1.4.5-CVE-2006-6979.patch b/amarok-1.4.5-CVE-2006-6979.patch
deleted file mode 100644
index 46bec40..0000000
--- a/amarok-1.4.5-CVE-2006-6979.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
-===================================================================
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633659)
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp (revision 633677)
-@@ -89,19 +89,19 @@
-
- //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.
-
-- QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &";
-+ QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &";
-
- debug() << "unpacking: " << unzipString << endl;
-
- system( unzipString.ascii() );
-
--
-
-+
- if (m_currentAlbumId != -1 ) {
-
-- //now I really want to add the album cover to the same folder where I just unzipped the album... The
-+ //now I really want to add the album cover to the same folder where I just unzipped the album... The
- //only way of getting the actual location where the album was unpacked is using the artist and album names
--
-+
- MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId );
- MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() );
-
diff --git a/amarok.spec b/amarok.spec
index 03512c7..2c7cb3e 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -3,15 +3,15 @@
Name: amarok
Summary: Media player for KDE
-Version: 1.4.5
-Release: 4%{?dist}
+Version: 1.4.6
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
Url: http://amarok.kde.org
# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
-Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
-Patch0: amarok-1.4.5-CVE-2006-6979.patch
+#Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdemultimedia-devel >= 6:3.2
@@ -81,7 +81,6 @@ use any of xmms' visualisation plugins with Amarok.
%prep
%setup -q
-%patch0 -p0 -b .CVE-2006-6979
@@ -235,6 +234,9 @@ rm -fr $RPM_BUILD_ROOT
%changelog
+* Mon Jun 18 2007 Aurelien Bompard 1.4.6-1
+- version 1.4.6
+
* Mon Feb 19 2007 Aurelien Bompard 1.4.5-4
- have the visualisation subpackage require libvisual-plugins (bug 229131)
diff --git a/sources b/sources
index 2ec330d..3d649f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1dac1cb5ac9c9cdabdab5f69b39e92c8 amarok-1.4.5.tar.bz2
+b3519d042732101acb74469746656cf0 amarok-1.4.6.tar.bz2