Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (98aadeaa28938bdad3e4869648344f7f80141e02)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (98aadeaa28938bdad3e4869648344f7f80141e02)
  • Date: Sat, 29 Aug 2009 06:05:42 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

chat-im/climm/DEPENDS | 2 +-
chat-im/climm/HISTORY | 6 +++++-
chat-im/climm/PRE_BUILD | 3 +++
chat-im/climm/gnutls.patch | 25 +++++++++++++++++++++++++
4 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 4e70a9093e179f050502d9a84a4a05eb6ee04a8b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

chat-im/climm: added patch to make climm compile with recent versions of
gnutls, fixed HISTORY entry

diff --git a/chat-im/climm/DEPENDS b/chat-im/climm/DEPENDS
index 1f4f005..d563d1c 100755
--- a/chat-im/climm/DEPENDS
+++ b/chat-im/climm/DEPENDS
@@ -3,7 +3,7 @@ optional_depends iksemel \
"--disable-xmpp" \
"for support for the jabber protocol" &&
optional_depends gnutls \
- "" \
+ "--with-libgnutls-prefix=${INSTALL_ROOT}/usr" \
"--disable-ssl" \
"for encrypted connection support" &&
optional_depends libotr \
diff --git a/chat-im/climm/HISTORY b/chat-im/climm/HISTORY
index f8b0ff0..a2a65b1 100644
--- a/chat-im/climm/HISTORY
+++ b/chat-im/climm/HISTORY
@@ -1,4 +1,8 @@
-2008-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+2009-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, gnutls.patch, PRE_BUILD: added patch to make climm
+ compile with recent versions of gnutls
+
+2009-05-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: updated to 0.7
* DEPENDS: switched jabber library to iksemel

diff --git a/chat-im/climm/PRE_BUILD b/chat-im/climm/PRE_BUILD
new file mode 100755
index 0000000..c8b32ef
--- /dev/null
+++ b/chat-im/climm/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gnutls.patch
diff --git a/chat-im/climm/gnutls.patch b/chat-im/climm/gnutls.patch
new file mode 100644
index 0000000..c126a28
--- /dev/null
+++ b/chat-im/climm/gnutls.patch
@@ -0,0 +1,25 @@
+diff -Naupr climm-0.7.orig/configure climm-0.7/configure
+--- climm-0.7.orig/configure 2009-08-29 12:51:36.989840512 +0200
++++ climm-0.7/configure 2009-08-29 12:55:26.699912039 +0200
+@@ -6093,7 +6093,7 @@ fi
+ if test x$libgnutls_config_prefix != x ; then
+ libgnutls_config_args="$libgnutls_config_args
--prefix=$libgnutls_config_prefix"
+ if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
++ LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/pkg-config
+ fi
+ fi
+
+@@ -6145,9 +6145,9 @@ $as_echo_n "checking for libgnutls - ver
+ if test "$LIBGNUTLS_CONFIG" = "no" ; then
+ no_libgnutls=yes
+ else
+- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args
--version`
++ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG gnutls --cflags`
++ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG gnutls --libs`
++ libgnutls_config_version=`$LIBGNUTLS_CONFIG gnutls --modversion`
+
+
+ ac_save_CFLAGS="$CFLAGS"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (98aadeaa28938bdad3e4869648344f7f80141e02), Florian Franzmann, 08/29/2009

Archive powered by MHonArc 2.6.24.

Top of Page