Changes 0.5.0:

* Fixed memory leak after unsuccessful attemt to load a module
* Better compatibility with Qt3
* Pthreads detection under FreeBSD
* Library detection under MacOSX
* More..

2 files changed, 45 insertions, 41 deletions

diff --git a/chat/kadu/patches/patch-ab b/chat/kadu/patches/patch-ab
index f67cc2eb0ee..924d7dd81c5 100644
--- a/chat/kadu/patches/patch-ab
+++ b/chat/kadu/patches/patch-ab
@@ -1,25 +1,17 @@
-$NetBSD: patch-ab,v 1.8 2006/01/22 00:11:27 adam Exp $
+$NetBSD: patch-ab,v 1.9 2007/10/14 07:51:19 adam Exp $
 
---- configure.orig	2005-10-02 14:06:30.000000000 +0200
+--- configure.orig	2007-01-01 12:34:49.000000000 +0100
 +++ configure
-@@ -4281,13 +4281,13 @@ done
- ##################
- 
- 
--	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+	echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+@@ -4999,7 +4999,7 @@ if test "${ac_cv_lib_pthread_pthread_cre
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4348,8 +4348,8 @@ echo "${ECHO_T}$ac_cv_lib_pthread_pthrea
+@@ -5073,8 +5073,8 @@ echo "${ECHO_T}$ac_cv_lib_pthread_pthrea
  if test $ac_cv_lib_pthread_pthread_create = yes; then
  
  		PTHREAD_CPPFLAGS=
@@ -30,35 +22,44 @@ $NetBSD: patch-ab,v 1.8 2006/01/22 00:11:27 adam Exp $
  
  else
  
-@@ -9549,12 +9549,12 @@ echo "$as_me: error: libgadu.h not found
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -11263,12 +11263,12 @@ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -	GADU_LIBS=-lgadu
 +	GADU_LIBS="-lgadu -lssl -lcrypto ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  
- 	echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5
- echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6
+ 	{ echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5
+ echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6; }
  	save_CFLAGS="$CFLAGS"
--	CFLAGS="$CFLAGS  -lgadu"
-+	CFLAGS="$CFLAGS ${GADU_LIBS}"
+-	CFLAGS="$CFLAGS  -lgadu -lstdc++ -lm"
++	CFLAGS="$CFLAGS ${GADU_LIBS} -lstdc++ -lm"
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -9919,7 +9919,11 @@ echo "$as_me: error: $mod download faile
- 	echo "$as_me:$LINENO: checking if lib$lib is in system directories" >&5
- echo $ECHO_N "checking if lib$lib is in system directories... $ECHO_C" >&6
+@@ -11694,7 +11694,7 @@ echo "$as_me: error: $mod download faile
+ 			echo "MODULE_CONFIGURE_CMD:  $MODULE_CONFIGURE_CMD" && \
+ 			echo -e "all:\n\t cd ..; make module_$mod; cd $mod\n\ninstall:\n\tcd ..; make module_$mod install_$mod; cd $mod\n\nclean:\n\trm -f *.o *.d *.so *.a *_moc.cpp .final.d .final.cpp.o .final.c.o\n\ndistclean: clean\n\trm -f .cxxflags .ldflags .final.cpp .final.c translations/*.qm\n" > modules/$mod/Makefile && \
+ 
+-			if test $enable_final == yes; then \
++			if test $enable_final = yes; then \
+ 				for src in $MODULE_SOURCES; do \
+ 					if test "`echo $src | sed 's/.*\.\(.*\)$/\1/'`" == "cpp"; then \
+ 						echo "#include \"$src\"" >> modules/$mod/.final2.cpp; \
+@@ -11738,7 +11738,11 @@ echo "$as_me: error: $mod download faile
+ 	{ echo "$as_me:$LINENO: checking if lib$lib is in system directories" >&5
+ echo $ECHO_N "checking if lib$lib is in system directories... $ECHO_C" >&6; }
  	save_CFLAGS="$CFLAGS"
 +	if [ x$lib = xssl ]; then
-+		CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lcrypto"
++	    CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lcrypto"
 +	else
- 	CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib"
+ 	CFLAGS="$CFLAGS $MODULE_LDFLAGS -l$lib -lstdc++ -lm"
 +	fi
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10053,7 +10057,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
+@@ -11898,7 +11902,7 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
   \
 -				MODULE_LDFLAGS="$MODULE_LDFLAGS -l$lib"; \
diff --git a/chat/kadu/patches/patch-ad b/chat/kadu/patches/patch-ad
index fc01bcf366b..35cdd2d9983 100644
--- a/chat/kadu/patches/patch-ad
+++ b/chat/kadu/patches/patch-ad
@@ -1,15 +1,18 @@
-$NetBSD: patch-ad,v 1.3 2006/01/22 00:12:37 adam Exp $
+$NetBSD: patch-ad,v 1.4 2007/10/14 07:51:20 adam Exp $
 
---- modules/Makefile.in.orig	2006-01-21 18:30:58.000000000 +0000
-+++ modules/Makefile.in	2006-01-21 18:31:53.000000000 +0000
-@@ -295,9 +295,7 @@
- 		if test -d translations; then \
- 			cd translations && \
- 			for trans in *.ts; do \
--				if [ ! -e $${trans//\ts/qm} ] || test $$trans -nt $${trans//\ts/qm}; then \
--					$(QT_LRELEASE_DIR)/lrelease $$trans; \
--				fi; \
-+				$(QT_LRELEASE_DIR)/lrelease $$trans; \
- 			done && \
- 			cd ..; \
- 		fi && \
+--- modules/Makefile.in.orig	2006-11-11 19:51:13.000000000 +0100
++++ modules/Makefile.in
+@@ -541,12 +541,7 @@ $(module_targets):
+ 	if test -d translations; then \
+ 		cd translations && \
+ 		for trans in *.ts; do \
+-			qm=`echo $${trans} | sed "s/\.ts/\.qm/"` && \
+-			if [ ! -e $${qm} -o $$trans -nt $${qm} ]; then \
+-				echo compiling translation file $$trans; \
+-				echo $(QT_LRELEASE_DIR)/lrelease $$trans >> ../../$(LOGFILE); \
+-				$(QT_LRELEASE_DIR)/lrelease $$trans; \
+-			fi; \
++			$(QT_LRELEASE_DIR)/lrelease $$trans; \
+ 		done && \
+ 		cd ..; \
+ 	fi && \