Hello, On Tuesday 14 May 2013 23:46:26 Valentin Rusu wrote: > On Tuesday 14 May 2013 23:17:32 Pali Rohár wrote: > > Hello Valentin, > > Hello, > > > I see that you completly disabled compiling kopete otr > > plugin in svn revision 1351916 because of incompatibility > > with new version of libotr. > > > > I'd like to ask you, why did you disabled it for everyone? > > Sorry for the inconvenience! > > > There > > are still lot of distributions and people who using > > compatible version of libotr. And also OTR plugin can be > > disabled at compile time with cmake option -DWITH_otr=OFF. > > > > I do agree with this change, because OTR plugin can be > > properly disabled at compile time. And I do not think that > > it will be hard to check if there is compatible version of > > libotr. Now cmake file cmake/modules/FindLibOTR.cmake > > already testing if version is greater then 3.2.0. > > (I suppose you meant that you do *not* agree with this change) >
Right, missing "not"!
> A quick check let me find-up that LibOTR 4 installs the same
> file names as previous 3 version. But the 4th version
> introduces large changes in the API and kopete simply won't
> compile on my ArchLinux. It's even worst than that! The data
> structures members have been re-ordered (have a look to
> otrlchatinterface.cpp line 315 - the structure
> OtrlMessageAppOps has undergone large changes). So FindLibOTR
> should fail if versions >=4 are found. Is that possible?
I very very quickly read that cmake script and wrote this patch.
Can you test if if now fail with version 4? It working fine with 3.2.1.
Index: ../cmake/modules/FindLibOTR.cmake
===================================================================
--- ../cmake/modules/FindLibOTR.cmake (revision 1353952)
+++ ../cmake/modules/FindLibOTR.cmake (working copy)
@@ -23,14 +23,14 @@
STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION
"${output}")
STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION
"${LIBOTR_VERSION}")
# Check if version is at least 3.2.0
- MACRO_ENSURE_VERSION("3.2.0" ${LIBOTR_VERSION} LIBOTR_FOUND)
+ MACRO_ENSURE_VERSION_RANGE("3.2.0" ${LIBOTR_VERSION} "4.0.0" LIBOTR_FOUND)
IF( LIBOTR_FOUND )
IF( NOT LIBOTR_FIND_QUIETLY )
- MESSAGE( STATUS "Found libotr: ${LIBOTR_LIBRARY}")
+ MESSAGE( STATUS "Found libotr: ${LIBOTR_LIBRARY} (version
${LIBOTR_VERSION})")
ENDIF( NOT LIBOTR_FIND_QUIETLY )
ELSE( LIBOTR_FOUND )
- MESSAGE(STATUS "libotr version 3.2.0 or greater required but found
${LIBOTR_VERSION}.")
+ MESSAGE(STATUS "libotr version between 3.2.0 and 4.0.0 required but found
${LIBOTR_VERSION}.")
ENDIF( LIBOTR_FOUND )
ENDIF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
--
Pali Rohár
pali.ro...@gmail.com
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kopete-devel mailing list kopete-devel@kde.org https://mail.kde.org/mailman/listinfo/kopete-devel
