From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B91CE138010 for ; Wed, 3 Apr 2013 18:30:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 320D7E090A; Wed, 3 Apr 2013 18:30:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B31C5E090A for ; Wed, 3 Apr 2013 18:30:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A3AF33DD55 for ; Wed, 3 Apr 2013 18:30:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D281AE4073 for ; Wed, 3 Apr 2013 18:30:16 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1365013776.11aedb28192f7449c66477cbcee4bb6a85952916.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/kdevelop-php/files/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch X-VCS-Directories: dev-util/kdevelop-php/files/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 11aedb28192f7449c66477cbcee4bb6a85952916 X-VCS-Branch: master Date: Wed, 3 Apr 2013 18:30:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa95df05-4e4e-4e08-8f0a-2c16554e3e55 X-Archives-Hash: a538f52a66a4ad00e9ca8ffc9cf7c549 commit: 11aedb28192f7449c66477cbcee4bb6a85952916 Author: Chris Reffett gentoo org> AuthorDate: Wed Apr 3 18:29:36 2013 +0000 Commit: Chris Reffett gmail com> CommitDate: Wed Apr 3 18:29:36 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=11aedb28 [dev-util/kdevelop-php] Respin test-removal patch to apply correctly wrt bug 464304. Package-Manager: portage-2.2.0_alpha171 --- .../files/kdevelop-php-1.2.0-dbustests.patch | 57 ++++++++++++++------ 1 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch index d3bb404..49402f4 100644 --- a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch +++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch @@ -1,7 +1,6 @@ -diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1.2.0/completion/tests/CMakeLists.txt ---- kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt 2011-01-23 20:42:54.000000000 +0100 -+++ kdevelop-php-1.2.0/completion/tests/CMakeLists.txt 2011-03-05 18:01:34.000000000 +0100 -@@ -8,24 +8,6 @@ +--- kdevelop-php-9999/completion/tests/CMakeLists.txt ++++ kdevelop-php-9999/completion/tests/CMakeLists.txt +@@ -8,16 +8,8 @@ set(completiontest_SRCS test_completion.cpp ../../duchain/tests/duchaintestbase.cpp) @@ -14,6 +13,12 @@ diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1 - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) + # hack to make ../../duchain/tests/duchaintestbase.h use the correct EXPORT tags when compiling with MinGW ++ + if (MINGW) + set_property(TARGET completiontest APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") + endif (MINGW) +@@ -25,15 +17,7 @@ set(completionbench_SRCS bench_completion.cpp ../../duchain/tests/duchaintestbase.cpp) @@ -26,10 +31,14 @@ diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1 - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) -diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt ---- kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt 2011-01-23 20:42:54.000000000 +0100 -+++ kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt 2011-03-05 17:54:27.000000000 +0100 -@@ -9,66 +9,21 @@ ++ + # hack to make ../../duchain/tests/duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET completionbenchmark APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") + +--- kdevelop-php-9999/duchain/tests/CMakeLists.txt ++++ kdevelop-php-9999-patched/duchain/tests/CMakeLists.txt +@@ -9,14 +9,7 @@ set(duchain_SRCS duchain.cpp duchaintestbase.cpp) @@ -41,8 +50,11 @@ diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2. - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) -- - ++ + # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET duchain APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") +@@ -26,14 +19,7 @@ set(expressionparser_SRCS expressionparser.cpp duchaintestbase.cpp) @@ -54,7 +66,11 @@ diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2. - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) - ++ + # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET expressionparser APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") +@@ -43,15 +29,7 @@ set(uses_SRCS uses.cpp duchaintestbase.cpp) @@ -67,8 +83,11 @@ diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2. - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) - - set(benchmarks_SRCS ++ + # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET uses APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") +@@ -62,15 +40,7 @@ benchmarks.cpp duchaintestbase.cpp ) @@ -81,9 +100,11 @@ diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2. - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) -- - - set(duchain_multiplefiles_SRCS ++ + # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET benchmarks APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB") +@@ -81,15 +51,7 @@ duchain_multiplefiles.cpp duchaintestbase.cpp ) @@ -96,3 +117,7 @@ diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2. - ${KDEVPLATFORM_TESTS_LIBRARIES} - ${KDEVPLATFORM_LANGUAGE_LIBRARIES} -) ++ + # hack to make ../duchaintestbase.h use the correct EXPORT tags when compiling with MinGW + if (MINGW) + set_property(TARGET duchain_multiplefiles APPEND_STRING PROPERTY COMPILE_FLAGS " -DMAKE_KDEV4PHPDUCHAIN_LIB")