ports/104479: Fix display or raw images in digikam

[Andy Fawcett]

>Number:         104479
>Category:       ports
>Synopsis:       Fix display or raw images in digikam
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 16 20:30:18 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andy Fawcett
>Release:        FreeBSD 6.1-STABLE amd64
>Organization:
>Environment:


System: FreeBSD 6.1-STABLE #2: Mon Jul 31 02:25:05 EEST 2006
    root at ping.int.athame.co.uk:/usr/obj/usr/src/sys/PING



>Description:


Digikam uses 'dcraw' to display raw images. Several revisions of dcraw ago, the "-2" parameter was removed and is no longer valid.

Displaying raw images currently fails with digikam


>How-To-Repeat:


Open raw image in digikam or showfoto


>Fix:


--- digikam-patch begins here ---
diff -ruN digikam.bak/Makefile digikam/Makefile
--- digikam.bak/Makefile	Tue Aug 22 07:54:15 2006
+++ digikam/Makefile	Mon Oct 16 23:09:47 2006
@@ -2,12 +2,12 @@
 # Date created: 			3 February 2003
 # Whom:					Arjan van Leeuwen <avleeuwen at piwebs.com>
 #
-# $FreeBSD: ports/graphics/digikam/Makefile,v 1.26 2006/08/21 15:30:37 garga Exp $
+# $FreeBSD: ports/graphics/digikam/Makefile,v 1.25 2006/06/19 21:13:52 pav Exp $
 #
 
 PORTNAME=	digikam
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN digikam.bak/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp
--- digikam.bak/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp	Sat Jun 10 18:49:01 2006
+++ digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp	Fri Jul 28 09:02:13 2006
@@ -1,5 +1,5 @@
---- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Mon Jan 16 19:10:18 2006
-+++ digikam/utilities/imageeditor/imlibinterface.cpp	Tue Apr 11 13:31:25 2006
+--- digikam/utilities/imageeditor/imlibinterface.cpp.orig	Mon Jan 16 20:10:18 2006
++++ digikam/utilities/imageeditor/imlibinterface.cpp	Fri Jul 28 08:52:39 2006
 @@ -21,14 +21,6 @@
  
  // Lib Tiff includes.
@@ -39,3 +39,12 @@
      {
          // RAW File test using dcraw.  
          // Need to test it before TIFF because any RAW file 
+@@ -293,7 +293,7 @@
+             // -2 : 8bit ppm output
+             // -w : Use camera white balance, if possible  
+             // -a : Use automatic white balance
+-            command  = "dcraw -c -2 -w -a -q 0 ";
++            command  = "dcraw -c -w -a -q 0 ";
+             command += QFile::encodeName( KProcess::quote( filename ) );
+             kdWarning() << "Running dcraw command : " << command << endl;
+         
--- digikam-patch ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: