--- ggadget/qt/CMakeLists.txt.linkage	2008-10-31 11:05:30.000000000 +0100
+++ ggadget/qt/CMakeLists.txt	2008-12-17 04:53:11.000000000 +0100
@@ -47,6 +47,7 @@
 TARGET_LINK_LIBRARIES(ggadget-qt${GGL_EPOCH}
   ggadget-xdg${GGL_EPOCH}
   ${QT_LIBRARIES}
+  ${X11_X11_LIB} ${X11_Xext_LIB}
 )
 
 OUTPUT_LIBRARY(ggadget-qt${GGL_EPOCH})
--- cmake/Configure.cmake.linkage	2008-12-16 10:13:23.000000000 +0100
+++ cmake/Configure.cmake	2008-12-17 04:53:11.000000000 +0100
@@ -152,7 +152,7 @@
 
 INCLUDE(CheckCCompilerFlag)
 IF(UNIX)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Werror -Wconversion")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wconversion")
   # No "-Wall -Werror" for C flags, to avoid third_party code break.
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
   SET(PROJECT_RESOURCE_DIR share/${PRODUCT_NAME})
--- extensions/qt_script_runtime/CMakeLists.txt.linkage	2008-10-31 06:05:29.000000000 -0400
+++ extensions/qt_script_runtime/CMakeLists.txt	2009-01-09 20:57:17.000000000 -0500
@@ -35,12 +35,20 @@
 QT4_AUTOMOC(js_function_slot.cc)
 
 ADD_LIBRARY(ggadget-qtscript ${SRCS})
+TARGET_LINK_LIBRARIES(ggadget-qtscript
+  ggadget${GGL_EPOCH}
+  ggadget-qtscript
+  ggadget-js${GGL_EPOCH}
+  ${QT_LIBRARIES}
+  ${QT_QTSCRIPT_LIBRARY}
+  )
 ADD_MODULE(qt-script-runtime qt_script_runtime.cc)
 TARGET_LINK_LIBRARIES(qt-script-runtime
   ggadget${GGL_EPOCH}
   ggadget-qtscript
   ggadget-js${GGL_EPOCH}
   ${QT_LIBRARIES}
+  ${QT_QTSCRIPT_LIBRARY}
   )
 OUTPUT_MODULE(qt-script-runtime)
 
--- extensions/smjs_script_runtime/CMakeLists.txt.linkage	2008-11-07 08:27:00.000000000 -0500
+++ extensions/smjs_script_runtime/CMakeLists.txt	2009-01-09 21:02:10.000000000 -0500
@@ -36,6 +36,12 @@
 )
 
 ADD_LIBRARY(ggadget-smjs ${SRCS})
+TARGET_LINK_LIBRARIES(ggadget-smjs
+  ggadget${GGL_EPOCH}
+  ggadget-js${GGL_EPOCH}
+  ${SMJS_LIBRARIES}
+)
+
 
 ADD_MODULE(smjs-script-runtime smjs_script_runtime.cc)
 TARGET_LINK_LIBRARIES(smjs-script-runtime