Skip to Content.
Sympa Menu

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

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 (d67118f7c8e576930532bcef10488af7adb6ef95)
  • Date: Tue, 18 Aug 2009 16:19:48 -0500

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

wm-addons/wmbiff/DEPENDS | 3 ++-
wm-addons/wmbiff/HISTORY | 4 ++++
wm-addons/wmbiff/PRE_BUILD | 4 ++++
wm-addons/wmbiff/gnutls-2.8.3.patch | 31 +++++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 1 deletion(-)

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

wm-addons/wmbiff: added patch to make it link against recent versions of
gnutls

diff --git a/wm-addons/wmbiff/DEPENDS b/wm-addons/wmbiff/DEPENDS
index 84c7c8a..411db81 100755
--- a/wm-addons/wmbiff/DEPENDS
+++ b/wm-addons/wmbiff/DEPENDS
@@ -1,6 +1,7 @@
depends xorg-libs &&
+depends autoconf &&

optional_depends gnutls \
- "--enable-crypto" \
+ "--enable-crypto
--with-libgnutls-prefix=${INSTALL_ROOT}/usr" \
"--disable-crypto" \
"for TLS support"
diff --git a/wm-addons/wmbiff/HISTORY b/wm-addons/wmbiff/HISTORY
index 746c264..321a34d 100644
--- a/wm-addons/wmbiff/HISTORY
+++ b/wm-addons/wmbiff/HISTORY
@@ -1,3 +1,7 @@
+2009-08-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, gnutls-2.8.3.patch: added patch to make wmbiff link
+ against current versions of gnutls
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/wm-addons/wmbiff/PRE_BUILD b/wm-addons/wmbiff/PRE_BUILD
new file mode 100755
index 0000000..32c5b50
--- /dev/null
+++ b/wm-addons/wmbiff/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < ${SCRIPT_DIRECTORY}/gnutls-2.8.3.patch &&
+autoconf
diff --git a/wm-addons/wmbiff/gnutls-2.8.3.patch
b/wm-addons/wmbiff/gnutls-2.8.3.patch
new file mode 100644
index 0000000..f576f67
--- /dev/null
+++ b/wm-addons/wmbiff/gnutls-2.8.3.patch
@@ -0,0 +1,31 @@
+diff -Naupr wmbiff-0.4.27.orig/aclocal.m4 wmbiff-0.4.27/aclocal.m4
+--- wmbiff-0.4.27.orig/aclocal.m4 2009-08-18 23:10:43.853310870 +0200
++++ wmbiff-0.4.27/aclocal.m4 2009-08-18 23:16:23.562860666 +0200
+@@ -854,22 +854,21 @@ AC_ARG_WITH(libgnutls-prefix,
+ libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
+
+ 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
+
+- AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
++ AC_PATH_PROG(LIBGNUTLS_CONFIG, pkg-config, no)
+ min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
+ AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
+ no_libgnutls=""
+ 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 --cflags gnutls`
++ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG --libs gnutls`
++ libgnutls_config_version=`$LIBGNUTLS_CONFIG --modversion gnutls`
+
+
+ ac_save_CFLAGS="$CFLAGS"



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

Archive powered by MHonArc 2.6.24.

Top of Page