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

Accepting request 41783 from KDE:KDE4:Factory:Desktop

Browse Source 
Copy from KDE:KDE4:Factory:Desktop/digikam based on submit request 41783 from user dirkmueller

OBS-URL: https://build.opensuse.org/request/show/41783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=46
This commit is contained in:
OBS User autobuild 2010-06-21 16:55:36 +00:00 committed by Git OBS Bridge
parent 7b5f5fd37e
commit b6f7a1d8be
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
digikam.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 7 23:29:28 UTC 2010 - cornelis@solcon.nl
- use right name for Red eyes tool action (fixes KDE bug
234545: Red eye correction tool is missing from image editor)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 10 17:54:14 UTC 2010 - cmorve69@yahoo.es Mon May 10 17:54:14 UTC 2010 - cmorve69@yahoo.es

4
digikam.spec
View File

@ -27,12 +27,13 @@ License: GPLv2+
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager Summary: A KDE Photo Manager
Version: 1.2.0 Version: 1.2.0
Release: 2 Release: 3
%define tar_version 1.2.0 %define tar_version 1.2.0
Source0: %name-%{tar_version}.tar.bz2 Source0: %name-%{tar_version}.tar.bz2
Source1: %{name}-docs.tar.bz2 Source1: %{name}-docs.tar.bz2
Patch0: r1109177.diff Patch0: r1109177.diff
Patch1: %{name}-buildtime.patch Patch1: %{name}-buildtime.patch
Patch2: fix-redeyestool.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires %kde4_runtime_requires
%kde4_pimlibs_requires %kde4_pimlibs_requires
@ -102,6 +103,7 @@ Authors:
%setup -q -n %name-%{tar_version} -a 1 %setup -q -n %name-%{tar_version} -a 1
%patch0 %patch0
%patch1 %patch1
%patch2
FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y') FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%b %e %Y')
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" digikam/version.h.cmake
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt

28
fix-redeyestool.diff Normal file
View File

@ -0,0 +1,28 @@
--- imageplugins/enhance/digikamimageplugin_enhance_ui.rc 2010/04/25 04:51:21 1118551
+++ imageplugins/enhance/digikamimageplugin_enhance_ui.rc 2010/04/25 05:31:21 1118552
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui version="21" name="digikamimageplugin_enhance" >
+<gui version="22" name="digikamimageplugin_enhance" >
<MenuBar>
@@ -39,6 +39,6 @@
<Action shortcut="" name="imageplugin_antivignetting" />
<Action shortcut="" name="imageplugin_lensdistortion" />
<Action shortcut="" name="imageplugin_hotpixels" />
-</ActionProperties>
+ </ActionProperties>
</gui>
--- imageplugins/enhance/imageplugin_enhance.cpp 2010/04/25 04:51:21 1118551
+++ imageplugins/enhance/imageplugin_enhance.cpp 2010/04/25 05:31:21 1118552
@@ -89,7 +89,7 @@
m_redeyeAction = new KAction(KIcon("redeyes"), i18n("Red Eye..."), this);
m_redeyeAction->setWhatsThis(i18n("This filter can be used to correct red eyes in a photo. "
"Select a region including the eyes to use this option."));
- actionCollection()->addAction("implugcore_redeye", m_redeyeAction);
+ actionCollection()->addAction("imageplugin_redeye", m_redeyeAction);
connect(m_redeyeAction, SIGNAL(triggered(bool) ),
this, SLOT(slotRedEye()));