Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (0cc9ea4d4b965bb27f45dacb643cbbce8722ba18)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (0cc9ea4d4b965bb27f45dacb643cbbce8722ba18)
  • Date: Wed, 1 Oct 2008 15:10:00 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

chat-im/licq/BUILD | 14 ++++++++++++++
chat-im/licq/DEPENDS | 4 ++++
chat-im/licq/DETAILS | 2 +-
chat-im/licq/HISTORY | 8 ++++++++
chat-im/licq/INSTALL | 5 +++++
chat-im/licq/PREPARE | 1 +
chat-im/licq/PRE_BUILD | 3 ---
chat-im/licq/licq-1.3.5-logonfix.patch | 13 -------------
chat-im/licq/licq-1.3.5.tar.bz2.sig | 0
chat-im/licq/licq-1.3.6.tar.bz2.sig |binary
dev/null |binary
11 files changed, 33 insertions(+), 17 deletions(-)

New commits:
commit 0cc9ea4d4b965bb27f45dacb643cbbce8722ba18
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

licq: Updated to version 1.3.6. Added ability to build qt4 gui.
Removed old patch.

diff --git a/chat-im/licq/BUILD b/chat-im/licq/BUILD
index 7896ced..606ceb9 100755
--- a/chat-im/licq/BUILD
+++ b/chat-im/licq/BUILD
@@ -19,6 +19,20 @@
default_build
fi &&

+ if [ "$QT4GUI" == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/qt4-gui &&
+ if [ "$LICQ_SVN" == "y" ]; then
+ make -f Makefile.cvs
+ fi &&
+ mkdir build &&
+ cd build &&
+ QTDIR=/usr &&
+ PATH=$QTDIR/bin/qt4:$PATH &&
+ export QTDIR=/usr &&
+ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr .. &&
+ make
+ fi &&
+
if [ "$EMAIL" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/email &&
if [ "$LICQ_SVN" == "y" ]; then
diff --git a/chat-im/licq/DEPENDS b/chat-im/licq/DEPENDS
index 0732a8a..34c025d 100755
--- a/chat-im/licq/DEPENDS
+++ b/chat-im/licq/DEPENDS
@@ -11,7 +11,11 @@ fi &&
if [ "$QTGUI" == "y" ]; then
depends qt-x11
fi &&
+if [ "$QT4GUI" == "y" ]; then
+ depends qt4
+fi &&
depends autoconf &&
+depends boost &&
optional_depends "openssl" \
"" \
"--disable-openssl" \
diff --git a/chat-im/licq/DETAILS b/chat-im/licq/DETAILS
index 061a2a1..cb1e5fd 100755
--- a/chat-im/licq/DETAILS
+++ b/chat-im/licq/DETAILS
@@ -34,7 +34,7 @@ fi
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
- VERSION=1.3.5
+ VERSION=1.3.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/licq/HISTORY b/chat-im/licq/HISTORY
index 4ecacd2..8711072 100644
--- a/chat-im/licq/HISTORY
+++ b/chat-im/licq/HISTORY
@@ -1,3 +1,11 @@
+2008-10-01 George Sherwood <gsherwood AT sourcemag.org>
+ * PREPARE: Added qt4 plugin query
+ * DETAILS: Updated to version 1.3.6
+ * BUILD: Add build for qt4 plugin
+ * INSTALL: Add install for qt4 plugin
+ * PRE_BUILD: Removed patch.
+ * licq-1.3.5-logonfix.patch: Removed unneeded patch
+
2008-09-24 George Sherwood <gsherwood AT sourcemage.org>
* PRE_BUILD: Added upstream patch
* licq-1.3.5-logonfix.patch: Upstream patch for login problems
diff --git a/chat-im/licq/INSTALL b/chat-im/licq/INSTALL
index c7f44cd..e2c1955 100755
--- a/chat-im/licq/INSTALL
+++ b/chat-im/licq/INSTALL
@@ -22,6 +22,11 @@ if [ $QTGUI == "y" ]; then
default_install
fi &&

+if [ $QT4GUI == "y" ]; then
+ cd $SOURCE_DIRECTORY/plugins/qt4-gui/build &&
+ default_install
+fi &&
+
if [ "$EMAIL" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins/email &&
default_install
diff --git a/chat-im/licq/PREPARE b/chat-im/licq/PREPARE
index c8d3302..55bb3e6 100755
--- a/chat-im/licq/PREPARE
+++ b/chat-im/licq/PREPARE
@@ -6,6 +6,7 @@ fi &&
persistent_remove LICQ_CVS LICQ_CVS_AUTOUPDATE &&
config_query XOSD "Build xosd plugin (depends on xosd)?" n &&
config_query QTGUI "Build QT-X11 plugin (depends on qt-x11)?" n &&
+config_query QT4GUI "Build QT4 plugin (depends on qt4)?" n &&
config_query CDK "Build console plugin (depends on cdk)?" n &&
config_query AREP "Build auto-reply plugin?" n &&
config_query RMS "Build remote managment server plugin?" n &&
diff --git a/chat-im/licq/PRE_BUILD b/chat-im/licq/PRE_BUILD
index f50ed00..8ee1cd1 100755
--- a/chat-im/licq/PRE_BUILD
+++ b/chat-im/licq/PRE_BUILD
@@ -31,9 +31,6 @@ if [ "$LICQ_SVN" == "y" ]; then
mv ${SOURCE_DIRECTORY}/${SPELL}-email-svn \
${SOURCE_DIRECTORY}/plugins/email
fi
-else
- cd $SOURCE_DIRECTORY &&
- patch -p0 < $SCRIPT_DIRECTORY/licq-1.3.5-logonfix.patch
fi
if [ "$XOSD" == "y" ]; then
cd $SOURCE_DIRECTORY/plugins &&
diff --git a/chat-im/licq/licq-1.3.5-logonfix.patch
b/chat-im/licq/licq-1.3.5-logonfix.patch
deleted file mode 100644
index 0edeae7..0000000
--- a/chat-im/licq/licq-1.3.5-logonfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/icqpacket.cpp
-===================================================================
---- src/icqpacket.cpp (revision 6387)
-+++ src/icqpacket.cpp (working copy)
-@@ -821,7 +821,7 @@
-
- // Static versioning
- buffer->PackUnsignedLongBE(0x00160002);
-- buffer->PackUnsignedShortBE(0x010A);
-+ buffer->PackUnsignedShortBE(0x010B);
- // Client version major (4 == ICQ2000, 5 == ICQ2001)
- buffer->PackUnsignedLongBE(0x00170002);
- buffer->PackUnsignedShortBE(0x0014);
diff --git a/chat-im/licq/licq-1.3.5.tar.bz2.sig
b/chat-im/licq/licq-1.3.5.tar.bz2.sig
deleted file mode 100644
index c5d7b44..0000000
Binary files a/chat-im/licq/licq-1.3.5.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/licq/licq-1.3.6.tar.bz2.sig
b/chat-im/licq/licq-1.3.6.tar.bz2.sig
new file mode 100644
index 0000000..3c74d04
Binary files /dev/null and b/chat-im/licq/licq-1.3.6.tar.bz2.sig differ



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (0cc9ea4d4b965bb27f45dacb643cbbce8722ba18), George Sherwood, 10/01/2008

Archive powered by MHonArc 2.6.24.

Top of Page