diff options
Diffstat (limited to 'databases/kmysqladmin/patches/patch-aa')
| -rw-r--r-- | databases/kmysqladmin/patches/patch-aa | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/databases/kmysqladmin/patches/patch-aa b/databases/kmysqladmin/patches/patch-aa index e498eb1bbed..faf2cc24ada 100644 --- a/databases/kmysqladmin/patches/patch-aa +++ b/databases/kmysqladmin/patches/patch-aa @@ -1,13 +1,28 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/08/01 08:20:45 skrll Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/27 23:35:01 markd Exp $ ---- configure.orig Thu Jul 5 16:24:43 2001 -+++ configure Thu Jul 5 16:25:45 2001 -@@ -5796,7 +5796,7 @@ - fi +--- kmysqladmin/setup/settings.cpp.orig 2004-12-28 12:06:21.000000000 +1300 ++++ kmysqladmin/setup/settings.cpp +@@ -151,7 +151,7 @@ KWallet::Wallet*CSettings::openWallet(co + delete myWall; return 0; + } + } +- myWall->setFolder(aDir); ++ myWall->setFolder(aDir.c_str()); + return myWall; + } - mysql_include_found="" -- if test -n "$mysq_use_include" && \ -+ if test -n "$mysql_use_include" && \ - test "$mysql_use_include" != "NONE"; then - mysql_include_found="Setting to $mysql_use_include" - else +@@ -169,10 +169,10 @@ void CSettings::SaveLastLogin(const std: + return; + } + QMap<QString,QString> login_values; +- login_values[_USER]=user; +- login_values[_HOST]=host; +- login_values[_PORT]=port; +- login_values[_PASS]=pass; ++ login_values[_USER]=user.c_str(); ++ login_values[_HOST]=host.c_str(); ++ login_values[_PORT]=port.c_str(); ++ login_values[_PASS]=pass.c_str(); + myWall->writeMap(_LAST_LOGIN_MAP,login_values); + delete myWall; + #endif |