diff options
| -rw-r--r-- | net-im/licq-console/Makefile | 1 | ||||
| -rw-r--r-- | net-im/licq-osd/Makefile | 5 | ||||
| -rw-r--r-- | net-im/licq-qt-gui/Makefile | 1 | ||||
| -rw-r--r-- | net-im/licq-qt-gui/pkg-plist | 127 | ||||
| -rw-r--r-- | net-im/licq/Makefile.inc | 8 | ||||
| -rw-r--r-- | net-im/licq/distinfo | 6 | ||||
| -rw-r--r-- | net-im/licq/files/patch-admin-ltmain.sh | 12 | ||||
| -rw-r--r-- | net-im/licq/files/patch-licq_buffer.h | 12 | ||||
| -rw-r--r-- | net-im/licq/files/patch-licq_icqd.h | 75 | ||||
| -rw-r--r-- | net-im/licq/files/patch-translate.cpp | 56 | ||||
| -rw-r--r-- | net-im/licq/pkg-plist | 6 |
11 files changed, 109 insertions, 200 deletions
diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile index eff247d4cab..936cf83ff67 100644 --- a/net-im/licq-console/Makefile +++ b/net-im/licq-console/Makefile @@ -7,7 +7,6 @@ PORTNAME= console PORTVERSION= ${CONSOLE_LICQ_VER} -PORTREVISION= 4 CATEGORIES= net-im MAINTAINER= dinoex@FreeBSD.org diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile index 4ca33a9de84..71e480c647f 100644 --- a/net-im/licq-osd/Makefile +++ b/net-im/licq-osd/Makefile @@ -8,10 +8,9 @@ PORTNAME= osd PORTVERSION= ${OSD_LICQ_VER} -PORTREVISION= 1 CATEGORIES= net-im -MAINTAINER= ports@FreeBSD.org +MAINTAINER= dinoex@FreeBSD.org COMMENT= OnScreenDisplay messages in licq LIB_DEPENDS= xosd.4:${PORTSDIR}/misc/xosd @@ -24,7 +23,7 @@ GNU_CONFIGURE= yes LICQ_PORT?= net-im/licq -LOCALES= de cs es fr pt pt_BR ro ru sv sk +LOCALES= be de cs es fr pt pt_BR ro ru sv sk PLIST_FILES= lib/licq/licq_osd.la \ lib/licq/licq_osd.so \ ${LOCALES:C+^.*$+share/locale/&/LC_MESSAGES/licq_osd_plugin.mo+} diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index d9f336c52f9..56743f9161c 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -7,7 +7,6 @@ PORTNAME= qt-gui PORTVERSION= ${QT_LICQ_VER} -PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} diff --git a/net-im/licq-qt-gui/pkg-plist b/net-im/licq-qt-gui/pkg-plist index 830fd5616f5..b259f14d6ea 100644 --- a/net-im/licq-qt-gui/pkg-plist +++ b/net-im/licq-qt-gui/pkg-plist @@ -1,5 +1,6 @@ lib/licq/licq_%%GUI_NAME%%-gui.la lib/licq/licq_%%GUI_NAME%%-gui.so +share/applications/licq.desktop share/licq/qt-gui/dock.console/away.xpm share/licq/qt-gui/dock.console/bothmsg.xpm share/licq/qt-gui/dock.console/console.dock @@ -82,34 +83,6 @@ share/licq/qt-gui/emoticons/Default/sunglasses.png share/licq/qt-gui/emoticons/Default/tongue.png share/licq/qt-gui/emoticons/Default/unhappy.png share/licq/qt-gui/emoticons/Default/wink.png -share/licq/qt-gui/emoticons/Mirabelis3/README -share/licq/qt-gui/emoticons/Mirabelis3/emoticons.xml -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_annoyed.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_disgusted.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_drooling.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_giggling.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_inlove.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_jokingly.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_shocked.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_surprised1.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_surprised2.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_e_whining.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_angel.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_angry.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_bandaid.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_crying.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_embarrassed.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_glasses.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_happy.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_kiss.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_nofingidea.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_sad.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_sealed.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_surprised.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_teeth.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_tongue.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_unsure.png -share/licq/qt-gui/emoticons/Mirabelis3/icq_s_wink.png share/licq/qt-gui/emoticons/Mirabelis4/README share/licq/qt-gui/emoticons/Mirabelis4/emoticons.xml share/licq/qt-gui/emoticons/Mirabelis4/icq_s_ack.png @@ -140,6 +113,36 @@ share/licq/qt-gui/emoticons/Mirabelis4/icq_s_tiredly.png share/licq/qt-gui/emoticons/Mirabelis4/icq_s_tongue.png share/licq/qt-gui/emoticons/Mirabelis4/icq_s_unsure.png share/licq/qt-gui/emoticons/Mirabelis4/icq_s_wink.png +share/licq/qt-gui/emoticons/Mirabelis5.1/README +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley1.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley10.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley11.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley12.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley13.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley14.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley15.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley16.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley17.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley18.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley19.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley2.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley20.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley21.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley22.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley23.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley24.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley25.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley26.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley27.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley28.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley3.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley4.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley5.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley6.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley7.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley8.png +share/licq/qt-gui/emoticons/Mirabelis5.1/Smiley9.png +share/licq/qt-gui/emoticons/Mirabelis5.1/emoticons.xml share/licq/qt-gui/emoticons/Mirabelis5/README share/licq/qt-gui/emoticons/Mirabelis5/Smiley1.png share/licq/qt-gui/emoticons/Mirabelis5/Smiley10.png @@ -170,7 +173,6 @@ share/licq/qt-gui/emoticons/Mirabelis5/Smiley7.png share/licq/qt-gui/emoticons/Mirabelis5/Smiley8.png share/licq/qt-gui/emoticons/Mirabelis5/Smiley9.png share/licq/qt-gui/emoticons/Mirabelis5/emoticons.xml -share/licq/qt-gui/emoticons/None/emoticons.xml share/licq/qt-gui/emoticons/bugeyes/README share/licq/qt-gui/emoticons/bugeyes/bug_angel.png share/licq/qt-gui/emoticons/bugeyes/bug_angry.png @@ -329,6 +331,23 @@ share/licq/qt-gui/extended.icons.basic/pixPhoneFollowMeActive.xpm share/licq/qt-gui/extended.icons.basic/pixPhoneFollowMeBusy.xpm share/licq/qt-gui/extended.icons.basic/pixSharedFiles.xpm share/licq/qt-gui/extended.icons.basic/pixTyping.xpm +share/licq/qt-gui/extended.icons.kde/README +share/licq/qt-gui/extended.icons.kde/birthday.png +share/licq/qt-gui/extended.icons.kde/collapsed.png +share/licq/qt-gui/extended.icons.kde/customar.png +share/licq/qt-gui/extended.icons.kde/expanded.png +share/licq/qt-gui/extended.icons.kde/gpgkey_disabled.png +share/licq/qt-gui/extended.icons.kde/gpgkey_enabled.png +share/licq/qt-gui/extended.icons.kde/invisible.png +share/licq/qt-gui/extended.icons.kde/kde.icons +share/licq/qt-gui/extended.icons.kde/phone.png +share/licq/qt-gui/extended.icons.kde/phone2.png +share/licq/qt-gui/extended.icons.kde/pixICQphoneActive.png +share/licq/qt-gui/extended.icons.kde/pixICQphoneBusy.png +share/licq/qt-gui/extended.icons.kde/pixPhoneFollowMeActive.png +share/licq/qt-gui/extended.icons.kde/pixPhoneFollowMeBusy.png +share/licq/qt-gui/extended.icons.kde/sharedfiles.png +share/licq/qt-gui/extended.icons.kde/typing.png share/licq/qt-gui/extended.icons.thomas/itemCollapsed.xpm share/licq/qt-gui/extended.icons.thomas/itemExpanded.xpm share/licq/qt-gui/extended.icons.thomas/pixBirthday.xpm @@ -417,6 +436,39 @@ share/licq/qt-gui/icons.icq2/offline.xpm share/licq/qt-gui/icons.icq2/online.xpm share/licq/qt-gui/icons.icq2/sms.xpm share/licq/qt-gui/icons.icq2/url.xpm +share/licq/qt-gui/icons.kde/README +share/licq/qt-gui/icons.kde/aim_away.png +share/licq/qt-gui/icons.kde/aim_offline.png +share/licq/qt-gui/icons.kde/aim_online.png +share/licq/qt-gui/icons.kde/authorize.png +share/licq/qt-gui/icons.kde/away.png +share/licq/qt-gui/icons.kde/chat.png +share/licq/qt-gui/icons.kde/contact.png +share/licq/qt-gui/icons.kde/dnd.png +share/licq/qt-gui/icons.kde/ffc.png +share/licq/qt-gui/icons.kde/file.png +share/licq/qt-gui/icons.kde/gpgkey.png +share/licq/qt-gui/icons.kde/history.png +share/licq/qt-gui/icons.kde/info.png +share/licq/qt-gui/icons.kde/invisible.png +share/licq/qt-gui/icons.kde/kde.icons +share/licq/qt-gui/icons.kde/message.png +share/licq/qt-gui/icons.kde/msn_away.png +share/licq/qt-gui/icons.kde/msn_occupied.png +share/licq/qt-gui/icons.kde/msn_offline.png +share/licq/qt-gui/icons.kde/msn_online.png +share/licq/qt-gui/icons.kde/msn_private.png +share/licq/qt-gui/icons.kde/na.png +share/licq/qt-gui/icons.kde/occupied.png +share/licq/qt-gui/icons.kde/offline.png +share/licq/qt-gui/icons.kde/online.png +share/licq/qt-gui/icons.kde/remove.png +share/licq/qt-gui/icons.kde/reqauthorize.png +share/licq/qt-gui/icons.kde/search.png +share/licq/qt-gui/icons.kde/secureoff.png +share/licq/qt-gui/icons.kde/secureon.png +share/licq/qt-gui/icons.kde/sms.png +share/licq/qt-gui/icons.kde/www.png share/licq/qt-gui/icons.mark/away.ppm share/licq/qt-gui/icons.mark/chat.ppm share/licq/qt-gui/icons.mark/dnd.ppm @@ -463,6 +515,15 @@ share/licq/qt-gui/icons.thomas/secureon.xpm share/licq/qt-gui/icons.thomas/sms.xpm share/licq/qt-gui/icons.thomas/thomas.icons share/licq/qt-gui/icons.thomas/url.xpm +share/licq/qt-gui/skin.Mirabilis/Mirabilis.skin +share/licq/qt-gui/skin.Mirabilis/README +share/licq/qt-gui/skin.Mirabilis/background.png +share/licq/qt-gui/skin.Mirabilis/background.xcf +share/licq/qt-gui/skin.Mirabilis/btnDown.png +share/licq/qt-gui/skin.Mirabilis/btnHighlight.png +share/licq/qt-gui/skin.Mirabilis/btnUp.png +share/licq/qt-gui/skin.Mirabilis/lblmsg.png +share/licq/qt-gui/skin.Mirabilis/status.png share/licq/qt-gui/skin.basic-ncb/basic-ncb.skin share/licq/qt-gui/skin.basic/basic.skin share/licq/qt-gui/skin.bheart/Frame.png @@ -518,6 +579,7 @@ share/licq/qt-gui/skin.thomas/btnUp.png share/licq/qt-gui/skin.thomas/thomas.skin share/licq/qt-gui/locale/be.qm share/licq/qt-gui/locale/bg_BG.qm +share/licq/qt-gui/locale/cs.qm share/licq/qt-gui/locale/cs_CZ.qm share/licq/qt-gui/locale/de.qm share/licq/qt-gui/locale/es.qm @@ -549,23 +611,25 @@ share/licq/qt-gui/locale/uk.qm @dirrm share/licq/qt-gui/skin.bheart @dirrm share/licq/qt-gui/skin.basic-ncb @dirrm share/licq/qt-gui/skin.basic +@dirrm share/licq/qt-gui/skin.Mirabilis @dirrm share/licq/qt-gui/icons.thomas @dirrm share/licq/qt-gui/icons.mark +@dirrm share/licq/qt-gui/icons.kde @dirrm share/licq/qt-gui/icons.icq2 @dirrm share/licq/qt-gui/icons.icq @dirrm share/licq/qt-gui/icons.computer @dirrm share/licq/qt-gui/icons.ami @dirrm share/licq/qt-gui/extended.icons.thomas +@dirrm share/licq/qt-gui/extended.icons.kde @dirrm share/licq/qt-gui/extended.icons.basic @dirrm share/licq/qt-gui/emoticons/thomas @dirrm share/licq/qt-gui/emoticons/phpBB @dirrm share/licq/qt-gui/emoticons/msn @dirrm share/licq/qt-gui/emoticons/ccmathteam.com @dirrm share/licq/qt-gui/emoticons/bugeyes +@dirrm share/licq/qt-gui/emoticons/Mirabelis5.1 @dirrm share/licq/qt-gui/emoticons/Mirabelis5 @dirrm share/licq/qt-gui/emoticons/Mirabelis4 -@dirrm share/licq/qt-gui/emoticons/Mirabelis3 -@dirrm share/licq/qt-gui/emoticons/None @dirrm share/licq/qt-gui/emoticons/Default @dirrm share/licq/qt-gui/emoticons @dirrm share/licq/qt-gui/dock.pli @@ -575,3 +639,4 @@ share/licq/qt-gui/locale/uk.qm @dirrm share/licq/qt-gui/dock.flower @dirrm share/licq/qt-gui/dock.console @dirrm share/licq/qt-gui +@dirrm share/applications diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc index 9ebf6396de1..c75f4a0c935 100644 --- a/net-im/licq/Makefile.inc +++ b/net-im/licq/Makefile.inc @@ -2,11 +2,11 @@ # $FreeBSD$ PKGNAMEPREFIX= licq- -LICQ_VER= 1.3.2 -QT_LICQ_VER= 1.3.2 -OSD_LICQ_VER= 1.3.2 +LICQ_VER= 1.3.4 +QT_LICQ_VER= 1.3.4 +OSD_LICQ_VER= 1.3.4 RMS_LICQ_VER= 0.33 -CONSOLE_LICQ_VER= 1.3.2 +CONSOLE_LICQ_VER= 1.3.4 JONS_GTK_LICQ_VER= 0.20.2 .if ${PORTNAME} != "base" RUN_DEPENDS+= licq:${PORTSDIR}/${LICQ_PORT} diff --git a/net-im/licq/distinfo b/net-im/licq/distinfo index e21e8e9f2e3..f8eec4d6c82 100644 --- a/net-im/licq/distinfo +++ b/net-im/licq/distinfo @@ -1,3 +1,3 @@ -MD5 (licq-1.3.2.tar.bz2) = 0471bb8fed91eefb23dfe153c9a4a806 -SHA256 (licq-1.3.2.tar.bz2) = 3c6ec77d42973c93a9d1926a3aa444ff0388263f38a19c9b51e1337cde60f8bc -SIZE (licq-1.3.2.tar.bz2) = 3980117 +MD5 (licq-1.3.4.tar.bz2) = 3bab0c9d1977f9b14421d36110e17e0c +SHA256 (licq-1.3.4.tar.bz2) = eed39b1fa78d6c03655babc6cb03155ed71391ec1422752d0611bd2583c2f608 +SIZE (licq-1.3.4.tar.bz2) = 3088438 diff --git a/net-im/licq/files/patch-admin-ltmain.sh b/net-im/licq/files/patch-admin-ltmain.sh deleted file mode 100644 index 33a0638ce81..00000000000 --- a/net-im/licq/files/patch-admin-ltmain.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- admin/ltmain.sh.orig Sun Oct 26 04:47:29 2003 -+++ admin/ltmain.sh Sun Oct 26 04:47:56 2003 -@@ -1239,7 +1239,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - diff --git a/net-im/licq/files/patch-licq_buffer.h b/net-im/licq/files/patch-licq_buffer.h deleted file mode 100644 index 3de48085cf9..00000000000 --- a/net-im/licq/files/patch-licq_buffer.h +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru licq-1.3.2/include/licq_buffer.h include/licq_buffer.h ---- licq-1.3.2/include/licq_buffer.h Wed Feb 4 18:00:20 2004 -+++ include/licq_buffer.h Sat Jul 15 16:38:24 2006 -@@ -62,7 +62,7 @@ - - char *Pack(CBuffer *); - char *Pack(const char *data, int size); -- char *CBuffer::PackLNTS(const char *); -+ char *PackLNTS(const char *); - char *PackString(const char *data, unsigned short max = 0); - char *PackUnsignedShort(unsigned short data); - char *PackUnsignedLong(unsigned long data); diff --git a/net-im/licq/files/patch-licq_icqd.h b/net-im/licq/files/patch-licq_icqd.h deleted file mode 100644 index 520f4157cd0..00000000000 --- a/net-im/licq/files/patch-licq_icqd.h +++ /dev/null @@ -1,75 +0,0 @@ -diff -ru licq-1.3.2/include/licq_icqd.h include/licq_icqd.h ---- licq-1.3.2/include/licq_icqd.h Fri Sep 9 18:13:53 2005 -+++ include/licq_icqd.h Sun Sep 3 20:00:07 2006 -@@ -6,6 +6,11 @@ - #ifndef ICQD_H - #define ICQD_H - -+#include <sys/select.h> -+#include <sys/time.h> -+#include <sys/types.h> -+#include <unistd.h> -+ - #include <vector> - #include <list> - #include <deque> -@@ -39,6 +44,28 @@ - class CReverseConnectToUserData; - class CMSN; - -+#define FOR_EACH_PROTO_PLUGIN_START(d) \ -+ { \ -+ ProtoPluginsList _pl_; \ -+ ProtoPluginsListIter _ppit; \ -+ d->ProtoPluginList(_pl_); \ -+ for (_ppit = _pl_.begin(); _ppit != _pl_.end(); _ppit++) \ -+ { -+ -+#define FOR_EACH_PROTO_PLUGIN_END \ -+ } \ -+ } -+ -+/* Forward declarations for friend functions */ -+void *Ping_tep(void *p); -+void *UpdateUsers_tep(void *p); -+void *MonitorSockets_tep(void *p); -+void *ReverseConnectToUser_tep(void *p); -+void *ProcessRunningEvent_Client_tep(void *p); -+void *ProcessRunningEvent_Server_tep(void *p); -+void *Shutdown_tep(void *p); -+void *ConnectToServer_tep(void *s); -+ - const unsigned short IGNORE_MASSMSG = 1; - const unsigned short IGNORE_NEWUSERS = 2; - const unsigned short IGNORE_EMAILPAGER = 4; -@@ -577,9 +604,12 @@ - ICQEvent *PopPluginEvent(); - CSignal *PopProtoSignal(); - -- // Server Side List functions -+ // ICQ options - bool UseServerContactList() { return m_bUseSS; } -- void SetUseServerContactList(bool b) { m_bUseSS = b; } -+ bool SendTypingNotification() { return m_bSendTN; } -+ -+ void SetUseServerContactList(bool b) { m_bUseSS = b; } -+ void SetSendTypingNotification(bool b) { m_bSendTN = b; } - - // Misc functions - bool ReconnectAfterUinClash() { return m_bReconnectAfterUinClash; } -@@ -669,6 +699,7 @@ - - // Misc - bool m_bUseSS; // server side list -+ bool m_bSendTN; // Send typing notifications - bool m_bReconnectAfterUinClash; // reconnect after uin has been used from another location? - - // Statistics -@@ -726,6 +757,7 @@ - ICQEvent *DoneExtendedServerEvent(const unsigned short, EventResult); - ICQEvent *DoneExtendedEvent(ICQEvent *, EventResult); - ICQEvent *DoneExtendedEvent(unsigned long tag, EventResult _eResult); -+ bool hasServerEvent(unsigned long); - void ProcessDoneEvent(ICQEvent *); - void PushExtendedEvent(ICQEvent *); - void PushPluginSignal(CICQSignal *); diff --git a/net-im/licq/files/patch-translate.cpp b/net-im/licq/files/patch-translate.cpp deleted file mode 100644 index 836fce3920b..00000000000 --- a/net-im/licq/files/patch-translate.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- src/translate.cpp.orig Thu Oct 13 17:09:23 2005 -+++ src/translate.cpp Sun Dec 11 16:46:24 2005 -@@ -223,7 +223,8 @@ - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -268,7 +269,8 @@ - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -312,7 +314,8 @@ - char *szNewStr = new char[nLen * 2]; - size_t nInSize, nOutSize; - -- char *szIn = _sz, *szOut = szNewStr; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = nLen; -@@ -339,11 +342,21 @@ - unsigned short nLen = strlen(_sz) * 3; - char *szNewStr = new char[nLen + 1]; - size_t nInSize, nOutSize; -- char *szOut = szNewStr, *szIn = _sz; -+ const char *szIn = _sz; -+ char *szOut = szNewStr; - iconv_t tr; - - nInSize = strlen(szIn); - nOutSize = nLen; -+ //--- deleting ' ' from _szEncoding --- -+ char *_szEnc_tmp = _szEncoding, *_szEnc_tmp2 = _szEncoding; -+ int _szflag = 0; -+ while (*_szEnc_tmp) -+ { -+ if (*_szEnc_tmp == ' ') {*_szEnc_tmp++; _szflag++;} -+ *_szEnc_tmp2++ = *_szEnc_tmp++; -+ } -+ while(_szflag--) --(*_szEnc_tmp2) = '\0'; - - tr = iconv_open("UCS-2BE", _szEncoding); - size_t ret = iconv(tr, &szIn, &nInSize, &szOut, &nOutSize); - diff --git a/net-im/licq/pkg-plist b/net-im/licq/pkg-plist index ce4cba563e0..1ee67f37894 100644 --- a/net-im/licq/pkg-plist +++ b/net-im/licq/pkg-plist @@ -1,10 +1,12 @@ bin/licq +bin/viewurl-firefox.sh bin/viewurl-lynx.sh +bin/viewurl-mozilla.sh bin/viewurl-ncftp.sh bin/viewurl-netscape.sh -bin/viewurl-mozilla.sh -bin/viewurl-w3m.sh bin/viewurl-opera.sh +bin/viewurl-seamonkey.sh +bin/viewurl-w3m.sh include/licq/licq_backgroundcodes.h include/licq/licq_buffer.h include/licq/licq_chat.h |