8 files changed, 104 insertions, 10 deletions

diff --git a/polish/kadu/files/patch-kadu-core__CMakeLists.txt b/polish/kadu/files/patch-kadu-core__CMakeLists.txt
new file mode 100644
index 000000000000..f5f9da6b83e6
--- /dev/null
+++ b/polish/kadu/files/patch-kadu-core__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- kadu-core/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ kadu-core/CMakeLists.txt	2011-08-20 22:41:28.000000000 +0200
+@@ -652,6 +652,7 @@
+ 	else (X11_Xfixes_FOUND)
+ 		message (FATAL_ERROR "Could not find X11 libraries")
+ 	endif (X11_FOUND)
++	include_directories (${X11_INCLUDE_DIR})
+ 
+ 	if (USE_X11_XFIXES)
+ 		if (X11_Xfixes_FOUND)
diff --git a/polish/kadu/files/patch-kadu-core_gadu_resolver.cpp b/polish/kadu/files/patch-kadu-core_gadu_resolver.cpp
deleted file mode 100644
index a4c60dac8898..000000000000
--- a/polish/kadu/files/patch-kadu-core_gadu_resolver.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kadu-core/gadu_resolver.cpp.orig	2009-10-18 10:00:12.000000000 +0200
-+++ kadu-core/gadu_resolver.cpp	2010-02-16 01:41:36.000000000 +0100
-@@ -9,6 +9,7 @@
- #include <io.h>
- #else
- #include <sys/wait.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
- #endif
diff --git a/polish/kadu/files/patch-modules__docking__CMakeLists.txt b/polish/kadu/files/patch-modules__docking__CMakeLists.txt
new file mode 100644
index 000000000000..240f467162e8
--- /dev/null
+++ b/polish/kadu/files/patch-modules__docking__CMakeLists.txt
@@ -0,0 +1,19 @@
+--- modules/docking/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/docking/CMakeLists.txt	2011-08-20 22:58:01.000000000 +0200
+@@ -13,6 +13,16 @@
+ 	SET_SOURCE_FILES_PROPERTIES(mac_docking_helper.cpp PROPERTIES COMPILE_FLAGS "-x objective-c++")
+ endif (APPLE)
+ 
++if (UNIX AND NOT APPLE)
++	include (FindX11)
++	if (X11_FOUND)
++		message (STATUS "Found X11 libraries: ${X11_X11_LIB}")
++	else (X11_FOUND)
++		message (FATAL_ERROR "Could not find X11 libraries")
++	endif (X11_FOUND)
++	include_directories (${X11_INCLUDE_DIR})
++endif (UNIX AND NOT APPLE)
++
+ set (TRANSLATION_SOURCES
+ 	translations/docking_en.ts
+ 	translations/docking_de.ts
diff --git a/polish/kadu/files/patch-modules__idle__CMakeLists.txt b/polish/kadu/files/patch-modules__idle__CMakeLists.txt
new file mode 100644
index 000000000000..d56dc994f9de
--- /dev/null
+++ b/polish/kadu/files/patch-modules__idle__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- modules/idle/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/idle/CMakeLists.txt	2011-08-21 00:06:34.000000000 +0200
+@@ -6,6 +6,7 @@
+ 		message (FATAL_ERROR "Could not find X11 Screen Saver extension")
+ 	endif (X11_Xscreensaver_FOUND)
+ 
++	include_directories (${X11_INCLUDE_DIR})
+ 	set (LIBRARIES ${X11_Xscreensaver_LIB})
+ 
+ 	set (SOURCES
diff --git a/polish/kadu/files/patch-modules__kde_notify__CMakeLists.txt b/polish/kadu/files/patch-modules__kde_notify__CMakeLists.txt
new file mode 100644
index 000000000000..bc13a90b3c74
--- /dev/null
+++ b/polish/kadu/files/patch-modules__kde_notify__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- modules/kde_notify/CMakeLists.txt.orig	2011-08-21 00:46:07.000000000 +0200
++++ modules/kde_notify/CMakeLists.txt	2011-08-21 00:45:20.000000000 +0200
+@@ -19,6 +19,9 @@
+ 	configuration/kde_notify.ui
+ )
+ 
++include_directories (${LIBGADU_INCLUDE_DIRS})
++link_directories (${LIBGADU_LIBRARY_DIRS})
++
+ kadu_module (kde_notify
+ 	MODULE_SOURCES ${SOURCES}
+ 	MODULE_MOC_SOURCES ${MOC_SOURCES}
diff --git a/polish/kadu/files/patch-modules__screenshot__CMakeLists.txt b/polish/kadu/files/patch-modules__screenshot__CMakeLists.txt
new file mode 100644
index 000000000000..df63a1c1788c
--- /dev/null
+++ b/polish/kadu/files/patch-modules__screenshot__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- modules/screenshot/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/screenshot/CMakeLists.txt	2011-08-21 01:51:47.000000000 +0200
+@@ -40,6 +40,9 @@
+ 	data/configuration/screenshot.ui
+ )
+ 
++include (FindX11)
++include_directories (${X11_INCLUDE_DIR})
++
+ kadu_module (screenshot
+ 	MODULE_SOURCES ${SOURCES}
+ 	MODULE_MOC_SOURCES ${MOC_SOURCES}
diff --git a/polish/kadu/files/patch-modules__sound__CMakeLists.txt b/polish/kadu/files/patch-modules__sound__CMakeLists.txt
new file mode 100644
index 000000000000..723520721165
--- /dev/null
+++ b/polish/kadu/files/patch-modules__sound__CMakeLists.txt
@@ -0,0 +1,31 @@
+--- modules/sound/CMakeLists.txt.orig	2011-08-21 02:45:28.000000000 +0200
++++ modules/sound/CMakeLists.txt	2011-08-21 03:01:52.000000000 +0200
+@@ -32,14 +32,6 @@
+ 	configuration/sound.ui
+ )
+ 
+-kadu_module (sound
+-	MODULE_SOURCES ${SOURCES}
+-	MODULE_MOC_SOURCES ${MOC_SOURCES}
+-	MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+-	MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+-	MODULE_BUILDDEF SOUND_BUILD
+-)
+-
+ if (NOT MINGW)
+ 	pkg_search_module (SNDFILE REQUIRED sndfile>=1.0)
+ else (NOT MINGW)
+@@ -58,4 +50,13 @@
+ 
+ include_directories (${SNDFILE_INCLUDE_DIRS})
+ link_directories (${SNDFILE_LIBRARY_DIRS})
++
++kadu_module (sound
++	MODULE_SOURCES ${SOURCES}
++	MODULE_MOC_SOURCES ${MOC_SOURCES}
++	MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
++	MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
++	MODULE_BUILDDEF SOUND_BUILD
++)
++
+ target_link_libraries (sound ${SNDFILE_LIBRARIES})
diff --git a/polish/kadu/files/patch-modules__spellchecker__CMakeLists.txt b/polish/kadu/files/patch-modules__spellchecker__CMakeLists.txt
new file mode 100644
index 000000000000..6c0d3dc75bc6
--- /dev/null
+++ b/polish/kadu/files/patch-modules__spellchecker__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- modules/spellchecker/CMakeLists.txt.orig	2011-05-08 20:32:41.000000000 +0200
++++ modules/spellchecker/CMakeLists.txt	2011-08-21 03:11:41.000000000 +0200
+@@ -68,6 +68,7 @@
+ 
+ 	set (LIBRARIES ${ENCHANT_LIBRARIES})
+ 	include_directories (${ENCHANT_INCLUDE_DIRS})
++	link_directories (${ENCHANT_LIBRARY_DIRS})
+ 	add_definitions (${ENCHANT_DEFINITIONS})
+ 	add_definitions (-DHAVE_ENCHANT)
+ endif (USE_ASPELL)