[emerge/kde-4.11] portage/kde/kdeutils/kcalc: adapt the 4.10 kcalc patch for 4.11

[Albert Astals Cid]

El Dimecres, 13 de novembre de 2013, a les 00:06:03, Nico Kruber va escriure:
> (ok, now to everyone...)
> 
> not that I'm aware of
> at least part of the previous 4.10 patch made it upstream (although
> not in its original form)
> 
> feel free to commit them upstream - same applies for the patch in here:
> http://commits.kde.org/emerge/88ffdc564f82f9213d66d664b05c0f1ef5ed7731
> 
> I'm not sure when I will have some (more) time to set up all those
> repos the patches should go into

I don't have time either, but i'd appreciate if we don't distro-patch 
ourselves unless its totally necessary. Anyone posting the patches to 
reviewboard gets some beers from me next time we meet.

Cheers,
  Albert

> 
> 
> Nico
> 
> On 12.11.2013 23:42, Albert Astals Cid wrote:
> > Is there a reason those patches are not upstream?
> > 
> > Cheers, Albert
> > 
> > El Dimarts, 12 de novembre de 2013, a les 22:37:27, Nico Kruber va
> > 
> > escriure:
> >> Git commit 5374bda2761be3b3b702d85210faa9c4f402be8f by Nico
> >> Kruber. Committed on 12/11/2013 at 22:37. Pushed by nkruber into
> >> branch 'kde-4.11'.
> >> 
> >> adapt the 4.10 kcalc patch for 4.11
> >> 
> >> M  +4    -3    portage/kde/kdeutils/kcalc/kcalc-20120112.py A
> >> +16   -0
> >> portage/kde/kdeutils/kcalc/kcalc-4.11.3-20131112.diff
> >> 
> >> http://commits.kde.org/emerge/5374bda2761be3b3b702d85210faa9c4f402be8f
> 
> diff --git a/portage/kde/kdeutils/kcalc/kcalc-20120112.py
> 
> >> b/portage/kde/kdeutils/kcalc/kcalc-20120112.py index
> >> 59c8a5a..cfc80ca 100644 ---
> >> a/portage/kde/kdeutils/kcalc/kcalc-20120112.py +++
> >> b/portage/kde/kdeutils/kcalc/kcalc-20120112.py @@ -7,9 +7,10 @@
> >> class subinfo(info.infoclass): for ver in ['0', '1', '2', '3',
> >> '4', '5']: self.targets[kd.kdeversion + ver] =
> >> "http://download.kde.org/stable/" + kd.kdeversion + ver + "/src/"
> >> + self.package + "-" + kd.kdeversion + ver + ".tar.xz"
> >> self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' +
> >> kd.kdeversion + ver -        self.patchToApply['4.10.0'] =
> >> [("kcalc-4.10.0-20130301.diff", 1)] -
> >> self.patchToApply['4.10.1'] = [("kcalc-4.10.0-20130301.diff", 1)]
> >> -        self.patchToApply['4.10.2'] =
> >> [("kcalc-4.10.0-20130301.diff", 1)] +            if kd.kdeversion
> >> == '4.10.': +                self.patchToApply[kd.kdeversion +
> >> ver] = [("kcalc-4.10.0-20130301.diff", 1)] +            if
> >> kd.kdeversion == '4.11.': +
> >> self.patchToApply[kd.kdeversion + ver] =
> >> [("kcalc-4.11.3-20131112.diff", 1)]
> >> 
> >> self.shortDescription = "KDE's calculator" self.defaultTarget =
> >> 'gitHEAD' diff --git
> >> a/portage/kde/kdeutils/kcalc/kcalc-4.11.3-20131112.diff
> >> b/portage/kde/kdeutils/kcalc/kcalc-4.11.3-20131112.diff new file
> >> mode 100644 index 0000000..9b0f029 --- /dev/null +++
> >> b/portage/kde/kdeutils/kcalc/kcalc-4.11.3-20131112.diff @@ -0,0
> >> +1,16 @@ +diff -Nru -x '*~'
> >> kcalc-4.11.3.orig/knumber/knumber_float.cpp
> >> kcalc-4.11.3/knumber/knumber_float.cpp +---
> >> kcalc-4.11.3.orig/knumber/knumber_float.cpp	2013-08-28
> >> 19:08:28.734058100 +0200 ++++
> >> kcalc-4.11.3/knumber/knumber_float.cpp	2013-11-12
> >> 23:34:14.031663900 +0100 +@@ -25,6 +25,12 @@ + #include <QDebug>
> >> + #include <math.h> + ++#ifdef _MSC_VER ++double log2(double x) {
> >> return log(x) / log(2); } ++double exp2(double x) { return exp(x
> >> * log(2)); } ++double exp10(double x) { return exp(x * log(10));
> >> } ++#endif ++ + // NOTE: these assume IEEE floats.. + #ifndef
> >> isinf + #define isinf(x) ((x) != 0.0 && (x) + (x) == (x))