aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAstroFloyd <AstroFloyd@gmail.com>2018-01-12 08:12:06 +0100
committerAstroFloyd <AstroFloyd@gmail.com>2018-01-12 08:12:06 +0100
commit1cada4cd0549a53f3c009e6d0562ff0cef76ebd4 (patch)
tree4ae037b0771e32fe51673f33681760e2cbaa95aa /media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
parentsys-cluster/opencoarrays: add dependency virtual/mpi (diff)
downloadAstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.tar.gz
AstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.tar.bz2
AstroFloyd-1cada4cd0549a53f3c009e6d0562ff0cef76ebd4.zip
media-sound/amarok (+3 deps): copy from portage to keep until Plasma-5 version of Amarok is released
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch')
-rw-r--r--media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
new file mode 100644
index 0000000..b03aa18
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
@@ -0,0 +1,34 @@
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Tue, 29 Mar 2016 12:22:41 -0400
+Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
+ WITH_MYSQL_EMBEDDED
+
+REVIEW: 127523
+---
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+index 244cde1..4c618fc 100644
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
+ ${KDE4_KDECORE_LIBS}
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+- ${MYSQL_EMBEDDED_LIBRARIES}
+ ${CMAKE_DL_LIBS}
+ ${ZLIB_LIBRARIES}
+ )
+
++if(WITH_MYSQL_EMBEDDED)
++ target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
++endif(WITH_MYSQL_EMBEDDED)
++
+ if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
+--
+2.8.1
+