[kde-freebsd] digikam-kde4 build failure on -current

[Jason E. Hale]

On Wednesday, June 20, 2012 19:27:21 Michael Butler wrote:
> Is anyone else seeing this?
> 
> [ 74%] Building CXX object
> utilities/advancedrename/CMakeFiles/advancedrename.dir/parser/modifiers/remo
> vedoublesmodifier.o Linking CXX shared module ../lib/kio_digikamsearch.so
> [ 74%] Built target kio_digikamsearch
> [ 75%] Building CXX object
> utilities/advancedrename/CMakeFiles/advancedrename.dir/parser/modifiers/uniq
> uemodifier.o In file included from
> /usr/local/include/qt4/QtCore/qbasicatomic.h:227, from
> /usr/local/include/qt4/QtCore/qatomic.h:46,
>                  from /usr/local/include/qt4/QtCore/qmap.h:45,
>                  from /usr/local/include/qt4/QtCore/QMap:1,
>                  from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/common/parseresults.h:29, from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/common/rule.h:29, from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/common/modifier.h:29, from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/parser/modifiers/uniquemodifier.h:34, from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/uniquemodifier.moc:10, from
> /usr/ports/graphics/digikam-kde4/work/digikam-2.6.0/core/utilities/advancedr
> ename/parser/modifiers/uniquemodifier.cpp:25:
> /usr/local/include/qt4/QtCore/qatomic_arch.h:96:4: error: #error "Qt has
> not been ported to this architecture"
> 
> I define CPUTYPE?=prescott and /usr/local/share/qt4/mkspecs/qconfig.pri
> defines (as it should) ..
> 
> QT_ARCH = i386
> 
> So, I'm assuming QT_ARCH_I386 *should* be defined somewhere .. <shrug>
> 

Do you happen to have QT3 installed?  It seems like the build is picking up 
QT3 headers included before the QT4 headers.  I went ahead and tested the 
build 	with QT3 installed and got a similar failure.  In any case, could you 
try the attached patch?  Simply replace /usr/ports/graphics/digikam-
kde4/files/patch-CMakeLists.txt with the attached file.

Let me know if it works and I'll see about getting it committed.
-------------- next part --------------
--- ./CMakeLists.txt.orig	2012-06-04 16:38:57.000000000 -0400
+++ ./CMakeLists.txt	2012-06-24 12:52:32.000000000 -0400
@@ -203,9 +203,10 @@
     FIND_LIBRARY(MATH_LIBRARY m)
 ENDIF(NOT WIN32)
 
-IF(Boost_FOUND)
-    INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-ENDIF(Boost_FOUND)
+STRING(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform)
+IF(${node_platform} MATCHES freebsd)
+    FIND_LIBRARY(KVM_LIBRARY NAMES kvm)
+ENDIF(${node_platform} MATCHES freebsd)
 
 #-------------------------------------------------------------------------------------
 
@@ -595,6 +596,10 @@
                         ${CMAKE_CURRENT_BINARY_DIR}/digikam
     )
 
+    IF(Boost_FOUND)
+        INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+    ENDIF(Boost_FOUND)
+
     IF(USE_SCRIPT_IFACE)
         INCLUDE_DIRECTORIES(${QT_QTSCRIPT_INCLUDE_DIR})
     ENDIF(USE_SCRIPT_IFACE)
@@ -1689,6 +1694,16 @@
         MACRO_OPTIONAL_ADD_SUBDIRECTORY(tests)
     ENDIF(KDE4_BUILD_TESTS)
 
+    OPTION(WITH_NLS "NLS Support" ON)
+    IF(WITH_NLS)
+        FIND_PACKAGE(Msgfmt REQUIRED)
+        FIND_PACKAGE(Gettext REQUIRED)
+        ADD_SUBDIRECTORY(po)
+    ENDIF(WITH_NLS)
+
+    ADD_SUBDIRECTORY(doc/digikam/digikam)
+    ADD_SUBDIRECTORY(doc/digikam/showfoto)
+
     IF(NOT WIN32)
         CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/digikam.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/digikam.lsm)
     ENDIF(NOT WIN32)