diff -U 10 -Nr k3b-0.12.10.old/admin/acinclude.m4.in k3b-0.12.10/admin/acinclude.m4.in

--- k3b-0.12.10.old/admin/acinclude.m4.in	2005-12-15 16:08:29 +0300

+++ k3b-0.12.10/admin/acinclude.m4.in	2005-12-20 13:01:01 +0300

@@ -1875,21 +1875,21 @@

 AC_SUBST(kde_libraries)

 AC_SUBST(kde_includes)

 if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then

  KDE_INCLUDES=""

 else

  KDE_INCLUDES="-I$kde_includes"

  all_includes="$KDE_INCLUDES $all_includes"

 fi

-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"

+KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_COMPAT -DQT_NO_TRANSLATION"

 KDE_LDFLAGS="-L$kde_libraries"

 if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 

  all_libraries="$KDE_LDFLAGS $all_libraries"

 fi

 AC_SUBST(KDE_LDFLAGS)

 AC_SUBST(KDE_INCLUDES)

 AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])

@@ -3094,22 +3094,22 @@

       CFLAGS="-pg $CFLAGS"

       CXXFLAGS="-pg $CXXFLAGS"

     ])

   fi

   if test "$kde_use_warnings" = "yes"; then

       if test "$GCC" = "yes"; then

         CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"

         case $host in

           *-*-linux-gnu)	

-            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"

-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"

+            CFLAGS="-W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"

+            CXXFLAGS="-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"

             KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])

             KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])

           ;;

         esac

         KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])

         KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])

         dnl ### FIXME: revert for KDE 4

         KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])

      fi

   fi

diff -U 10 -Nr k3b-0.12.10.old/src/Makefile.am k3b-0.12.10/src/Makefile.am

--- k3b-0.12.10.old/src/Makefile.am	2005-12-15 16:08:58 +0300

+++ k3b-0.12.10/src/Makefile.am	2005-12-20 13:01:39 +0300

@@ -15,21 +15,22 @@

 	k3bprojectmanager.cpp k3btrm.cpp k3bmusicbrainz.cpp \

 	k3baudioprojectinterface.cpp k3bmixedprojectinterface.cpp \

 	k3baudioprojectinterface.skel k3bmixedprojectinterface.skel k3bflatbutton.cpp \

 	k3bemptydiscwaiter.cpp k3bjobprogressosd.cpp k3brichtextlabel.cpp \

 	k3bdebuggingoutputdialog.cpp k3bdebuggingoutputfile.cpp

 k3b_LDADD = ./cdinfo/libcdinfo.la ./option/liboption.la ./rip/librip.la \

 	./videoEncoding/libvideoEncoding.la \

 	./projects/libprojects.la ../libk3bdevice/libk3bdevice.la \

 	../libk3b/libk3b.la ./misc/libmisc.la \

-	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)

+	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS) \

+	$(KDE_MT_LIBS)

 SUBDIRS = cdinfo option misc rip projects videoEncoding pics icons konqi mimetypes sounds

 xdg_apps_DATA = k3b.desktop

 silent_DATA = k3b-iso.desktop k3b-cue.desktop

 silentdir = $(kde_appsdir)/.hidden/

 ###################

 # this 10 paths are KDE specific. Use them: