From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 4 02:40:20 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 111D516A4BF for ; Thu, 4 Sep 2003 02:40:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DE5B43FFB for ; Thu, 4 Sep 2003 02:40:19 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h849eIUp022593 for ; Thu, 4 Sep 2003 02:40:18 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h849eIxY022592; Thu, 4 Sep 2003 02:40:18 -0700 (PDT) Date: Thu, 4 Sep 2003 02:40:18 -0700 (PDT) Message-Id: <200309040940.h849eIxY022592@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Edwin Groothuis Subject: Re: ports/47862: Maintainer update: databases/mysql-gui (build fix) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Sep 2003 09:40:20 -0000 The following reply was made to PR ports/47862; it has been noted by GNATS. From: Edwin Groothuis To: freebsd-gnats-submit@FreeBSD.org, cyrille.lefevre@laposte.net Cc: Subject: Re: ports/47862: Maintainer update: databases/mysql-gui (build fix) Date: Thu, 4 Sep 2003 19:36:28 +1000 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Find attached my patches to make it more or less working up to the part where admin.cc gets compiled. -- Edwin Groothuis | Personal website: http://www.mavetju.org edwin@mavetju.org | Weblog: http://www.mavetju.org/weblog/weblog.php --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=Makefile Index: Makefile =================================================================== RCS file: /home/pcvs/ports/databases/mysql-gui/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- Makefile 26 Aug 2003 20:25:38 -0000 1.12 +++ Makefile 4 Sep 2003 09:23:14 -0000 @@ -7,7 +7,7 @@ PORTNAME= mysql-gui PORTVERSION= 1.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= http://www.mysql.com/Downloads/%SUBDIR%/ \ ftp://mysql.nixc.net/pub/mysql/Downloads/%SUBDIR%/ \ @@ -19,8 +19,6 @@ MAINTAINER= cyrille.lefevre@laposte.net COMMENT= A graphical SQL client for MySQL -BROKEN= Does not patch - # Global variables # @@ -30,6 +28,7 @@ jpeg.9:${PORTSDIR}/graphics/jpeg \ fleditor.1:${PORTSDIR}/x11-toolkits/fl_editor \ flvw.1:${PORTSDIR}/x11-toolkits/flvw +PATCH_DEPENDS= ${X11BASE}/include/FL/:${PORTSDIR}/x11-toolkits/fl_editor USE_REINPLACE= yes USE_X_PREFIX= yes @@ -66,7 +65,7 @@ copy-inc: .for file in ${NEW_FILES} - @${CP} ${PREFIX}/include/FL/${file} ${WRKSRC}/FL/ + @${CP} ${X11BASE}/include/FL/${file} ${WRKSRC}/FL/ .endfor .include --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-Animated_Icon.cc" --- Animated_Icon.cc.orig Wed Sep 3 19:04:06 2003 +++ Animated_Icon.cc Wed Sep 3 19:04:14 2003 @@ -1,7 +1,7 @@ #include #include -Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l = 0) : +Animated_Icon::Animated_Icon(int x, int y, int w, int h, const char *l) : Fl_Box(x, y, w, h, l) { first = current = 0; --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-FL-Fl_Editor.H" --- FL/Fl_Editor.H.orig Mon Feb 3 01:53:09 2003 +++ FL/Fl_Editor.H Mon Feb 3 02:04:37 2003 @@ -210,6 +210,7 @@ Fl_Color textcolor() const { return(Fl_Color)textcolor_; } void textcolor(uchar n) { textcolor_ = n; } void LoadFrom(FILE *file) { engine->LoadFrom(file); engine->Command(MOVE_BOF); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); } + void LoadSQL (const char *query) { engine->LoadSQL(query); ShowCursor(CURSOR_UNHIDE); SyncDisplay(); } void SaveTo(FILE *file) { engine->SaveTo(file); } void LoadFrom(const char *buffer) { engine->LoadFrom(buffer); SyncDisplay(); ShowCursor(CURSOR_UNHIDE); } void SaveTo(char *buffer) { engine->SaveTo(buffer); } --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-FL-editengine.h" --- FL/editengine.h.orig Sat Aug 18 18:19:59 2001 +++ FL/editengine.h Sat Aug 18 17:12:48 2001 @@ -113,6 +113,7 @@ rclError SetTabs(short *tabs); rclError ChangeWidth(short newwidth) { Width = newwidth; return Command(REFORMAT,(long)newwidth); }; rclError LoadFrom(const char *buffer); + rclError LoadSQL(const char *query); rclError SaveTo(char *buffer); rclError LoadFrom(FILE *infile); rclError SaveTo(FILE *outfile); --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-FL::Selection.H" --- FL/Selection.H.orig Wed Sep 3 19:03:20 2003 +++ FL/Selection.H Wed Sep 3 19:03:27 2003 @@ -17,7 +17,7 @@ private: class SelectionRange { - friend Selection; + friend class Selection; private: int mFrom; int mTo; --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-Fl_NSlider.cc" --- Fl_NSlider.cc.orig Mon Feb 3 02:17:30 2003 +++ Fl_NSlider.cc Mon Feb 3 02:16:37 2003 @@ -9,6 +9,7 @@ * provided "as is" without express or implied warranty. */ #include +#include static uchar isHoz = 0; //for image draw setup static uchar r1, g1, b1; //for color ramp --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-Makefile --- Makefile.orig Wed Apr 11 21:12:20 2001 +++ Makefile Mon Feb 3 18:19:49 2003 @@ -1,27 +1,53 @@ # --------------------- M a c r o s ------------------------------- -CC = gcc -CXX = g++ -#CFLAGS = -O0 -g -pipe -fno-default-inline -CFLAGS = -O3 -g -pipe -fforce-mem -fforce-addr -#CFLAGS = -g -pipe -#CFLAGS = -c -O2 -fstrength-reduce -finline-functions -INCLUDE1 = -I. -I../mysql++-1.7/sqlplusint -I/usr/local/include/mysql -LIBS = -L. -L/usr/X11R6/lib -lrcl -lrcledit -lsqlplus /usr/local/lib/mysql/libmysqlclient.a -lm -lflvw -lfltk -lXext -ljpeg -#LIBS = -L. -L/usr/X11R6/lib -lrcl -lrcledit /home/Sinisa/guiclient/libsqlplus.a /usr/local/lib/mysql/libmysqlclient.a -lfltk /usr/X11R6/lib/libXext.a /usr/X11R6/lib/libX11.a /usr/lib/libstdc++.a /usr/lib/libm.a /usr/lib/libc.a xx.o -OBJS = edfile.o about.o db_tree.o Fl_NSlider.o getvars.o qsort.o queries.o bebac.o main.o do_sql.o tables.o dodatni.o status.o process.o grant.o password.o get_table.o admin.o single.o zoom.o sin_jpeg.o jmemsrc.o options.o Fl_File_Dialog.o Fl_Dir.o Fl_Input_File.o Fl_Toggle_Tree.o Fl_Toggle_Node.o Fl_Toggle_Tree_Base.o Fl_Toggle_Node_Base.o Animated_Icon.o Fl_Help.o Fl_Envelope.o Fl_Envelope_Scroll.o Selection.o gif.o + +PREFIX?= /usr/X11R6 +LOCALBASE?= /usr/local +X11BASE?= /usr/X11R6 +BSD_INSTALL_PROGRAM?= install -C -c -s -o root -g wheel -m 555 +PTHREAD_CFLAGS?= -D_THREAD_SAFE +PTHREAD_LIBS?= -pthread +CPPFLAGS+= ${PTHREAD_CFLAGS} \ + -DFLTK_1_0_COMPAT \ + -I. \ + -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/mysql \ + -I${X11BASE}/include +LDFLAGS= -L${LOCALBASE}/lib \ + -L${LOCALBASE}/lib/mysql \ + -L${X11BASE}/lib +LIBS= -lsqlplus -lmysqlclient -lfleditor -lflvw -lfltk \ + -ljpeg -lGLU -lGL -lXext -lX11 -lintl -lm -lz ${PTHREAD_LIBS} \ + -lcipher + +TARGET= mysqlgui +OBJS = Fl_Dir.o Fl_Envelope.o Fl_Envelope_Scroll.o \ + Fl_File_Dialog.o Fl_Help.o Fl_Input_File.o \ + Fl_NSlider.o Fl_Toggle_Node.o Fl_Toggle_Node_Base.o \ + Fl_Toggle_Tree.o Fl_Toggle_Tree_Base.o \ + Animated_Icon.o Selection.o \ + about.o admin.o bebac.o db_tree.o do_sql.o \ + dodatni.o get_table.o getvars.o gif.o grant.o \ + jmemsrc.o main.o options.o password.o process.o \ + qsort.o queries.o sin_jpeg.o single.o status.o \ + tables.o zoom.o # -------------------- R u l e s --------------------------------- -default: all -all: mysqlgui + +all: $(TARGET) + +install: $(TARGET) + ${BSD_INSTALL_PROGRAM} $(TARGET) ${PREFIX}/bin + clean : - /bin/rm *.o mysqlgui + rm -f *.o +clobber: clean + rm -f $(TARGET) -mysqlgui: $(OBJS) -# $(CC) $(OBJS) $(LIBS) -o mysqlgui "-Wl,-rpath,../mysql++-1.7/sqlplusint/.libs" - $(CXX) -o mysqlgui $(OBJS) $(LIBS) /usr/lib/libz.a +$(TARGET): $(OBJS) + $(CXX) $(LDFLAGS) -o mysqlgui $(OBJS) $(LIBS) -%.o : %.cc - $(CXX) $(CFLAGS) $(INCLUDE1) -c $< -%.o : %.c - gcc $(CFLAGS) $(INCLUDE1) -c $< +.c.o: + ${CC} ${CFLAGS} ${CPPFLAGS} -c $< +.cc.o: + ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c $< --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-about.cc" --- about.cc.orig Wed Sep 3 19:04:33 2003 +++ about.cc Wed Sep 3 19:04:46 2003 @@ -11,6 +11,7 @@ #include #endif #include +using namespace std; extern string c_info,s_info; static Fl_Double_Window *xxx=(Fl_Double_Window *)0; Fl_Window *splash=(Fl_Window *)0; --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-bebac.h" --- bebac.h.orig Wed Apr 11 21:12:19 2001 +++ bebac.h Mon Feb 3 02:28:44 2003 @@ -5,6 +5,7 @@ #include #include #include "client.h" +#undef Success #include extern Connection *con; extern void do_exit(Fl_Double_Window*, void*); --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-client.h" --- client.h.orig Wed Sep 3 19:05:06 2003 +++ client.h Wed Sep 3 19:05:21 2003 @@ -45,6 +45,7 @@ typedef long ssize_t; #endif #include +using namespace std; class store_query { public: --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-db_tree.cc" --- db_tree.cc.orig Wed Apr 11 21:12:19 2001 +++ db_tree.cc Mon Feb 3 02:32:09 2003 @@ -28,6 +28,7 @@ #endif #include #include +#undef Success #include #include "client.h" --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-do_sql.cc" --- do_sql.cc.orig Wed Apr 11 12:12:19 2001 +++ do_sql.cc Thu Sep 4 02:17:56 2003 @@ -1,3 +1,5 @@ +#include +#undef frame #include #include #include @@ -5,10 +7,15 @@ #include #include #include +#define filename_setext fl_filename_setext #include "bebac.h" #include #include -extern string real_sql; extern enum ios::open_mode how_to_open; extern char *pass; +#include +using namespace std; +extern string real_sql; +extern enum ios::open_mode how_to_open; +extern char *pass; #define depth 18 #define minmin 5 #define fontsize 14 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-dodatni.cc" --- dodatni.cc.orig Sat Aug 18 18:18:15 2001 +++ dodatni.cc Sat Aug 18 09:51:00 2001 @@ -1,5 +1,6 @@ // generated by Fast Light User Interface Designer (fluid) version 1.00 #include "bebac.h" +#include #ifdef __WIN32__ extern "C" { #define errno WSAGetLastError() --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-get_table.cc" --- get_table.cc.orig Wed Apr 11 21:12:25 2001 +++ get_table.cc Mon Feb 3 03:40:34 2003 @@ -1,6 +1,7 @@ // generated by Fast Light User Interface Designer (fluid) version 1.00 #include #include "get_table.h" +#undef Success #include #include "client.h" #include --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-gif.cc" --- gif.cc.orig Wed Apr 11 21:12:24 2001 +++ gif.cc Mon Feb 3 03:46:27 2003 @@ -107,11 +107,11 @@ box(FL_NO_BOX); end(); show(); } ~gif_window () { - if (p && p->data) { - char** real_data = (char**)(p->data); + if (p && p->alloc_data) { + char** real_data = (char**)(p->alloc_data); for (int i = 0; i < 3; i++) delete[] real_data[i]; delete[] real_data; - p->data = 0; delete p; p = 0; + p->alloc_data = 0; delete p; p = 0; } if (linelength) free((void*)linelength); } --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-grant.cc" --- grant.cc.orig Wed Apr 11 21:12:24 2001 +++ grant.cc Mon Feb 3 03:47:34 2003 @@ -23,6 +23,7 @@ #endif #include #include +#undef Success #include #define REFRESH_GRANT 1 /* Refresh grant tables */ --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-main.cc" --- main.cc.orig Wed Apr 11 21:12:20 2001 +++ main.cc Mon Feb 3 03:53:01 2003 @@ -1,3 +1,4 @@ +#define filename_setext fl_filename_setext #include "bebac.h" #include "qsort.h" #include "komande.h" @@ -461,7 +462,7 @@ } static void if_conn (void) { - unsigned int j = 0, counter = 0; c_info=con->clinet_info(); s_info=con->server_info(); + unsigned int j = 0, counter = 0; c_info=con->client_info(); s_info=con->server_info(); try { Query query = con->query(); if (ldb) {ddd=(string)ldb; ldb=(char*)ddd.c_str();} query << "show databases"; @@ -526,7 +527,7 @@ tables.insert(tables.end(),xx); } qSortHelp (0, (size_t) tables.size(), Fcmp, Exchange); - ldb = (char *)databases[j].c_str(); c_info=con->clinet_info(); s_info=con->server_info(); + ldb = (char *)databases[j].c_str(); c_info=con->client_info(); s_info=con->server_info(); b_connect->set(); down_group->activate(); query_browser->activate(); if (databases.size()) choice_db->activate(); choice_db->redraw(); ; if (query_menus) hier->activate(); --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-password.cc" --- password.cc.orig Wed Apr 11 21:12:25 2001 +++ password.cc Mon Feb 3 03:58:35 2003 @@ -1,6 +1,7 @@ // generated by Fast Light User Interface Designer (fluid) version 1.00 #include #include "password.h" +#undef Success #include #include "client.h" #include --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-process.cc" --- process.cc.orig Wed Apr 11 21:12:24 2001 +++ process.cc Mon Feb 3 04:00:41 2003 @@ -1,6 +1,7 @@ // generated by Fast Light User Interface Designer (fluid) version 1.00 #include "process.h" +#undef Success #include extern char *pass; extern int w7_x, w7_y, server_version; extern Connection *con; #include --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-single.cc" --- single.cc.orig Wed Apr 11 21:12:23 2001 +++ single.cc Mon Feb 3 04:05:55 2003 @@ -1,16 +1,14 @@ // generated by Fast Light User Interface Designer (fluid) version 1.00 - #include +#undef Success #include +#undef Time // // This file implements the file I/O routines for the editor engine. // These are simple ASCII I/O routines, just for getting text out of // a file, or putting it into one. // #include "single.h" -#include -#include -#include extern Connection *con; --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-status.cc" --- status.cc.orig Wed Apr 11 21:12:24 2001 +++ status.cc Mon Feb 3 04:10:54 2003 @@ -1,4 +1,5 @@ #include "status.h" +#undef Success #include extern char *pass; extern int w8_x, w8_y; #include --envbJBWh7q8WU6mo--