Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2018-01-19 11:53:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Fri Jan 19 11:53:49 2018 rev:166 rq:567200 version:5.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2018-01-17 21:58:35.178440320 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2018-01-19 11:54:16.244647811 +0100 @@ -1,0 +2,7 @@ +Wed Jan 17 18:50:08 UTC 2018 - [email protected] + +- Add fix-font-size-in-tooltips.patch to make tooltips respect the + configured font size (kde#337243) +- Remove some no longer respected cmake options + +------------------------------------------------------------------- New: ---- fix-font-size-in-tooltips.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.v5K16f/_old 2018-01-19 11:54:21.076420109 +0100 +++ /var/tmp/diff_new_pack.v5K16f/_new 2018-01-19 11:54:21.076420109 +0100 @@ -32,6 +32,8 @@ Patch2: 0002-Revert-replace-obsolete-qSort-function.patch # PATCH-FIX-OPENSUSE fix-italian-docs-with-older-kdoctools.patch -- fix build with the old kdoctools in Leap 42.2 that misses two necessary entities for italian Patch3: fix-italian-docs-with-older-kdoctools.patch +# PATCH-FIX-UPSTREAM +Patch4: fix-font-size-in-tooltips.patch #This pulls in QWebEngine, which is not available on ppc64 %ifarch %ix86 x86_64 %arm aarch64 mips mips64 BuildRequires: akonadi-contact-devel @@ -181,6 +183,7 @@ %patch3 -p1 %endif %endif +%patch4 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -200,7 +203,7 @@ EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kf5 -d build -- -DKFACE_EXTERNAL_FINDOPENCV:BOOL=TRUE -DENABLE_APPSTYLES=ON -DENABLE_MYSQLSUPPORT=on -DENABLE_KINOTIFY=ON -DENABLE_OPENCV3=ON -DENABLE_MEDIAPLAYER=ON +%cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MYSQLSUPPORT=on -DENABLE_OPENCV3=ON -DENABLE_MEDIAPLAYER=ON %make_jobs VERBOSE=1 ++++++ fix-font-size-in-tooltips.patch ++++++ >From cdc4659165008995bc60d6ac6fabe482928b8aef Mon Sep 17 00:00:00 2001 From: Maik Qualmann <[email protected]> Date: Wed, 17 Jan 2018 19:09:06 +0100 Subject: fix font size in the tooltips BUGS: 337243 FIXED-IN: 5.9.0 --- NEWS | 3 ++- libs/widgets/itemview/ditemtooltip.cpp | 41 ++++++++++++++++++++++------------ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/core/libs/widgets/itemview/ditemtooltip.cpp b/core/libs/widgets/itemview/ditemtooltip.cpp index c375c53..ab932a7 100644 --- a/core/libs/widgets/itemview/ditemtooltip.cpp +++ b/core/libs/widgets/itemview/ditemtooltip.cpp @@ -52,33 +52,46 @@ namespace Digikam DToolTipStyleSheet::DToolTipStyleSheet(const QFont& font) : maxStringLength(30) { - unavailable = i18n("unavailable"); + unavailable = i18n("unavailable"); + + QString fontSize = (font.pointSize() == -1) ? QString::fromUtf8("font-size: %1px;").arg(font.pixelSize()) + : QString::fromUtf8("font-size: %1pt;").arg(font.pointSize()); tipHeader = QLatin1String("<qt><table cellspacing=\"0\" cellpadding=\"0\" width=\"250\" border=\"0\">"); tipFooter = QLatin1String("</table></qt>"); headBeg = QString::fromLatin1("<tr bgcolor=\"%1\"><td colspan=\"2\">" - "<nobr><font size=\"-1\" color=\"%2\" face=\"%3\"><center><b>") + "<nobr><p style=\"color:%2; font-family:%3; %4\"><center><b>") .arg(qApp->palette().color(QPalette::Base).name()) .arg(qApp->palette().color(QPalette::Text).name()) - .arg(font.family()); - headEnd = QLatin1String("</b></center></font></nobr></td></tr>"); + .arg(font.family()) + .arg(fontSize); + + headEnd = QLatin1String("</b></center></p></nobr></td></tr>"); - cellBeg = QString::fromLatin1("<tr><td><nobr><font size=\"-1\" color=\"%1\" face=\"%2\">") + cellBeg = QString::fromLatin1("<tr><td><nobr><p style=\"color:%1; font-family:%2; %3\">") .arg(qApp->palette().color(QPalette::ToolTipText).name()) - .arg(font.family()); - cellMid = QString::fromLatin1("</font></nobr></td><td><nobr><font size=\"-1\" color=\"%1\" face=\"%2\">") + .arg(font.family()) + .arg(fontSize); + + cellMid = QString::fromLatin1("</p></nobr></td><td><nobr><p style=\"color:%1; font-family:%2; %3\">") .arg(qApp->palette().color(QPalette::ToolTipText).name()) - .arg(font.family()); - cellEnd = QLatin1String("</font></nobr></td></tr>"); + .arg(font.family()) + .arg(fontSize); - cellSpecBeg = QString::fromLatin1("<tr><td><nobr><font size=\"-1\" color=\"%1\" face=\"%2\">") + cellEnd = QLatin1String("</p></nobr></td></tr>"); + + cellSpecBeg = QString::fromLatin1("<tr><td><nobr><p style=\"color:%1; font-family:%2; %3\">") .arg(qApp->palette().color(QPalette::ToolTipText).name()) - .arg(font.family()); - cellSpecMid = QString::fromLatin1("</font></nobr></td><td><nobr><font size=\"-1\" color=\"%1\" face=\"%2\"><i>") + .arg(font.family()) + .arg(fontSize); + + cellSpecMid = QString::fromLatin1("</p></nobr></td><td><nobr><p style=\"color:%1; font-family:%2; %3\"><i>") .arg(qApp->palette().color(QPalette::ToolTipText).name()) - .arg(font.family()); - cellSpecEnd = QLatin1String("</i></font></nobr></td></tr>"); + .arg(font.family()) + .arg(fontSize); + + cellSpecEnd = QLatin1String("</i></p></nobr></td></tr>"); } QString DToolTipStyleSheet::breakString(const QString& input) const -- cgit v0.11.2
