diff options
author | frealgagu | 2020-10-14 08:13:59 -0500 |
---|---|---|
committer | frealgagu | 2020-10-14 08:13:59 -0500 |
commit | b377e90ffaaf49cfda1d6a7320bd223af3b4d26d (patch) | |
tree | cbad54649f20f46e9fe58d69b607431f7ee762db /amarok_mariadb.patch | |
parent | b02149a7404f25fa71b30b57d053b2c186e50124 (diff) | |
download | aur-b377e90ffaaf49cfda1d6a7320bd223af3b4d26d.tar.gz |
Upgrading to version 2.9.0.r482.c272ca62ca
Diffstat (limited to 'amarok_mariadb.patch')
-rw-r--r-- | amarok_mariadb.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/amarok_mariadb.patch b/amarok_mariadb.patch deleted file mode 100644 index fbc04cbc882d..000000000000 --- a/amarok_mariadb.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake -index 0bd7fdfd07..0216668731 100644 ---- a/cmake/modules/FindMySQL.cmake -+++ b/cmake/modules/FindMySQL.cmake -@@ -42,7 +42,16 @@ if(MYSQLCONFIG_EXECUTABLE) - # At least on OpenSUSE and FreeBSD --libmysql-libs doesn't exist, so we just use - # MYSQL_LIBRARIES for that. We'll see if that's enough when testing - # below. -- set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_LIBRARIES}) -+ # mysql-config removed --libmysql-libs, but amarok need libmysqld other -+ # than libmysqlclient to run mysql embedded server. -+ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld libmysqld -+ PATHS -+ $ENV{MYSQL_DIR}/libmysql_r/.libs -+ $ENV{MYSQL_DIR}/lib -+ $ENV{MYSQL_DIR}/lib/mysql -+ PATH_SUFFIXES -+ mysql -+ ) - else() - set(MYSQL_EMBEDDED_LIBRARIES ${MC_MYSQL_EMBEDDED_LIBRARIES}) - endif() |