<table><tr><td style="">wbauer added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D28284">View Revision</a></tr></table><br /><div><div><p>One thing I should note though: we do use a patch to fix things on openSUSE currently, but that's not a problem of this change.</p>
<p>I plan to propose our patch upstream anyway (I originally took it from Arch Linux and didn't really understand why it is needed), although it would actually not be needed anymore with this and a mariadb-connector-c without mysql support ... ;-)</p>
<p>In case you're interested right away, this is it:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="diff" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);"><span style="color: #000080">diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake</span>
<span style="color: #000080">index 0bd7fdfd07..8973729f1f 100644</span>
<span style="color: #a00000">--- a/cmake/modules/FindMySQL.cmake</span>
<span style="color: #00a000">+++ b/cmake/modules/FindMySQL.cmake</span>
<span style="color: #800080">@@ -38,14 +38,16 @@ if(MYSQLCONFIG_EXECUTABLE)</span>
OUTPUT_STRIP_TRAILING_WHITESPACE
)
<span style="color: #a00000">- if(NOT MC_MYSQL_EMBEDDED_LIBRARIES OR NOT "${MC_return_embedded}" STREQUAL "0")</span>
<span style="color: #a00000">- # At least on OpenSUSE and FreeBSD --libmysql-libs doesn't exist, so we just use</span>
<span style="color: #a00000">- # MYSQL_LIBRARIES for that. We'll see if that's enough when testing</span>
<span style="color: #a00000">- # below.</span>
<span style="color: #a00000">- set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES})</span>
<span style="color: #a00000">- else()</span>
<span style="color: #a00000">- set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES})</span>
<span style="color: #a00000">- endif()</span>
<span style="color: #00a000">+ # mysql-config removed --libmysql-libs, but amarok need libmysqld other</span>
<span style="color: #00a000">+ # than libmysqlclient to run mysql embedded server.</span>
<span style="color: #00a000">+ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld</span>
<span style="color: #00a000">+ PATHS</span>
<span style="color: #00a000">+ $ENV{MYSQL_DIR}/libmysql_r/.libs</span>
<span style="color: #00a000">+ $ENV{MYSQL_DIR}/lib</span>
<span style="color: #00a000">+ $ENV{MYSQL_DIR}/lib/mysql</span>
<span style="color: #00a000">+ PATH_SUFFIXES</span>
<span style="color: #00a000">+ mysql</span>
<span style="color: #00a000">+ )</span>
endif()
# Try searching manually via find_path/find_library, possibly with hints</pre></div>
<p>That of course will likely break things on other systems (in this form), so better don't incorporate it blindly... ;-)</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R181 Amarok</div></div></div><br /><div><strong>BRANCH</strong><div><div>mysqle-split-for-phab</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D28284">https://phabricator.kde.org/D28284</a></div></div><br /><div><strong>To: </strong>asturmlechner, Amarok, heikobecker, wbauer<br /><strong>Cc: </strong>amarok-devel, vmatare, mdn, pgomes, nicolamori, jyasi, mfraser, ryanmccoskrie, semareit, eridani, eoinoneill, jackyalcine, nhuisman, paul, domson, yaohanchen, malteveerman, markey, James, tbettler, Smar, ricktimmis, asturmlechner, schweingruber, heikobecker<br /></div>