diff options
| author | Chris Reffett <creffett@gentoo.org> | 2013-12-27 10:20:37 -0500 |
|---|---|---|
| committer | Chris Reffett <creffett@gentoo.org> | 2013-12-27 10:20:37 -0500 |
| commit | d5e16e90c83bdafb4ffa72a749887b1a99ce349a (patch) | |
| tree | 563a468c487bc49b6e98119461f03fc8696b9e5f /dev-util/kdevelop/files | |
| parent | 05360efdfd989b30d4dc8a9760d46890464d077e (diff) | |
| download | kde-d5e16e90c83bdafb4ffa72a749887b1a99ce349a.tar.gz kde-d5e16e90c83bdafb4ffa72a749887b1a99ce349a.tar.bz2 kde-d5e16e90c83bdafb4ffa72a749887b1a99ce349a.zip | |
[dev-util/kdevelop] Bump to 4.6.0
Package-Manager: portage-2.2.7
Diffstat (limited to 'dev-util/kdevelop/files')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-4.5.2-kdevplatform-without-qjson.patch | 32 |
1 files changed, 32 insertions, 0 deletions
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 <kevin@kfunk.org> +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 ############### + |