diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-02-11 15:20:38 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-11 15:20:38 +0000 |
| commit | 6f45c77c2be8597a5a782d5ac1d18fde8d8f0506 (patch) | |
| tree | 5877548bfa6eb4e94390d6ab2d85fc67e773736b /packages | |
| parent | 0553097d11c96e79b29cef6b8b21b34919fd1332 (diff) | |
gaim_cvs: build fix
- drop desktop-name-cvs.patch, doesn't apply anymore
- work around the strftime %z support test
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gaim/files/configure-strftime.patch | 25 | ||||
| -rw-r--r-- | packages/gaim/gaim_cvs.bb | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/packages/gaim/files/configure-strftime.patch b/packages/gaim/files/configure-strftime.patch new file mode 100644 index 0000000000..80621055f1 --- /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 801ec7dd25..2505b1b9eb 100644 --- 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 |