On Thursday 27 October 2011 20:37:14 Conrad J. Sabatier wrote: > OK, that's what I thought. Just wanted to spare myself any unnecessary > troubles.
Would you test a patch for me? I'm trying to fix the conflict between kdelibs and Qt 3... Please, paste the attached patch in x11/kdelibs4/files/ and rebuild kdelibs *with* Qt 3 installed. Thanks! -- Alberto Villa, FreeBSD committer <avi...@freebsd.org> http://people.FreeBSD.org/~avilla What if there had been room at the inn? -- Linda Festa on the origins of Christianity
--- ./kio/CMakeLists.txt.orig 2011-11-03 01:00:32.757074041 -0700
+++ ./kio/CMakeLists.txt 2011-11-03 01:02:10.937079665 -0700
@@ -17,22 +17,6 @@
set(KIO_NO_SOPRANO TRUE)
endif(NOT SOPRANO_FOUND)
-if(OPENSSL_FOUND)
- set(KSSL_HAVE_SSL 1)
- include_directories(${OPENSSL_INCLUDE_DIR})
-endif(OPENSSL_FOUND)
-
-if(NOT KIO_NO_NEPOMUK)
- include_directories(
- ${SOPRANO_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/nepomuk/
- ${CMAKE_SOURCE_DIR}/nepomuk/core/
- ${CMAKE_SOURCE_DIR}/nepomuk/types/
- ${CMAKE_SOURCE_DIR}/nepomuk/ui/
- ${CMAKE_SOURCE_DIR}/nepomuk/query/
- )
-endif(NOT KIO_NO_NEPOMUK)
-
# This applies to all subdirs; let's put kio's dependencies (and own dirs)
here, once and for all
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/bookmarks
@@ -49,6 +33,23 @@
${ZLIB_INCLUDE_DIR}
)
+
+if(OPENSSL_FOUND)
+ set(KSSL_HAVE_SSL 1)
+ include_directories(${OPENSSL_INCLUDE_DIR})
+endif(OPENSSL_FOUND)
+
+if(NOT KIO_NO_NEPOMUK)
+ include_directories(
+ ${SOPRANO_INCLUDE_DIR}
+ ${CMAKE_SOURCE_DIR}/nepomuk/
+ ${CMAKE_SOURCE_DIR}/nepomuk/core/
+ ${CMAKE_SOURCE_DIR}/nepomuk/types/
+ ${CMAKE_SOURCE_DIR}/nepomuk/ui/
+ ${CMAKE_SOURCE_DIR}/nepomuk/query/
+ )
+endif(NOT KIO_NO_NEPOMUK)
+
if (NOT KIO_NO_STRIGI)
include_directories(${STRIGI_INCLUDE_DIR})
set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY}
${STRIGI_STREAMS_LIBRARY})
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
