Bug#139825: mysql-navigator: relocation error - ** PATCH **
Package: mysql-navigator
Version: 1.3.12-4.gg
Followup-For: Bug #139825
Hi,
Here is a patch which solve the relocation error while starting
mysql-navigator.
BTW, bug #139514 seems to be related to the exact same problem.
Regards,
Gilles.
-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux pinpin 2.4.19 #1 sam aoû 3 15:33:13 CEST 2002 i686
Locale: LANG=fr_FR@euro, LC_CTYPE=fr_FR@euro
Versions of packages mysql-navigator depends on:
ii libc6 2.2.5-14 GNU C Library: Shared libraries an
ii libmysqlclient10 3.23.51-4 mysql database client library
ii libqt3-mt 2:3.0.5-3 Qt GUI Library (Threaded runtime v
ii libstdc++2.10-glibc2.2 1:2.95.4-11 The GNU stdc++ library
ii zlib1g 1:1.1.4-3 compression library - runtime
-- no debconf information
-- patch to mysql-navigator-1.3.12.orig.tar.gz:
diff -Naur -x '*~' mysql-navigator-1.3.12.orig/; mysql-navigator-1.3.12/;
--- mysql-navigator-1.3.12.orig/; 2002-06-04 10:48:03.000000000 +0200
+++ mysql-navigator-1.3.12/; 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-cvs remove ./src/mysql/script/script_moc.cpp ./src/mysql/flush/flush_moc.cpp ./src/mysql/field/field_moc.cpp ./src/mysql/query/query_moc.cpp ./src/mysql/log/log_moc.cpp ./src/mysql/user/user_moc.cpp ./src/mysql/option/option_moc.cpp ./src/mysql/find/find_moc.cpp ./src/mysql/password/password_moc.cpp ./src/mysql/process/process_moc.cpp ./src/mysql/widget/loglistview_moc.cpp ./src/mysql/widget/querytable_moc.cpp ./src/mysql/widget/xworkspace_moc.cpp ./src/mysql/widget/xcombobox_moc.cpp ./src/mysql/widget/querylistview_moc.cpp ./src/mysql/widget/serverlistviewitem_moc.cpp ./src/mysql/table/table_moc.cpp ./src/mysql/key/key_moc.cpp ./src/mysql/schema/schema_moc.cpp ./src/mysql/about/about_moc.cpp ./src/mysql/xport/xport_moc.cpp ./src/mysql/privilege/privilege_moc.cpp ./src/mysql/mainwindow/mdiwindow_moc.cpp ./src/mysql/mainwindow/mainwindow_moc.cpp ./src/mysql/edit/edit_moc.cpp ./src/mysql/edit/file_moc.cpp ./src/mysql/server/server_moc.cpp ./src/mysql/server/servernew_moc.cpp
diff -Naur mysql-navigator-1.3.12.orig/build mysql-navigator-1.3.12/build
--- mysql-navigator-1.3.12.orig/build 2002-06-04 10:48:03.000000000 +0200
+++ mysql-navigator-1.3.12/build 2002-08-25 01:49:03.000000000 +0200
@@ -2,4 +2,4 @@
# build static binary
-cd src/main; g++ -static -o mysqlnavigator-static main.cxx -pipe -Wall -W -O2 -I../../ -I../../include -I/usr/local/mysql/include/mysql -I$QTDIR/include ../mysql/.libs/libmysqlui.a $QTDIR/lib/libqt.a /usr/local/mysql/lib/mysql/libmysqlclient.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/lib/libjpeg.a; mv mysqlnavigator-static ../../
+cd src/main; g++ -static -o mysqlnavigator-static main.cxx -pipe -Wall -W -O2 -I../../ -I../../include -I/usr/local/mysql/include/mysql -I$QTDIR/include ../mysql/.libs/libmysqlui.a $QTDIR/lib/libqt-mt.a /usr/local/mysql/lib/mysql/libmysqlclient.a /usr/X11R6/lib/libX11.a /usr/X11R6/lib/libSM.a /usr/X11R6/lib/libICE.a /usr/X11R6/lib/libXext.a /usr/lib/libjpeg.a; mv mysqlnavigator-static ../../
diff -Naur mysql-navigator-1.3.12.orig/src/main/main.cxx mysql-navigator-1.3.12/src/main/main.cxx
--- mysql-navigator-1.3.12.orig/src/main/main.cxx 2002-06-04 10:48:03.000000000 +0200
+++ mysql-navigator-1.3.12/src/main/main.cxx 2002-08-25 01:53:11.000000000 +0200
@@ -4,10 +4,7 @@
#include <qapplication.h>
#include <qlabel.h>
#include <qfont.h>
-#include <qwindowsstyle.h>
-#include <qplatinumstyle.h>
-#include <qmotifstyle.h>
-#include <qcdestyle.h>
+#include <qstylefactory.h>
#include <qtranslator.h>
#include <qobject.h>
@@ -81,7 +78,7 @@
flag = TRUE;
}
- app.setStyle(new QWindowsStyle());
+ app.setStyle(QStyleFactory::create("windows"));
#ifndef WIN32
app.setFont(QFont("lucida", 10));
diff -Naur mysql-navigator-1.3.12.orig/src/main/Makefile.am mysql-navigator-1.3.12/src/main/Makefile.am
--- mysql-navigator-1.3.12.orig/src/main/Makefile.am 2002-06-04 10:48:03.000000000 +0200
+++ mysql-navigator-1.3.12/src/main/Makefile.am 2002-08-25 02:02:33.000000000 +0200
@@ -2,4 +2,4 @@
INCLUDES = -I$(top_srcdir)/pics -I$(top_srcdir)/include @MYSQL_INCLUDE@ @QT_INCLUDE@
mysqlnavigator_SOURCES = main.cxx
LDFLAGS = @MYSQL_LDFLAG@ @QT_LDFLAG@ -L../mysql
-LDADD = -lmysqlui -lmysqlclient -lqt
+LDADD = -lmysqlui -lmysqlclient -lqt-mt
diff -Naur mysql-navigator-1.3.12.orig/src/mysql/mainwindow/mainwindowslotstyle.cxx mysql-navigator-1.3.12/src/mysql/mainwindow/mainwindowslotstyle.cxx
--- mysql-navigator-1.3.12.orig/src/mysql/mainwindow/mainwindowslotstyle.cxx 2002-06-04 10:48:03.000000000 +0200
+++ mysql-navigator-1.3.12/src/mysql/mainwindow/mainwindowslotstyle.cxx 2002-08-25 01:30:06.000000000 +0200
@@ -4,12 +4,7 @@
#else
#include "resource.h"
#endif
-#include <qwindowsstyle.h>
-#include <qmotifstyle.h>
-#include <qmotifplusstyle.h>
-#include <qcdestyle.h>
-#include <qplatinumstyle.h>
-#include <qsgistyle.h>
+#include <qstylefactory.h>
#include <qmenubar.h>
//#include "jfcstyle.h"
@@ -27,7 +22,7 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_WINDOWS,TRUE);
- qApp->setStyle(new QWindowsStyle());
+ qApp->setStyle(QStyleFactory::create("windows"));
}
void MainWindow::slot_cde()
@@ -42,7 +37,7 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_CDE,TRUE);
- qApp->setStyle(new QCDEStyle());
+ qApp->setStyle(QStyleFactory::create("cde"));
}
void MainWindow::slot_motif()
@@ -57,7 +52,7 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_MOTIF,TRUE);
- qApp->setStyle(new QMotifStyle());
+ qApp->setStyle(QStyleFactory::create("motif"));
}
void MainWindow::slot_motif_plus()
@@ -72,7 +67,7 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_MOTIF_PLUS,TRUE);
- qApp->setStyle(new QMotifPlusStyle());
+ qApp->setStyle(QStyleFactory::create("motifplus"));
}
void MainWindow::slot_platinum()
@@ -87,7 +82,7 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_PLATINUM,TRUE);
- qApp->setStyle(new QPlatinumStyle());
+ qApp->setStyle(QStyleFactory::create("platinum"));
}
void MainWindow::slot_sgi()
@@ -102,7 +97,8 @@
//menuBar()->setItemChecked(ID_NEXTSTEP, FALSE);
menuBar()->setItemChecked(ID_SGI, TRUE);
- qApp->setStyle(new QSGIStyle());
+ qApp->setStyle(QStyleFactory::create("sgi"));
}
void MainWindow::slot_jfc()
Reply to: