Initial build for K3B

v3.5.13-sru
albator 13 years ago
parent 33d2f70781
commit 3b770cc37b

@ -0,0 +1,48 @@
--- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount 2007-07-27 21:26:30.000000000 +0200
+++ k3b-1.0.3/libk3b/core/k3bglobals.cpp 2007-07-27 21:31:26.000000000 +0200
@@ -569,7 +569,24 @@
return true;
}
- // now try pmount
+#ifdef HAVE_HAL
+ if (!K3bDevice::HalConnection::instance()->unmount( dev ))
+ return true;
+#endif
+
+ QString gumountBin = K3b::findExe( "gnome-umount" );
+ if( !gumountBin.isEmpty() ) {
+ KProcess p;
+ p << gumountBin;
+ p << "-u";
+ p << "-d";
+ p << dev->blockDeviceName();
+ p.start( KProcess::Block );
+ if( !p.exitStatus() )
+ return true;
+ }
+
+// now try pmount
QString pumountBin = K3b::findExe( "pumount" );
if( !pumountBin.isEmpty() ) {
KProcess p;
@@ -577,15 +592,11 @@
p << "-l"; // lazy unmount
p << dev->blockDeviceName();
p.start( KProcess::Block );
- return !p.exitStatus();
- }
- else {
-#ifdef HAVE_HAL
- return !K3bDevice::HalConnection::instance()->unmount( dev );
-#else
- return false;
-#endif
+ if( !p.exitStatus() )
+ return true;
}
+
+ return false;
}

@ -0,0 +1,21 @@
diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
--- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize 2007-11-02 10:55:39.000000000 +0100
+++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp 2008-04-22 14:15:06.000000000 +0200
@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
: m_eject(true),
m_burnfree(true),
m_overburn(false),
- m_useManualBufferSize(false),
+ m_useManualBufferSize(true),
m_bufferSize(4),
m_force(false)
{
@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
m_eject = !c->readBoolEntry( "No cd eject", false );
m_burnfree = c->readBoolEntry( "burnfree", true );
m_overburn = c->readBoolEntry( "Allow overburning", false );
- m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
+ m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
m_force = c->readBoolEntry( "Force unsafe operations", false );

@ -0,0 +1,31 @@
diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
--- k3b-1.0.5/src/Makefile.in.hidden 2008-05-27 03:34:44.000000000 -0500
+++ k3b-1.0.5/src/Makefile.in 2008-08-27 14:18:54.000000000 -0500
@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
-xdg_apps_DATA = k3b.desktop
-silent_DATA = k3b-iso.desktop k3b-cue.desktop
-silentdir = $(kde_appsdir)/.hidden/
+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+#silent_DATA = k3b-iso.desktop k3b-cue.desktop
+#silentdir = $(kde_appsdir)/.hidden/
###################
# this 10 paths are KDE specific. Use them:
diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
--- k3b-1.0.5/src/Makefile.am.hidden 2008-05-27 03:24:04.000000000 -0500
+++ k3b-1.0.5/src/Makefile.am 2008-08-27 14:13:36.000000000 -0500
@@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
-xdg_apps_DATA = k3b.desktop
-
-silent_DATA = k3b-iso.desktop k3b-cue.desktop
-silentdir = $(kde_appsdir)/.hidden/
+xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
###################
# this 10 paths are KDE specific. Use them:

@ -0,0 +1,6 @@
[General Options]
check system config=false
Manual buffer size=true
[Notification Messages]
Don't prompt me again.=No

@ -0,0 +1,33 @@
--- libk3b/jobs/k3bverificationjob.cpp.sav 2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.cpp 2009-06-11 17:58:58.000000000 +0200
@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
emit newTask( i18n("Checking medium") );
d->mediumHasBeenReloaded = false;
+ connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
+ SIGNAL(finished(K3bDevice::DeviceHandler*)),
+ this,
+ SLOT(slotMediaLoaded()) );
+}
+
+void K3bVerificationJob::slotMediaLoaded()
+{
+ // we always need to wait for the medium. Otherwise the diskinfo below
+ // may run before the drive is ready!
+ waitForMedia( d->device,
+ K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
+ K3bDevice::MEDIA_WRITABLE );
+
connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
SIGNAL(finished(K3bDevice::DeviceHandler*)),
this,
--- libk3b/jobs/k3bverificationjob.h.sav 2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.h 2009-06-11 17:13:37.000000000 +0200
@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
void setGrownSessionSize( const K3b::Msf& );
private slots:
+ void slotMediaLoaded();
void slotMediaReloaded( bool success );
void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
void readTrack( int trackIndex );

@ -0,0 +1,271 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.12
%endif
%define release 6
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/kde3
Name: trinity-k3b
Summary: CD/DVD burning application
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
%if "%{?_prefix}" == "/usr"
Obsoletes: k3b
%endif
Group: Applications/Archiving
License: GPLv2+
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
# Legacy RedHat / Fedora patches
Patch2: k3b-1.0.3-umount.patch
# manual bufsize (upstream?)
Patch4: k3b-1.0.4-manualbufsize.patch
# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30
Patch102: reload-for-verification.diff
# put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
# upstreamed 2008-08-27
Patch105: k3b-1.0.5-hidden.patch
# RHEL6: Fix K3B icon
Patch106: trinity-k3b-icons.patch
BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
BuildRequires: dbus-qt-devel hal-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: libdvdread-devel
%if 0%{?fedora} >= 15
BuildRequires: libmpcdec-devel
%else
BuildRequires: musepack-tools-devel
%endif
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: taglib-devel
BuildRequires: zlib-devel
Obsoletes: k3b-extras < 0:1.0-1
Provides: k3b-extras = %{version}-%{release}
Obsoletes: %{name}-i18n
Provides: %{name}-i18n
Requires(post): coreutils
Requires(postun): coreutils
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
Requires: cdrecord mkisofs
Requires: cdrdao
Requires: dvd+rw-tools
%description
K3b provides a comfortable user interface to perform most CD/DVD
burning tasks. While the experienced user can take influence in all
steps of the burning process the beginner may find comfort in the
automatic settings and the reasonable k3b defaults which allow a quick
start.
%package common
Summary: Common files of %{name}
Group: Applications/Archiving
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description common
%{summary}.
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%package devel
Summary: Files for the development of applications which will use %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
%{summary}.
%prep
%setup -q -a 1 -n applications/k3b
%patch2 -p1 -b .umount
# set in k3brc too
%patch4 -p1 -b .manualbufsize
%patch102 -p0 -b .kde#156684
%patch105 -p1 -b .hidden
%patch106 -p1 -b .desktopfile
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
CFLAGS="%optflags -fno-strict-aliasing" \
CXXFLAGS="%optflags -fno-strict-aliasing" \
%configure \
--includedir=%{_includedir}/k3b \
--disable-rpath \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-k3bsetup=no \
--without-cdrecord-suid-root \
--with-oggvorbis \
--with-flac \
--with-external-libsamplerate \
--with-libdvdread \
--with-musicbrainz \
--with-sndfile \
--without-ffmpeg --without-lame --without-libmad \
--with-musepack \
--with-extra-includes=%{_includedir}/tqt
%__make %{?_smp_mflags}
# Build for i18n tarball
pushd k3b-i18n-1.0.5
%configure
%__make %{?_smp_mflags}
popd
%install
%__rm -rf %{buildroot}
%make_install
%make_install -C k3b-i18n-1.0.5
%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
# remove the .la files
%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la
# remove i18n for Plattdeutsch (Low Saxon)
%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
%find_lang k3b --with-kde
%find_lang k3bsetup
%find_lang libk3b
%find_lang libk3bdevice
cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
%check
export PATH="%{_bindir}:${PATH}"
desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
%clean
%__rm -rf %{buildroot}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post common
touch --no-create %{_datadir}/icons/hicolor ||:
%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
fi
%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING TODO ChangeLog
%{_bindir}/k3b
%{tde_libdir}/*.so
%{tde_libdir}/*.la
%doc %{tde_docdir}/HTML/*/k3b/*
%files common -f all.lang
%defattr(-,root,root,-)
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/k3b/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
%{_datadir}/config/k3brc
%{_datadir}/mimelnk/application/x-k3b.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/services/kfile_k3b.desktop
%{_datadir}/services/videodvd.protocol
%{_datadir}/sounds/k3b_*.wav
%files libs
%defattr(-,root,root,-)
%{_libdir}/libk3b.so.3*
%{_libdir}/libk3bdevice.so.5*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libk3b.so
%{_libdir}/libk3bdevice.so
%changelog
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-6
- Import to GIT
* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
- Add fix for Fedora 15
* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Correct macro to install under "/opt", if desired
* Thu Apr 28 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
- Fix config file '/usr/share/config/k3brc'
* Sun Dec 19 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Add i18n translations
- Add patches from RHEL 6.0 (except Patch106, redundant with our 'patch0')
- Renamed 'patch0' (Thales) to 'patch106'
* Fri Dec 17 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3)
- Add '--with-extra-includes=%{_includedir}/tqt'
* Wed Dec 15 2010 Francois Andriot <francois.andriot@free.fr> - 3.5.12-0
- Initial version built for RHEL 6.0
- Add 'patch0' : invalid syntax in 'k3b.desktop'

@ -0,0 +1,244 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity
Name: trinity-k3b
Summary: CD/DVD burning application
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
%if "%{?_prefix}" == "/usr"
Obsoletes: k3b
%endif
Group: Applications/Archiving
License: GPLv2+
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
# Legacy RedHat / Fedora patches
# manual bufsize (upstream?)
Patch4: k3b-1.0.4-manualbufsize.patch
# Thales: correction de l'icone
Patch106: trinity-k3b-icons.patch
BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
BuildRequires: dbus-qt-devel hal-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: libdvdread-devel
%if 0%{?fedora} >= 15
BuildRequires: libmpcdec-devel
%else
BuildRequires: musepack-tools-devel
%endif
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
BuildRequires: taglib-devel
BuildRequires: zlib-devel
Obsoletes: k3b-extras < 0:1.0-1
Provides: k3b-extras = %{version}-%{release}
Obsoletes: %{name}-i18n
Provides: %{name}-i18n
Requires(post): coreutils
Requires(postun): coreutils
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release}
Requires: cdrecord mkisofs
Requires: cdrdao
Requires: dvd+rw-tools
%description
K3b provides a comfortable user interface to perform most CD/DVD
burning tasks. While the experienced user can take influence in all
steps of the burning process the beginner may find comfort in the
automatic settings and the reasonable k3b defaults which allow a quick
start.
%package common
Summary: Common files of %{name}
Group: Applications/Archiving
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description common
%{summary}.
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%package devel
Summary: Files for the development of applications which will use %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
%{summary}.
%prep
%setup -q -a 1 -n applications/k3b
# set in k3brc too
%patch4 -p1 -b .manualbufsize
%patch106 -p1 -b .desktopfile
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
CFLAGS="%optflags -fno-strict-aliasing" \
CXXFLAGS="%optflags -fno-strict-aliasing" \
%configure \
--includedir=%{_includedir}/k3b \
--disable-rpath \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-k3bsetup=no \
--without-cdrecord-suid-root \
--with-oggvorbis \
--with-flac \
--with-external-libsamplerate \
--with-libdvdread \
--with-musicbrainz \
--with-sndfile \
--without-ffmpeg --without-lame --without-libmad \
--with-musepack \
--with-extra-includes=%{_includedir}/tqt
%__make %{?_smp_mflags}
# Build for i18n tarball
pushd k3b-i18n-1.0.5
%configure
%__make %{?_smp_mflags}
popd
%install
%__rm -rf %{buildroot}
%make_install
%make_install -C k3b-i18n-1.0.5
%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
# remove the .la files
%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la
# remove i18n for Plattdeutsch (Low Saxon)
%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
%find_lang k3b --with-kde
%find_lang k3bsetup
%find_lang libk3b
%find_lang libk3bdevice
cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
%check
export PATH="%{_bindir}:${PATH}"
desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
%clean
%__rm -rf %{buildroot}
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post common
touch --no-create %{_datadir}/icons/hicolor ||:
%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
fi
%posttrans common
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null
%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING TODO ChangeLog
%{_bindir}/k3b
%{tde_libdir}/*.so
%{tde_libdir}/*.la
%doc %{tde_docdir}/HTML/*/k3b/*
%files common -f all.lang
%defattr(-,root,root,-)
%{_datadir}/applications/kde/*.desktop
%{_datadir}/apps/k3b/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
%{_datadir}/config/k3brc
%{_datadir}/mimelnk/application/x-k3b.desktop
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/services/kfile_k3b.desktop
%{_datadir}/services/videodvd.protocol
%{_datadir}/sounds/k3b_*.wav
%files libs
%defattr(-,root,root,-)
%{_libdir}/libk3b.so.3*
%{_libdir}/libk3bdevice.so.5*
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/libk3b.so
%{_libdir}/libk3bdevice.so
%changelog
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT

@ -0,0 +1,22 @@
diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop
*** k3b.ori/src/k3b.desktop Wed Dec 15 14:23:05 2010
--- k3b/src/k3b.desktop Wed Dec 15 14:28:55 2010
***************
*** 116,123 ****
Name[ar]= K3b
Name[bn]=কে-থ্রি-বি
Name[hi]=के3बी
! MimeType=application/x-k3b;application/x-iso;application/x-cue
X-KDE-StartupNotify=true
! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
! Categories=KDE;Application;AudioVideo;DiscBurning;
X-DCOP-ServiceType=Unique
--- 116,123 ----
Name[ar]= K3b
Name[bn]=কে-থ্রি-বি
Name[hi]=के3बी
! MimeType=application/x-k3b;application/x-iso;application/x-cue;
X-KDE-StartupNotify=true
! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue;
! Categories=KDE;AudioVideo;DiscBurning;
X-DCOP-ServiceType=Unique

@ -20,3 +20,4 @@ kdegames
kdeedu kdeedu
kdeaddons kdeaddons
kde-i18n kde-i18n
applications/k3b

Loading…
Cancel
Save