pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/kphone Update "kphone" package to version 4.0.5. C...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1c8faaed100a
branches: trunk
changeset: 483511:1c8faaed100a
user: tron <tron%pkgsrc.org@localhost>
date: Sat Nov 13 18:33:44 2004 +0000
description:
Update "kphone" package to version 4.0.5. Changes since version 4.0.3:
- Fixed bug in localization
- Memory leak fixed
- Localization added, thanks to Mario Scheel
- Tray icon support added, thanks to Thomas Zell
- Some errors fixed
diffstat:
net/kphone/Makefile | 8 +++-----
net/kphone/distinfo | 15 +++++++--------
net/kphone/patches/patch-ae | 27 ++++++++++++++++-----------
net/kphone/patches/patch-af | 15 ++++++++++++---
net/kphone/patches/patch-ag | 19 +++++++------------
net/kphone/patches/patch-ah | 29 +++++++++++++++--------------
net/kphone/patches/patch-ak | 31 -------------------------------
7 files changed, 60 insertions(+), 84 deletions(-)
diffs (271 lines):
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/Makefile
--- a/net/kphone/Makefile Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/Makefile Sat Nov 13 18:33:44 2004 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/10/19 02:26:39 grant Exp $
-#
+# $NetBSD: Makefile,v 1.4 2004/11/13 18:33:44 tron Exp $
-DISTNAME= kphone-4.0.3
-PKGREVISION= 1
+DISTNAME= kphone-4.0.5
CATEGORIES= net comms
MASTER_SITES= http://www.wirlab.net/kphone/
-MAINTAINER= tech-pkg%NetBSD.org@localhost
+MAINTAINER= tron%NetBSD.org@localhost
HOMEPAGE= http://www.wirlab.net/kphone/
COMMENT= Graphical Voice Over Internet (VoIP) phone
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/distinfo
--- a/net/kphone/distinfo Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/distinfo Sat Nov 13 18:33:44 2004 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.2 2004/11/12 06:39:21 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/11/13 18:33:44 tron Exp $
-SHA1 (kphone-4.0.3.tar.gz) = 957e8836c032fd0b5f29f7967569eb2ff101e538
-Size (kphone-4.0.3.tar.gz) = 220383 bytes
+SHA1 (kphone-4.0.5.tar.gz) = d4182d07b82555147481a65d3274620fa01a96ac
+Size (kphone-4.0.5.tar.gz) = 258159 bytes
SHA1 (patch-aa) = ecb31fdeeaf4cb2a5aafe50b5fe58b85375cfd65
SHA1 (patch-ab) = 6edbc28aeb485b8004b6258b04d50c0888c28a31
SHA1 (patch-ac) = 71ee825881b0a9135bdc4259c96a622e0c9cb268
SHA1 (patch-ad) = 1017e963c72ac24b1b86f4c810222a8ee0583f33
-SHA1 (patch-ae) = be6482e3543dc990aee370aaf1750b5f802d73ac
-SHA1 (patch-af) = d3889d76ed5f082f6a39552a98791c27217c5d58
-SHA1 (patch-ag) = 5b203fd99de99d447e6974487f67d4bfe79c9acb
-SHA1 (patch-ah) = f61ea22795a38eb0243ff2df40c681fdfc9ed85a
+SHA1 (patch-ae) = 7f145e6d8e78a5fbbe2dfa780a7321013d123765
+SHA1 (patch-af) = c638706c5c5f853d80a225aa873a886868c6ffb4
+SHA1 (patch-ag) = 29879e04fc1525feeb3895f13c06e2808a348df5
+SHA1 (patch-ah) = 24157b3b121ee64a87f020c1b140fad1a11428b7
SHA1 (patch-ai) = 4e405c8d0db5617fb814776507308864ee698818
SHA1 (patch-aj) = 600f96693fcf6f00f0b23a76923cdf0046116936
-SHA1 (patch-ak) = 7b9bdf3f99cf5b373a82d40f6f81fd5b06a91982
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/patches/patch-ae
--- a/net/kphone/patches/patch-ae Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/patches/patch-ae Sat Nov 13 18:33:44 2004 +0000
@@ -1,34 +1,39 @@
-$NetBSD: patch-ae,v 1.1 2004/07/21 21:49:02 scw Exp $
+$NetBSD: patch-ae,v 1.2 2004/11/13 18:33:44 tron Exp $
---- Makefile.in.orig 2004-04-01 14:54:32.000000000 +0100
-+++ Makefile.in 2004-07-21 11:44:19.000000000 +0100
-@@ -2,22 +2,22 @@
+--- Makefile.in.orig 2004-11-13 19:12:23.000000000 +0100
++++ Makefile.in 2004-11-13 19:13:07.000000000 +0100
+@@ -2,25 +2,25 @@
SUBS :=$(foreach sub,$(SUBDIRS), $(sub)/$(sub).a)
all dep:
- @for T in $(SUBDIRS); do make -C $$T $@; done
-+ @for T in $(SUBDIRS); do ${MAKE} -C $$T $@; done
++ @for T in $(SUBDIRS); do $(MAKE) -C $$T $@; done
install: all
+- make -C po install
- make -C icons install
- make -C kphone install
-+ ${MAKE} -C icons install
-+ ${MAKE} -C kphone install
++ $(MAKE) -C po install
++ $(MAKE) -C icons install
++ $(MAKE) -C kphone install
uninstall:
+- make -C po uninstall
- make -C icons uninstall
- make -C kphone uninstall
-+ ${MAKE} -C icons uninstall
-+ ${MAKE} -C kphone uninstall
++ $(MAKE) -C po uninstall
++ $(MAKE) -C icons uninstall
++ $(MAKE) -C kphone uninstall
clean:
- @for T in $(SUBDIRS); do make -C $$T $@; done
-+ @for T in $(SUBDIRS); do ${MAKE} -C $$T $@; done
++ @for T in $(SUBDIRS); do $(MAKE) -C $$T $@; done
distclean: clean
rm -f config.cache config.log config.status
rm -f Makefile
- @for T in $(SUBDIRS); do make -C $$T $@; done
-+ @for T in $(SUBDIRS); do ${MAKE} -C $$T $@; done
++ @for T in $(SUBDIRS); do $(MAKE) -C $$T $@; done
+ rm -f po/Makefile
rm -f icons/Makefile
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/patches/patch-af
--- a/net/kphone/patches/patch-af Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/patches/patch-af Sat Nov 13 18:33:44 2004 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-af,v 1.2 2004/11/12 06:39:21 jlam Exp $
+$NetBSD: patch-af,v 1.3 2004/11/13 18:33:44 tron Exp $
---- configure.orig 2004-04-01 16:56:26.000000000 +0100
-+++ configure 2004-07-21 11:45:46.000000000 +0100
+--- configure.orig 2004-10-11 10:04:28.000000000 +0200
++++ configure 2004-11-13 19:28:05.000000000 +0100
+@@ -1238,7 +1238,7 @@
+ fi
+
+ CFLAGS="-I$ac_cv_qt_inc -Wall"
+-LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname -L/usr/local/lib -L/usr/X11R6/lib"
++LIBS="-L$ac_cv_qt_lib -l$ac_cv_qt_libname $LIBOSSAUDIO -L/usr/X11R6/lib"
+
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1860,7 +1860,6 @@
CFLAGS="$CFLAGS -g -DDEBUG"
echo "$ac_t""yes" 1>&6
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/patches/patch-ag
--- a/net/kphone/patches/patch-ag Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/patches/patch-ag Sat Nov 13 18:33:44 2004 +0000
@@ -1,18 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2004/07/21 21:49:02 scw Exp $
+$NetBSD: patch-ag,v 1.2 2004/11/13 18:33:44 tron Exp $
---- kphone/Makefile.in.orig 2004-06-23 10:21:38.000000000 +0100
-+++ kphone/Makefile.in 2004-07-21 12:52:34.000000000 +0100
-@@ -6,11 +6,11 @@
- SHARE_DIR=@datadir@/kphone
+--- kphone/Makefile.in.orig 2004-11-08 10:28:49.000000000 +0100
++++ kphone/Makefile.in 2004-11-13 19:23:10.000000000 +0100
+@@ -6,7 +6,7 @@
+ SHARE_DIR=@datadir@/apps/kphone
BIN_DIR=@bindir@
--MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\"
-+MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DDEVOSSAUDIO=\"$(DEVOSSAUDIO)\"
+-MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"$(SHARE_DIR)/translations//\"
++MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"$(SHARE_DIR)/translations//\" -DDEVOSSAUDIO=\"$(DEVOSSAUDIO)\"
CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS)
CXXFLAGS=$(CFLAGS)
--LIBS=@LIBS@ -lssl -lcrypto -lresolv
-+LIBS=@LIBS@ -lssl -lcrypto -lresolv ${LIBOSSAUDIO} ${PTHREAD_LIBS}
- LDFLAGS=@LDFLAGS@ -g
-
- SUBLIBS=dissipate2 gsm ilbc
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/patches/patch-ah
--- a/net/kphone/patches/patch-ah Sat Nov 13 16:00:17 2004 +0000
+++ b/net/kphone/patches/patch-ah Sat Nov 13 18:33:44 2004 +0000
@@ -1,18 +1,19 @@
-$NetBSD: patch-ah,v 1.1 2004/07/21 21:49:02 scw Exp $
+$NetBSD: patch-ah,v 1.2 2004/11/13 18:33:44 tron Exp $
---- kphone/dspoutoss.cpp.orig 2004-03-29 15:59:45.000000000 +0100
-+++ kphone/dspoutoss.cpp 2004-07-21 12:35:56.000000000 +0100
-@@ -6,6 +6,9 @@
- #include <fcntl.h>
- #include <unistd.h>
+--- kphone/dspoutoss.cpp.orig 2004-10-18 09:57:56.000000000 +0200
++++ kphone/dspoutoss.cpp 2004-11-13 19:15:54.000000000 +0100
+@@ -8,6 +8,10 @@
#include <errno.h>
+ #include <qobject.h>
+
+#ifdef __NetBSD__
+#include <sys/audioio.h>
+#endif
-
++
#include "dspoutoss.h"
-@@ -52,6 +55,7 @@
+ DspOutOss::DspOutOss( const QString &fileName )
+@@ -53,6 +57,7 @@
flags &= ~O_NONBLOCK;
fcntl( audio_fd, F_SETFL, flags );
@@ -20,7 +21,7 @@
// keep fragsize less than 20ms !!
int frag = ( ( 32767 << 16 ) | 7 );
if( ioctl( audio_fd, SNDCTL_DSP_SETFRAGMENT, &frag ) ) {
-@@ -59,6 +63,7 @@
+@@ -60,6 +65,7 @@
printf( "ERROR: %s\n", lasterror.ascii() );
return false;
}
@@ -28,7 +29,7 @@
int format = AFMT_S16_LE;
-@@ -108,6 +113,23 @@
+@@ -109,6 +115,23 @@
8000, rate, 100*((rate-8000)/8000.0) );
}
@@ -52,7 +53,7 @@
audio_buf_info info;
-@@ -126,6 +148,14 @@
+@@ -127,6 +150,14 @@
}
audio_buf.resize( info.fragsize * sizeof( short ) );
@@ -67,7 +68,7 @@
lasterror = QString::null;
devstate = DeviceOpened;
return true;
-@@ -149,6 +179,14 @@
+@@ -150,6 +181,14 @@
}
audio_buf.resize( info.fragsize * sizeof( short ) );
@@ -82,7 +83,7 @@
lasterror = QString::null;
devstate = DeviceOpened;
return true;
-@@ -215,6 +253,7 @@
+@@ -216,6 +255,7 @@
unsigned int DspOutOss::readableBytes( void )
{
@@ -90,7 +91,7 @@
audio_buf_info info;
struct timeval timeout;
fd_set read_fds;
-@@ -238,6 +277,18 @@
+@@ -239,6 +279,18 @@
}
return info.bytes;
diff -r 2100dacc0115 -r 1c8faaed100a net/kphone/patches/patch-ak
--- a/net/kphone/patches/patch-ak Sat Nov 13 16:00:17 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/07/21 21:49:02 scw Exp $
-
---- kphone/kcallwidget.cpp.orig 2004-06-23 10:21:38.000000000 +0100
-+++ kphone/kcallwidget.cpp 2004-07-21 12:51:54.000000000 +0100
-@@ -443,7 +443,7 @@
- return;
- }
- if( !audio->isAudioOn() ) {
-- audio_fd = ::open( "/dev/dsp", O_WRONLY | O_NONBLOCK );
-+ audio_fd = ::open( DEVOSSAUDIO, O_WRONLY | O_NONBLOCK );
- if( audio_fd == -1 ) {
- QMessageBox::information( this, "Dial",
- "Close any program which might be using soundcard \nand then retry dial." );
-@@ -815,7 +815,7 @@
- if( isRingingTone ) {
- if( ringCount < 5 ) {
- ringCount++;
-- audio_fd = ::open( "/dev/dsp", O_WRONLY | O_NONBLOCK );
-+ audio_fd = ::open( DEVOSSAUDIO, O_WRONLY | O_NONBLOCK );
- if( audio_fd == -1 ) {
- printf( "ERROR: %s\n", "Open Failed" );
- return;
-@@ -881,7 +881,7 @@
- if( !audio->isAudioOn() ) {
- if( isRingingTone ) {
- }
-- audio_fd = ::open( "/dev/dsp", O_WRONLY | O_NONBLOCK );
-+ audio_fd = ::open( DEVOSSAUDIO, O_WRONLY | O_NONBLOCK );
- if( audio_fd == -1 ) {
- QMessageBox::information( this, "Accept Call",
- "Close any program which might be using soundcard \nand then retry accepting call." );
Home |
Main Index |
Thread Index |
Old Index