rev 20945 - in kde-extras/k3b/trunk/debian: . patches
Pino Toscano
pino at moszumanska.debian.org
Sun Dec 24 19:00:58 UTC 2017
Author: pino
Date: 2017-12-24 19:00:57 +0000 (Sun, 24 Dec 2017)
New Revision: 20945
Removed:
kde-extras/k3b/trunk/debian/patches/113_initial_preference.diff
kde-extras/k3b/trunk/debian/patches/cmake-duplicate-doc.diff
kde-extras/k3b/trunk/debian/patches/upstream_Fix-build-failure-when-compiling-with-GCC-5.patch
kde-extras/k3b/trunk/debian/patches/upstream_Fixed-compilation-on-newer-ffmpeg-libav.patch
Modified:
kde-extras/k3b/trunk/debian/changelog
kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
kde-extras/k3b/trunk/debian/patches/series
Log:
update the patches
- 101_rename_normalize.diff: update
- 104_dont_require_suid_cdrecord_or_cdrdao.diff: refresh
- 110_disable_no_problems_found_popup.diff: update
- 111_advice_debian_libk3b3-extracodes.diff: update
- 112_dont_require_mp3.diff: refresh
- 113_initial_preference.diff: drop, applied upstream
- cmake-duplicate-doc.diff: drop, no more needed
- upstream_Fixed-compilation-on-newer-ffmpeg-libav.patch: drop,
backported from upstream
- upstream_Fix-build-failure-when-compiling-with-GCC-5.patch: drop,
backported from upstream
Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/changelog 2017-12-24 19:00:57 UTC (rev 20945)
@@ -23,6 +23,18 @@
* Pass -DBUILD_TESTING=OFF to cmake to disable the test suite, as it does
not work.
* Update lintian overrides.
+ * Update the patches:
+ - 101_rename_normalize.diff: update
+ - 104_dont_require_suid_cdrecord_or_cdrdao.diff: refresh
+ - 110_disable_no_problems_found_popup.diff: update
+ - 111_advice_debian_libk3b3-extracodes.diff: update
+ - 112_dont_require_mp3.diff: refresh
+ - 113_initial_preference.diff: drop, applied upstream
+ - cmake-duplicate-doc.diff: drop, no more needed
+ - upstream_Fixed-compilation-on-newer-ffmpeg-libav.patch: drop, backported
+ from upstream
+ - upstream_Fix-build-failure-when-compiling-with-GCC-5.patch: drop,
+ backported from upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sat, 20 Aug 2016 12:48:14 +0200
Modified: kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/101_rename_normalize.diff 2017-12-24 19:00:57 UTC (rev 20945)
@@ -3,7 +3,7 @@
Reviewed-by: Didier Raboud <didier at raboud.com>
Updated-by: Roderick B. Greening <roderick.greening at gmail.com>
Updated-by: Pino Toscano <pino at debian.org>
-Last-Update: 2012-02-20
+Last-Update: 2017-12-24
---
libk3b/core/k3bdefaultexternalprograms.cpp | 8 +++++++-
@@ -17,7 +17,7 @@
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
-@@ -427,11 +427,17 @@ QString K3b::VcdbuilderProgram::versionI
+@@ -429,11 +429,17 @@ QString K3b::VcdbuilderProgram::versionI
K3b::NormalizeProgram::NormalizeProgram()
@@ -38,7 +38,7 @@
{
--- a/libk3b/projects/audiocd/k3baudiodoc.cpp
+++ b/libk3b/projects/audiocd/k3baudiodoc.cpp
-@@ -590,7 +590,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
+@@ -591,7 +591,7 @@ bool K3b::AudioDoc::loadDocumentData( QD
return false;
}
@@ -47,7 +47,7 @@
setNormalize( e.text() == "yes" );
else if( e.nodeName() == "hide_first_track" )
-@@ -792,7 +792,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
+@@ -795,7 +795,7 @@ bool K3b::AudioDoc::saveDocumentData( QD
saveGeneralDocumentData( docElem );
// add normalize
@@ -59,8 +59,8 @@
--- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp
+++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp
@@ -50,10 +50,10 @@ void K3b::AudioNormalizeJob::start()
- connect( m_process, SIGNAL(stderrLine(const QString&)), this, SLOT(slotStdLine(const QString&)) );
- connect( m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotProcessExited(int, QProcess::ExitStatus)) );
+ connect( m_process, SIGNAL(stderrLine(QString)), this, SLOT(slotStdLine(QString)) );
+ connect( m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(slotProcessExited(int,QProcess::ExitStatus)) );
- const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize" );
+ const K3b::ExternalBin* bin = k3bcore->externalBinManager()->binObject( "normalize-audio" );
@@ -75,9 +75,9 @@
if( !m_process->start( KProcess::OnlyStderrChannel ) ) {
// something went wrong when starting the program
// it "should" be the executable
-- kDebug() << "(K3b::AudioNormalizeJob) could not start normalize";
+- qDebug() << "(K3b::AudioNormalizeJob) could not start normalize";
- emit infoMessage( i18n("Could not start normalize."), K3b::Job::MessageError );
-+ kDebug() << "(K3b::AudioNormalizeJob) could not start normalize-audio";
++ qDebug() << "(K3b::AudioNormalizeJob) could not start normalize-audio";
+ emit infoMessage( i18n("Could not start normalize-audio."), K3b::Job::MessageError );
jobFinished(false);
}
@@ -102,7 +102,7 @@
emit infoMessage( i18n("Error while normalizing tracks."), MessageError );
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
-@@ -293,7 +293,7 @@ void K3b::ProjectManager::loadDefaults(
+@@ -311,7 +311,7 @@ void K3b::ProjectManager::loadDefaults(
audioDoc->writeCdText( c.readEntry( "cd_text", true ) );
audioDoc->setHideFirstTrack( c.readEntry( "hide_first_track", false ) );
@@ -111,7 +111,7 @@
audioDoc->setAudioRippingParanoiaMode( c.readEntry( "paranoia mode", 0 ) );
audioDoc->setAudioRippingRetries( c.readEntry( "read retries", 128 ) );
audioDoc->setAudioRippingIgnoreReadErrors( c.readEntry( "ignore read errors", false ) );
-@@ -364,7 +364,7 @@ void K3b::ProjectManager::loadDefaults(
+@@ -382,7 +382,7 @@ void K3b::ProjectManager::loadDefaults(
K3b::MixedDoc* mixedDoc = static_cast<K3b::MixedDoc*>(doc);
mixedDoc->audioDoc()->writeCdText( c.readEntry( "cd_text", true ) );
@@ -122,7 +122,7 @@
if( c.readEntry( "mixed_type" ) == "last_track" )
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
-@@ -186,7 +186,7 @@ void K3b::AudioBurnDialog::loadSettings(
+@@ -185,7 +185,7 @@ void K3b::AudioBurnDialog::loadSettings(
m_cdtextWidget->setChecked( c.readEntry( "cd_text", true ) );
m_checkHideFirstTrack->setChecked( c.readEntry( "hide_first_track", false ) );
@@ -131,7 +131,7 @@
m_comboParanoiaMode->setCurrentIndex( c.readEntry( "paranoia mode", 0 ) );
m_checkAudioRippingIgnoreReadErrors->setChecked( c.readEntry( "ignore read errors", true ) );
-@@ -202,7 +202,7 @@ void K3b::AudioBurnDialog::saveSettings(
+@@ -201,7 +201,7 @@ void K3b::AudioBurnDialog::saveSettings(
c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
c.writeEntry( "hide_first_track", m_checkHideFirstTrack->isChecked() );
@@ -140,7 +140,7 @@
c.writeEntry( "paranoia mode", m_comboParanoiaMode->currentText() );
c.writeEntry( "ignore read errors", m_checkAudioRippingIgnoreReadErrors->isChecked() );
-@@ -283,11 +283,11 @@ void K3b::AudioBurnDialog::slotNormalize
+@@ -282,11 +282,11 @@ void K3b::AudioBurnDialog::slotNormalize
{
if( on ) {
// we are not able to normalize in on-the-fly mode
@@ -158,7 +158,7 @@
else if( !m_checkCacheImage->isChecked() && !m_checkOnlyCreateImage->isChecked() ) {
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
-@@ -201,7 +201,7 @@ void K3b::MixedBurnDialog::loadSettings(
+@@ -195,7 +195,7 @@ void K3b::MixedBurnDialog::loadSettings(
K3b::ProjectBurnDialog::loadSettings( c );
m_cdtextWidget->setChecked( c.readEntry( "cd_text", false ) );
@@ -167,7 +167,7 @@
// load mixed type
if( c.readEntry( "mixed_type" ) == "last_track" )
-@@ -225,7 +225,7 @@ void K3b::MixedBurnDialog::saveSettings(
+@@ -219,7 +219,7 @@ void K3b::MixedBurnDialog::saveSettings(
K3b::ProjectBurnDialog::saveSettings(c);
c.writeEntry( "cd_text", m_cdtextWidget->isChecked() );
@@ -176,7 +176,7 @@
// save mixed type
switch( m_comboMixedModeType->selectedValue() ) {
-@@ -289,11 +289,11 @@ void K3b::MixedBurnDialog::slotNormalize
+@@ -283,11 +283,11 @@ void K3b::MixedBurnDialog::slotNormalize
{
if( on ) {
// we are not able to normalize in on-the-fly mode
Modified: kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/104_dont_require_suid_cdrecord_or_cdrdao.diff 2017-12-24 19:00:57 UTC (rev 20945)
@@ -12,15 +12,15 @@
#ifdef Q_OS_LINUX
//
-@@ -257,6 +258,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -256,6 +257,7 @@ void K3b::SystemProblemDialog::checkSyst
}
#endif // CDRECORD_SUID_ROOT_CHECK
#endif
+*/
}
- if( !k3bcore->externalBinManager()->foundBin( "cdrdao" ) ) {
-@@ -265,6 +267,7 @@ void K3b::SystemProblemDialog::checkSyst
+ if( !k3bcore->externalBinManager()->binNeedGroup( "cdrdao" ).isEmpty() ) {
+@@ -272,6 +274,7 @@ void K3b::SystemProblemDialog::checkSyst
i18n("K3b uses cdrdao to actually write CDs."),
i18n("Install the cdrdao package.") ) );
}
@@ -28,9 +28,9 @@
else {
#ifdef Q_OS_LINUX
#ifdef CDRECORD_SUID_ROOT_CHECK
-@@ -280,6 +283,7 @@ void K3b::SystemProblemDialog::checkSyst
- #endif // CDRECORD_SUID_ROOT_CHECK
- #endif
+@@ -294,6 +297,7 @@ void K3b::SystemProblemDialog::checkSyst
+ i18n("K3b uses cdrskin in place of cdrecord."),
+ i18n("Install the libburn package which contains cdrskin")));
}
+*/
}
Modified: kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/110_disable_no_problems_found_popup.diff 2017-12-24 19:00:57 UTC (rev 20945)
@@ -4,12 +4,15 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -593,7 +593,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -616,9 +616,11 @@ void K3b::SystemProblemDialog::checkSyst
if( problems.isEmpty() ) {
- kDebug() << " - none - ";
+ qDebug() << " - none - ";
if( level == AlwaysNotify ) {
-- K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
-+// K3b::PassivePopup::showPopup( i18n("No problems found in system configuration."), i18n("System configured properly") );
++/*
+ KNotification::event( "NoProblemsFound",
+ i18n("System configured properly"),
+ i18n("No problems found in system configuration.") );
++*/
}
}
else {
Modified: kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/111_advice_debian_libk3b3-extracodes.diff 2017-12-24 19:00:57 UTC (rev 20945)
@@ -4,13 +4,13 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -526,8 +526,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -551,8 +551,7 @@ void K3b::SystemProblemDialog::checkSyst
"include MP3 support for legal reasons."),
i18n("To enable MP3 support, please install the MAD MP3 decoding library as well as the "
"K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
- "due to the missing libmad). Some distributions allow installation of MP3 support "
- "via an online update tool.") ) );
-+ "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
++ "due to the missing libmad). To get MP3 support, please install the package libk3b7-extracodecs.") ) );
}
- #ifdef HAVE_ICONV_H
+ #ifdef HAVE_ICONV
Modified: kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/112_dont_require_mp3.diff 2017-12-24 19:00:57 UTC (rev 20945)
@@ -4,7 +4,7 @@
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
-@@ -509,6 +509,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -534,6 +534,7 @@ void K3b::SystemProblemDialog::checkSyst
// Way too many users are complaining about K3b not being able to decode mp3 files. So just warn them about
// the legal restrictions with many distros
//
@@ -12,11 +12,11 @@
QList<K3b::Plugin*> plugins = k3bcore->pluginManager()->plugins( "AudioDecoder" );
bool haveMp3Decoder = false;
for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
-@@ -528,6 +529,7 @@ void K3b::SystemProblemDialog::checkSyst
+@@ -553,6 +554,7 @@ void K3b::SystemProblemDialog::checkSyst
"K3b MAD MP3 decoder plugin (the latter may already be installed but not functional "
- "due to the missing libmad). To get MP3 support, please install the package libk3b6-extracodecs.") ) );
+ "due to the missing libmad). To get MP3 support, please install the package libk3b7-extracodecs.") ) );
}
+*/
- #ifdef HAVE_ICONV_H
+ #ifdef HAVE_ICONV
char* codec = nl_langinfo( CODESET );
Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series 2017-12-24 18:45:15 UTC (rev 20944)
+++ kde-extras/k3b/trunk/debian/patches/series 2017-12-24 19:00:57 UTC (rev 20945)
@@ -3,7 +3,3 @@
110_disable_no_problems_found_popup.diff
111_advice_debian_libk3b3-extracodes.diff
112_dont_require_mp3.diff
-113_initial_preference.diff
-cmake-duplicate-doc.diff
-upstream_Fixed-compilation-on-newer-ffmpeg-libav.patch
-upstream_Fix-build-failure-when-compiling-with-GCC-5.patch
More information about the pkg-kde-commits
mailing list