gaim_cvs: build fix

 - drop desktop-name-cvs.patch, doesn't apply anymore
 - work around the strftime %z support test

diff --git a/packages/gaim/files/configure-strftime.patch b/packages/gaim/files/configure-strftime.patch
new file mode 100644 (file)
index 0000000..8062105
--- /dev/null
+++ b/packages/gaim/files/configure-strftime.patch
@@ -0,0 +1,25 @@
+--- gaim/configure.ac  2006-02-09 00:04:40.000000000 +0100
++++ gaim/configure.ac  2006-02-09 22:37:00.000000000 +0100
+@@ -111,6 +111,14 @@
+ AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
+ 
+ AC_MSG_CHECKING(for the %z format string in strftime())
++
++if test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xyes"; then
++      AC_MSG_RESULT(yes)
++      AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
++                                      [Define to 1 if you have a strftime() that supports the %z format string.])
++elif test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xno"; then
++      AC_MSG_RESULT(no)
++else
+ AC_TRY_RUN([
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+@@ -145,6 +153,7 @@
+       AC_MSG_RESULT(no)
+ ]
+ )
++fi
+ 
+ 
+ dnl #######################################################################

diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb
index 801ec7d..2505b1b 100644 (file)
--- a/packages/gaim/gaim_cvs.bb
+++ b/packages/gaim/gaim_cvs.bb
@@ -4,8 +4,8 @@ PV = "2.0+cvs-${SRCDATE}"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \
        file://no-superimposed-version-on-logo.patch;patch=1 \
-       file://desktop-name-cvs.patch;patch=1 \
        file://gtk-deprecated-2.0.0.patch;patch=1 \
+       file://configure-strftime.patch;patch=1 \
        "
 
 include gaim.inc

diff --git a/site/arm-linux b/site/arm-linux
index e3e9968..95596c9 100644 (file)
--- a/site/arm-linux
+++ b/site/arm-linux
@@ -362,3 +362,6 @@ with_broken_putenv=${with_broken_putenv=no}
 
 # xffm
 jm_cv_func_working_readdir=yes
+
+# gaim
+gaim_cv_HAVE_STRFTIME_Z_FORMAT=${gaim_cv_HAVE_STRFTIME_Z_FORMAT=yes}