Drop unused patch.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 5 insertions, 78 deletions

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index ee8bdd243202..d58c4382e63c 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.77 2010/08/09 17:35:27 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.78 2010/08/10 13:26:08 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/4.3.3-world_clock.patch:
+  Drop unused patch.
 
   09 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> marble-4.4.5.ebuild:
   Drop alpha ia64 and sparc per the AT Lead permission.
diff --git a/kde-base/marble/files/4.3.3-world_clock.patch b/kde-base/marble/files/4.3.3-world_clock.patch
deleted file mode 100644
index e0ece4d57d4a..000000000000
--- a/kde-base/marble/files/4.3.3-world_clock.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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