From e6601280196d13bbe2dfe0a2cf1f7e0401464b8d0b0676bf004fc0553c2f3633 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 8 May 2008 21:04:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=22 --- FIXME.diff | 37 +++++++++ digikam.changes | 5 ++ digikam.spec | 210 +++++++++++++++++++++++++----------------------- 3 files changed, 151 insertions(+), 101 deletions(-) create mode 100644 FIXME.diff diff --git a/FIXME.diff b/FIXME.diff new file mode 100644 index 0000000..69fb93f --- /dev/null +++ b/FIXME.diff @@ -0,0 +1,37 @@ +--- digikam/utilities/setup/setupdcraw.cpp ++++ digikam/utilities/setup/setupdcraw.cpp +@@ -89,8 +89,10 @@ void SetupDcraw::applySettings() + KConfig* config = kapp->config(); + config->setGroup("ImageViewer Settings"); + config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits()); ++#if 0 + config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB()); + config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance()); ++#endif + config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor()); + config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels()); + config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction()); +@@ -116,8 +118,10 @@ void SetupDcraw::readSettings() + d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0)); + d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false)); + d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0)); ++#if 0 + d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true)); + d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true)); ++#endif + d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false)); + d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality) + config->readNumEntry("RAWQuality", +--- digikam/utilities/imageeditor/editor/editorwindow.cpp ++++ digikam/utilities/imageeditor/editor/editorwindow.cpp +@@ -894,8 +894,10 @@ void EditorWindow::applyStandardSettings + m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB; + + m_IOFileSettings->rawDecodingSettings.sixteenBitsImage = config->readBoolEntry("SixteenBitsImage", false); ++#if 0 + m_IOFileSettings->rawDecodingSettings.automaticColorBalance = config->readBoolEntry("AutomaticColorBalance", true); + m_IOFileSettings->rawDecodingSettings.cameraColorBalance = config->readBoolEntry("CameraColorBalance", true); ++#endif + m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors = config->readBoolEntry("RGBInterpolate4Colors", false); + m_IOFileSettings->rawDecodingSettings.DontStretchPixels = config->readBoolEntry("DontStretchPixels", false); + m_IOFileSettings->rawDecodingSettings.enableNoiseReduction = config->readBoolEntry("EnableNoiseReduction", false); diff --git a/digikam.changes b/digikam.changes index d1b659a..1a43d04 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 8 14:16:07 CEST 2008 - dmueller@suse.de + +- temporarly disable autocolor/whitebalance setting + ------------------------------------------------------------------- Sun Dec 30 12:28:36 CET 2007 - coolo@suse.de diff --git a/digikam.spec b/digikam.spec index 4ff3120..34234e2 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam (Version 0.9.3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + Name: digikam BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel sqlite-devel sqlite2-devel @@ -30,7 +31,7 @@ License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Version: 0.9.3 -Release: 1 +Release: 57 %define rversion 0.9.3 Url: http://www.digikam.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,7 @@ Patch4: digikam-gphoto-disk.patch Patch5: digikam-load.diff Patch7: digikam-print.diff Patch9: renamepreview.patch +Patch10: FIXME.diff Requires: imlib2-loaders %if %suse_version > 1020 Requires: %{name}-lang = %{version} @@ -65,6 +67,7 @@ Authors: Renchi Raju %package -n libdigikam-devel +License: GPL v2 or later Group: Hardware/Camera Summary: A KDE Photo Manager Requires: libkexiv2-devel kdelibs3-devel @@ -93,6 +96,7 @@ Authors: Renchi Raju %package -n digikamimageplugins +License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: Image Manipulation Plug-Ins Recommends: digikamimageplugins-superimpose @@ -127,6 +131,7 @@ Authors: Renchi Raju %package -n digikamimageplugins-superimpose +License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: Templates for Digikam's Superimpose Plugin @@ -152,6 +157,7 @@ rm -rf digikam/sqlite #%patch5 -p0 %patch7 %patch9 +%patch10 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -239,10 +245,12 @@ rm -rf $RPM_BUILD_ROOT /opt/kde3/share/apps/digikamimageplugins/superimpose %changelog -* Sun Dec 30 2007 - coolo@suse.de +* Thu May 08 2008 dmueller@suse.de +- temporarly disable autocolor/whitebalance setting +* Sun Dec 30 2007 coolo@suse.de - update to 0.9.3 final: * new quick navigation feature has been added -* Mon Dec 10 2007 - stbinner@suse.de +* Mon Dec 10 2007 stbinner@suse.de - update to 0.9.3-rc1: * In the Albums/Tags/Searches/TagsFilter sidebars the is a live filter at the bottom that lets you search for a string in @@ -264,21 +272,21 @@ rm -rf $RPM_BUILD_ROOT to album window. - A progress bar has been added to indicate the available space in the Album Library Path -* Sat Nov 03 2007 - dmueller@suse.de +* Sat Nov 03 2007 dmueller@suse.de - fix build against lcms 1.17 -* Wed Aug 22 2007 - meissner@suse.de +* Wed Aug 22 2007 meissner@suse.de - handle filename conversions correctly, if you by chance use MTP devices with digikam. -* Tue Jul 17 2007 - stbinner@suse.de +* Tue Jul 17 2007 stbinner@suse.de - don't show digikamthemedesigner within application menu -* Mon Jul 09 2007 - stbinner@suse.de +* Mon Jul 09 2007 stbinner@suse.de - move obsoletes/provides to proper place -* Thu Jun 21 2007 - dmueller@suse.de +* Thu Jun 21 2007 dmueller@suse.de - deinstall digikamimageplugins-lang on update -* Tue Jun 19 2007 - stbinner@suse.de +* Tue Jun 19 2007 stbinner@suse.de - fix build in KDE:Backports for older distributions - add "Recommends: digikamimageplugins-superimpose" -* Mon Jun 18 2007 - stbinner@suse.de +* Mon Jun 18 2007 stbinner@suse.de - update to version 0.9.2: * DigikamImagePlugins have been merged into digiKam tarballs. * New depency to libkdcraw shared library used to decode RAW file. @@ -291,25 +299,25 @@ rm -rf $RPM_BUILD_ROOT film types (Agfa, Ilford, Kodak). A new 'strength' setting can simulate the amount of Lens filters effect. - split of Superimpose plugin templates into sub-package -* Wed Jun 13 2007 - stbinner@suse.de +* Thu Jun 14 2007 stbinner@suse.de - running fdupes makes digikam.rpm 285KB smaller -* Fri Jun 01 2007 - coolo@suse.de +* Fri Jun 01 2007 coolo@suse.de - move kde_post_install -* Tue May 15 2007 - coolo@suse.de +* Tue May 15 2007 coolo@suse.de - build on older distributions -* Fri May 11 2007 - coolo@suse.de +* Fri May 11 2007 coolo@suse.de - seperate translations into special subpackage -* Tue Apr 24 2007 - dmueller@suse.de +* Tue Apr 24 2007 dmueller@suse.de - fix devel package requires -* Mon Apr 23 2007 - dmueller@suse.de +* Mon Apr 23 2007 dmueller@suse.de - split into -devel package -* Fri Apr 20 2007 - dmueller@suse.de +* Fri Apr 20 2007 dmueller@suse.de - update BuildRequires -* Thu Apr 19 2007 - dmueller@suse.de +* Thu Apr 19 2007 dmueller@suse.de - update BuildRequires -* Mon Apr 16 2007 - dmueller@suse.de +* Tue Apr 17 2007 dmueller@suse.de - build against libexiv 0.14 -* Mon Mar 05 2007 - stbinner@suse.de +* Mon Mar 05 2007 stbinner@suse.de - update to 0.9.1: * Native JPEG2000 image loader. Warning for lossy JPEG file saving * Tags View from Comments & Tags side bar support drag & drop. @@ -341,27 +349,27 @@ rm -rf $RPM_BUILD_ROOT * Advanced options to keep ratio and alignment when printing pictures. * Color profiles are tested now to avoid invalid files. * Add a progress bar to Image editor/showfoto about IO image files access. -* Thu Jan 04 2007 - stbinner@suse.de +* Thu Jan 04 2007 stbinner@suse.de - fix build on 10.2 in KDE:Backports -* Mon Dec 18 2006 - stbinner@suse.de +* Tue Dec 19 2006 stbinner@suse.de - update to final 0.9 release -* Sat Dec 09 2006 - dmueller@suse.de +* Sat Dec 09 2006 dmueller@suse.de - update to 0.9.0 rc2: * uses libexiv2 now for EXIF parsing * many more features and over 500 bugfixes see: http://www.digikam.org/?q=about/features09x -* Sat Nov 04 2006 - stbinner@suse.de +* Sat Nov 04 2006 stbinner@suse.de - fix build for < 10.1 -* Fri Nov 03 2006 - llunak@suse.cz +* Fri Nov 03 2006 llunak@suse.cz - fix preview in rename dialog when downloading from camera (#188108) -* Thu Nov 02 2006 - stbinner@suse.de +* Thu Nov 02 2006 stbinner@suse.de - fix crash when right-clicking in empty main window (#216511) -* Sat Oct 21 2006 - meissner@suse.de +* Sat Oct 21 2006 meissner@suse.de - buildrequires libgphoto2-devel -* Wed Sep 13 2006 - stbinner@suse.de +* Wed Sep 13 2006 stbinner@suse.de - fix build for 10.0 -* Tue Jul 18 2006 - dmueller@suse.de +* Wed Jul 19 2006 dmueller@suse.de - update to 0.8.2. * add missing Rating info in album item file tip and image properties dialog @@ -370,168 +378,168 @@ rm -rf $RPM_BUILD_ROOT main interface * Buttons to set the album date to oldest, yougest of the images in the album -* Mon May 22 2006 - stbinner@suse.de +* Mon May 22 2006 stbinner@suse.de - no x-raw.desktop in STABLE, is now contained in kdelibs 3.5.2 -* Wed Mar 22 2006 - stbinner@suse.de +* Wed Mar 22 2006 stbinner@suse.de - no x-raw.desktop in PLUS, is now contained in kdelibs 3.5.2 -* Tue Feb 28 2006 - coolo@suse.de +* Tue Feb 28 2006 coolo@suse.de - fix the print of filename (as indicated by compiler warning and [#153544]) -* Mon Feb 13 2006 - stbinner@suse.de +* Mon Feb 13 2006 stbinner@suse.de - add upstream patch to fix problems on ppc (KDE #121646) -* Mon Feb 06 2006 - stbinner@suse.de +* Mon Feb 06 2006 stbinner@suse.de - fix build -* Mon Feb 06 2006 - coolo@suse.de +* Mon Feb 06 2006 coolo@suse.de - grap fix from KDE SVN to fix severe problem with search for images (KDE bugs 120479 and 120775) -* Tue Jan 31 2006 - coolo@suse.de +* Tue Jan 31 2006 coolo@suse.de - fix gphoto2 cameras -* Thu Jan 26 2006 - meissner@suse.de +* Thu Jan 26 2006 meissner@suse.de - Upgraded to 0.8.1. - image rating - 8 bit raw support added - copy & paste support (between albums or between digikam + konqi) - new dcop interface to control opening the camera dialog -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 - coolo@suse.de +* Mon Jan 23 2006 coolo@suse.de - give digikam as option in the media popup -* Wed Dec 21 2005 - dmueller@suse.de +* Wed Dec 21 2005 dmueller@suse.de - fix file list -* Mon Nov 28 2005 - stbinner@suse.de +* Mon Nov 28 2005 stbinner@suse.de - update to version 0.8 -* Sat Nov 19 2005 - stbinner@suse.de +* Sat Nov 19 2005 stbinner@suse.de - keep old xdg menu category for build on older distribution -* Thu Nov 17 2005 - stbinner@suse.de +* Thu Nov 17 2005 stbinner@suse.de - fix build on 9.1 and 9.2 -* Thu Sep 29 2005 - stbinner@suse.de +* Thu Sep 29 2005 stbinner@suse.de - fix "Photograph" to correct "Photography" xdg menu category -* Fri Aug 19 2005 - adrian@suse.de +* Fri Aug 19 2005 adrian@suse.de - update to version 0.7.4 * translation updates -* Fri Aug 19 2005 - coolo@suse.de +* Fri Aug 19 2005 coolo@suse.de - fix file list for icons -* Wed Aug 17 2005 - meissner@suse.de +* Wed Aug 17 2005 meissner@suse.de - do not overwrite ports with "usb:" everytime. -* Sat Jul 23 2005 - dmueller@suse.de +* Sat Jul 23 2005 dmueller@suse.de - fix filelist -* Thu Jul 21 2005 - dmueller@suse.de +* Thu Jul 21 2005 dmueller@suse.de - 0.7.3 final update - removed -fvisibility=hidden support as it exposes a compiler bug on x86_64 and ppc64 -* Mon May 23 2005 - adrian@suse.de +* Mon May 23 2005 adrian@suse.de - update to version 0.7.3 beta 2 -* Mon Mar 14 2005 - adrian@suse.de +* Mon Mar 14 2005 adrian@suse.de - fix build for 9.2 distribution -* Sat Mar 05 2005 - adrian@suse.de +* Sat Mar 05 2005 adrian@suse.de - fix build -* Thu Mar 03 2005 - adrian@suse.de +* Thu Mar 03 2005 adrian@suse.de - update to version 0.7.2 final - hide showfoto dialog for now, we use gwenview as default picture viewer -* Fri Feb 11 2005 - adrian@suse.de +* Fri Feb 11 2005 adrian@suse.de - remove some debug output -* Wed Feb 09 2005 - adrian@suse.de +* Wed Feb 09 2005 adrian@suse.de - update to version 0.7.2beta1 -* Tue Jan 04 2005 - adrian@suse.de +* Tue Jan 04 2005 adrian@suse.de - update to version 0.7.1 -* Mon Nov 29 2004 - adrian@suse.de +* Mon Nov 29 2004 adrian@suse.de - use sqlite2 compat packages -* Wed Nov 17 2004 - adrian@suse.de +* Wed Nov 17 2004 adrian@suse.de - use the new native digikam icon again -* Mon Nov 15 2004 - adrian@suse.de +* Mon Nov 15 2004 adrian@suse.de - use internal sqlite for < SuSE 9.1 -* Mon Nov 08 2004 - adrian@suse.de +* Mon Nov 08 2004 adrian@suse.de - update to version 0.7 final -* Sun Oct 24 2004 - adrian@suse.de +* Sun Oct 24 2004 adrian@suse.de - add libkipi-devel to nfb -* Wed Oct 20 2004 - adrian@suse.de +* Wed Oct 20 2004 adrian@suse.de - update to version 0.7 beta 1 -* Mon Sep 27 2004 - adrian@suse.de +* Mon Sep 27 2004 adrian@suse.de - add Requires: imlib2-loaders or the editor is unable to load a picture (#46002) -* Mon Sep 20 2004 - adrian@suse.de +* Mon Sep 20 2004 adrian@suse.de - update to current cvs - use the core camera icon, it does fit better to crystal icons -* Fri Sep 10 2004 - adrian@suse.de +* Fri Sep 10 2004 adrian@suse.de - update to current cvs -* Thu Jul 29 2004 - adrian@suse.de +* Thu Jul 29 2004 adrian@suse.de - update to current snapshot (pre-0.7 version) * enable kipi support - patch to use external sqlite lib -* Mon Jun 21 2004 - adrian@suse.de +* Mon Jun 21 2004 adrian@suse.de - update to version 0.6.2 -* Wed Jun 16 2004 - adrian@suse.de +* Wed Jun 16 2004 adrian@suse.de - add requires to dcraw for > 9.1 A plugin needs it. -* Wed Apr 21 2004 - coolo@suse.de +* Wed Apr 21 2004 coolo@suse.de - build everything without unsermake -* Sat Apr 17 2004 - coolo@suse.de +* Sun Apr 18 2004 coolo@suse.de - return in non-void function -* Thu Apr 15 2004 - coolo@suse.de +* Thu Apr 15 2004 coolo@suse.de - build without unsermake -* Thu Apr 08 2004 - adrian@suse.de +* Thu Apr 08 2004 adrian@suse.de - fix path to k3b - remove mpeg plugin, we miss the tools anyway -* Sun Apr 04 2004 - adrian@suse.de +* Sun Apr 04 2004 adrian@suse.de - add patch by Andi Kleen to create a "Pictures" directory, instead of confusing the user. -* Thu Apr 01 2004 - coolo@suse.de +* Thu Apr 01 2004 coolo@suse.de - readding icons (#37369) -* Mon Mar 22 2004 - adrian@suse.de +* Mon Mar 22 2004 adrian@suse.de - fixing german translation (#36674) -* Sun Feb 29 2004 - ro@suse.de +* Sun Feb 29 2004 ro@suse.de - different approach to remove buildroot traces -* Tue Feb 17 2004 - adrian@suse.de +* Tue Feb 17 2004 adrian@suse.de - fix Categories -* Tue Feb 10 2004 - adrian@suse.de +* Tue Feb 10 2004 adrian@suse.de - update to version 0.6 final -* Tue Feb 03 2004 - adrian@suse.de +* Wed Feb 04 2004 adrian@suse.de - fix build -* Mon Feb 02 2004 - adrian@suse.de +* Mon Feb 02 2004 adrian@suse.de - update to version 0.6.0rc2 - add digikamplugins to package -* Tue Jan 13 2004 - coolo@suse.de +* Tue Jan 13 2004 coolo@suse.de - fixing Makefile problems -* Tue Dec 30 2003 - adrian@suse.de +* Tue Dec 30 2003 adrian@suse.de - install default icons in crystalsvg -* Wed Oct 15 2003 - meissner@suse.de +* Wed Oct 15 2003 meissner@suse.de - Upgraded to current 0.6.0 CVS, "all known bugs fixed" [tm] - Do not build as root. -* Tue Sep 23 2003 - meissner@suse.de +* Tue Sep 23 2003 meissner@suse.de - fixed crash on corrupt JPEG, #31180. -* Thu Sep 18 2003 - varkoly@suse.de +* Thu Sep 18 2003 varkoly@suse.de - update hungarian translation -* Tue Sep 16 2003 - adrian@suse.de +* Tue Sep 16 2003 adrian@suse.de - update czech translation -* Tue Sep 09 2003 - adrian@suse.de +* Tue Sep 09 2003 adrian@suse.de - add hungarian translation from Peter Varkoly -* Mon Sep 08 2003 - adrian@suse.de +* Mon Sep 08 2003 adrian@suse.de - use a nicer icon -* Wed Aug 13 2003 - adrian@suse.de +* Wed Aug 13 2003 adrian@suse.de - add czech translation from Klara Cihlarova -* Mon Jul 28 2003 - adrian@suse.de +* Mon Jul 28 2003 adrian@suse.de - add %%run_ldconfig -* Mon Jul 28 2003 - adrian@suse.de +* Mon Jul 28 2003 adrian@suse.de - Add Categories -* Thu Jun 12 2003 - coolo@suse.de +* Thu Jun 12 2003 coolo@suse.de - use find_lang - package icons directories too - use $INSTALL_TARGET -* Mon Jun 02 2003 - meissner@suse.de +* Mon Jun 02 2003 meissner@suse.de - Upgraded to pre 0.6, packaged the rest of the files, adapted neededforbuild. -* Thu Sep 19 2002 - adrian@suse.de +* Thu Sep 19 2002 adrian@suse.de - enable the build again and update to 0.5.1 (KDE 3 port) -* Tue Feb 26 2002 - ro@suse.de +* Tue Feb 26 2002 ro@suse.de - added libexif to neededforbuild -* Mon Feb 04 2002 - ro@suse.de +* Mon Feb 04 2002 ro@suse.de - try forward port to current gphoto2 -* Sat Jan 19 2002 - adrian@suse.de +* Sat Jan 19 2002 adrian@suse.de - update to version 0.4 -* Sat Jan 05 2002 - adrian@suse.de +* Sat Jan 05 2002 adrian@suse.de - update to final 0.3 -* Wed Jan 02 2002 - adrian@suse.de +* Thu Jan 03 2002 adrian@suse.de - update to version 0.3_beta1 -* Sat Dec 29 2001 - adrian@suse.de +* Sat Dec 29 2001 adrian@suse.de - initial packaging