--- qt-2.2.4/tools/designer/designer/Makefile.in.orig Fri Feb 9 10:53:20 2001 +++ qt-2.2.4/tools/designer/designer/Makefile.in Fri Feb 9 10:54:09 2001 @@ -8,7 +8,7 @@ CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) -LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) +LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) $(QT_LIBS_OPT) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) --- qt-2.2.4/tools/designer/uic/Makefile.in.orig Fri Feb 9 10:53:48 2001 +++ qt-2.2.4/tools/designer/uic/Makefile.in Fri Feb 9 10:53:59 2001 @@ -8,7 +8,7 @@ CFLAGS = $(SYSCONF_CFLAGS) -DUIC INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) -LIBS = $(SUBLIBS) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) +LIBS = $(SUBLIBS) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) $(QT_LIBS_OPT) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) --- qt-2.2.4/src/network/qsocketdevice_unix.cpp.orig Fri Feb 9 11:48:05 2001 +++ qt-2.2.4/src/network/qsocketdevice_unix.cpp Fri Feb 9 11:51:03 2001 @@ -351,7 +351,7 @@ if ( n != -1 ) { SOCKLEN_T len; len = sizeof(v); - int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, &len ); + int r = ::getsockopt( fd, SOL_SOCKET, n, (char*)&v, (socklen_t *)&len ); if ( r >= 0 ) return v; if ( !e ) { @@ -578,7 +578,7 @@ return FALSE; struct sockaddr aa; SOCKLEN_T l = sizeof(struct sockaddr); - int s = ::accept( fd, (struct sockaddr*)&aa, &l ); + int s = ::accept( fd, (struct sockaddr*)&aa, (socklen_t *)&l ); // we'll blithely throw away the stuff accept() wrote to aa if ( s < 0 && e == NoError ) { switch( errno ) { @@ -720,7 +720,7 @@ SOCKLEN_T sz; sz = sizeof( aa ); r = ::recvfrom( fd, data, maxlen, 0, - (struct sockaddr *)&aa, &sz ); + (struct sockaddr *)&aa, (socklen_t *)&sz ); pp = ntohs( aa.sin_port ); pa = QHostAddress( ntohl( aa.sin_addr.s_addr ) ); } else { @@ -947,11 +947,11 @@ memset( &sa, 0, sizeof(sa) ); SOCKLEN_T sz; sz = sizeof( sa ); - if ( !::getsockname( fd, (struct sockaddr *)(&sa), &sz ) ) { + if ( !::getsockname( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) { p = ntohs( sa.sin_port ); a = QHostAddress( ntohl( sa.sin_addr.s_addr ) ); } - if ( !::getpeername( fd, (struct sockaddr *)(&sa), &sz ) ) { + if ( !::getpeername( fd, (struct sockaddr *)(&sa), (socklen_t *)&sz ) ) { pp = ntohs( sa.sin_port ); pa = QHostAddress( ntohl( sa.sin_addr.s_addr ) ); } Index: qt-2.2.4/configs/aix-g++-shared diff -c qt-2.2.4/configs/aix-g++-shared:1.1.1.1 qt-2.2.4/configs/aix-g++-shared:1.3 *** qt-2.2.4/configs/aix-g++-shared:1.1.1.1 Tue Feb 27 10:46:23 2001 --- qt-2.2.4/configs/aix-g++-shared Fri Mar 9 14:02:34 2001 *************** *** 5,13 **** DASHCROSS = # Compiling with support libraries ! SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include ! SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses --- 5,13 ---- DASHCROSS = # Compiling with support libraries ! SYSCONF_CXXFLAGS_X11 = SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include ! SYSCONF_CXXFLAGS_OPENGL = # Compiling YACC output SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses *************** *** 19,32 **** # Linking with support libraries # X11 ! SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) SYSCONF_LIBS_QT_OPENGL = # OpenGL ! SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = --- 19,32 ---- # Linking with support libraries # X11 ! SYSCONF_LFLAGS_X11 = SYSCONF_LIBS_X11 = -lXext -lX11 -lm # Qt, Qt+OpenGL SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) SYSCONF_LIBS_QT_OPENGL = # OpenGL ! SYSCONF_LFLAGS_OPENGL = SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu # Yacc SYSCONF_LIBS_YACC = *************** *** 43,49 **** SYSCONF_CFLAGS_THREAD = -D_THREAD_SAFE SYSCONF_CXXFLAGS_THREAD = -D_THREAD_SAFE SYSCONF_LFLAGS_THREAD = ! # SYSCONF_LIBS_THREAD = ??? # Meta-object compiler SYSCONF_MOC = $(QTDIR)/bin/moc --- 43,49 ---- SYSCONF_CFLAGS_THREAD = -D_THREAD_SAFE SYSCONF_CXXFLAGS_THREAD = -D_THREAD_SAFE SYSCONF_LFLAGS_THREAD = ! SYSCONF_LIBS_THREAD = -lpthreads # Meta-object compiler SYSCONF_MOC = $(QTDIR)/bin/moc *************** *** 57,72 **** # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # SYSCONF_LINK_SHLIB = g++ ! SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ $(OBJECTS) $(OBJMOC) $(LIBS) && \ ! mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ ! cd $(DESTDIR) && \ ! rm -f lib$(TARGET).a lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ ! ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).a; \ ! ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ ! ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a --- 57,69 ---- # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # SYSCONF_LINK_SHLIB = g++ ! SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ $(OBJECTS) $(OBJMOC) $(LIBS) && \ ! ar q lib$(TARGET).a $(SYSCONF_LINK_TARGET_SHARED) && \ ! ranlib lib$(TARGET).a; \ ! mv lib$(TARGET).a $(DESTDIR); # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a *************** *** 77,84 **** SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source ! SYSCONF_CXXFLAGS = -O2 -mminimal-toc ! SYSCONF_CFLAGS = -O2 -mminimal-toc # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED) --- 74,81 ---- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source ! SYSCONF_CXXFLAGS = -mminimal-toc ! SYSCONF_CFLAGS = -mminimal-toc # Default link type (static linking is still be used where required) SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED) SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)