From 699333767f37c98f6c94b85eb9c14a5a1878b20b Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 9 Jul 2004 10:46:23 +0000 Subject: Changes 0.3.9: * Warning if there's another instance running * Saving window dimensions * Fixed installer script * Bug fixes --- chat/kadu/Makefile | 8 ++++---- chat/kadu/PLIST | 45 +++++++++++++++++++++++++++++++++++++-------- chat/kadu/distinfo | 12 +++++------- chat/kadu/patches/patch-aa | 6 +++--- chat/kadu/patches/patch-ab | 6 +++--- chat/kadu/patches/patch-ac | 20 -------------------- chat/kadu/patches/patch-ad | 33 --------------------------------- 7 files changed, 52 insertions(+), 78 deletions(-) delete mode 100644 chat/kadu/patches/patch-ac delete mode 100644 chat/kadu/patches/patch-ad (limited to 'chat/kadu') diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile index f1631ae7f80..d6a1db4e52f 100644 --- a/chat/kadu/Makefile +++ b/chat/kadu/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2004/04/29 15:27:01 adam Exp $ +# $NetBSD: Makefile,v 1.3 2004/07/09 10:46:23 adam Exp $ -DISTNAME= kadu-0.3.8 +DISTNAME= kadu-0.3.9 CATEGORIES= chat MASTER_SITES= http://www.kadu.net/download/stable/ EXTRACT_SUFX= .tar.bz2 @@ -18,8 +18,8 @@ LIBS+= ${LIBOSSAUDIO} WRKSRC= ${WRKDIR}/kadu # pure hack -post-configure: - cd ${WRKSRC}; ${TOUCH} Makefile +#post-configure: +# cd ${WRKSRC}; ${TOUCH} Makefile .include "../../chat/ekg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/chat/kadu/PLIST b/chat/kadu/PLIST index 53ec3ffd51e..c3417c744dc 100644 --- a/chat/kadu/PLIST +++ b/chat/kadu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/28 13:55:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/07/09 10:46:23 adam Exp $ bin/kadu bin/kadu-config bin/kadu-mozilla @@ -8,7 +8,6 @@ include/kadu/config_dialog.h include/kadu/config_file.h include/kadu/dcc.h include/kadu/debug.h -include/kadu/dock_widget.h include/kadu/emoticons.h include/kadu/events.h include/kadu/expimp.h @@ -24,6 +23,7 @@ include/kadu/modules.h include/kadu/modules/autoaway.h include/kadu/modules/autoresponder.h include/kadu/modules/default_sms.h +include/kadu/modules/docking.h include/kadu/modules/dsp_sound.h include/kadu/modules/encryption.h include/kadu/modules/player_external.h @@ -31,6 +31,10 @@ include/kadu/modules/simlite.h include/kadu/modules/sms.h include/kadu/modules/sound.h include/kadu/modules/sound_desc.h +include/kadu/modules/voice.h +include/kadu/modules/voice_arts.h +include/kadu/modules/voice_dsp.h +include/kadu/modules/x11_docking.h include/kadu/password.h include/kadu/pending_events.h include/kadu/pending_msgs.h @@ -43,9 +47,6 @@ include/kadu/updates.h include/kadu/userbox.h include/kadu/userinfo.h include/kadu/userlist.h -include/kadu/voice.h -include/kadu/voice_arts.h -include/kadu/voice_dsp.h share/kadu/AUTHORS share/kadu/COPYING share/kadu/ChangeLog @@ -56,6 +57,7 @@ share/kadu/modules/autoaway.desc share/kadu/modules/autoresponder.desc share/kadu/modules/autoresponder.so share/kadu/modules/default_sms.desc +share/kadu/modules/docking.desc share/kadu/modules/dsp_sound.desc share/kadu/modules/dsp_sound.so share/kadu/modules/encryption.desc @@ -65,21 +67,38 @@ share/kadu/modules/sound.desc share/kadu/modules/translations/autoaway_de.qm share/kadu/modules/translations/autoaway_it.qm share/kadu/modules/translations/autoaway_pl.qm +share/kadu/modules/translations/autoresponder_de.qm share/kadu/modules/translations/autoresponder_it.qm share/kadu/modules/translations/autoresponder_pl.qm share/kadu/modules/translations/default_sms_de.qm share/kadu/modules/translations/default_sms_it.qm share/kadu/modules/translations/default_sms_pl.qm +share/kadu/modules/translations/docking_de.qm +share/kadu/modules/translations/docking_it.qm +share/kadu/modules/translations/docking_pl.qm +share/kadu/modules/translations/dsp_sound_de.qm +share/kadu/modules/translations/dsp_sound_it.qm share/kadu/modules/translations/dsp_sound_pl.qm +share/kadu/modules/translations/encryption_de.qm share/kadu/modules/translations/encryption_it.qm share/kadu/modules/translations/encryption_pl.qm +share/kadu/modules/translations/ext_sound_de.qm share/kadu/modules/translations/ext_sound_it.qm share/kadu/modules/translations/ext_sound_pl.qm share/kadu/modules/translations/sms_de.qm share/kadu/modules/translations/sms_it.qm share/kadu/modules/translations/sms_pl.qm +share/kadu/modules/translations/sound_de.qm share/kadu/modules/translations/sound_it.qm share/kadu/modules/translations/sound_pl.qm +share/kadu/modules/translations/voice_de.qm +share/kadu/modules/translations/voice_it.qm +share/kadu/modules/translations/voice_pl.qm +share/kadu/modules/translations/x11_docking_de.qm +share/kadu/modules/translations/x11_docking_it.qm +share/kadu/modules/translations/x11_docking_pl.qm +share/kadu/modules/voice.desc +share/kadu/modules/x11_docking.desc share/kadu/themes/emoticons/gadu-gadu/1/8P.gif share/kadu/themes/emoticons/gadu-gadu/1/8P_na.gif share/kadu/themes/emoticons/gadu-gadu/1/beksa.gif @@ -349,6 +368,7 @@ share/kadu/themes/emoticons/gadu-gadu/2/zly.gif share/kadu/themes/emoticons/gadu-gadu/2/zly_na.gif share/kadu/themes/emoticons/gadu-gadu/2/zygi.gif share/kadu/themes/emoticons/gadu-gadu/2/zygi_na.gif +share/kadu/themes/icons/default/abouticon.png share/kadu/themes/icons/default/back.png share/kadu/themes/icons/default/blocking.png share/kadu/themes/icons/default/busy.png @@ -358,6 +378,7 @@ share/kadu/themes/icons/default/busy_m.png share/kadu/themes/icons/default/configure.png share/kadu/themes/icons/default/connect_creating.png share/kadu/themes/icons/default/decrypted.png +share/kadu/themes/icons/default/emoticon.png share/kadu/themes/icons/default/encrypted.png share/kadu/themes/icons/default/eraser.png share/kadu/themes/icons/default/exit.png @@ -368,14 +389,19 @@ share/kadu/themes/icons/default/history.png share/kadu/themes/icons/default/icons.conf share/kadu/themes/icons/default/icons.png share/kadu/themes/icons/default/identity.png +share/kadu/themes/icons/default/impexpicon.png share/kadu/themes/icons/default/invisible.png share/kadu/themes/icons/default/invisible_d.png share/kadu/themes/icons/default/invisible_d_m.png share/kadu/themes/icons/default/invisible_m.png share/kadu/themes/icons/default/key_enter.png +share/kadu/themes/icons/default/loading.png share/kadu/themes/icons/default/mail_generic.png +share/kadu/themes/icons/default/manageignored.png +share/kadu/themes/icons/default/manusricon.png share/kadu/themes/icons/default/message.png share/kadu/themes/icons/default/mobile.png +share/kadu/themes/icons/default/msgbox_warning.png share/kadu/themes/icons/default/mute.png share/kadu/themes/icons/default/newuser.png share/kadu/themes/icons/default/offline.png @@ -386,11 +412,16 @@ share/kadu/themes/icons/default/online.png share/kadu/themes/icons/default/online_d.png share/kadu/themes/icons/default/online_d_m.png share/kadu/themes/icons/default/online_m.png +share/kadu/themes/icons/default/password.png +share/kadu/themes/icons/default/personalinfo.png +share/kadu/themes/icons/default/registeraccount.png share/kadu/themes/icons/default/reload.png share/kadu/themes/icons/default/remove.png share/kadu/themes/icons/default/scroll_lock.png +share/kadu/themes/icons/default/share.png share/kadu/themes/icons/default/stop.png share/kadu/themes/icons/default/unmute.png +share/kadu/themes/icons/default/unregisteraccount.png share/kadu/themes/icons/default/viewmag.png share/kadu/themes/sounds/default/msg.wav share/kadu/themes/sounds/default/sound.conf @@ -402,9 +433,6 @@ share/kadu/translations/qt_de.qm share/kadu/translations/qt_en.qm share/kadu/translations/qt_it.qm share/kadu/translations/qt_pl.qm -share/pixmaps/kadu-16.png -share/pixmaps/kadu-48.png -share/pixmaps/kadu.png @dirrm share/kadu/translations @dirrm share/kadu/themes/sounds/default @dirrm share/kadu/themes/sounds @@ -416,6 +444,7 @@ share/pixmaps/kadu.png @dirrm share/kadu/themes/emoticons @dirrm share/kadu/themes @dirrm share/kadu/modules/translations +@dirrm share/kadu/modules/data @dirrm share/kadu/modules @dirrm share/kadu @dirrm include/kadu/modules diff --git a/chat/kadu/distinfo b/chat/kadu/distinfo index fe294360a27..3e90cb92273 100644 --- a/chat/kadu/distinfo +++ b/chat/kadu/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/04/28 13:55:21 adam Exp $ +$NetBSD: distinfo,v 1.2 2004/07/09 10:46:23 adam Exp $ -SHA1 (kadu-0.3.8.tar.bz2) = 5395734755db9858a7ecb13ddb8df7aa34f5c59a -Size (kadu-0.3.8.tar.bz2) = 881198 bytes -SHA1 (patch-aa) = 0e18cf2994de7dad6c206cd5909db3d5e9d54304 -SHA1 (patch-ab) = 0e86f38182df547ab6f753a33e940e5c30303f46 -SHA1 (patch-ac) = 9b574f800828297ed46f74e44f3bcd4cc3269c7e -SHA1 (patch-ad) = 76555335b578fa8122519658936b6fc317c68029 +SHA1 (kadu-0.3.9.tar.bz2) = 633faefb53660be80b9f368dcbf837e07cb15cfd +Size (kadu-0.3.9.tar.bz2) = 942895 bytes +SHA1 (patch-aa) = 5ed7b1dab199097fa032fee1349e585efa1d0096 +SHA1 (patch-ab) = 2bad6bf94b1f4f39a88914c625bf4a1d6da5ae52 diff --git a/chat/kadu/patches/patch-aa b/chat/kadu/patches/patch-aa index e9b3d7b4ae9..e2fe51703d9 100644 --- a/chat/kadu/patches/patch-aa +++ b/chat/kadu/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/04/28 13:55:22 adam Exp $ +$NetBSD: patch-aa,v 1.2 2004/07/09 10:46:23 adam Exp $ ---- libgsm/Makefile.orig 2003-10-15 14:09:01.000000000 +0000 -+++ libgsm/Makefile +--- modules/voice/libgsm/Makefile.orig 2003-10-15 14:09:01.000000000 +0000 ++++ modules/voice/libgsm/Makefile @@ -44,7 +44,7 @@ WAV49 = -DWAV49 # CCFLAGS = -c -O diff --git a/chat/kadu/patches/patch-ab b/chat/kadu/patches/patch-ab index 2d6c6b8a64d..7f76f3c8218 100644 --- a/chat/kadu/patches/patch-ab +++ b/chat/kadu/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/04/28 13:55:22 adam Exp $ +$NetBSD: patch-ab,v 1.2 2004/07/09 10:46:23 adam Exp $ ---- modules/dsp_sound/dsp_sound.cpp.orig 2004-04-28 14:47:44.000000000 +0000 +--- modules/dsp_sound/dsp_sound.cpp.orig 2004-05-25 17:44:15.000000000 +0000 +++ modules/dsp_sound/dsp_sound.cpp -@@ -174,7 +174,7 @@ void DirectPlayThread::run() +@@ -178,7 +178,7 @@ void DirectPlayThread::run() continue; } diff --git a/chat/kadu/patches/patch-ac b/chat/kadu/patches/patch-ac deleted file mode 100644 index 628a8ec73aa..00000000000 --- a/chat/kadu/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/04/28 13:55:22 adam Exp $ - ---- kadu/events.cpp.orig 2004-04-28 14:55:16.000000000 +0000 -+++ kadu/events.cpp -@@ -137,6 +137,7 @@ void EventManager::connectionFailedSlot( - case GG_FAILURE_CONNECTING: - msg = QString(tr("Unable to connect")); - break; -+#ifdef GG_FAILURE_NEED_EMAIL - case GG_FAILURE_NEED_EMAIL: - msg = QString(tr("Please change your email in \"Change password/email\" window. " - "Leave new password field blank.")); -@@ -145,6 +146,7 @@ void EventManager::connectionFailedSlot( - hintmanager->addHintError(msg); - MessageBox::msg(msg); - break; -+#endif - case GG_FAILURE_INVALID: - msg = QString(tr("Unable to connect, server has returned unknown data")); - break; diff --git a/chat/kadu/patches/patch-ad b/chat/kadu/patches/patch-ad deleted file mode 100644 index f0e53c2d05b..00000000000 --- a/chat/kadu/patches/patch-ad +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/04/28 13:55:22 adam Exp $ - ---- kadu/Makefile.in.orig 2004-04-28 15:30:08.000000000 +0000 -+++ kadu/Makefile.in -@@ -533,22 +533,13 @@ uninstall-am: uninstall-binPROGRAMS unin - install-data-local: - $(mkinstalldirs) "$(DESTDIR)/$(includedir)/kadu/" - $(INSTALL_DATA) *.h "$(DESTDIR)/$(includedir)/kadu/" -- @if test -w "/usr/share"; then \ -- $(mkinstalldirs) "$(DESTDIR)/usr/share/applnk/Internet/"; \ -- echo "[Desktop Entry]" > "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "Type=Application" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "Exec=$(bindir)/kadu" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "Icon=kadu.png" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "MiniIcon=kadu-16.png" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "Terminal=0" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- echo "Name=Kadu" >> "$(DESTDIR)/usr/share/applnk/Internet/kadu.desktop"; \ -- $(mkinstalldirs) "$(DESTDIR)/usr/share/pixmaps/"; \ -- $(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-48.png"; \ -- $(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu.png"; \ -- $(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)/usr/share/pixmaps/kadu-16.png"; \ -+ @if test -w "$(DESTDIR)/$(datadir)"; then \ -+ $(mkinstalldirs) "$(DESTDIR)/$(datadir)/pixmaps/"; \ -+ $(INSTALL_DATA) hi48-app-kadu.png "$(DESTDIR)/$(datadir)/pixmaps/kadu-48.png"; \ -+ $(INSTALL_DATA) hi32-app-kadu.png "$(DESTDIR)/$(datadir)/pixmaps/kadu.png"; \ -+ $(INSTALL_DATA) hi16-app-kadu.png "$(DESTDIR)/$(datadir)/pixmaps/kadu-16.png"; \ - echo ""; \ -- echo "Icons installed to $(DESTDIR)/usr/share/pixmaps"; \ -- echo "Link(kadu.desktop) installed to $(DESTDIR)/usr/share/applnk/Internet"; \ -+ echo "Icons installed to $(DESTDIR)/$(datadir)/pixmaps"; \ - echo ""; \ - else \ - echo "";\ -- cgit v1.2.3