diff options
| author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2017-08-08 18:19:47 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-08-08 19:15:27 +0200 |
| commit | 50e46a94c460f838dbf8d181fa6fc5a60f9ee0cd (patch) | |
| tree | 534d0f11c1c5aa9132554b18939c7f631dfbf114 | |
| parent | ed4d3f945c9f50f16ae0d7678c646a53e8e4972c (diff) | |
| download | gentoo-50e46a94c460f838dbf8d181fa6fc5a60f9ee0cd.tar.gz gentoo-50e46a94c460f838dbf8d181fa6fc5a60f9ee0cd.tar.xz | |
media-sound/amarok: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/5358
| -rw-r--r-- | media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch | 35 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch | 12 |
2 files changed, 0 insertions, 47 deletions
diff --git a/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch b/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch deleted file mode 100644 index 1c0a7f45d25..00000000000 --- a/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 5b3c84b29c16931e46bf7e1ddba16095245ce070 -Author: Mark Kretschmann <kretschmann@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-devel@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" diff --git a/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch deleted file mode 100644 index 80dc93dc6b1..00000000000 --- a/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt.orig 2014-06-15 18:31:07.362415065 -0400 -+++ src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt 2014-06-15 18:33:19.612419882 -0400 -@@ -28,6 +28,9 @@ - ${ZLIB_LIBRARIES} - ) - -+SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -+SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}") -+ - if(NOT WIN32 AND NOT APPLE) - target_link_libraries( amarok_collection-mysqlecollection crypt pthread ) - endif(NOT WIN32 AND NOT APPLE) |