[k3b] * Sat Sep 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.0.2-5 - increase overburning tolerance

[Kevin Kofler]

commit d870e2ad1ebad68b6fa7a1a25720ebfe6ca2aaef
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Sep 17 23:41:46 2011 +0200

    * Sat Sep 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.0.2-5
    - increase overburning tolerance from 1/10 to 1/4 for CD-R90/99 (kde#276002)
    - fix overburning check to not count the used capacity twice

 k3b-2.0.2-overburn-usedcapacity.patch |   27 +++++++++++++++++++++++++++
 k3b.spec                              |    6 ++++++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/k3b-2.0.2-overburn-usedcapacity.patch b/k3b-2.0.2-overburn-usedcapacity.patch
new file mode 100644
index 0000000..5e552b5
--- /dev/null
+++ b/k3b-2.0.2-overburn-usedcapacity.patch
@@ -0,0 +1,27 @@
+From 8270d2853f2962facdf6f9ea6d669922d6c78aba Mon Sep 17 00:00:00 2001
+Message-Id: <8270d2853f2962facdf6f9ea6d669922d6c78aba.1316295404.git.kevin.kofler at chello.at>
+From: Kevin Kofler <kevin.kofler at chello.at>
+Date: Sat, 17 Sep 2011 23:34:23 +0200
+Subject: [PATCH] K3b::IsOverburnAllowed: Don't count used capacity twice.
+
+CCBUG: 276002
+---
+ libk3b/core/k3bglobals.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
+index 28c12c6..cdead56 100644
+--- a/libk3b/core/k3bglobals.cpp
++++ b/libk3b/core/k3bglobals.cpp
+@@ -595,7 +595,7 @@ bool K3b::IsOverburnAllowed( const K3b::Msf& projectSize, const K3b::Msf& capaci
+ bool K3b::IsOverburnAllowed( const Msf& projectSize, const Msf& capacity, const Msf& usedCapacity )
+ {
+     return( k3bcore->globalSettings()->overburn() &&
+-        (projectSize + usedCapacity) <= ( capacity.lba() - usedCapacity.lba() + capacity.lba() / 4 ) ); // 25% tolerance in overburn mode
++        (projectSize + usedCapacity) <= ( capacity.lba() + capacity.lba() / 4 ) ); // 25% tolerance in overburn mode
+ }
+ 
+ 
+-- 
+1.7.6
+
diff --git a/k3b.spec b/k3b.spec
index 5e04c52..6be8f21 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -25,6 +25,10 @@ Patch100: k3b-2.0.2-use_growisofs_instead_of_wodim.patch
 # https://git.reviewboard.kde.org/r/102648/
 # https://projects.kde.org/projects/extragear/multimedia/k3b/repository/revisions/b0df9e7771ac9148004187bb53ba13ac40b01cae
 Patch101: k3b-2.0.2-overburn-cdr90.patch
+# fix overburning check to not count the used capacity twice
+# (followup to the above fix)
+# https://projects.kde.org/projects/extragear/multimedia/k3b/repository/revisions/8270d2853f2962facdf6f9ea6d669922d6c78aba
+Patch102: k3b-2.0.2-overburn-usedcapacity.patch
 
 
 BuildRequires: desktop-file-utils
@@ -88,6 +92,7 @@ Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 
 %patch100 -p1 -b .use_growisofs_instead_of_wodim
 %patch101 -p1 .b .overburn-cdr90
+%patch102 -p1 .b .overburn-usedcapacity
 
 
 %build
@@ -184,6 +189,7 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null
 %changelog
 * Sat Sep 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.0.2-5
 - increase overburning tolerance from 1/10 to 1/4 for CD-R90/99 (kde#276002)
+- fix overburning check to not count the used capacity twice
 
 * Sat Apr 23 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.0.2-4
 - prefer growisofs to wodim for DVD/BluRay also for DVD copying and data