head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.104 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.102 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.100 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.98 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.96 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.94 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.92 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.90 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.88 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.86 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.84 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.82 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.80 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.78 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.76 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.74 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.72 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.70 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.68 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.66 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.64 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.62 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.60 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.56 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.36 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.58 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.54 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.52 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.50 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.48 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.46 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.44 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.42 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.40 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.38 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.34 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.32 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.30 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.28 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.26 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.24 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.22 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.20 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.18 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.16 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.14 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.12 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.10 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.8 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.6 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.4 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.2 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.1.0.10 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.8 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.6 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.4 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.2 pkgsrc-2012Q1-base:1.1; locks; strict; comment @// @; 1.2 date 2013.04.03.10.51.50; author markd; state Exp; branches; next 1.1; 1.1 date 2012.03.19.19.44.04; author markd; state Exp; branches; next ; desc @@ 1.2 log @Update to KDE SC 4.10.2 bugfixes, other quality improvements, new and improved KDE Applications @ text @$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.1 2012/03/19 19:44:04 markd Exp $ avoid an infinite loop when starting plasma. (from Sverre Froyen) --- plasma/generic/applets/digital-clock/clock.cpp.orig 2013-03-01 06:32:24.000000000 +0000 +++ plasma/generic/applets/digital-clock/clock.cpp @@@@ -678,32 +678,38 @@@@ void Clock::generatePixmap() void Clock::expandFontToMax(QFont &font, const QString &text) { - bool first = true; const QRect rect = contentsRect().toRect(); int oldWidth = 0; int oldHeight = 0; + int tryMax = 10; + int trys = 0; + int pointSize = font.pointSize(); + int width, height; // Starting with the given font, increase its size until it'll fill the rect + // Try logic protects against an infinite loop + // when larger point sizes are missing do { - if (first) { - first = false; - } else { - font.setPointSize(font.pointSize() + 1); - } - + font.setPointSize(font.pointSize() + 1); const QFontMetrics fm(font); QRect fr = fm.boundingRect(rect, Qt::TextSingleLine, text); - if (oldWidth == fr.width() && oldHeight == fr.height()) { - // Largest font size reached. - break; + if (fr.width() > width || fr.height() > height) { + width = fr.width(); + height = fr.height(); + if (width > rect.width() || height > rect.height()) { + break; + } + // Real point size has changed and is valid + pointSize = font.pointSize(); + trys = 0; } - oldWidth = fr.width(); - oldHeight = fr.height(); - - if (fr.width() >= rect.width() || fr.height() >= rect.height()) { - break; + else { + // Real point size did not change + trys++; } - } while (true); + } while (trys < tryMax); + + font.setPointSize(pointSize); } void Clock::prepareFont(QFont &font, QRect &rect, const QString &text, bool singleline) @ 1.1 log @Update to KDE SC 4.8.0 add kactivities rename kdebase4 -> kde-baseapps4 rename kdebase-runtime4 -> kde-runtime4 rename kdebase-workspace4 -> kde-workspace4 rename kdebindings4-python -> py-kde4 @ text @d1 1 a1 1 $NetBSD$ d5 3 a7 3 --- plasma/generic/applets/digital-clock/clock.cpp.orig 2012-01-09 10:32:10.000000000 -0700 +++ plasma/generic/applets/digital-clock/clock.cpp 2012-01-10 11:57:19.000000000 -0700 @@@@ -687,23 +687,36 @@@@ void Clock::generatePixmap() d13 2 d33 2 a34 1 - if (fr.width() >= rect.width() || fr.height() >= rect.height()) { d46 5 a50 1 - } while (true); d54 2 a55 1 + } @