From bbaed7bf356fe7dca434262c23ab6f330e92497402fc1e747314310c8444707b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 19 Jan 2018 10:53:49 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/digikam revision 166.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=fef2615473014f3ef5ea5d7d30193b0e --- digikam.changes | 7 +++ digikam.spec | 5 ++- fix-font-size-in-tooltips.patch | 78 +++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 fix-font-size-in-tooltips.patch diff --git a/digikam.changes b/digikam.changes index e08df7d..032022e 100644 --- a/digikam.changes +++ b/digikam.changes @@ -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 diff --git a/digikam.spec b/digikam.spec index 6e5a0d8..9128ef8 100644 --- a/digikam.spec +++ b/digikam.spec @@ -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 diff --git a/fix-font-size-in-tooltips.patch b/fix-font-size-in-tooltips.patch new file mode 100644 index 0000000..54d9e8c --- /dev/null +++ b/fix-font-size-in-tooltips.patch @@ -0,0 +1,78 @@ +From cdc4659165008995bc60d6ac6fabe482928b8aef Mon Sep 17 00:00:00 2001 +From: Maik Qualmann +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(""); + tipFooter = QLatin1String("
"); + + headBeg = QString::fromLatin1("" +- "
") ++ "

") + .arg(qApp->palette().color(QPalette::Base).name()) + .arg(qApp->palette().color(QPalette::Text).name()) +- .arg(font.family()); +- headEnd = QLatin1String("
"); ++ .arg(font.family()) ++ .arg(fontSize); ++ ++ headEnd = QLatin1String("

"); + +- cellBeg = QString::fromLatin1("") ++ cellBeg = QString::fromLatin1("

") + .arg(qApp->palette().color(QPalette::ToolTipText).name()) +- .arg(font.family()); +- cellMid = QString::fromLatin1("") ++ .arg(font.family()) ++ .arg(fontSize); ++ ++ cellMid = QString::fromLatin1("

") + .arg(qApp->palette().color(QPalette::ToolTipText).name()) +- .arg(font.family()); +- cellEnd = QLatin1String(""); ++ .arg(font.family()) ++ .arg(fontSize); + +- cellSpecBeg = QString::fromLatin1("") ++ cellEnd = QLatin1String("

"); ++ ++ cellSpecBeg = QString::fromLatin1("

") + .arg(qApp->palette().color(QPalette::ToolTipText).name()) +- .arg(font.family()); +- cellSpecMid = QString::fromLatin1("") ++ .arg(font.family()) ++ .arg(fontSize); ++ ++ cellSpecMid = QString::fromLatin1("

") + .arg(qApp->palette().color(QPalette::ToolTipText).name()) +- .arg(font.family()); +- cellSpecEnd = QLatin1String(""); ++ .arg(font.family()) ++ .arg(fontSize); ++ ++ cellSpecEnd = QLatin1String("

"); + } + + QString DToolTipStyleSheet::breakString(const QString& input) const +-- +cgit v0.11.2 +