OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=19

digikam.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Nov  3 00:11:23 CET 2007 - dmueller@suse.de
+
+- fix build against lcms 1.17 
+
 -------------------------------------------------------------------
 Wed Aug 22 08:13:42 CEST 2007 - meissner@suse.de
 

digikam.spec

@@ -30,9 +30,9 @@ License:        GPL v2 or later
 Group:          Productivity/Graphics/Viewers
 Summary:        A KDE Photo Manager
 Version:        0.9.2
-Release:        28
+Release:        69
 %define rversion %version-final
-URL:            http://www.digikam.org/
+Url:            http://www.digikam.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{rversion}.tar.bz2
 Source1:        service.desktop
@@ -44,6 +44,7 @@ Patch5:         digikam-load.diff
 Patch7:         digikam-print.diff
 Patch9:         renamepreview.patch
 Patch10:        digikam-gphoto-codeset.patch
+Patch11:        r703199.diff
 Requires:       imlib2-loaders
 %if %suse_version > 1020
 Requires:       %{name}-lang = %{version}
@@ -155,6 +156,7 @@ rm -rf digikam/sqlite
 %patch7
 %patch9
 %patch10
+%patch11
 . /etc/opt/kde3/common_options
 update_admin --no-unsermake
 
@@ -187,7 +189,6 @@ tar xfj %SOURCE3 -C $RPM_BUILD_ROOT/opt/kde3/share/apps/digikamimageplugins/supe
 mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/config/
 install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/opt/kde3/share/config/
 %if %suse_version > 1020
-
 %fdupes -s $RPM_BUILD_ROOT
 %endif
 kde_post_install
@@ -248,8 +249,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %dir /opt/kde3/share/apps/digikamimageplugins
 /opt/kde3/share/apps/digikamimageplugins/superimpose
-
 %changelog
+* Sat Nov 03 2007 - dmueller@suse.de
+- fix build against lcms 1.17
 * Wed Aug 22 2007 - meissner@suse.de
 - handle filename conversions correctly, if you by chance
   use MTP devices with digikam.

r703199.diff

@@ -0,0 +1,22 @@
+------------------------------------------------------------------------
+r703199 | cgilles | 2007-08-22 09:03:07 +0200 (Wed, 22 Aug 2007) | 3 lines
+
+digiKam from KDE3 branch : patch from Angelo Naselli about to compile digiKam with lcms 1.17. Tested under Mandriva 2007.1 and 2008.0 (cooker)
+BUG: 148930
+
+------------------------------------------------------------------------
+Index: digikam/libs/lprof/lcmsprf.h
+===================================================================
+--- digikam/libs/lprof/lcmsprf.h	(revision 703198)
++++ digikam/libs/lprof/lcmsprf.h	(revision 703199)
+@@ -69,6 +69,10 @@ typedef struct {
+ 
+     } MATN,FAR* LPMATN;
+ 
++// See B.K.O #148930: compile with lcms v.1.17
++#if (LCMS_VERSION > 116)
++typedef LCMSBOOL BOOL;
++#endif
+ 
+ LPMATN      cdecl MATNalloc(int Rows, int Cols);
+ void        cdecl MATNfree (LPMATN mat);