[media-gfx/digikam] new 9999 patches, thanks to mva

4 files changed, 330 insertions, 22 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b79350aabc..0a730987a0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,29 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX digikam-1.3.0-clapack.patch 7182 RMD160 f0b8bfe449091e24d69bb54de6592fddf3e54c1c SHA1 6b70ac686c9ea0d1d5cb93a5d00f49ea1227f9c9 SHA256 273723c1bcd9bab8d5c301eeebfe572d3c8a5ef82a18a69eff424cb32722807a
 AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
 AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
+AUX digikam-9999-clapack.patch 6396 RMD160 9f01f1f23695d8028efb95a40d106d9a2f80b34f SHA1 9350060f5f00a61c8415852f26d1086e8216012b SHA256 7644578418050706d748473a8b754b62a1fc937211798a4cd99c0bc1927cae82
+AUX digikam-9999-libpgf.patch 8403 RMD160 2d43ccab4f165c3bcc893bb8cf3ba1481ec71de0 SHA1 7fc88e4756913c3cf4e5a99feb55c050e8fffb46 SHA256 02f46df5e8280f45996ce9a854dc628aff470b982ae8d24055ec819c4450d380
 DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
 DIST digikam-1.4.0.tar.bz2 14907229 RMD160 a78656044bcc42f21794c1c4a25dcaaf869df38d SHA1 a3370f2d2c469fa5b90966bb0141b5a8956c71df SHA256 d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba
 EBUILD digikam-1.3.0-r2.ebuild 2352 RMD160 b1f2bb85bd63205a26fc1b6bd800210a086f6bef SHA1 ca0b1237d2806800788825ee8507530c42d8b417 SHA256 e8fed398db4624a911e697529b7d06e8acd196410b05f5765746c7d0a2a8f5ac
 EBUILD digikam-1.4.0.ebuild 2382 RMD160 c270d1dd1f692ae047566f5bcb40be6305f72441 SHA1 dafe8dfb4bc18b32800240febbbf5d81a1fc3bd1 SHA256 4f52edb3d32e46ee307f7b3c53e7a35fafbd23acc8d5c30093db1ef9d355ddbc
-EBUILD digikam-9999.ebuild 2374 RMD160 1ecce2ed7ccfda99c9780dec96cead7afa876264 SHA1 87a68e8f262ead54350a6ef711529dd0da366c9c SHA256 ee91ed95f7500a3dbd0ecfeb01b8ea488a568375ee6980be2e84a13622600710
+EBUILD digikam-9999.ebuild 2401 RMD160 94dd98dedcdb150cdfd685f5cd1563b5670b400f SHA1 8d8c9c28ffab77e9df1a26610b837dcbdefe9f40 SHA256 2852cbaf324913c3fb9e81f3b9e40f533666003411e286c804ab09508802970e
 MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMeY4AAAoJENwGBM22xffeohwP/0Cro+aIV+GdrOlyUwhPXSgk
-tXzNErD6TufJRq15GOwYBV2N+YfAWZH6JZXjQtkWUHprzQeeDs9dX0Fszhs4ScWV
-u26tEcgsKKA6SUhwFOfao3nChOm9hCJUAs+365PrUV89VsRnx3pMbY5gwBSXNCXH
-3YunYsvDr9BbxHLs/t3Bi16imRgbGpa1TG2QJUHJx4yXoHV6OlyMkD84+TnlkJJN
-xq6DhwX15zfVU9uyfxa3Rfz71t9mLw1gG7Legx/AmOpq0FNfGuUxuLEPelmHhhKu
-miy7oIl9plmJ1pSQwlqPezkD4M5A++1taL2PCzDMU5n2I9Dob6md01/J4M28/GsU
-OqywpRohZnOS7qX4IqXLg7g+KHzttwTW9baglDOUcO1YNxPWWxtwy5fI9dM8wMjB
-NW2x1mHMj7LVUWBh4cJsNBJrLagqQr9t7zqxT55MmfXY6WO+Xb6mD7Mlq2trhqIX
-7DYgsaqfemM9tsfI/05SpVfZ4fi5P/Z8zC8o/LaxFAHJ2krHsW8cD7X0rLmDICHV
-XOK/uZ1rx3ni2gH269Q7fWFXLyB2LP3fpVhrHB1ePG6aB/l1lqbdfJj0wPLilglI
-CNUdkTe0mOhtLbQaSaoHchMej4Zq6DUepPAimAbrOVBdYLcoqlUYGGqn2fA/eaqz
-6t/qZbNAp4oVAnWBnbtf
-=hlna
------END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild
index b0f5972d19..c184c26e58 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -62,7 +62,10 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}"-1.3.0-{docs,pgf,clapack}.patch )
+PATCHES=(
+	"${FILESDIR}/${PN}"-1.3.0-docs.patch
+	"${FILESDIR}/${P}"-{pgf,clapack}.patch
+)
 
 src_configure() {
 	local backend
diff --git a/media-gfx/digikam/files/digikam-9999-clapack.patch b/media-gfx/digikam/files/digikam-9999-clapack.patch
new file mode 100644
index 0000000000..619074a787
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-9999-clapack.patch
@@ -0,0 +1,124 @@
+diff -Naur digikam-9999/CMakeLists.txt digikam-9999-fixed/CMakeLists.txt
+--- digikam-9999/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
++++ digikam-9999-fixed/CMakeLists.txt	2010-08-25 01:12:41.000000000 +0700
+@@ -3,6 +3,8 @@
+ OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
+ OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
+ 
++ENABLE_LANGUAGE(Fortran)
++
+ # ==================================================================================================
+ # Information to update before to release this package.
+ 
+@@ -141,6 +143,9 @@
+ # This function call the script cmake/modules/FindPGF.cmake
+ FIND_PACKAGE(PGF)
+ 
++# Included to unbundle lapack that is in portage tree.
++FIND_PACKAGE(LAPACK)
++
+ FIND_PACKAGE(Jasper)
+ FIND_PACKAGE(Kdcraw)
+ FIND_PACKAGE(Kexiv2)
+@@ -374,13 +379,13 @@
+ 
+ ENDIF(DOXYGEN_FOUND)
+ 
+-IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_FOUND)
+     MESSAGE(STATUS " digiKam will be compiled................. YES")
+     SET(DIGIKAM_CAN_BE_COMPILED true)
+-ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_FOUND)
+     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
+     SET(DIGIKAM_CAN_BE_COMPILED false)
+-ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND AND LAPACK_FOUND)
+ 
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "")
+@@ -539,39 +544,7 @@
+         ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
+        )
+ 
+-    SET(libclapack_SRCS
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/endfile.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/idamax.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/open.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sig_die.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wref.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/close.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetf2.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dscal.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/err.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ieeeck.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_cmp.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_stop.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wrtfmt.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgemm.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrf.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dswap.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmt.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/ilaenv.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/s_copy.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/wsfe.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dger.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgetrs.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dtrsm.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/fmtlib.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/lsame.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/sfe.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
+-       )
++    INCLUDE_DIRECTORIES(${LAPACK_INCLUDE_DIRS})
+ 
+     SET(libdimgfilters_SRCS
+         ${libclapack_SRCS}
+diff -Naur digikam-9999/digikam/CMakeLists.txt digikam-9999-fixed/digikam/CMakeLists.txt
+--- digikam-9999/digikam/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
++++ digikam-9999-fixed/digikam/CMakeLists.txt	2010-08-25 01:14:32.000000000 +0700
+@@ -92,6 +92,7 @@
+                      ${PNG_PNG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
+                      ${PGF_INCLUDE_DIRS}
++                     ${LAPACK_INCLUDE_DIRS}
+                    )
+ 
+ IF(LENSFUN_LIBRARY)
+@@ -176,6 +177,7 @@
+                       ${PGF_LIBRARIES}
+                       ${LCMS_LIBRARIES}
+                       ${JASPER_LIBRARIES}
++                      ${LAPACK_LIBRARIES}
+ 
+                       # Require by CImg library which use pthread internally.
+                       ${CMAKE_THREAD_LIBS_INIT}
+@@ -241,6 +243,7 @@
+                       ${QT_QTGUI_LIBRARY}
+                       ${QT_QTSQL_LIBRARY}
+                       ${PGF_LIBRARIES}
++                      ${LAPACK_LIBRARIES}
+                      )
+ 
+ SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+diff -Naur digikam-9999/libs/CMakeLists.txt digikam-9999-fixed/libs/CMakeLists.txt
+--- digikam-9999/libs/CMakeLists.txt	2010-08-25 01:16:09.000000000 +0700
++++ digikam-9999-fixed/libs/CMakeLists.txt	2010-08-25 01:15:15.000000000 +0700
+@@ -14,12 +14,12 @@
+                      imageproperties
+                      dialogs
+                      3rdparty/cimg
+-                     3rdparty/clapack
+                      ${JPEG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
+                      ${PNG_INCLUDE_DIR}
+                      ${PGF_INCLUDE_DIRS}
+                      ${JASPER_INCLUDE_DIR}
++                     ${LAPACK_INCLUDE_DIRS}
+                    )
+ 
+ ADD_SUBDIRECTORY( histogram )
\ No newline at end of file
diff --git a/media-gfx/digikam/files/digikam-9999-libpgf.patch b/media-gfx/digikam/files/digikam-9999-libpgf.patch
new file mode 100644
index 0000000000..023317ffc5
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-9999-libpgf.patch
@@ -0,0 +1,199 @@
+diff -Naur digikam-9999/cmake/modules/FindPGF.cmake digikam-9999-fixed/cmake/modules/FindPGF.cmake
+--- digikam-9999/cmake/modules/FindPGF.cmake	1970-01-01 07:00:00.000000000 +0700
++++ digikam-9999-fixed/cmake/modules/FindPGF.cmake	2010-08-25 01:03:32.000000000 +0700
+@@ -0,0 +1,15 @@
++# - Try to find libpgf
++# Once done this will define
++#
++#  PGF_FOUND - system has libgf
++#  PGF_INCLUDE_DIRS - the libpgf include directory
++#  PGF_LIBRARIES - Link these to use libpgf
++
++# PKG-CONFIG is required.
++INCLUDE(FindPkgConfig REQUIRED)
++
++IF(PKG_CONFIG_FOUND)
++       INCLUDE(FindPkgConfig)
++
++       PKG_CHECK_MODULES(PGF libpgf)
++ENDIF(PKG_CONFIG_FOUND)
+diff -Naur digikam-9999/CMakeLists.txt digikam-9999-fixed/CMakeLists.txt
+--- digikam-9999/CMakeLists.txt	2010-08-25 01:00:50.000000000 +0700
++++ digikam-9999-fixed/CMakeLists.txt	2010-08-25 01:04:10.000000000 +0700
+@@ -34,6 +34,9 @@
+     "${DIGIKAM_VERSION_SHORT}${DIGIKAM_SUFFIX_VERSION}"
+    )
+ 
++# Path to find FindPGF.cmake script.
++SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
++
+ # ==================================================================================================
+ # Debug area codes
+ # These codes will be set for every project specific path automatically, so
+@@ -133,6 +136,11 @@
+ FIND_PACKAGE(JPEG)
+ FIND_PACKAGE(PNG)
+ FIND_PACKAGE(TIFF)
++
++# Included to unbundle libpgf that is on portage tree.
++# This function call the script cmake/modules/FindPGF.cmake
++FIND_PACKAGE(PGF)
++
+ FIND_PACKAGE(Jasper)
+ FIND_PACKAGE(Kdcraw)
+ FIND_PACKAGE(Kexiv2)
+@@ -263,6 +271,7 @@
+     PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
+ ENDIF (NOT WIN32)
+ PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
++PRINT_LIBRARY_STATUS("libpgf" "http://www.libpgf.org" "" PGF_FOUND)
+ PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
+ PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)
+ PRINT_LIBRARY_STATUS("liblcms" "http://www.littlecms.com" "" LCMS_FOUND)
+@@ -365,13 +374,13 @@
+ 
+ ENDIF(DOXYGEN_FOUND)
+ 
+-IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+     MESSAGE(STATUS " digiKam will be compiled................. YES")
+     SET(DIGIKAM_CAN_BE_COMPILED true)
+-ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
+     SET(DIGIKAM_CAN_BE_COMPILED false)
+-ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
++ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND PGF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+ 
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "")
+@@ -1023,14 +1032,7 @@
+         ${CMAKE_CURRENT_SOURCE_DIR}/libs/threadimageio/pgfutils.cpp
+        )
+ 
+-    SET(libpgf_SRCS
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Decoder.cpp
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Encoder.cpp
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/PGFimage.cpp
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Stream.cpp
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/Subband.cpp
+-        ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/libpgf/WaveletTransform.cpp
+-       )
++    INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
+ 
+     SET(libsqlite2_SRCS
+         ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/sqlite2/attach.c
+@@ -1340,16 +1342,39 @@
+ # ==================================================================================================
+ # API documentation generation
+ 
+-IF(DOXYGEN_FOUND)
++# Checks if user ask to build documentation.
++IF(BUILD_DOC)
++    IF(DOXYGEN_FOUND)
++
++        MESSAGE(STATUS "")
++        MESSAGE(STATUS "Documentation will be installed")
++       MESSAGE(STATUS "")
+ 
+     SET(API_DIR ${CMAKE_BINARY_DIR}/api)
+     SET(SOURCE_DIR ${CMAKE_SOURCE_DIR})
+     SET(DOXYFILE ${CMAKE_BINARY_DIR}/Doxyfile)
+     SET(WARNFILE ${CMAKE_BINARY_DIR}/doxygen-warn.log)
+ 
++
+     CONFIGURE_FILE(Doxyfile.cmake ${DOXYFILE})
+ 
+     ADD_CUSTOM_TARGET(doc ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+                       WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ 
+-ENDIF(DOXYGEN_FOUND)
++    ELSE(DOXYGEN_FOUND)
++
++        MESSAGE(STATUS "")
++        MESSAGE(STATUS "Documentation will NOT be installed")
++       MESSAGE(STATUS "Doxygen wasn't found on the system")
++       MESSAGE(STATUS "")
++
++    ENDIF(DOXYGEN_FOUND)
++
++ELSE(BUILD_DOC)
++
++    MESSAGE(STATUS "")
++    MESSAGE(STATUS "Documentation will NOT be installed")
++    MESSAGE(STATUS "Because the option -DBUILD_DOC=ON wasn't passed to cmake")
++    MESSAGE(STATUS "")
++
++ENDIF(BUILD_DOC)
+diff -Naur digikam-9999/digikam/CMakeLists.txt digikam-9999-fixed/digikam/CMakeLists.txt
+--- digikam-9999/digikam/CMakeLists.txt	2010-08-25 01:00:51.000000000 +0700
++++ digikam-9999-fixed/digikam/CMakeLists.txt	2010-08-25 00:58:52.000000000 +0700
+@@ -53,7 +53,6 @@
+                      # specific libs and utilities
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/lprof
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/sqlite2
+-                     ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/clapack
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/cimg
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../libs/themeengine
+@@ -92,6 +91,7 @@
+                      ${JPEG_INCLUDE_DIR}
+                      ${PNG_PNG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
++                     ${PGF_INCLUDE_DIRS}
+                    )
+ 
+ IF(LENSFUN_LIBRARY)
+@@ -103,9 +103,6 @@
+ # Disable Clapack C code warnings.
+ SET_SOURCE_FILES_PROPERTIES(${libclapack_SRCS} PROPERTIES COMPILE_FLAGS "-w")
+ 
+-# Disable libpgf warnings.
+-SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
+-
+ # Disable liblqr C code warnings.
+ SET_SOURCE_FILES_PROPERTIES(${liblqr_SRCS} PROPERTIES COMPILE_FLAGS "-w")
+ 
+@@ -124,7 +121,6 @@
+                         ${libjpegutils_SRCS}
+                         ${libthreadimageio_SRCS}
+                         ${libthemeengine_SRCS}
+-                        ${libpgf_SRCS}
+                         ${pgfutils_SRCS}
+                         ${libdigikamhelpers_SRCS}
+                         ${libtthread_SRCS}
+@@ -177,6 +173,7 @@
+                       ${JPEG_LIBRARIES}
+                       ${TIFF_LIBRARIES}
+                       ${PNG_LIBRARIES}
++                      ${PGF_LIBRARIES}
+                       ${LCMS_LIBRARIES}
+                       ${JASPER_LIBRARIES}
+ 
+@@ -229,7 +226,6 @@
+                              ${libhaar_SRCS}
+                              ${libdatabasemodels_SRCS}
+                              ${libsqlite2_SRCS}
+-                             ${libpgf_SRCS}
+                              ${pgfutils_SRCS}
+    )
+ 
+@@ -244,6 +240,7 @@
+                       ${QT_QTCORE_LIBRARY}
+                       ${QT_QTGUI_LIBRARY}
+                       ${QT_QTSQL_LIBRARY}
++                      ${PGF_LIBRARIES}
+                      )
+ 
+ SET_TARGET_PROPERTIES(digikamdatabase PROPERTIES VERSION 1.0.0 SOVERSION 1 )
+diff -Naur digikam-9999/libs/CMakeLists.txt digikam-9999-fixed/libs/CMakeLists.txt
+--- digikam-9999/libs/CMakeLists.txt	2010-08-25 01:00:53.000000000 +0700
++++ digikam-9999-fixed/libs/CMakeLists.txt	2010-08-25 00:59:25.000000000 +0700
+@@ -18,6 +18,7 @@
+                      ${JPEG_INCLUDE_DIR}
+                      ${TIFF_INCLUDE_DIR}
+                      ${PNG_INCLUDE_DIR}
++                     ${PGF_INCLUDE_DIRS}
+                      ${JASPER_INCLUDE_DIR}
+                    )
+ 
\ No newline at end of file