summaryrefslogtreecommitdiffstats
path: root/mandriva/2010.2/applications/k3b
diff options
context:
space:
mode:
Diffstat (limited to 'mandriva/2010.2/applications/k3b')
-rw-r--r--mandriva/2010.2/applications/k3b/iso-level-3.patch12
-rw-r--r--mandriva/2010.2/applications/k3b/kde3-k3b.spec233
-rw-r--r--mandriva/2010.2/applications/k3b/verify-reload-fix.patch89
3 files changed, 0 insertions, 334 deletions
diff --git a/mandriva/2010.2/applications/k3b/iso-level-3.patch b/mandriva/2010.2/applications/k3b/iso-level-3.patch
deleted file mode 100644
index 81a83cc65..000000000
--- a/mandriva/2010.2/applications/k3b/iso-level-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp
---- k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp 2007-11-02 11:55:40.000000000 +0200
-+++ k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp 2008-01-04 15:56:28.000000000 +0200
-@@ -52,7 +52,7 @@
-
- m_doNotCacheInodes = true;
-
-- m_isoLevel = 2;
-+ m_isoLevel = 3;
-
- m_discardSymlinks = false;
- m_discardBrokenSymlinks = false;
diff --git a/mandriva/2010.2/applications/k3b/kde3-k3b.spec b/mandriva/2010.2/applications/k3b/kde3-k3b.spec
deleted file mode 100644
index 449ddcc55..000000000
--- a/mandriva/2010.2/applications/k3b/kde3-k3b.spec
+++ /dev/null
@@ -1,233 +0,0 @@
-%define major 3
-%define libname %mklibname k3b %major
-%define oldlibname %mklibname k3b 2
-
-%define k3b_18n_version 1.0.5
-
-Name: kde3-k3b
-Summary: CD-Burner for KDE
-Version: 3.5.12
-Release: %mkrel 1
-License: GPL
-Group: Archiving/Cd burning
-Source0: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
-Source1: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-i18n-%{k3b_18n_version}.tar.bz2
-Patch0: kde-3.5.10-acinclude.patch
-#Patch1: fix_autotools.patch
-#Patch2: new-ffmpeg.diff
-Patch3: iso-level-3.patch
-Patch4: verify-reload-fix.patch
-#Patch5: no-suid-warning.patch
-#Patch6: fix-k3bjobhandler_install.patch
-Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
-Patch8: kdebase-3.5.12-config.patch
-URL: http://www.k3b.org/
-Provides: k3b = %version-%release
-Requires: cdrecord
-Requires: mkisofs
-Requires: cdrdao
-Requires: sox
-Requires: vcdimager
-Requires: normalize
-Requires: kdebase-progs
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: kde3-macros
-%if %mdkversion < 201000
-BuildRequires: autoconf <= 1:2.63
-%else
-BuildRequires: autoconf >= 1:2.65
-%endif
-BuildRequires: automake >= 1.6.1
-BuildRequires: libcdda-devel
-BuildRequires: kdelibs-devel
-BuildRequires: jpeg-devel
-BuildRequires: png-devel
-BuildRequires: X11-devel
-BuildRequires: mad-devel
-BuildRequires: arts-devel
-BuildRequires: libart_lgpl-devel
-BuildRequires: fam-devel
-BuildRequires: audiofile-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: libvorbis-devel
-BuildRequires: nas-devel
-BuildRequires: libflac++-devel
-BuildRequires: libflac-devel
-BuildRequires: id3lib-devel
-BuildRequires: taglib-devel
-BuildRequires: musicbrainz-devel
-BuildRequires: ffmpeg-devel
-BuildRequires: libsndfile-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libsamplerate-devel
-BuildRequires: libdbus-qt-1-devel
-BuildRequires: GL-devel
-BuildRequires: hal-devel
-BuildRequires: libdvdread-devel
-BuildRequires: desktop-file-utils
-Obsoletes: k3b < 1.95
-Requires: %libname = %version-%release
-
-%description
-K3b is CD-writing software which intends to be feature-rich and
-provide an easily usable interface. Features include burning
-audio CDs from .WAV and .MP3 audio files, configuring external
-programs and configuring devices.
-
-%if %mdkversion < 200900
-%post
-%update_menus
-%endif
-
-%if %mdkversion < 200900
-%postun
-%clean_menus
-%endif
-
-%files -f k3b.lang
-%defattr (-,root,root)
-%dir %_kde3_docdir/HTML/*/k3b
-%doc %_kde3_docdir/HTML/*/k3b/*
-%_kde3_libdir/kde3/*
-%_kde3_bindir/*
-%_kde3_datadir/applications/kde/*
-%_kde3_appsdir/konqueror/servicemenus/*
-%_kde3_datadir/mimelnk/application/*
-%dir %_kde3_appsdir/k3b/
-%_kde3_appsdir/k3b/*
-%_kde3_datadir/sounds/*.wav
-%_kde3_datadir/applnk/.hidden/*.desktop
-%_kde3_iconsdir/*/*/*/*
-%_kde3_appsdir/konqsidebartng/virtual_folders/services/videodvd.desktop
-%_kde3_datadir/services/kfile_k3b.desktop
-%_kde3_datadir/services/videodvd.protocol
-
-#------------------------------------------------------------------
-
-%package -n %libname
-Group: System/Libraries
-Summary: Libraries for %name
-Provides: libk3b = %version-%release
-Conflicts: k3b <= 0.9-3mdk
-Obsoletes: %oldlibname
-Obsoletes: %mklibname k3b 3 < %version-%release
-Obsoletes: %mklibname kde3-k3b 3 < %version-%release
-
-%description -n %libname
-The libraries from %name package
-
-%if %mdkversion < 200900
-%post -n %libname -p /sbin/ldconfig
-%endif
-%if %mdkversion < 200900
-%postun -n %libname -p /sbin/ldconfig
-%endif
-
-%files -n %libname
-%defattr(-,root,root)
-%_kde3_libdir/libk3b.la
-%_kde3_libdir/libk3b.so.%{major}*
-%_kde3_libdir/libk3bdevice.so.*
-%_kde3_libdir/libk3bdevice.la
-
-#------------------------------------------------------------------
-
-%package devel
-Group: Development/Other
-Summary: Libraries for %name
-Requires: %libname = %version-%release
-Provides: kde3-k3b-devel = %{version}-%{release}
-Obsoletes: %oldlibname-devel
-Obsoletes: %libname-devel
-Conflicts: k3b <= 0.9-3mdk
-
-%description devel
-Development libraries from %name
-
-%files devel
-%defattr (-,root,root)
-%_kde3_includedir/*
-%_kde3_libdir/*.so
-
-#------------------------------------------------------------------
-
-%prep
-%setup -q -c -n k3b
-%setup -q -T -D -c -a 1 -n k3b
-cd %_builddir/k3b/k3b-%version
-%if %mdkversion >= 201000
-%patch0 -p1
-#%patch1 -p1
-%endif
-#%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-%patch7 -p0
-%patch8 -p0
-
-
-cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
-%if %mdkversion >= 201000
-%patch0 -p1
-#%patch1 -p1
-%endif
-cd %_builddir/k3b
-
-%build
-export QTDIR=%qt3dir
-
-PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
-
-cd %_builddir/k3b/k3b-%version
-make -f admin/Makefile.common
-
-%configure_kde3 \
- --without-cdrecord-suid-root \
- --with-k3bsetup=no
-
-%make
-
-cd -
-
-cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
-make -f admin/Makefile.common
-CFLAGS="${CFLAGS} %optflags"
-CXXFLAGS="${CXXFLAGS} %optflags"
-export CFLAGS CXXFLAGS
-%configure_kde3
-
-# Necessary to regenerate po file !!!! Otherwise it's not generated
-make clean
-find -name *.gmo | xargs rm -f
-%make
-cd -
-
-
-%install
-rm -rf %buildroot
-mkdir -p %buildroot/%_kde3_datadir/applnk/Multimedia
-
-cd %_builddir/k3b/k3b-%{version}
-%makeinstall_std
-cd -
-
-cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
-%makeinstall_std
-cd -
-
-install -d %buildroot/%_kde3_datadir/applications/kde/
-desktop-file-install --vendor='' \
- --dir %buildroot/%_kde3_datadir/applications/kde/ \
- --remove-key='Encoding' \
- --remove-category='Application' \
- --remove-category='AudioVideo' \
- --add-category='Utility' \
- %buildroot/%_kde3_datadir/applications/kde/k3b.desktop
-
-%find_lang k3b k3b k3bsetup libk3b libk3bdevice
-
-%clean
-rm -rf %buildroot
diff --git a/mandriva/2010.2/applications/k3b/verify-reload-fix.patch b/mandriva/2010.2/applications/k3b/verify-reload-fix.patch
deleted file mode 100644
index acba642c5..000000000
--- a/mandriva/2010.2/applications/k3b/verify-reload-fix.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog
---- k3b-1.0.4/ChangeLog 2007-11-02 10:55:57.000000000 +0100
-+++ k3b-1.0.4-verification-always-reload/ChangeLog 2007-12-07 19:33:18.000000000 +0100
-@@ -4,9 +4,6 @@
- * Unmount medium before DVD formatting
- * Silently (without introducing new strings for translation) allow the burning of files
- bigger than 4 GB with appropriate versions of genisoimage or mkisofs.
-- * Do only reload the medium before verification if necessary, i.e. if the newly written
-- track cannot be read otherwise (many old drives depend on this). Hopefully this will
-- at least work around the aweful "DMA disabled" bug for many users.
-
- 1.0.3
- =====
-diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp
---- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp 2007-11-02 10:55:53.000000000 +0100
-+++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp 2007-07-21 21:53:53.000000000 +0200
-@@ -84,8 +84,6 @@
- K3bPipe pipe;
-
- bool readSuccessful;
--
-- bool mediumHasBeenReloaded;
- };
-
-
-@@ -151,13 +149,11 @@
- d->currentTrackIndex = 0;
- d->alreadyReadSectors = 0;
-
-- emit newTask( i18n("Checking medium") );
-+ // first we need to reload and mount the device
-+ emit newTask( i18n("Reloading the medium") );
-
-- d->mediumHasBeenReloaded = false;
-- connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
-- SIGNAL(finished(K3bDevice::DeviceHandler*)),
-- this,
-- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
-+ connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)),
-+ this, SLOT(slotMediaReloaded(bool)) );
- }
-
-
-@@ -165,7 +165,6 @@
- K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
- K3bDevice::MEDIA_WRITABLE );
-
-- d->mediumHasBeenReloaded = true;
-
- emit newTask( i18n("Checking medium") );
-
-@@ -191,6 +185,12 @@
- d->toc = dh->toc();
- d->totalSectors = 0;
-
-+ if ( d->toc.isEmpty() ) {
-+ emit infoMessage( i18n( "No tracks to verify found." ), ERROR );
-+ jobFinished( false );
-+ return;
-+ }
-+
- // just to be sure check if we actually have all the tracks
- int i = 0;
- for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
-@@ -201,21 +201,9 @@
- (*it).trackNumber = d->toc.count();
-
- if( (int)d->toc.count() < (*it).trackNumber ) {
-- if ( d->mediumHasBeenReloaded ) {
-- emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
-- .arg( "Specified track number not found on medium" ), ERROR );
-- jobFinished( false );
-- return;
-- }
-- else {
-- // many drives need to reload the medium to return to a proper state
-- emit newTask( i18n("Reloading the medium") );
-- connect( K3bDevice::reload( d->device ),
-- SIGNAL(finished(bool)),
-- this,
-- SLOT(slotMediaReloaded(bool)) );
-- return;
-- }
-+ emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR );
-+ jobFinished( false );
-+ return;
- }
-
- d->totalSectors += trackLength( i );