From 9fcb662fed38dbd836bdd9f0f3a11c0e5c6c94d5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Nov 22 2011 13:29:23 +0000 Subject: Unreadable text on tooltips in KDE 4.7 (kde#283572) --- diff --git a/digikam-2.3.0-tooltips.patch b/digikam-2.3.0-tooltips.patch new file mode 100644 index 0000000..8dfb5d7 --- /dev/null +++ b/digikam-2.3.0-tooltips.patch @@ -0,0 +1,26 @@ +diff -up digikam-2.3.0/core/libs/widgets/common/ditemtooltip.cpp.tooltips digikam-2.3.0/core/libs/widgets/common/ditemtooltip.cpp +--- digikam-2.3.0/core/libs/widgets/common/ditemtooltip.cpp.tooltips 2011-11-07 01:50:35.000000000 -0600 ++++ digikam-2.3.0/core/libs/widgets/common/ditemtooltip.cpp 2011-11-22 07:24:57.108458305 -0600 +@@ -65,18 +65,18 @@ DToolTipStyleSheet::DToolTipStyleSheet(c + headEnd = QString(""); + + cellBeg = QString("") +- .arg(kapp->palette().color(QPalette::Text).name()) ++ .arg(kapp->palette().color(QPalette::ToolTipText).name()) + .arg(font.family()); + cellMid = QString("") +- .arg(kapp->palette().color(QPalette::Text).name()) ++ .arg(kapp->palette().color(QPalette::ToolTipText).name()) + .arg(font.family()); + cellEnd = QString(""); + + cellSpecBeg = QString("") +- .arg(kapp->palette().color(QPalette::Text).name()) ++ .arg(kapp->palette().color(QPalette::ToolTipText).name()) + .arg(font.family()); + cellSpecMid = QString("") +- .arg(kapp->palette().color(QPalette::Text).name()) ++ .arg(kapp->palette().color(QPalette::ToolTipText).name()) + .arg(font.family()); + cellSpecEnd = QString(""); + } diff --git a/digikam.spec b/digikam.spec index 8f3cd64..9199fb6 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ Name: digikam Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -20,6 +20,9 @@ Source1: digikam-import.desktop Patch0: digikam-2.1.1-clapack-atlas.patch ## upstreamable patches +# Unreadable text on tooltips in KDE 4.7 (kde#283572) +# http://bugs.kde.org/283572 +Patch50: digikam-2.3.0-tooltips.patch ## upstream patches # https://projects.kde.org/projects/extragear/graphics/digikam/repository/revisions/beecc2628e0c4ad3a9a44b28a88360b391048c7d @@ -198,6 +201,7 @@ Requires: kipi-plugins = %{version}-%{release} %setup -q -n %{name}-%{version}%{?pre:-%{pre}} %patch0 -p1 -b .clapack-atlas +%patch50 -p1 -b .tooltips pushd core for i in data/icons/apps/ox*; do mv $i $(echo $i | sed -e 's/ox/hi/g'); done @@ -475,6 +479,9 @@ update-desktop-database -q &> /dev/null %changelog +* Mon Nov 21 2011 Rex Dieter 2.3.0-4 +- Unreadable text on tooltips in KDE 4.7 (kde#283572) + * Tue Nov 15 2011 Rex Dieter 2.3.0-3 - BR: libjpeg-devel