mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 05:40:30 -04:00
303a695888
databases/akonadi: - Update to 1.11.0 - Drop ipv6 from CATEGORIES - Squeeze MASTER_SITES/SUBDIR - Add dependency on modern compiler to fix build on 9.x - Use options helpers - Remove QT_PREFIX from PLIST_SUB, it's already set in bsd.qt.mk - Realign commented lines devel/grantlee: update to 0.4.0 - Remove broken DOXYGEN option - Add list of ports that need modification on grantlee update - Remove MAKE_JOBS_UNSAFE devel/libkgapi: - Update to 2.0.1 devel/libkolab: - Update to 0.5.0 textproc/libkolabxml: - Update to 1.0.1
11 lines
1 KiB
C++
11 lines
1 KiB
C++
--- ./server/src/storage/dbconfigmysql.cpp.orig 2012-06-13 02:11:19.473370856 +0200
|
|
+++ ./server/src/storage/dbconfigmysql.cpp 2012-06-13 02:11:50.113468897 +0200
|
|
@@ -265,7 +265,7 @@ void DbConfigMysql::startInternalServer()
|
|
// first run, some MySQL versions need a mysql_install_db run for that
|
|
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
|
|
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
|
|
- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
|
|
+ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" );
|
|
QProcess::execute( mMysqlInstallDbPath, arguments );
|
|
}
|
|
|