diff options
| author | barner <barner@FreeBSD.org> | 2006-02-05 09:56:36 +0000 |
|---|---|---|
| committer | barner <barner@FreeBSD.org> | 2006-02-05 09:56:36 +0000 |
| commit | 62228c218c46e42e5072082826536b19d0062d66 (patch) | |
| tree | 5d14124bba3bce5aec3f984062cbda4f588d7027 /graphics/digikam/files | |
| parent | 1ec57ce747c16b4d7fce6df39aabfbb20fedbb2b (diff) | |
| download | FreeBSD-ports-62228c218c46e42e5072082826536b19d0062d66.zip FreeBSD-ports-62228c218c46e42e5072082826536b19d0062d66.tar.gz | |
- Update to 0.8.1
Submitted by: Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)
PR: ports/92229
Diffstat (limited to 'graphics/digikam/files')
| -rw-r--r-- | graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp | 11 | ||||
| -rw-r--r-- | graphics/digikam/files/patch-externc | 65 |
2 files changed, 11 insertions, 65 deletions
diff --git a/graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp b/graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp new file mode 100644 index 0000000..0f75d98 --- /dev/null +++ b/graphics/digikam/files/patch-digikam_utilities_imageeditor_imlibinterface.cpp @@ -0,0 +1,11 @@ +--- digikam/utilities/imageeditor/imlibinterface.cpp.orig Mon Jan 23 22:31:31 2006 ++++ digikam/utilities/imageeditor/imlibinterface.cpp Mon Jan 23 22:32:01 2006 +@@ -203,7 +203,7 @@ + { + return PNG_IMAGE; + } +- else if (rawFileParser.getCameraModel( QFile::encodeName(filePath), NULL, NULL) == 0) ++ else if (rawFileParser.getCameraModel( QFile::encodeName(filePath), (char *)NULL, (char *)NULL) == 0) + { + // RAW File test using dcraw. + // Need to test it before TIFF because any RAW file diff --git a/graphics/digikam/files/patch-externc b/graphics/digikam/files/patch-externc deleted file mode 100644 index bd3b9b3..0000000 --- a/graphics/digikam/files/patch-externc +++ /dev/null @@ -1,65 +0,0 @@ ---- digikam/digikam/digikamfirstrun.cpp.orig Sun Sep 4 17:47:15 2005 -+++ digikam/digikam/digikamfirstrun.cpp Sun Sep 4 17:48:44 2005 -@@ -19,15 +19,6 @@ - * - * ============================================================ */ - --// C Ansi includes. -- --extern "C" --{ --#include <sys/types.h> --#include <sys/stat.h> --#include <unistd.h> --} -- - // C++ Includes. - - #include <iostream> -@@ -64,6 +55,16 @@ - #include "firstrunUI.h" - - #include <iostream> -+ -+// C Ansi includes. -+ -+extern "C" -+{ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> -+} -+ - using namespace std; - - DigikamFirstRun::DigikamFirstRun( KConfig* config, ---- digikam/utilities/imageeditor/imlibinterface.cpp.orig Sun Sep 4 17:49:22 2005 -+++ digikam/utilities/imageeditor/imlibinterface.cpp Sun Sep 4 17:50:00 2005 -@@ -21,13 +21,6 @@ - - #define PI 3.14159265 - --// Lib Tiff includes. -- --extern "C" --{ --#include <tiffio.h> --} -- - // C++ includes. - - #include <cmath> -@@ -59,6 +52,13 @@ - #include "undomanager.h" - #include "undoaction.h" - #include "imlibinterface.h" -+ -+// Lib Tiff includes. -+ -+extern "C" -+{ -+#include <tiffio.h> -+} - - namespace Digikam - { |
