johu 14/03/14 14:47:59 Added: amarok-2.8.0-gmock-1.7.patch Log: Revision bump marks pax on /usr/bin/amarok, bug #481592. Adds a patch to unbreak build of tests with gmock-1.7. (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.1 media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch?rev=1.1&content-type=text/plain Index: amarok-2.8.0-gmock-1.7.patch =================================================================== commit 5b3c84b29c16931e46bf7e1ddba16095245ce070 Author: Mark Kretschmann <kretschm...@kde.org> Date: Sat Dec 14 10:25:45 2013 +0100 Fix compilation with unit tests enabled. The problem was clashing symbols between KDE's kWarning macro and gmock. Thanks go to Edward for help with fixing. CCMAIL: amarok-de...@kde.org diff --git a/tests/core/collections/MockCollectionLocationDelegate.h b/tests/core/collections/MockCollectionLocationDelegate.h index 019b096..a2f4504 100644 --- a/tests/core/collections/MockCollectionLocationDelegate.h +++ b/tests/core/collections/MockCollectionLocationDelegate.h @@ -23,6 +23,7 @@ #include "core/collections/CollectionLocationDelegate.h" +#undef kWarning // WORKAROUND: Prevent symbols clash with KDE's kWarning macro #include <gmock/gmock.h> namespace Collections { diff --git a/tests/mocks/MockTrack.h b/tests/mocks/MockTrack.h index 9f47956..fec6ef2 100644 --- a/tests/mocks/MockTrack.h +++ b/tests/mocks/MockTrack.h @@ -17,6 +17,7 @@ #ifndef META_MOCKTRACK_H #define META_MOCKTRACK_H +#undef kWarning // WORKAROUND: Prevent symbols clash with KDE's kWarning macro #include <gmock/gmock.h> #include "core/meta/Meta.h"
