diff --git a/.gitignore b/.gitignore index e1f5d79..b390cf1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /digikam-2.1.1.tar.bz2 /digikam-2.2.0.tar.bz2 /digikam-2.3.0.tar.bz2 +/digikam-2.4.0.tar.bz2 +/digikam-2.4.1.tar.bz2 diff --git a/digikam-2.3.0-hicolor-icons.patch b/digikam-2.3.0-hicolor-icons.patch deleted file mode 100644 index 8c1c1a8..0000000 --- a/digikam-2.3.0-hicolor-icons.patch +++ /dev/null @@ -1,162 +0,0 @@ -commit beecc2628e0c4ad3a9a44b28a88360b391048c7d -Author: Ananta Palani -Date: Tue Nov 8 10:10:08 2011 +0000 - - Regression for collision of digiKam icons with Oxygen - - BUG: 286034 - -diff --git a/data/icons/apps/hi128-app-digikam.png b/data/icons/apps/hi128-app-digikam.png -new file mode 100644 -index 0000000..95dcfc4 -Binary files /dev/null and b/data/icons/apps/hi128-app-digikam.png differ -diff --git a/data/icons/apps/hi128-app-showfoto.png b/data/icons/apps/hi128-app-showfoto.png -new file mode 100644 -index 0000000..a64f441 -Binary files /dev/null and b/data/icons/apps/hi128-app-showfoto.png differ -diff --git a/data/icons/apps/hi16-app-digikam.png b/data/icons/apps/hi16-app-digikam.png -new file mode 100644 -index 0000000..da9d087 -Binary files /dev/null and b/data/icons/apps/hi16-app-digikam.png differ -diff --git a/data/icons/apps/hi16-app-showfoto.png b/data/icons/apps/hi16-app-showfoto.png -new file mode 100644 -index 0000000..d5629b1 -Binary files /dev/null and b/data/icons/apps/hi16-app-showfoto.png differ -diff --git a/data/icons/apps/hi22-app-digikam.png b/data/icons/apps/hi22-app-digikam.png -new file mode 100644 -index 0000000..7a915f4 -Binary files /dev/null and b/data/icons/apps/hi22-app-digikam.png differ -diff --git a/data/icons/apps/hi22-app-showfoto.png b/data/icons/apps/hi22-app-showfoto.png -new file mode 100644 -index 0000000..702452f -Binary files /dev/null and b/data/icons/apps/hi22-app-showfoto.png differ -diff --git a/data/icons/apps/hi256-app-digikam.png b/data/icons/apps/hi256-app-digikam.png -new file mode 100644 -index 0000000..661cc3a -Binary files /dev/null and b/data/icons/apps/hi256-app-digikam.png differ -diff --git a/data/icons/apps/hi256-app-showfoto.png b/data/icons/apps/hi256-app-showfoto.png -new file mode 100644 -index 0000000..b55f0fb -Binary files /dev/null and b/data/icons/apps/hi256-app-showfoto.png differ -diff --git a/data/icons/apps/hi32-app-digikam.png b/data/icons/apps/hi32-app-digikam.png -new file mode 100644 -index 0000000..01cb96c -Binary files /dev/null and b/data/icons/apps/hi32-app-digikam.png differ -diff --git a/data/icons/apps/hi32-app-showfoto.png b/data/icons/apps/hi32-app-showfoto.png -new file mode 100644 -index 0000000..ecb2612 -Binary files /dev/null and b/data/icons/apps/hi32-app-showfoto.png differ -diff --git a/data/icons/apps/hi48-app-digikam.png b/data/icons/apps/hi48-app-digikam.png -new file mode 100644 -index 0000000..ed1dd37 -Binary files /dev/null and b/data/icons/apps/hi48-app-digikam.png differ -diff --git a/data/icons/apps/hi48-app-showfoto.png b/data/icons/apps/hi48-app-showfoto.png -new file mode 100644 -index 0000000..bf43254 -Binary files /dev/null and b/data/icons/apps/hi48-app-showfoto.png differ -diff --git a/data/icons/apps/hi64-app-digikam.png b/data/icons/apps/hi64-app-digikam.png -new file mode 100644 -index 0000000..77c1126 -Binary files /dev/null and b/data/icons/apps/hi64-app-digikam.png differ -diff --git a/data/icons/apps/hi64-app-showfoto.png b/data/icons/apps/hi64-app-showfoto.png -new file mode 100644 -index 0000000..0818125 -Binary files /dev/null and b/data/icons/apps/hi64-app-showfoto.png differ -diff --git a/data/icons/apps/hisc-app-digikam.svgz b/data/icons/apps/hisc-app-digikam.svgz -new file mode 100644 -index 0000000..b8f0ff3 -Binary files /dev/null and b/data/icons/apps/hisc-app-digikam.svgz differ -diff --git a/data/icons/apps/hisc-app-showfoto.svgz b/data/icons/apps/hisc-app-showfoto.svgz -new file mode 100644 -index 0000000..1586bb5 -Binary files /dev/null and b/data/icons/apps/hisc-app-showfoto.svgz differ -diff --git a/data/icons/apps/ox128-app-digikam.png b/data/icons/apps/ox128-app-digikam.png -deleted file mode 100644 -index 95dcfc4..0000000 -Binary files a/data/icons/apps/ox128-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox128-app-showfoto.png b/data/icons/apps/ox128-app-showfoto.png -deleted file mode 100644 -index a64f441..0000000 -Binary files a/data/icons/apps/ox128-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox16-app-digikam.png b/data/icons/apps/ox16-app-digikam.png -deleted file mode 100644 -index da9d087..0000000 -Binary files a/data/icons/apps/ox16-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox16-app-showfoto.png b/data/icons/apps/ox16-app-showfoto.png -deleted file mode 100644 -index d5629b1..0000000 -Binary files a/data/icons/apps/ox16-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox22-app-digikam.png b/data/icons/apps/ox22-app-digikam.png -deleted file mode 100644 -index 7a915f4..0000000 -Binary files a/data/icons/apps/ox22-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox22-app-showfoto.png b/data/icons/apps/ox22-app-showfoto.png -deleted file mode 100644 -index 702452f..0000000 -Binary files a/data/icons/apps/ox22-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox256-app-digikam.png b/data/icons/apps/ox256-app-digikam.png -deleted file mode 100644 -index 661cc3a..0000000 -Binary files a/data/icons/apps/ox256-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox256-app-showfoto.png b/data/icons/apps/ox256-app-showfoto.png -deleted file mode 100644 -index b55f0fb..0000000 -Binary files a/data/icons/apps/ox256-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox32-app-digikam.png b/data/icons/apps/ox32-app-digikam.png -deleted file mode 100644 -index 01cb96c..0000000 -Binary files a/data/icons/apps/ox32-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox32-app-showfoto.png b/data/icons/apps/ox32-app-showfoto.png -deleted file mode 100644 -index ecb2612..0000000 -Binary files a/data/icons/apps/ox32-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox48-app-digikam.png b/data/icons/apps/ox48-app-digikam.png -deleted file mode 100644 -index ed1dd37..0000000 -Binary files a/data/icons/apps/ox48-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox48-app-showfoto.png b/data/icons/apps/ox48-app-showfoto.png -deleted file mode 100644 -index bf43254..0000000 -Binary files a/data/icons/apps/ox48-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/ox64-app-digikam.png b/data/icons/apps/ox64-app-digikam.png -deleted file mode 100644 -index 77c1126..0000000 -Binary files a/data/icons/apps/ox64-app-digikam.png and /dev/null differ -diff --git a/data/icons/apps/ox64-app-showfoto.png b/data/icons/apps/ox64-app-showfoto.png -deleted file mode 100644 -index 0818125..0000000 -Binary files a/data/icons/apps/ox64-app-showfoto.png and /dev/null differ -diff --git a/data/icons/apps/oxsc-app-digikam.svgz b/data/icons/apps/oxsc-app-digikam.svgz -deleted file mode 100644 -index b8f0ff3..0000000 -Binary files a/data/icons/apps/oxsc-app-digikam.svgz and /dev/null differ -diff --git a/data/icons/apps/oxsc-app-showfoto.svgz b/data/icons/apps/oxsc-app-showfoto.svgz -deleted file mode 100644 -index 1586bb5..0000000 -Binary files a/data/icons/apps/oxsc-app-showfoto.svgz and /dev/null differ -diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt -index e015354..4e92cb7 100644 ---- a/digikam/CMakeLists.txt -+++ b/digikam/CMakeLists.txt -@@ -256,7 +256,7 @@ ENDIF(USE_SCRIPT_IFACE) - - QT4_ADD_DBUS_ADAPTOR(digikam_SRCS main/org.kde.digikam.xml main/digikamapp.h Digikam::DigikamApp) - --KDE4_ADD_APP_ICON(digikam_SRCS "../data/icons/apps/ox*-app-digikam.png") -+KDE4_ADD_APP_ICON(digikam_SRCS "../data/icons/apps/hi*-app-digikam.png") - - KDE4_ADD_EXECUTABLE(digikam ${digikam_SRCS}) - -diff --git a/showfoto/CMakeLists.txt b/showfoto/CMakeLists.txt -index 2b78690..658aad7 100644 ---- a/showfoto/CMakeLists.txt -+++ b/showfoto/CMakeLists.txt -@@ -20,7 +20,7 @@ SET(showfoto_SRCS - main/showfoto.cpp - ) - --KDE4_ADD_APP_ICON(showfoto_SRCS "../data/icons/apps/ox*-app-showfoto.png") -+KDE4_ADD_APP_ICON(showfoto_SRCS "../data/icons/apps/hi*-app-showfoto.png") - - KDE4_ADD_EXECUTABLE(showfoto ${showfoto_SRCS}) - diff --git a/digikam-2.3.0-tooltips.patch b/digikam-2.3.0-tooltips.patch deleted file mode 100644 index 8dfb5d7..0000000 --- a/digikam-2.3.0-tooltips.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 9199fb6..5a8ed7e 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ Name: digikam -Version: 2.3.0 -Release: 4%{?dist} +Version: 2.4.1 +Release: 1%{?dist} Summary: A digital camera accessing & photo management application License: GPLv2+ @@ -20,14 +20,8 @@ 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 -# fix collision of digiKam icons with Oxygen -Patch100: digikam-2.3.0-hicolor-icons.patch # for clapack, see also the clapack-atlas patch BuildRequires: atlas-devel @@ -201,12 +195,6 @@ 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 -%patch100 -p1 -b .hicolor-icons -popd %build @@ -232,7 +220,6 @@ desktop-file-install --vendor="" \ cat showfoto.lang >> digikam.lang %find_lang libkgeomap -#find_lang libkvkontakte %find_lang kipi-plugins --with-kde %find_lang kipiplugin_acquireimages @@ -260,7 +247,6 @@ cat showfoto.lang >> digikam.lang %find_lang kipiplugin_sendimages %find_lang kipiplugin_shwup %find_lang kipiplugin_timeadjust -#find_lang kipiplugin_wallpaper cat kipiplugin_acquireimages.lang kipiplugin_advancedslideshow.lang \ kipiplugin_batchprocessimages.lang kipiplugin_calendar.lang \ kipiplugin_dngconverter.lang kipiplugin_expoblending.lang \ @@ -479,6 +465,10 @@ update-desktop-database -q &> /dev/null %changelog +* Mon Dec 5 2011 Alexey Kurov - 2.4.1-1 +- digikam-2.4.1 +- drop icons and tooltips patches (in upstream now) + * Mon Nov 21 2011 Rex Dieter 2.3.0-4 - Unreadable text on tooltips in KDE 4.7 (kde#283572) diff --git a/sources b/sources index 3984ec7..b3eceb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45e635c0079a608c2d5508be8127d388 digikam-2.3.0.tar.bz2 +4e36b8cc33f5ac589e4b45b22c902fdd digikam-2.4.1.tar.bz2