ports/63983: Maintainer update: database/mysql-gui (still broken)
Cyrille Lefevre
cyrille.lefevre at laposte.net
Tue Mar 9 13:20:12 UTC 2004
>Number: 63983
>Category: ports
>Synopsis: Maintainer update: database/mysql-gui (still broken)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 09 05:20:11 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sat Jan 31 15:17:05 CET 2004 root at gits:/disk3/freebsd/current/obj/disk3/freebsd/current/src/sys/CUSTOM i386
>Description:
Makefile
PORTREVISION bumped
MAINTAINER -> ports (since my knowledge in c++ is too bad :)
CXXFLAGS added (-fpermisive helps but don't solve anything)
BROKEN message updated
files/patch-Fl_NSlider.cc
int() added
files/patch-client.h
iomanip.h -> iomanip
files/patch-do_sql.cc
ios::open_mode -> ios_base::openmode
files/patch-Fl_Envelope.cc
new file -- int() added
files/patch-Fl_Envelope_Scroll.cc
new file -- int() added
files/patch-admin.cc
new files -- adm_outputi.erase -> delete adm_outputi
files/patch-admin.h
new file
>How-To-Repeat:
n/a
>Fix:
--- /dev/null Tue Mar 9 14:05:30 2004
+++ files/patch-Fl_Envelope.cc Tue May 27 06:00:47 2003
@@ -0,0 +1,47 @@
+--- Fl_Envelope.cc.orig Wed Apr 11 21:12:25 2001
++++ Fl_Envelope.cc Tue May 27 05:54:42 2003
+@@ -673,7 +673,7 @@
+ to+=0.5;
+
+ while (from<=to+d) {
+- fl_line(from,y()+topmargin_,from,y()+h()-bottommargin_);
++ fl_line(int(from),y()+topmargin_,int(from),y()+h()-bottommargin_);
+ from+=d;
+ }
+ }
+@@ -689,7 +689,7 @@
+
+ float d=griddy_*ym;
+ while (from<=to+d) {
+- fl_line(x(),from,x()+w()-rightmargin_,from);
++ fl_line(x(),int(from),x()+w()-rightmargin_,int(from));
+ from+=d;
+ }
+ }
+@@ -809,11 +809,11 @@
+ from+=0.5;
+ to+=0.5;
+ while (from<=to+d ) {
+- fl_line(from,drawy1,from,drawy2);
++ fl_line(int(from),drawy1,int(from),drawy2);
+ char val[12]; float x = p; while (x >= 24.0f) x = x - 24.0f;
+ float y = (x - floor(x)) * 0.6; x = floor(x);
+ sprintf(val,hformatstr,x + y);
+- fl_draw(val,from+2,drawy2-2);
++ fl_draw(val,int(from)+2,drawy2-2);
+ from+=d;
+ p+=pd;
+ }
+@@ -865,10 +865,10 @@
+ to+=0.5;
+ fl_font(FL_COURIER,12);
+ while (from<=to+d && (p >= 0.0)) {
+- fl_line(drawx1,from,drawx2,from);
++ fl_line(drawx1,int(from),drawx2,int(from));
+ char val[18];
+ sprintf(val,vformatstr,p);
+- fl_draw(val,drawx1,from-2);
++ fl_draw(val,drawx1,int(from)-2);
+ from+=d;
+ p-=pd;
+ }
--- /dev/null Tue Mar 9 14:05:30 2004
+++ files/patch-Fl_Envelope_Scroll.cc Tue May 27 06:01:02 2003
@@ -0,0 +1,20 @@
+--- Fl_Envelope_Scroll.cc.orig Wed Apr 11 21:12:25 2001
++++ Fl_Envelope_Scroll.cc Tue May 27 05:55:51 2003
+@@ -84,7 +84,7 @@
+ }*/
+ envelope->xbound(top,top+total);
+ envelope->xscale(position,position+size);
+- hscroll->value(position*hmul,size*hmul,top*hmul,total*hmul);
++ hscroll->value(int(position*hmul),int(size*hmul),int(top*hmul),int(total*hmul));
+ hrange->range(0.01,total);
+ hrange->value(size);
+ envelope->redraw();
+@@ -109,7 +109,7 @@
+ envelope->ybound(top,top+total);
+ envelope->yscale(position2,position2+size);
+ // envelope->yscale(position2,position2+size);
+- vscroll->value(position*vmul,size*vmul,top*vmul,total*vmul);
++ vscroll->value(int(position*vmul),int(size*vmul),int(top*vmul),int(total*vmul));
+ vrange->range(0.01,total);
+ vrange->value(size);
+ envelope->redraw();
--- /dev/null Tue Mar 9 14:05:30 2004
+++ files/patch-admin.cc Tue May 27 07:12:04 2003
@@ -0,0 +1,14 @@
+--- admin.cc.orig Tue May 27 06:41:44 2003
++++ admin.cc Tue May 27 06:53:02 2003
+@@ -206,7 +206,7 @@
+ for (i = 0; i < adm_outputi.size(); i++) {
+ Fl_Output * x=adm_outputi[i]; if (x == output) break;
+ }
+- if (i<adm_outputi.size()) adm_outputi.erase(&(adm_outputi[i]));
++ if (i<adm_outputi.size()) delete adm_outputi[i];
+ }
+ Panel (void ) {
+ Fl_Window* w; koliko_gi_ima++; No_no_no_you_can_not_have_that_type_of_reentrancy=0;
--- /dev/null Tue Mar 9 14:05:30 2004
+++ files/patch-admin.h Tue Mar 9 13:09:55 2004
@@ -0,0 +1,10 @@
+--- admin.h.orig Wed Apr 11 21:12:25 2001
++++ admin.h Tue Mar 9 13:09:46 2004
+@@ -10,6 +10,7 @@
+ #include <FL/Fl_Output.H>
+ #include <FL/Fl_Window.H>
+ #include <FL/Fl_Pixmap.H>
++#undef Success
+ #include <sqlplus.hh>
+ extern Connection *con;
+ extern void do_process_b(Fl_Button*, void*);
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-gui/Makefile,v
retrieving revision 1.17
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.17 Makefile
--- Makefile 4 Feb 2004 04:35:47 -0000 1.17
+++ Makefile 9 Mar 2004 13:04:09 -0000
@@ -7,7 +7,7 @@
PORTNAME= mysql-gui
PORTVERSION= 1.7.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= http://mysql.ftp.cvut.cz/Downloads/%SUBDIR%/ \
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/%SUBDIR%/ \
@@ -15,7 +15,7 @@
MASTER_SITE_SUBDIR= mysqlgui
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
-MAINTAINER= cyrille.lefevre at laposte.net
+MAINTAINER= ports at FreeBSD.org
COMMENT= A graphical SQL client for MySQL
LIB_DEPENDS= sqlplus.1:${PORTSDIR}/databases/mysql++ \
@@ -29,6 +29,7 @@
USE_REINPLACE= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/-/-src-/}
+CXXFLAGS+= -fpermissive # don't know how to fix all those "ISO C++ says"
MAKE_ARGS= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -44,7 +45,9 @@
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000
-BROKEN= Does not build
+BROKEN= "Does not build" \
+ "- use mysql-administrator (GNOME)" \
+ "or mysql-navigator (KDE) instead."
.endif
# Post-extract
Index: files/patch-Fl_NSlider.cc
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-Fl_NSlider.cc,v
retrieving revision 1.1
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.1 patch-Fl_NSlider.cc
--- files/patch-Fl_NSlider.cc 14 Dec 2003 18:03:48 -0000 1.1
+++ files/patch-Fl_NSlider.cc 9 Mar 2004 12:08:15 -0000
@@ -1,5 +1,5 @@
---- Fl_NSlider.cc.orig Mon Feb 3 02:17:30 2003
-+++ Fl_NSlider.cc Mon Feb 3 02:16:37 2003
+--- Fl_NSlider.cc.orig Wed Apr 11 21:12:20 2001
++++ Fl_NSlider.cc Tue Mar 9 03:01:20 2004
@@ -9,6 +9,7 @@
* provided "as is" without express or implied warranty.
*/
@@ -8,3 +8,53 @@
static uchar isHoz = 0; //for image draw setup
static uchar r1, g1, b1; //for color ramp
+@@ -256,12 +257,12 @@
+ fnumIncr = tk_range/(px_w/mdev);
+ mcount = 0;
+ fnum = 0;
+- fl_line( px_x+px_w , majorLnStart, px_x+px_w , majorLnStart+majorLnLen );
++ fl_line( int(px_x+px_w) , majorLnStart, int(px_x+px_w) , majorLnStart+majorLnLen );
+ while(mcount < px_w) {
+- fl_line( px_x+mcount , majorLnStart, px_x+mcount , majorLnStart+majorLnLen );
++ fl_line( int(px_x+mcount) , majorLnStart, int(px_x+mcount) , majorLnStart+majorLnLen );
+ sprintf(pnt, _majorTickPrecision, fnum+minimum() );
+ fl_measure(pnt, fw, fh);
+- if(_tick_fontSize) fl_draw(pnt, px_x+mcount-(fw/3), majorFntStart);
++ if(_tick_fontSize) fl_draw(pnt, int(px_x+mcount-(fw/3)), majorFntStart);
+ fnum += fnumIncr;
+ mcount += mdev;
+ }
+@@ -271,7 +272,7 @@
+ if(mdev < 4) mdev = 4;
+ mcount = mdev;
+ while(mcount < px_w)
+- { fl_line( px_x+mcount , minorLnStart, px_x+mcount , minorLnStart+minorLnLen ); //create main line
++ { fl_line( int(px_x+mcount) , minorLnStart, int(px_x+mcount) , minorLnStart+minorLnLen ); //create main line
+ mcount += mdev;
+ }
+ } //(if minor)
+@@ -302,12 +303,12 @@
+ fnumIncr = tk_range/(px_h/mdev);
+ mcount = 0;
+ fnum = 0;
+- fl_line( majorLnStart, px_y+px_h , majorLnStart+majorLnLen, px_y+px_h );
++ fl_line( majorLnStart, int(px_y+px_h) , majorLnStart+majorLnLen, int(px_y+px_h) );
+ while(mcount < px_h) {
+- fl_line( majorLnStart, px_y+mcount ,majorLnStart+majorLnLen, px_y+mcount );
++ fl_line( majorLnStart, int(px_y+mcount) ,majorLnStart+majorLnLen, int(px_y+mcount) );
+ sprintf(pnt, _majorTickPrecision, fnum+minimum() );
+ fl_measure(pnt, fw, fh);
+- if(_tick_fontSize) fl_draw(pnt, majorFntStart,px_y+mcount+(fh/3));
++ if(_tick_fontSize) fl_draw(pnt, majorFntStart,int(px_y+mcount+(fh/3)));
+ fnum += fnumIncr;
+ mcount += mdev;
+ }
+@@ -317,7 +318,7 @@
+ if(mdev < 4) mdev = 4;
+ mcount = mdev;
+ while(mcount < px_h)
+- { fl_line( minorLnStart, px_y+mcount, minorLnStart+minorLnLen, px_y+mcount ); //create main line
++ { fl_line( minorLnStart, int(px_y+mcount), minorLnStart+minorLnLen, int(px_y+mcount) ); //create main line
+ mcount += mdev;
+ }
+ } //(if minor)
Index: files/patch-client.h
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-client.h,v
retrieving revision 1.1
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.1 patch-client.h
--- files/patch-client.h 14 Dec 2003 18:03:48 -0000 1.1
+++ files/patch-client.h 9 Mar 2004 12:12:59 -0000
@@ -1,5 +1,14 @@
---- client.h.orig Wed Sep 3 19:05:06 2003
-+++ client.h Wed Sep 3 19:05:21 2003
+--- client.h.orig Wed Apr 11 21:12:19 2001
++++ client.h Tue Mar 9 13:12:44 2004
+@@ -17,7 +17,7 @@
+ #ifndef __WIN32__
+ #include <stdlib.h>
+ #include <stdio.h>
+-#include <iomanip.h>
++#include <iomanip>
+ #include <unistd.h>
+ #endif
+ #include <FL/Fl_NSlider.H>
@@ -45,6 +45,7 @@
typedef long ssize_t;
#endif
Index: files/patch-do_sql.cc
===================================================================
RCS file: /home/ncvs/ports/databases/mysql-gui/files/patch-do_sql.cc,v
retrieving revision 1.1
diff -u -I$Id.*$ -I$.+BSD.*$ -r1.1 patch-do_sql.cc
--- files/patch-do_sql.cc 14 Dec 2003 18:03:48 -0000 1.1
+++ files/patch-do_sql.cc 9 Mar 2004 13:00:34 -0000
@@ -1,5 +1,5 @@
---- do_sql.cc.orig Wed Apr 11 12:12:19 2001
-+++ do_sql.cc Thu Sep 4 02:17:56 2003
+--- do_sql.cc.orig Wed Apr 11 21:12:19 2001
++++ do_sql.cc Tue Mar 9 14:00:12 2004
@@ -1,3 +1,5 @@
+#include <FL/Enumerations.H>
+#undef frame
@@ -15,11 +15,20 @@
#include <sqlplus.hh>
#include <ctype.h>
-extern string real_sql; extern enum ios::open_mode how_to_open; extern char *pass;
-+#include <iostream>
++#include <ios>
+using namespace std;
+extern string real_sql;
-+extern enum ios::open_mode how_to_open;
++extern enum ios_base::openmode how_to_open;
+extern char *pass;
#define depth 18
#define minmin 5
#define fontsize 14
+@@ -347,7 +354,7 @@
+ }
+ static void file_save(Fl_Button *xx, void *p) {
+ Sinisa_je_blesav *s = (Sinisa_je_blesav *)p;
+- int i = fl_file_dialog("Save Results",file_name,Fl_File_Dialog::APPEND | Fl_File_Dialog::SAVEMODE | Fl_File_Dialog::MESSAGES,0,0); how_to_open=(i>1000) ? ios::app : ios::trunc;
++ int i = fl_file_dialog("Save Results",file_name,Fl_File_Dialog::APPEND | Fl_File_Dialog::SAVEMODE | Fl_File_Dialog::MESSAGES,0,0); how_to_open=(i>1000) ? ios_base::app : ios_base::trunc;
+ if (!file_name[0] || !i) return;
+ if (strcmp(filename_ext(file_name),".res")) filename_setext(file_name,".res");
+ do_save_file(s->sql);
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list