Mailinglist Archive: opensuse-commit (857 mails)
| < Previous | Next > |
commit digikam
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 03 Nov 2007 16:15:14 +0100
- Message-id: <20071103151514.8AF05678336@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package digikam
checked in at Sat Nov 3 16:15:14 CET 2007.
--------
--- KDE/digikam/digikam.changes 2007-08-22 10:17:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2007-11-03
00:11:29.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 3 00:11:23 CET 2007 - dmueller@xxxxxxx
+
+- fix build against lcms 1.17
+
+-------------------------------------------------------------------
New:
----
r703199.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.UQ4721/_old 2007-11-03 16:14:59.000000000 +0100
+++ /var/tmp/diff_new_pack.UQ4721/_new 2007-11-03 16:14:59.000000000 +0100
@@ -30,9 +30,9 @@
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 @@
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 @@
%patch7
%patch9
%patch10
+%patch11
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -187,7 +189,6 @@
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 @@
%defattr(-,root,root)
%dir /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikamimageplugins/superimpose
-
%changelog
+* Sat Nov 03 2007 - dmueller@xxxxxxx
+- fix build against lcms 1.17
* Wed Aug 22 2007 - meissner@xxxxxxx
- handle filename conversions correctly, if you by chance
use MTP devices with digikam.
++++++ r703199.diff ++++++
------------------------------------------------------------------------
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);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |