Fix world clock plasmoid. Per bug #280834.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 93 insertions, 14 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index a7f5cd2118c3..88e60d2afdf7 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.47 2009/11/09 00:14:55 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.48 2009/11/22 12:10:06 scarabeus Exp $
+
+*marble-4.3.3-r1 (22 Nov 2009)
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.3.3-world_clock.patch, -marble-4.3.3.ebuild,
+  +marble-4.3.3-r1.ebuild:
+  Fix world clock plasmoid. Per bug #280834.
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -marble-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index f2170b908c0c..cb0aa9bda0f7 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 4.3.3-world_clock.patch 3156 RMD160 562427f96a14be8aeb7c92f07c0f0c2a6d0b861c SHA1 61c631f07e0b301be3564a3cc390c138fa050a66 SHA256 b0938e92976c3302eafda065b30758d9f7b1d9f15952be036c65b24d2fde9888
 DIST kdeedu-4.3.1.tar.bz2 57866780 RMD160 dcb90ec4d3794131ea3387518fdbcb88e67c1118 SHA1 6326cff7779dfadc1b18a3a6bbe7b0750fb7ceaf SHA256 2dd1d45da9941fb7977e7746eba71f218ea081d1f1828c971db906d003775413
 DIST kdeedu-4.3.3.tar.bz2 57944052 RMD160 97ebfc7d2eb4fd5cf21df32eae95efa26f835b86 SHA1 fde1b8a7e548077f6327c940ec530db8565b5968 SHA256 3527fdb100f8d9e821ae1c811780ab6c255fb29f2c8d4acfe18d72f067312998
 EBUILD marble-4.3.1.ebuild 1362 RMD160 3197a93b3a330c46f101a4d0992c74aac1f05917 SHA1 f8570c01d8fc48ac2ea9c9df63fe4a33b8c8d9fd SHA256 f2aa85bcff81acb0e4da3c40e36059a5c0ae7dadf98a1afe4e0a66afd34506a0
-EBUILD marble-4.3.3.ebuild 1345 RMD160 05310cdda11556e6c537cea836b41f844b20a620 SHA1 500bba6a58f5f489070054ccdd0224f70c8cf175 SHA256 d73783cf0fc462a502d754c1c4af74b12f5d8a087f24cf1b819359586088f88b
-MISC ChangeLog 6001 RMD160 92677fd659e3b19769cb7b2805a5cc5f93b3eee2 SHA1 0131e86221dcc0c83b585c961ec55581f212bf36 SHA256 90a2293154a2ed79685f6334ceb6da66ff6091e166601fc74b166ae6fa54701c
+EBUILD marble-4.3.3-r1.ebuild 1404 RMD160 e03e18ea89a227ae530b4cd00319ae85c9f5c4f5 SHA1 d9de764ea403a1c9bfeae6dbb7359e69d22c9701 SHA256 47a35ea3aa63aad32bd9fe378b324e14e57da7355810ef9949422d27de07d8c2
+MISC ChangeLog 6220 RMD160 fb79f177ee81a57bc3cf30ba337c1112b032d676 SHA1 0116b46e84ed729e7340e572aa27e1334da2f105 SHA256 5a4ed7c0170eae77c702a9b9eaf659597a819a8a76657ba49d21a636a16835cd
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkr3XxAACgkQ5BmOA85PVLi27wCfQFOofjNLHeubScdOFMX5bvrE
-TpkAnRQKrYdYmB9lJrN+WJ6/6HhLg275
-=bBEY
------END PGP SIGNATURE-----
diff --git a/kde-base/marble/files/4.3.3-world_clock.patch b/kde-base/marble/files/4.3.3-world_clock.patch
new file mode 100644
index 000000000000..e0ece4d57d4a
--- /dev/null
+++ b/kde-base/marble/files/4.3.3-world_clock.patch
@@ -0,0 +1,77 @@
+Index: branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.cpp
+===================================================================
+--- branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.cpp	(revision 1049583)
++++ branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.cpp	(revision 1049584)
+@@ -295,30 +295,41 @@
+     locstr.remove( 0, locstr.lastIndexOf( '/' ) + 1 ).replace( '_', ' ' );
+     QRect timeRect( m_points.value( "topleft" ), m_points.value( "middleright" ) );
+     QRect locationRect( m_points.value( "middleleft" ), m_points.value( "bottomright" ) );
++    
++    m_locationFont = calculateFont(locstr, locationRect);
++    m_timeFont = calculateFont(timestr, timeRect);
++}
++
++QFont WorldClock::calculateFont(const QString &text, const QRect &boundingBox) const
++{
++    QFont resultFont( "Helvetica", 3, QFont::Bold);
++     
++    int unscaled = 0; // Avoid infinite loops, bug 189633
++    QRect lastBox;
++    
+     //we set very small defaults and then increase them
+-    int lastSize = 3;
+-    for ( int curSize = 4; ; ++curSize, ++lastSize ) {
+-        QFont font( "Helvetica", curSize, QFont::Bold);
+-        QFontMetrics metrics( font );
+-        QRect rect = metrics.boundingRect( locstr );
+-        if ( rect.width()  > locationRect.width() ||
+-             rect.height() > locationRect.height() ) {
++    for ( int curSize = resultFont.pointSize()+1; unscaled<100; ++curSize ) {
++        resultFont.setPointSize(curSize);
++        QFontMetrics metrics( resultFont );
++        QRect rect = metrics.boundingRect( text );
++        if ( rect.width()  > boundingBox.width() ||
++             rect.height() > boundingBox.height() ) {
+             break;
+         }
+-    }
+-    m_locationFont = QFont( "Helvetica", lastSize, QFont::Bold);
+-    lastSize = 3;
+-    for ( int curSize = 4; ; ++curSize, ++lastSize ) {
+-        QFont font( "Helvetica", curSize, QFont::Bold);
+-        QFontMetrics metrics( font );
+-        QRect rect = metrics.boundingRect( timestr );
+-        if ( rect.width()  > timeRect.width() ||
+-             rect.height() > timeRect.height() ) {
+-            break;
++
++        if ( rect.width() > lastBox.width() || 
++            rect.height() > lastBox.height() ) {
++            unscaled = 0;
+         }
++        else {
++            ++unscaled;
++        }
++
++        lastBox = rect;
+     }
+-    m_timeFont = QFont( "Helvetica", lastSize, QFont::Bold);
+-    return;
++        
++    resultFont.setPointSize(resultFont.pointSize()-1);
++    return resultFont;
+ }
+ 
+ void WorldClock::recalculateTranslation()
+Index: branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.h
+===================================================================
+--- branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.h	(revision 1049583)
++++ branches/KDE/4.3/kdeedu/marble/src/plasmoid/worldclock.h	(revision 1049584)
+@@ -67,6 +67,7 @@
+         //these are used for sizing & positioning text
+         void recalculatePoints();
+         void recalculateFonts();
++        QFont calculateFont(const QString &text, const QRect &boundingBox) const;
+         void recalculateTranslation();
+ 
+         //for changing zones based on mouse position
diff --git a/kde-base/marble/marble-4.3.3.ebuild b/kde-base/marble/marble-4.3.3-r1.ebuild
index f262f77f69f9..2f54e69494c4 100644
--- a/kde-base/marble/marble-4.3.3.ebuild
+++ b/kde-base/marble/marble-4.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.3.3.ebuild,v 1.1 2009/11/02 22:04:20 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.3.3-r1.ebuild,v 1.1 2009/11/22 12:10:06 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,6 +26,10 @@ RDEPEND="${DEPEND}
 	!kdeprefix? ( !sci-geosciences/marble )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}-world_clock.patch"
+)
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)