Ticket #1401: licq-1.3.4-RC1-MacOSX.patch

plugins/msn/src/msn-ssl.cpp

@@ -77 +77 @@
     {
       fromPP+= 9; // skip to the tag
       char *endTag = strchr(fromPP, '\'');
-      tag = strndup(fromPP, endTag - fromPP); // Thanks, this is all we need
+      strncpy(tag, fromPP, endTag - fromPP);  // Thanks, this is all we need
     }
 
     CMSNPacket *pReply = new CPS_MSNSendTicket(tag);

plugins/qt-gui/Makefile.in

@@ -67 +67 @@
 DIST_SUBDIRS = $(SUBDIRS)
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=README.KDE configure.in README.SLACKWARE README.QT-AND-GIFS Makefile.cvs README.SOLARIS Makefile.in aclocal.m4 acinclude.m4.in config.h.in acinclude.m4 Makefile.am am_edit 
+KDE_DIST=stamp-h.in README.SLACKWARE README.QT-AND-GIFS README.SOLARIS Makefile.in config.h.in acinclude.m4.in README.KDE configure.in Makefile.cvs aclocal.m4 Makefile.am acinclude.m4 configure am_edit 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -658 +658 @@
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 
+
 #>+ 2
 docs-am:
 

plugins/qt-gui/acinclude.m4

@@ -59 +59 @@
 
       for qt_dir in $qt_library_dirs; do
         if test -z $ac_kde || test "$ac_kde" = "no" || test "$kde_version" -ge 3; then
-          if test -r "$qt_dir/libqt-mt.so"; then
+          if test -r "$qt_dir/libqt-mt.so" -o -r "$qt_dir/libqt-mt.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break
@@ -67 +67 @@
             echo "tried $qt_dir/libqt-mt.so" >&AC_FD_CC 
           fi
 
-          if test -r "$qt_dir/libqt-mt.so.3"; then
+          if test -r "$qt_dir/libqt-mt.so.3" -o -r "$qt_dir/libqt-mt.so.3.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break
@@ -144 +144 @@
         /usr/X11/lib/qt/include"
 
       if test -n "$QTDIR"; then
-        qt_include_dirs="$QTDIR/include $qt_include_dirs"
+        qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt3 $qt_include_dirs"
       fi
 
       if test -n "$QTINC"; then

plugins/qt-gui/acinclude.m4.in

@@ -59 +59 @@
 
       for qt_dir in $qt_library_dirs; do
         if test -z $ac_kde || test "$ac_kde" = "no" || test "$kde_version" -ge 3; then
-          if test -r "$qt_dir/libqt-mt.so"; then
+          if test -r "$qt_dir/libqt-mt.so" -o -r "$qt_dir/libqt-mt.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break
@@ -67 +67 @@
             echo "tried $qt_dir/libqt-mt.so" >&AC_FD_CC 
           fi
 
-          if test -r "$qt_dir/libqt-mt.so.3"; then
+          if test -r "$qt_dir/libqt-mt.so.3" -o -r "$qt_dir/libqt-mt.so.3.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break
@@ -144 +144 @@
         /usr/X11/lib/qt/include"
 
       if test -n "$QTDIR"; then
-        qt_include_dirs="$QTDIR/include $qt_include_dirs"
+        qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt3 $qt_include_dirs"
       fi
 
       if test -n "$QTINC"; then

plugins/qt-gui/configure

@@ -21471 +21471 @@
         /usr/X11/lib/qt/include"
 
       if test -n "$QTDIR"; then
-        qt_include_dirs="$QTDIR/include $qt_include_dirs"
+        qt_include_dirs="$QTDIR/include $QTDIR/include/qt $QTDIR/include/qt3 $qt_include_dirs"
       fi
 
       if test -n "$QTINC"; then
@@ -21671 +21671 @@
 
       for qt_dir in $qt_library_dirs; do
         if test -z $ac_kde || test "$ac_kde" = "no" || test "$kde_version" -ge 3; then
-          if test -r "$qt_dir/libqt-mt.so"; then
+          if test -r "$qt_dir/libqt-mt.so" -o -r "$qt_dir/libqt-mt.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break
@@ -21679 +21679 @@
             echo "tried $qt_dir/libqt-mt.so" >&5
           fi
 
-          if test -r "$qt_dir/libqt-mt.so.3"; then
+          if test -r "$qt_dir/libqt-mt.so.3" -o -r "$qt_dir/libqt-mt.so.3.dylib"; then
             ac_qt_libname=-lqt-mt
             ac_qt_libdir=$qt_dir
             break