pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 567200 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/567200
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=166
This commit is contained in:
Dominique Leuenberger 2018-01-19 10:53:49 +00:00 committed by Git OBS Bridge
commit 4a3d27a156
3 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
digikam.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 17 18:50:08 UTC 2018 - wbauer@tmo.at
- Add fix-font-size-in-tooltips.patch to make tooltips respect the
configured font size (kde#337243)
- Remove some no longer respected cmake options
-------------------------------------------------------------------
Mon Jan 15 19:33:44 UTC 2018 - wbauer@tmo.at

5
digikam.spec
View File

@ -32,6 +32,8 @@ Patch1: 0001-Revert-replace-obsolete-qSort-function.patch
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 @@ The main digikam libraries that are being shared between showfoto and digikam
%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=OFF"
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

78
fix-font-size-in-tooltips.patch Normal file
View File

@ -0,0 +1,78 @@
From cdc4659165008995bc60d6ac6fabe482928b8aef Mon Sep 17 00:00:00 2001
From: Maik Qualmann <metzpinguin@gmail.com>
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