Ludovico Cavedon wrote: > 3) Is the version of libpurple beging used a verbatim inclusion from > the upstream release? Would there be any problem in using the system > libpurple shared library? If you think it would be ok I could write > the patch for that.
Anyway, here it is the patch in order to use system libpurple, simpler than expected :) And it seems to work with the latest libpurple in Debian sid (2.5.2)! Regards, Ludovico
Index: qutecom-2.2/libs/3rdparty/libpurple/CMakeLists-external.txt =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ qutecom-2.2/libs/3rdparty/libpurple/CMakeLists-external.txt 2008-12-09 06:56:28.000000000 +0000 @@ -0,0 +1,10 @@ +if (NOT LIBPURPLE_FOUND) + find_package(LibPurple REQUIRED) +endif (NOT LIBPURPLE_FOUND) + +ow_create_project(libpurple) + +ow_use_public_libraries( + LIBPURPLE +) + Index: qutecom-2.2/libs/3rdparty/libpurple/CMakeLists.txt =================================================================== --- qutecom-2.2.orig/libs/3rdparty/libpurple/CMakeLists.txt 2008-12-09 06:32:59.000000000 +0000 +++ qutecom-2.2/libs/3rdparty/libpurple/CMakeLists.txt 2008-12-09 06:35:04.000000000 +0000 @@ -1,7 +1,11 @@ if (NOT WIN32) # Not MSVC and not MinGW - include(CMakeLists-unix.txt) + if (LIBPURPLE_INTERNAL) + include(CMakeLists-unix.txt) + else (LIBPURPLE_INTERNAL) + include(CMakeLists-external.txt) + endif (LIBPURPLE_INTERNAL) else (NOT WIN32) # If MSVC or MinGW include(CMakeLists-win32.txt) -endif (NOT WIN32) \ No newline at end of file +endif (NOT WIN32) Index: qutecom-2.2/libs/3rdparty/CMakeLists.txt =================================================================== --- qutecom-2.2.orig/libs/3rdparty/CMakeLists.txt 2008-12-09 06:35:45.000000000 +0000 +++ qutecom-2.2/libs/3rdparty/CMakeLists.txt 2008-12-09 08:30:56.000000000 +0000 @@ -8,6 +8,7 @@ option(SAMPLERATE_INTERNAL "Use internal libsamplerate" OFF) option(OSIP2_INTERNAL "Use internal oSIP" ON) option(CURL_INTERNAL "Use internal cURL" OFF) + option(LIBPURPLE_INTERNAL "Use internal libpurple" OFF) else (LINUX) option(PORTAUDIO_INTERNAL "Use internal PortAudio" ON) option(FFMPEG_INTERNAL "Use internal FFmpeg" ON) @@ -16,6 +17,7 @@ option(SAMPLERATE_INTERNAL "Use internal libsamplerate" ON) option(OSIP2_INTERNAL "Use internal oSIP" ON) option(CURL_INTERNAL "Use internal cURL" ON) + option(LIBPURPLE_INTERNAL "Use internal libpurple" ON) endif (LINUX) if (WIN32) Index: qutecom-2.2/libs/imwrapper/src/purple/PurpleIMFactory.h =================================================================== --- qutecom-2.2.orig/libs/imwrapper/src/purple/PurpleIMFactory.h 2008-12-09 07:01:41.000000000 +0000 +++ qutecom-2.2/libs/imwrapper/src/purple/PurpleIMFactory.h 2008-12-09 07:04:18.000000000 +0000 @@ -24,6 +24,7 @@ #include <imwrapper/IMAccount.h> #include <glib.h> +#include <glib/gtypes.h> class PurpleAccountMngr; class PurpleChatMngr; Index: qutecom-2.2/libs/imwrapper/CMakeLists.txt =================================================================== --- qutecom-2.2.orig/libs/imwrapper/CMakeLists.txt 2008-12-09 08:31:30.000000000 +0000 +++ qutecom-2.2/libs/imwrapper/CMakeLists.txt 2008-12-09 08:31:42.000000000 +0000 @@ -9,6 +9,7 @@ ow_use_public_libraries( owsettings + glib2 ) ow_use_private_libraries(
_______________________________________________ QuteCom-dev mailing list [email protected] http://lists.qutecom.org/mailman/listinfo/qutecom-dev
