Gentoo Archives: gentoo-commits

From: "Andrey Grozin (grozin)" <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/fbreader/files: fbreader-0.99.4-mimetypes.patch fbreader-0.99.4-qreal-cast.patch
Date: Thu, 10 Jul 2014 10:46:33
Message-Id: 20140710104629.765722004E@flycatcher.gentoo.org
1 grozin 14/07/10 10:46:29
2
3 Added: fbreader-0.99.4-mimetypes.patch
4 fbreader-0.99.4-qreal-cast.patch
5 Log:
6 Added casts to qreal (bug #515698), thanks to William Throwe <wtt6@×××××××.edu>; added mimetypes to .desktop (bug #516794); depend on qtcore[ssl] (bug #462044); added -j1 (bug #484516)
7
8 (Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
9
10 Revision Changes Path
11 1.1 app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch?rev=1.1&content-type=text/plain
15
16 Index: fbreader-0.99.4-mimetypes.patch
17 ===================================================================
18 diff -r -U1 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
19 --- fbreader-0.99.4.orig/fbreader/desktop/desktop 2012-11-30 19:41:25.000000000 +0700
20 +++ fbreader-0.99.4/fbreader/desktop/desktop 2014-07-10 20:56:33.527638562 +0700
21 @@ -23 +23,2 @@
22 Categories=Office;Viewer;Literature;
23 +MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
24
25
26
27 1.1 app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
28
29 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch?rev=1.1&view=markup
30 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch?rev=1.1&content-type=text/plain
31
32 Index: fbreader-0.99.4-qreal-cast.patch
33 ===================================================================
34 diff -r -U1 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
35 --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 19:41:25.000000000 +0700
36 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2014-07-10 19:18:17.002886537 +0700
37 @@ -88,3 +88,3 @@
38 void QtWaitingSpinner::setRoundness(qreal roundness) {
39 - myRoundness = std::max(0.0, std::min(100.0, roundness));
40 + myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
41 }
42 @@ -150,3 +150,3 @@
43 qreal resultAlpha = color.alphaF() - gradation * distance;
44 - resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
45 + resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
46 color.setAlphaF(resultAlpha);