pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/kmysqladmin Changes 0.7.2:
details: https://anonhg.NetBSD.org/pkgsrc/rev/7fc43ab0c907
branches: trunk
changeset: 538633:7fc43ab0c907
user: adam <adam%pkgsrc.org@localhost>
date: Thu Feb 14 18:05:24 2008 +0000
description:
Changes 0.7.2:
- When administrate users on mysql servers >= 4.0 the max_updates/queries/
connections settings will reflected.
- fixes for building with gcc 4
- fixes for mysql lib > 4.1
- Integrated a compact layout where the non-modal windows are part of main
window
- Setting up a new more compact table browser widget
diffstat:
databases/kmysqladmin/Makefile | 9 ++---
databases/kmysqladmin/PLIST | 4 +-
databases/kmysqladmin/distinfo | 13 ++------
databases/kmysqladmin/patches/patch-aa | 28 --------------------
databases/kmysqladmin/patches/patch-ab | 13 ---------
databases/kmysqladmin/patches/patch-ac | 19 --------------
databases/kmysqladmin/patches/patch-ad | 46 ----------------------------------
databases/kmysqladmin/patches/patch-ae | 12 --------
8 files changed, 10 insertions(+), 134 deletions(-)
diffs (199 lines):
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/Makefile
--- a/databases/kmysqladmin/Makefile Thu Feb 14 12:26:56 2008 +0000
+++ b/databases/kmysqladmin/Makefile Thu Feb 14 18:05:24 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2008/01/18 05:06:26 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2008/02/14 18:05:24 adam Exp $
-DISTNAME= kmysqladmin-0.7.0
-PKGREVISION= 11
+DISTNAME= kmysqladmin-0.7.2
CATEGORIES= databases kde
MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/
@@ -10,8 +9,8 @@
COMMENT= MySQL administration GUI
USE_LANGUAGES= c c++
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
MYSQLDIR= ${BUILDLINK_PREFIX.mysql-client}
CONFIGURE_ARGS+= --with-mysql-include=${MYSQLDIR}/include/mysql
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/PLIST
--- a/databases/kmysqladmin/PLIST Thu Feb 14 12:26:56 2008 +0000
+++ b/databases/kmysqladmin/PLIST Thu Feb 14 18:05:24 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/26 03:49:32 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/02/14 18:05:24 adam Exp $
bin/kmysqladmin
share/doc/kde/HTML/en/kmysqladmin/Logo.png
share/doc/kde/HTML/en/kmysqladmin/common
@@ -13,7 +13,7 @@
share/icons/hicolor/48x48/apps/kmysqladmin.png
share/icons/locolor/16x16/apps/kmysqladmin.png
share/icons/locolor/32x32/apps/kmysqladmin.png
-share/kde/applnk/Applications/kmysqladmin.desktop
+share/kde/applnk/Database/kmysqladmin.desktop
share/kde/apps/kmysqladmin/kmysqladminui.rc
share/kde/apps/kmysqladmin/toolbar/access_rights.xpm
share/kde/apps/kmysqladmin/toolbar/altertab.xpm
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/distinfo
--- a/databases/kmysqladmin/distinfo Thu Feb 14 12:26:56 2008 +0000
+++ b/databases/kmysqladmin/distinfo Thu Feb 14 18:05:24 2008 +0000
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/11/03 18:53:11 rillig Exp $
+$NetBSD: distinfo,v 1.9 2008/02/14 18:05:24 adam Exp $
-SHA1 (kmysqladmin-0.7.0.tar.gz) = b01cb4a19669a11eb22c9f2a0ed44c6891734987
-RMD160 (kmysqladmin-0.7.0.tar.gz) = 1af15d1c7dadbb48fbbb9c467a53ae294b2dcb17
-Size (kmysqladmin-0.7.0.tar.gz) = 1315939 bytes
-SHA1 (patch-aa) = e3327d1992f70534b20af4be5e9698038dff13e1
-SHA1 (patch-ab) = d7fd4b73cecbe03c20efbdf89981738cc6fa7c19
-SHA1 (patch-ac) = 284e490aa24eeaacb80f2df1c3da1ab32594de20
-SHA1 (patch-ad) = b71cda5286b772eb068f4324323c86f01d7fe665
-SHA1 (patch-ae) = cbf90098f4808bc9101e7d345ac4eee6dcf6fadf
+SHA1 (kmysqladmin-0.7.2.tar.gz) = b184c5f9ffcc872c49f048b939327448e0a82ae7
+RMD160 (kmysqladmin-0.7.2.tar.gz) = 0993b8969888618395efa5b671a9a0f9d44e9d5a
+Size (kmysqladmin-0.7.2.tar.gz) = 1294472 bytes
SHA1 (patch-af) = bb36a6402d9ba28a73c01203fe282f93ccd654ae
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/patches/patch-aa
--- a/databases/kmysqladmin/patches/patch-aa Thu Feb 14 12:26:56 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/12/27 23:35:01 markd Exp $
-
---- 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;
- }
-
-@@ -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
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/patches/patch-ab
--- a/databases/kmysqladmin/patches/patch-ab Thu Feb 14 12:26:56 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/12/27 23:35:01 markd Exp $
-
---- kmysqladmin/frontend/browsetable/tableview.cpp.orig 2004-12-28 12:13:38.000000000 +1300
-+++ kmysqladmin/frontend/browsetable/tableview.cpp
-@@ -786,7 +786,7 @@ void CTableView::saveHtml(const char*fil
- bimagesaved = true;
- }
- } else {
-- iname = QString("%1_%2.jpg").arg(desc->get_name()).arg(number);
-+ iname = QString("%1_%2.jpg").arg(desc->get_name().c_str()).arg(number);
- bImage.save(inf.dirPath(true)+"/"+iname,"JPEG");
- }
- st << iname << "\">\n";
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/patches/patch-ac
--- a/databases/kmysqladmin/patches/patch-ac Thu Feb 14 12:26:56 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/12/27 23:35:01 markd Exp $
-
---- kmysqladmin/MainWindow.cpp.orig 2004-12-28 12:18:13.000000000 +1300
-+++ kmysqladmin/MainWindow.cpp
-@@ -285,10 +285,10 @@ void CMainWindow::ConnectQuick(const QSt
- {
- if (which.length()==0) return;
- QMap<QString,QString> qvals = GlobalSettings.getConnectProfile(which);
-- _connect(qvals[Settings_defines::_PROFILES_user],
-- qvals[Settings_defines::_PROFILES_host],
-- qvals[Settings_defines::_PROFILES_port],
-- qvals[Settings_defines::_PROFILES_pass]);
-+ _connect(qvals[Settings_defines::_PROFILES_user].latin1(),
-+ QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_host]),
-+ QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_port]),
-+ QT_TO_STL_STRING(qvals[Settings_defines::_PROFILES_pass]));
- }
-
- void CMainWindow::_connect(const std::string&user,const std::string&host,
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/patches/patch-ad
--- a/databases/kmysqladmin/patches/patch-ad Thu Feb 14 12:26:56 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/11/03 18:53:12 rillig Exp $
-
---- kmysqladmin/backend/my_sql/my_sql.cpp.orig 2004-09-22 04:53:03.000000000 +0200
-+++ kmysqladmin/backend/my_sql/my_sql.cpp 2007-09-26 22:55:12.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <mysql_com.h>
-+#include <mysql_version.h>
- #include <cmath>
- #include <iostream>
-
-@@ -70,6 +71,7 @@ const my_sql_type CMySql::f_arr[]=
- my_sql_type("DATETIME","DateTime", 14, 14,0,0,false,false,false,false,false,false,false,false),
- my_sql_type("YEAR","Year", 4, 4,0,0, true,false,false,false,false,false,false,false),
- my_sql_type("DOUBLE","Double (8 Bytes)", 1, 20,0,8, true, true, true,false,false, true,false,false),
-+ my_sql_type("DOUBLE UNSIGNED", "Double (8 Bytes)", 1, 20,0,8, true, true, true, true,false, true,false,false),
- my_sql_type("NUMERIC","Decimal (lenght,dec)", 1, 20,0,8, true, true, true,false, true, true,false,false),
- };
-
-@@ -469,8 +471,10 @@ bool CMySql::get_table_fields(const std:
- }
- }
- if (f_type == FieldDescriptCounts()) {
-- do_message("Error retrieving fieldtypes - please send a mail to the "
-- "autor of the software!");
-+ std::string msg = "Unknown MySQL type ";
-+ msg += type_string;
-+ msg += " - please send a mail to the author of the software!";
-+ do_message(msg);
- return false;
- }
- my_sql_type t_info = sql_type(f_type);
-@@ -1184,7 +1188,11 @@ int CMySql::shutdown()
- int i;
- if (!Sql_Connection)
- return 0;
-- i = mysql_shutdown(Sql_Connection);
-+ i = mysql_shutdown(Sql_Connection
-+#if MYSQL_VERSION_ID >= 40103
-+ , SHUTDOWN_DEFAULT
-+#endif
-+ );
- if (i < 0) {
- do_message(get_last_error());
- }
diff -r 6ffc7e7892fb -r 7fc43ab0c907 databases/kmysqladmin/patches/patch-ae
--- a/databases/kmysqladmin/patches/patch-ae Thu Feb 14 12:26:56 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/03/28 18:07:52 joerg Exp $
-
---- kmysqladmin/helpers/tfunctions.h.orig 2006-03-28 16:39:35.000000000 +0000
-+++ kmysqladmin/helpers/tfunctions.h
-@@ -209,6 +209,6 @@ namespace tfunctions {
- }
- const typename std::vector<T>&operator()()const{return res;}
- };
--};
-+}
-
- #endif
Home |
Main Index |
Thread Index |
Old Index