diff -aurN k3b-kde4.orig/Makefile k3b-kde4/Makefile --- k3b-kde4.orig/Makefile 2010-07-27 09:45:59.000000000 +0200 +++ k3b-kde4/Makefile 2010-07-27 11:22:30.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= k3b -DISTVERSION= 1.91.0rc2 +DISTVERSION= 2.0.0 CATEGORIES= sysutils multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} diff -aurN k3b-kde4.orig/distinfo k3b-kde4/distinfo --- k3b-kde4.orig/distinfo 2010-07-27 09:45:59.000000000 +0200 +++ k3b-kde4/distinfo 2010-07-27 11:22:37.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (k3b-1.91.0rc2.tar.bz2) = 56d1c726a2771d341f59f08d5364d141 -SHA256 (k3b-1.91.0rc2.tar.bz2) = 463bcc0a6773f80d889f2191c3502935672e9ea2eede4fb1e8ef81d2824b3958 -SIZE (k3b-1.91.0rc2.tar.bz2) = 13754384 +MD5 (k3b-2.0.0.tar.bz2) = 2ec161ccd6c24778d4c5289c85473747 +SHA256 (k3b-2.0.0.tar.bz2) = df71fcb97ac29344c43a819d39ae9fb96e874c6dc40e905a1788d632d327344b +SIZE (k3b-2.0.0.tar.bz2) = 12441752 diff -aurN k3b-kde4.orig/files/patch-libk3b-tools-k3blibdvdcss.cpp k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp --- k3b-kde4.orig/files/patch-libk3b-tools-k3blibdvdcss.cpp 1970-01-01 01:00:00.000000000 +0100 +++ k3b-kde4/files/patch-libk3b-tools-k3blibdvdcss.cpp 2010-07-27 13:57:23.000000000 +0200 @@ -0,0 +1,11 @@ +--- libk3b/tools/k3blibdvdcss.cpp.orig 2010-07-27 13:56:42.000000000 +0200 ++++ libk3b/tools/k3blibdvdcss.cpp 2010-07-27 13:56:54.000000000 +0200 +@@ -61,7 +61,7 @@ + #ifdef Q_OS_WIN32 + #define LIBDVDCSS_NAME "dvdcss.dll" + #else +-#define LIBDVDCSS_NAME "libdvdcss.so.2" ++#define LIBDVDCSS_NAME "libdvdcss.so.3" + #endif + + void* K3b::LibDvdCss::s_libDvdCss = 0; diff -aurN k3b-kde4.orig/files/patch-libk3b__core__k3bdefaultexternalprograms.cpp k3b-kde4/files/patch-libk3b__core__k3bdefaultexternalprograms.cpp --- k3b-kde4.orig/files/patch-libk3b__core__k3bdefaultexternalprograms.cpp 2010-07-27 09:45:59.000000000 +0200 +++ k3b-kde4/files/patch-libk3b__core__k3bdefaultexternalprograms.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ ---- ./libk3b/core/k3bdefaultexternalprograms.cpp.orig 2009-09-27 17:04:15.000000000 -0400 -+++ ./libk3b/core/k3bdefaultexternalprograms.cpp 2009-10-19 10:55:39.000000000 -0400 -@@ -128,10 +128,14 @@ - QFileInfo(K3b::resolveLink( cdrtoolsPath )).baseName() != m_cdrkitAlt ) { - m_usingCdrkit = false; - path = cdrtoolsPath; -+#ifdef Q_OS_WIN32 -+ setVersionIdentifier( name() ); -+#endif - } - else if( QFile::exists( cdrkitPath ) ) { - m_usingCdrkit = true; - path = cdrkitPath; -+ setVersionIdentifier( m_cdrkitAlt ); - } - - #ifndef Q_OS_WIN32 -@@ -140,13 +144,6 @@ - } - #endif - -- if ( m_usingCdrkit ) -- setVersionIdentifier( m_cdrkitAlt ); --#ifdef Q_OS_WIN32 -- else -- setVersionIdentifier( name() ); --#endif -- - return path; - } - diff -aurN k3b-kde4.orig/pkg-plist k3b-kde4/pkg-plist --- k3b-kde4.orig/pkg-plist 2010-07-27 09:45:59.000000000 +0200 +++ k3b-kde4/pkg-plist 2010-07-27 13:53:52.000000000 +0200 @@ -306,108 +306,6 @@ share/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop share/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop %%LIBDVDREAD%%share/apps/solid/actions/k3b_videodvd_rip.desktop -share/doc/HTML/de/k3b/audiocd-howto.docbook -share/doc/HTML/de/k3b/cdcopy-howto.docbook -share/doc/HTML/de/k3b/commands.docbook -share/doc/HTML/de/k3b/common -share/doc/HTML/de/k3b/dcop.docbook -share/doc/HTML/de/k3b/index.cache.bz2 -share/doc/HTML/de/k3b/index.docbook -share/doc/HTML/en/k3b/audiocd-howto.docbook -share/doc/HTML/en/k3b/burndialog_audio.png -share/doc/HTML/en/k3b/burndialog_progress.png -share/doc/HTML/en/k3b/cdcloning_dialog.png -share/doc/HTML/en/k3b/cdcloning_reading.png -share/doc/HTML/en/k3b/cdcopy-howto.docbook -share/doc/HTML/en/k3b/cdcopy_done.png -share/doc/HTML/en/k3b/cdcopy_reading.png -share/doc/HTML/en/k3b/cdcopy_settings.png -share/doc/HTML/en/k3b/cdcopy_writing.png -share/doc/HTML/en/k3b/commands.docbook -share/doc/HTML/en/k3b/common -share/doc/HTML/en/k3b/dcop.docbook -share/doc/HTML/en/k3b/index.cache.bz2 -share/doc/HTML/en/k3b/index.docbook -share/doc/HTML/en/k3b/select_audiofiles.png -share/doc/HTML/en/k3b/select_project.png -share/doc/HTML/es/k3b/audiocd-howto.docbook -share/doc/HTML/es/k3b/burndialog_audio.png -share/doc/HTML/es/k3b/burndialog_progress.png -share/doc/HTML/es/k3b/cdcloning_dialog.png -share/doc/HTML/es/k3b/cdcloning_reading.png -share/doc/HTML/es/k3b/cdcopy-howto.docbook -share/doc/HTML/es/k3b/cdcopy_done.png -share/doc/HTML/es/k3b/cdcopy_reading.png -share/doc/HTML/es/k3b/cdcopy_settings.png -share/doc/HTML/es/k3b/cdcopy_writing.png -share/doc/HTML/es/k3b/commands.docbook -share/doc/HTML/es/k3b/common -share/doc/HTML/es/k3b/dcop.docbook -share/doc/HTML/es/k3b/index.cache.bz2 -share/doc/HTML/es/k3b/index.docbook -share/doc/HTML/es/k3b/select_audiofiles.png -share/doc/HTML/es/k3b/select_project.png -share/doc/HTML/et/k3b/audiocd-howto.docbook -share/doc/HTML/et/k3b/cdcopy-howto.docbook -share/doc/HTML/et/k3b/commands.docbook -share/doc/HTML/et/k3b/common -share/doc/HTML/et/k3b/dcop.docbook -share/doc/HTML/et/k3b/index.cache.bz2 -share/doc/HTML/et/k3b/index.docbook -share/doc/HTML/fr/k3b/audiocd-howto.docbook -share/doc/HTML/fr/k3b/burndialog_audio.png -share/doc/HTML/fr/k3b/cdcopy-howto.docbook -share/doc/HTML/fr/k3b/cdcopy_settings.png -share/doc/HTML/fr/k3b/commands.docbook -share/doc/HTML/fr/k3b/common -share/doc/HTML/fr/k3b/dcop.docbook -share/doc/HTML/fr/k3b/index.cache.bz2 -share/doc/HTML/fr/k3b/index.docbook -share/doc/HTML/fr/k3b/select_audiofiles.png -share/doc/HTML/fr/k3b/select_project.png -share/doc/HTML/nl/k3b/audiocd-howto.docbook -share/doc/HTML/nl/k3b/cdcopy-howto.docbook -share/doc/HTML/nl/k3b/commands.docbook -share/doc/HTML/nl/k3b/common -share/doc/HTML/nl/k3b/dcop.docbook -share/doc/HTML/nl/k3b/index.cache.bz2 -share/doc/HTML/nl/k3b/index.docbook -share/doc/HTML/pt/k3b/audiocd-howto.docbook -share/doc/HTML/pt/k3b/cdcopy-howto.docbook -share/doc/HTML/pt/k3b/commands.docbook -share/doc/HTML/pt/k3b/common -share/doc/HTML/pt/k3b/dcop.docbook -share/doc/HTML/pt/k3b/index.cache.bz2 -share/doc/HTML/pt/k3b/index.docbook -share/doc/HTML/pt_BR/k3b/audiocd-howto.docbook -share/doc/HTML/pt_BR/k3b/cdcopy-howto.docbook -share/doc/HTML/pt_BR/k3b/commands.docbook -share/doc/HTML/pt_BR/k3b/common -share/doc/HTML/pt_BR/k3b/dcop.docbook -share/doc/HTML/pt_BR/k3b/index.cache.bz2 -share/doc/HTML/pt_BR/k3b/index.docbook -share/doc/HTML/sv/k3b/audiocd-howto.docbook -share/doc/HTML/sv/k3b/burndialog_audio.png -share/doc/HTML/sv/k3b/burndialog_progress.png -share/doc/HTML/sv/k3b/cdcopy-howto.docbook -share/doc/HTML/sv/k3b/cdcopy_done.png -share/doc/HTML/sv/k3b/cdcopy_reading.png -share/doc/HTML/sv/k3b/cdcopy_settings.png -share/doc/HTML/sv/k3b/cdcopy_writing.png -share/doc/HTML/sv/k3b/commands.docbook -share/doc/HTML/sv/k3b/common -share/doc/HTML/sv/k3b/dcop.docbook -share/doc/HTML/sv/k3b/index.cache.bz2 -share/doc/HTML/sv/k3b/index.docbook -share/doc/HTML/sv/k3b/select_audiofiles.png -share/doc/HTML/sv/k3b/select_project.png -share/doc/HTML/uk/k3b/audiocd-howto.docbook -share/doc/HTML/uk/k3b/cdcopy-howto.docbook -share/doc/HTML/uk/k3b/commands.docbook -share/doc/HTML/uk/k3b/common -share/doc/HTML/uk/k3b/dcop.docbook -share/doc/HTML/uk/k3b/index.cache.bz2 -share/doc/HTML/uk/k3b/index.docbook share/kde4/services/ServiceMenus/k3b_create_audio_cd.desktop share/kde4/services/ServiceMenus/k3b_create_data_project.desktop share/kde4/services/ServiceMenus/k3b_create_video_cd.desktop @@ -528,6 +426,8 @@ share/locale/hu/LC_MESSAGES/libk3bdevice.mo share/locale/is/LC_MESSAGES/k3b.mo share/locale/is/LC_MESSAGES/libk3b.mo +share/locale/is/LC_MESSAGES/k3bsetup.mo +share/locale/is/LC_MESSAGES/libk3bdevice.mo share/locale/it/LC_MESSAGES/k3b.mo share/locale/it/LC_MESSAGES/k3bsetup.mo share/locale/it/LC_MESSAGES/libk3b.mo @@ -608,6 +508,12 @@ share/locale/sk/LC_MESSAGES/libk3bdevice.mo share/locale/sl/LC_MESSAGES/k3b.mo share/locale/sl/LC_MESSAGES/k3bsetup.mo +share/locale/sl/LC_MESSAGES/libk3b.mo +share/locale/sl/LC_MESSAGES/libk3bdevice.mo +share/locale/sr/LC_MESSAGES/k3b.mo +share/locale/sr/LC_MESSAGES/k3bsetup.mo +share/locale/sr/LC_MESSAGES/libk3b.mo +share/locale/sr/LC_MESSAGES/libk3bdevice.mo share/locale/sv/LC_MESSAGES/k3b.mo share/locale/sv/LC_MESSAGES/k3bsetup.mo share/locale/sv/LC_MESSAGES/libk3b.mo @@ -636,16 +542,6 @@ share/sounds/k3b_error1.wav share/sounds/k3b_success1.wav share/sounds/k3b_wait_media1.wav -@dirrm share/doc/HTML/uk/k3b -@dirrm share/doc/HTML/sv/k3b -@dirrm share/doc/HTML/pt_BR/k3b -@dirrm share/doc/HTML/pt/k3b -@dirrm share/doc/HTML/nl/k3b -@dirrm share/doc/HTML/fr/k3b -@dirrm share/doc/HTML/et/k3b -@dirrm share/doc/HTML/es/k3b -@dirrm share/doc/HTML/en/k3b -@dirrm share/doc/HTML/de/k3b @dirrm share/apps/k3b/pics/quant @dirrm share/apps/k3b/pics/crystal @dirrm share/apps/k3b/pics/RobsTheme