update to mysqlcc-0.8.7
This commit is contained in:
wilfried
parent
ec41654d95
commit
3a6feec07c
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2002/11/05 15:55:48 wilfried Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2002/12/16 14:55:37 wilfried Exp $
|
||||
|
||||
COMMENT= "GUI client for MySQL"
|
||||
|
||||
VERSION= 0.8.6
|
||||
VERSION= 0.8.7
|
||||
DISTNAME= mysqlcc-${VERSION}-src
|
||||
PKGNAME= mysqlcc-${VERSION}
|
||||
CATEGORIES= databases
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (mysqlcc-0.8.6-src.tar.gz) = a34b076b8b2dff1c33aeb4b690d454ec
|
||||
RMD160 (mysqlcc-0.8.6-src.tar.gz) = 83abc327efdf6ced4ca8b51e8e17784134721ee8
|
||||
SHA1 (mysqlcc-0.8.6-src.tar.gz) = 4536cf8a98a789ce65c6603b745cafcc3f6f0707
|
||||
MD5 (mysqlcc-0.8.7-src.tar.gz) = f6069be95adbf5049e9088610eed8c2e
|
||||
RMD160 (mysqlcc-0.8.7-src.tar.gz) = 4547a83222b6d70ded921e38d4cd45f70f91f2ff
|
||||
SHA1 (mysqlcc-0.8.7-src.tar.gz) = e065b1b2a0e5ff7e3b74202e230512b49dff8c4c
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# $Id: qmake.conf,v 1.1.1.1 2002/03/19 13:58:12 wilfried Exp $
|
||||
# $Id: qmake.conf,v 1.2 2002/12/16 14:55:37 wilfried Exp $
|
||||
#
|
||||
# qmake configuration for openbsd-g++
|
||||
#
|
||||
@ -33,6 +33,7 @@ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||||
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||||
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
|
||||
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||||
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
QMAKE_INCDIR = $(LOCALBASE)/include
|
||||
QMAKE_LIBDIR = $(LOCALBASE)/lib
|
||||
@ -53,12 +54,13 @@ QMAKE_LFLAGS_RELEASE =
|
||||
QMAKE_LFLAGS_DEBUG =
|
||||
QMAKE_LFLAGS_SHLIB = -shared
|
||||
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||
QMAKE_LFLAGS_SONAME =
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
||||
QMAKE_LFLAGS_THREAD = -pthread
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
QMAKE_LIBS_X11 = -lXext -lX11 -lm
|
||||
QMAKE_LIBS_X11SM = -lSM -lICE
|
||||
QMAKE_LIBS_QT = -lqt
|
||||
QMAKE_LIBS_QT_THREAD = -lqt-mt
|
||||
QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
|
||||
@ -75,7 +77,7 @@ QMAKE_TAR = tar -cf
|
||||
QMAKE_GZIP = gzip -9f
|
||||
|
||||
QMAKE_COPY = cp -f
|
||||
QMAKE_MOVE = mv
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- configure.orig Sat Nov 2 14:47:25 2002
|
||||
+++ configure Mon Nov 4 18:13:33 2002
|
||||
@@ -2121,7 +2121,7 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.3 2002/12/16 14:55:37 wilfried Exp $
|
||||
--- configure.orig Fri Dec 6 00:06:56 2002
|
||||
+++ configure Mon Dec 16 15:39:00 2002
|
||||
@@ -2480,7 +2480,7 @@ fi
|
||||
if test "x$mysql_found" = "xyes"
|
||||
then
|
||||
LIBS="-L$dir $SAVE_LIBS $LIBZ_LIB"
|
||||
- MYSQL_LIB="$dir/libmysqlclient.a $LIBZ_LIB"
|
||||
+ MYSQL_LIB="-lmysqlclient $LIBZ_LIB"
|
||||
|
||||
echo "$as_me:2126: checking for mysql_real_connect in -lmysqlclient" >&5
|
||||
echo "$as_me:$LINENO: checking for mysql_real_connect in -lmysqlclient" >&5
|
||||
echo $ECHO_N "checking for mysql_real_connect in -lmysqlclient... $ECHO_C" >&6
|
||||
@@ -2497,7 +2497,7 @@ fi
|
||||
@@ -3129,7 +3129,7 @@ fi
|
||||
|
||||
echo "$as_me:2498: checking \"if Qt Version in $QTDIR is >= 3.0.2\"" >&5
|
||||
echo $ECHO_N "checking \"if Qt Version in $QTDIR is >= 3.0.2\"... $ECHO_C" >&6
|
||||
echo "$as_me:$LINENO: checking \"if Qt Version in $QTDIR is >= 3.0.5\"" >&5
|
||||
echo $ECHO_N "checking \"if Qt Version in $QTDIR is >= 3.0.5\"... $ECHO_C" >&6
|
||||
-CPPFLAGS="$CPPFLAGS -I$QTDIR/include"
|
||||
+CPPFLAGS="$CPPFLAGS -I$LOCALBASE/include/X11/qt3"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 2502 "configure"
|
||||
#line $LINENO "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -3184,7 +3184,7 @@ fi
|
||||
@@ -4017,7 +4017,7 @@ fi
|
||||
|
||||
QMAKESPEC=$QTDIR/mkspecs/$host_os
|
||||
echo "Creating Makefile with qmake"
|
||||
-QMAKESPEC=$QMAKESPECE QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
|
||||
-QMAKESPEC=$QMAKESPEC QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
|
||||
+QMAKESPEC=$FILESDIR QTDIR=$QTDIR $QTDIR/bin/qmake mysqlcc.pro
|
||||
if test ! $? = 0 ; then
|
||||
echo "qmake failed, aborting"
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
$OpenBSD: patch-include_CMySQLQuery_h,v 1.1 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- include/CMySQLQuery.h.orig Sat Nov 2 14:47:27 2002
|
||||
+++ include/CMySQLQuery.h Mon Nov 4 18:59:05 2002
|
||||
@@ -100,6 +100,7 @@ public slots:
|
||||
void cancel();
|
||||
|
||||
private:
|
||||
+#if defined(QT_THREAD_SUPPORT)
|
||||
class QueryThread : public QThread
|
||||
{
|
||||
public:
|
||||
@@ -113,6 +114,7 @@ private:
|
||||
ulong len;
|
||||
bool res;
|
||||
};
|
||||
+#endif
|
||||
|
||||
CMySQL *m_mysql;
|
||||
MYSQL_RES *mysql_res;
|
||||
@ -1,19 +1,19 @@
|
||||
$OpenBSD: patch-mysqlcc_pro_in,v 1.1 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- mysqlcc.pro.in.orig Sat Nov 2 14:47:25 2002
|
||||
+++ mysqlcc.pro.in Mon Nov 4 18:11:03 2002
|
||||
$OpenBSD: patch-mysqlcc_pro_in,v 1.2 2002/12/16 14:55:37 wilfried Exp $
|
||||
--- mysqlcc.pro.in.orig Fri Dec 6 00:06:56 2002
|
||||
+++ mysqlcc.pro.in Mon Dec 16 14:49:00 2002
|
||||
@@ -1,5 +1,5 @@
|
||||
TEMPLATE = app
|
||||
-CONFIG += qt warn_on debug thread
|
||||
+CONFIG += qt release
|
||||
DEFINES += QT_DLL
|
||||
TARGET = mysqlcc
|
||||
LANGUAGE = C++
|
||||
@@ -15,7 +15,7 @@ win32 {
|
||||
}
|
||||
|
||||
unix {
|
||||
- LIBS += @MYSQL_LIB@
|
||||
+ LIBS += @MYSQL_LIB@ -lz
|
||||
INCLUDEPATH += @MYSQL_INCLUDE@
|
||||
CONFIG += x11
|
||||
OBJECTS_DIR = tmp
|
||||
TEMPLATE = app
|
||||
-CONFIG += qt warn_on debug thread
|
||||
+CONFIG += qt release
|
||||
DEFINES += QT_DLL
|
||||
DEFINES += HAVE_MYSQLCC_CONFIG
|
||||
TARGET = mysqlcc
|
||||
@@ -16,7 +16,7 @@ win32 {
|
||||
}
|
||||
|
||||
unix {
|
||||
- LIBS += @MYSQL_LIB@
|
||||
+ LIBS += @MYSQL_LIB@ -lz
|
||||
INCLUDEPATH += @MYSQL_INCLUDE@
|
||||
CONFIG += x11
|
||||
OBJECTS_DIR = tmp
|
||||
|
||||
@ -1,29 +1,29 @@
|
||||
$OpenBSD: patch-src_CApplication_cpp,v 1.1 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- src/CApplication.cpp.orig Sat Nov 2 14:47:25 2002
|
||||
+++ src/CApplication.cpp Mon Nov 4 19:03:22 2002
|
||||
@@ -122,7 +122,7 @@ void CApplication::initGlobals(bool star
|
||||
QString mydir = QDir::currentDirPath() + "/";
|
||||
|
||||
//Translations path
|
||||
- translations_path = cfg->readStringEntry("Translations Path", mydir + "translations/");
|
||||
+ translations_path = cfg->readStringEntry("Translations Path", LOCALBASE "/share/mysqlcc/" "translations/");
|
||||
|
||||
//Current Language
|
||||
current_language = cfg->readStringEntry("Language File", "English");
|
||||
@@ -141,12 +141,12 @@ void CApplication::initGlobals(bool star
|
||||
CHistoryView::setHistorySize(history_size);
|
||||
|
||||
//Syntax File
|
||||
- syntax_file = cfg->readStringEntry("Syntax File", mydir + "syntax.txt");
|
||||
+ syntax_file = cfg->readStringEntry("Syntax File", LOCALBASE "/share/mysqlcc/" "syntax.txt");
|
||||
|
||||
//Audio files
|
||||
- error_sound_file = cfg->readStringEntry("Error Sound", mydir + "error.wav");
|
||||
- warning_sound_file = cfg->readStringEntry("Warning Sound", mydir + "warning.wav");
|
||||
- information_sound_file = cfg->readStringEntry("Information Sound", mydir + "information.wav");
|
||||
+ error_sound_file = cfg->readStringEntry("Error Sound", LOCALBASE "/share/mysqlcc/" "error.wav");
|
||||
+ warning_sound_file = cfg->readStringEntry("Warning Sound", LOCALBASE "/share/mysqlcc/" "warning.wav");
|
||||
+ information_sound_file = cfg->readStringEntry("Information Sound", LOCALBASE "/share/mysqlcc/" "information.wav");
|
||||
|
||||
//Query Syntax Highlighting
|
||||
syntax_highlight = strtobool(cfg->readStringEntry("Syntax Highlighting", "true"));
|
||||
$OpenBSD: patch-src_CApplication_cpp,v 1.2 2002/12/16 14:55:37 wilfried Exp $
|
||||
--- src/CApplication.cpp.orig Fri Dec 6 00:06:57 2002
|
||||
+++ src/CApplication.cpp Mon Dec 16 14:58:15 2002
|
||||
@@ -123,7 +123,7 @@ void CApplication::initGlobals(bool star
|
||||
//QString mydir = "/usr/share/mysqlcc/"; This needs to be done with a PREFIX define ..
|
||||
|
||||
//Translations path
|
||||
- translations_path = cfg->readStringEntry("Translations Path", mydir + "translations/");
|
||||
+ translations_path = cfg->readStringEntry("Translations Path", LOCALBASE "/share/mysqlcc/" "translations/");
|
||||
|
||||
//Current Language
|
||||
current_language = cfg->readStringEntry("Language File", "English");
|
||||
@@ -142,12 +142,12 @@ void CApplication::initGlobals(bool star
|
||||
CHistoryView::setHistorySize(history_size);
|
||||
|
||||
//Syntax File
|
||||
- syntax_file = cfg->readStringEntry("Syntax File", mydir + "syntax.txt");
|
||||
+ syntax_file = cfg->readStringEntry("Syntax File", LOCALBASE "/share/mysqlcc/" "syntax.txt");
|
||||
|
||||
//Audio files
|
||||
- error_sound_file = cfg->readStringEntry("Error Sound", mydir + "error.wav");
|
||||
- warning_sound_file = cfg->readStringEntry("Warning Sound", mydir + "warning.wav");
|
||||
- information_sound_file = cfg->readStringEntry("Information Sound", mydir + "information.wav");
|
||||
+ error_sound_file = cfg->readStringEntry("Error Sound", LOCALBASE "/share/mysqlcc/" "error.wav");
|
||||
+ warning_sound_file = cfg->readStringEntry("Warning Sound", LOCALBASE "/share/mysqlcc/" "warning.wav");
|
||||
+ information_sound_file = cfg->readStringEntry("Information Sound", LOCALBASE "/share/mysqlcc/" "information.wav");
|
||||
|
||||
//Query Syntax Highlighting
|
||||
syntax_highlight = strtobool(cfg->readStringEntry("Syntax Highlighting", "true"));
|
||||
|
||||
@ -1,65 +1,19 @@
|
||||
$OpenBSD: patch-src_CMySQLQuery_cpp,v 1.1 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- src/CMySQLQuery.cpp.orig Sat Nov 2 14:47:25 2002
|
||||
+++ src/CMySQLQuery.cpp Mon Nov 4 18:53:33 2002
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#define PROCESS_EVENT 35
|
||||
|
||||
+#if defined(QT_THREAD_SUPPORT)
|
||||
CMySQLQuery::QueryThread::QueryThread(MYSQL *m, const char *q, ulong l)
|
||||
: QThread(), m_mysql(m), qry((char *) q), len(l)
|
||||
{
|
||||
@@ -51,6 +52,7 @@ void CMySQLQuery::QueryThread::run()
|
||||
|
||||
res = (mysql_real_query(m_mysql, qry, len) == 0);
|
||||
}
|
||||
+#endif
|
||||
|
||||
CMySQLQuery::CMySQLQuery(CMySQL *m)
|
||||
: QObject(0, "CMySQLQuery")
|
||||
@@ -149,6 +151,7 @@ bool CMySQLQuery::execRealStaticQuery(co
|
||||
}
|
||||
QTime tm;
|
||||
tm.start();
|
||||
$OpenBSD: patch-src_CMySQLQuery_cpp,v 1.2 2002/12/16 14:55:37 wilfried Exp $
|
||||
--- src/CMySQLQuery.cpp.orig Fri Dec 6 00:06:57 2002
|
||||
+++ src/CMySQLQuery.cpp Mon Dec 16 14:59:15 2002
|
||||
@@ -37,6 +37,7 @@
|
||||
|
||||
#define PROCESS_EVENT 35
|
||||
|
||||
+#if defined(QT_THREAD_SUPPORT)
|
||||
QueryThread queryThread(m_mysql->mysql, qry, len);
|
||||
queryThread.start();
|
||||
queryThread.wait();
|
||||
@@ -159,6 +162,14 @@ bool CMySQLQuery::execRealStaticQuery(co
|
||||
m_mysql->emitError();
|
||||
return false;
|
||||
}
|
||||
+#else
|
||||
+ if (mysql_real_query(m_mysql->mysql, qry, len) != 0)
|
||||
+ {
|
||||
+ if (emiterror)
|
||||
+ m_mysql->emitError();
|
||||
+ return false;
|
||||
+ }
|
||||
CMySQLQuery::QueryThread::QueryThread(MYSQL *m, const char *q, ulong l)
|
||||
: QThread(), m_mysql(m), qry((char *) q), len(l)
|
||||
{
|
||||
@@ -55,6 +56,7 @@ void CMySQLQuery::QueryThread::run()
|
||||
|
||||
res = (mysql_real_query(m_mysql, qry, len) == 0);
|
||||
}
|
||||
+#endif
|
||||
mysql_res = NULL;
|
||||
num_fields = 0;
|
||||
last_query = qry;
|
||||
@@ -205,6 +216,7 @@ bool CMySQLQuery::execRealQuery(const ch
|
||||
QTime tm;
|
||||
tm.start();
|
||||
|
||||
+#if defined(QT_THREAD_SUPPORT)
|
||||
QueryThread queryThread(m_mysql->mysql, qry, len);
|
||||
queryThread.start();
|
||||
queryThread.wait();
|
||||
@@ -215,6 +227,14 @@ bool CMySQLQuery::execRealQuery(const ch
|
||||
m_mysql->emitError();
|
||||
return false;
|
||||
}
|
||||
+#else
|
||||
+ if (mysql_real_query(m_mysql->mysql, qry, len) != 0)
|
||||
+ {
|
||||
+ if (emiterror)
|
||||
+ m_mysql->emitError();
|
||||
+ return false;
|
||||
+ }
|
||||
+#endif
|
||||
|
||||
if (!(mysql_res=mysql_store_result(m_mysql->mysql)))
|
||||
{
|
||||
|
||||
CMySQLQuery::CMySQLQuery(CMySQL *m)
|
||||
: QObject(0, "CMySQLQuery")
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-src_CMySQL_cpp,v 1.1 2002/11/05 15:55:49 wilfried Exp $
|
||||
--- src/CMySQL.cpp.orig Sat Nov 2 14:47:25 2002
|
||||
+++ src/CMySQL.cpp Mon Nov 4 18:39:52 2002
|
||||
@@ -472,7 +472,7 @@ QString CMySQL::mysqlInfo() const
|
||||
qDebug("CMySQL::mysqlInfo()");
|
||||
#endif
|
||||
|
||||
- return (isConnected() ? mysql_info(mysql) : QString::null);
|
||||
+ return (isConnected() ? QString(mysql_info(mysql)) : QString::null);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -497,7 +497,7 @@ QString CMySQL::mysqlGetHostInfo() const
|
||||
qDebug("CMySQL::mysqlGetHostInfo()");
|
||||
#endif
|
||||
|
||||
- return (isConnected() ? mysql_get_host_info(mysql) : QString::null);
|
||||
+ return (isConnected() ? QString(mysql_get_host_info(mysql)) : QString::null);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -522,7 +522,7 @@ QString CMySQL::mysqlGetServerInfo() con
|
||||
qDebug("CMySQL::mysqlGetServerInfo()");
|
||||
#endif
|
||||
|
||||
- return (isConnected() ? mysql_get_server_info(mysql) : QString::null);
|
||||
+ return (isConnected() ? QString(mysql_get_server_info(mysql)) : QString::null);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user