licq: Updated (1.3.9 -> 1.5.0)

14 years ago · 4c8acc7ef5
4 changed files with 93 additions and 71 deletions
--- a/network/licq/licq-1.5.0-compile.patch
+++ b/network/licq/licq-1.5.0-compile.patch
@ -0,0 +1,41 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../licq/licq-1.5.0-compile.patch
+# Copyright (C) 2011 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+
+error: invalid conversion from 'const char**' to 'char**'
+
+--- licq-1.5.0/src/translator.cpp.orig	2011-04-19 02:00:23.472077820 +0200
+++ licq-1.5.0/src/translator.cpp	2011-04-19 02:09:10.076077820 +0200
+@@ -394,7 +394,7 @@
+   else
+   {
+     const char* inPtr = s.c_str();
+-    size_t ret = iconv(tr, (ICONV_CONST char**)&inPtr, &inLen, &outPtr, &outLen);
+    size_t ret = iconv(tr, (char**)&inPtr, &inLen, &outPtr, &outLen);
+     iconv_close(tr);
+ 
+     if (outDone != NULL)
+--- licq-1.5.0/plugins/osd/src/licq-osd.cpp.orig	2011-04-19 03:03:33.660077822 +0200
+++ licq-1.5.0/plugins/osd/src/licq-osd.cpp	2011-04-19 03:04:11.936077820 +0200
+@@ -778,7 +778,7 @@
+ 
+     while ((fromsize>0) && (tosize>0))
+     {
+-	if ((int)iconv(conv, (ICONV_CONST char **)&msgptr, &fromsize, &resptr, &tosize)==-1)
+	if ((int)iconv(conv, (char **)&msgptr, &fromsize, &resptr, &tosize)==-1)
+ 	{
+ 	    // array is not enough
+ 	    if (errno == E2BIG)
--- a/network/licq/licq.cache
+++ b/network/licq/licq.cache
@ -1,59 +1,65 @@

-[TIMESTAMP] 1134286291 Sun Dec 11 08:31:31 2005
-[BUILDTIME] 155 (9) ERROR
-[SIZE] 6.03 MB, 687 files
+[TIMESTAMP] 1303209015 Tue Apr 19 12:30:15 2011
+[BUILDTIME] 200 (5)
+[SIZE] 9.16 MB, 953 files

 [DEP] bash
 [DEP] binutils
+[DEP] boost
 [DEP] bzip2
-[DEP] xorg-cf-files
+[DEP] cairo
+[DEP] cdk
+[DEP] cmake
+[DEP] compositeproto
 [DEP] coreutils
+[DEP] cyrus-sasl2
 [DEP] diffutils
-[DEP] expat
-[DEP] gamin
-[DEP] file
+[DEP] fhs
+[DEP] findutils
+[DEP] fixesproto
 [DEP] fontconfig
 [DEP] freetype
 [DEP] gawk
 [DEP] gcc
 [DEP] gettext
+[DEP] glib
 [DEP] glibc
+[DEP] gloox
+[DEP] gmp
 [DEP] gpgme
 [DEP] grep
-[DEP] imake
-[DEP] kdelibs
-[DEP] libart_lgpl23
-[DEP] libdrm
+[DEP] kbproto
+[DEP] libaosd
+[DEP] libassuan
 [DEP] libgpg-error
 [DEP] libice
-[DEP] libidn
 [DEP] libpng
+[DEP] libpthread-stubs
 [DEP] libsm
 [DEP] libx11
 [DEP] libxau
-[DEP] libxcursor
-[DEP] libxdmcp
+[DEP] libxcb
+[DEP] libxcomposite
 [DEP] libxext
 [DEP] libxfixes
-[DEP] libxft
-[DEP] libxinerama
-[DEP] libxmu
-[DEP] libxrandr
 [DEP] libxrender
 [DEP] libxscrnsaver
-[DEP] libxt
-[DEP] libxxf86vm
 [DEP] linux-header
 [DEP] make
-[DEP] mesa
-[DEP] mktemp
-[DEP] net-tools
+[DEP] ncurses
 [DEP] openssl
-[DEP] qt3
+[DEP] pango
+[DEP] patch
+[DEP] pixman
+[DEP] pkgconfig
+[DEP] qt4
+[DEP] renderproto
 [DEP] scrnsaverproto
 [DEP] sed
+[DEP] subversion
 [DEP] sysfiles
 [DEP] tar
-[DEP] util-linux
+[DEP] util-linux-ng
+[DEP] xextproto
+[DEP] xosd
 [DEP] xproto
-[DEP] zlib
--- a/network/licq/licq.conf
+++ b/network/licq/licq.conf
@ -15,50 +15,25 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---

+# licq cmake options and their default settings
+# ENABLE_NLS "Enable translation of program messages" ON
+# USE_FIFO "Use Licq FIFO" ON
+# USE_HEBREW "Include support for hebrew reverse string" OFF
+# USE_OPENSSL "Enable secure communication channels" ON
+# USE_SOCKS5 "Enable socks5 support" OFF
+# BUILD_PLUGINS "Build all plugins" OFF
+# BUILD_TESTS "Build all unit tests" OFF

-licq_custmain () {
-	export CPPFLAGS=-Wno-deprecated
-	var_append confopt ' ' "--disable-gpgme"
-	eval ./configure $confopt
-	eval $MAKE $makeopt ; eval $MAKE $makeopt install
+# build all plugins (no way to build selected ones)
+var_append cmakeopt ' ' '-DBUILD_PLUGINS=ON'

-	if [ $SDECFG_PKG_LICQ_CLI == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/console
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_QTG == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/qt-gui
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_KDE == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/qt-gui
-		eval ./configure $confopt --with-kde
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_RMS == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/rms
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_EMAIL == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/email
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_REPLY == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/auto-reply
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-	if [ $SDECFG_PKG_LICQ_OSD == 1 ] ; then
-		cd $builddir/licq-$ver/plugins/osd
-		eval ./configure $confopt
-		eval $MAKE $makeopt ; eval $MAKE $makeopt install
-	fi
-}
+# NLS support
+if [ "$SDECFG_DISABLE_NLS" = 1 ]; then
+	var_append cmakeopt ' ' '-DENABLE_NLS=OFF'
+fi

-custmain="licq_custmain"
+# openssl support
+if ! pkginstalled openssl; then
+	var_append cmakeopt ' ' '-DUSE_OPENSSL=OFF'
+fi

-var_append extraconfopt " " "--with-qt-libraries=$(pkgprefix libdir qt4)"
--- a/network/licq/licq.desc
+++ b/network/licq/licq.desc
@ -30,10 +30,10 @@

 [L] GPL
 [S] Stable
-[V] 1.3.9
+[V] 1.5.0
 [P] O -----5---9 203.900

 [O] var_append GCC_WRAPPER_INSERT ' ' "-ffriend-injection"

-[D] 2459995203 licq-1.3.9.tar.bz2 http://dl.sourceforge.net/sourceforge/licq/
+[D] 601608206 licq-1.5.0.tar.bz2 http://dl.sourceforge.net/sourceforge/licq/