From d5e16e90c83bdafb4ffa72a749887b1a99ce349a Mon Sep 17 00:00:00 2001 From: Chris Reffett Date: Fri, 27 Dec 2013 10:20:37 -0500 Subject: [dev-util/kdevelop] Bump to 4.6.0 Package-Manager: portage-2.2.7 --- ...kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch (limited to 'dev-util/kdevelop/files') diff --git a/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch new file mode 100644 index 00000000000..b45623623a2 --- /dev/null +++ b/dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch @@ -0,0 +1,32 @@ +commit fb4234cd72ceebb200bef13234ea9c36c9a62046 +Author: Kevin Funk +Date: Sun Nov 3 22:09:56 2013 +0100 + + Check if kdevplatform has JSON support + + BUG: 327095 + +diff --git a/languages/cpp/tests/CMakeLists.txt b/languages/cpp/tests/CMakeLists.txt +index 84ce3ee..fbdd4db 100644 +--- a/languages/cpp/tests/CMakeLists.txt ++++ b/languages/cpp/tests/CMakeLists.txt +@@ -55,7 +55,9 @@ target_link_libraries(buddiestest + ########### next target ############### + + find_package(QJSON) +-if(QJSON_FOUND) ++# Also check that kdevplatform is built with JSON support ++# see: https://bugs.kde.org/show_bug.cgi?id=327095 ++if(QJSON_FOUND AND KDEVPLATFORM_JSONTESTS_LIBRARIES) + set(cppfilestest_SRCS test_cppfiles.cpp) + kde4_add_unit_test(cppfilestest ${cppfilestest_SRCS}) + configure_file("testfilepaths.h.cmake" "testfilepaths.h" ESCAPE_QUOTES) +@@ -67,7 +69,7 @@ if(QJSON_FOUND) + ${KDEVPLATFORM_JSONTESTS_LIBRARIES} + kdev4cppduchain + ) +-endif(QJSON_FOUND) ++endif() + + ########### next target ############### + -- cgit v1.2.3