From d3a387a0ec6e5265f625de87318be2de610efb01 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 7 Apr 2020 11:10:41 +0200 Subject: [PATCH] Downgrade dependencies Use g_date_time_format() instead of g_date_time_format_iso8601() to only rely on glib 2.56.0 which is the latest version in Debian Buster (current stable). We also only use basic sqlite functions so 3.27.0 should be fine there (also the one in Debian buster). Thanks to @DebXWoody. --- configure.ac | 8 ++++---- src/database.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0808e76e..67fb6638 100644 --- a/configure.ac +++ b/configure.ac @@ -166,8 +166,8 @@ AS_IF([test "x$ncurses_cv_wget_wch" != xyes], [AC_MSG_ERROR([ncurses does not support wide characters])]) ### Check for glib libraries -PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.62], [], - [AC_MSG_ERROR([glib 2.62 or higher is required for profanity])]) +PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.56.0], [], + [AC_MSG_ERROR([glib 2.56.0 or higher is required for profanity])]) PKG_CHECK_MODULES([gio], [gio-2.0], [], [AC_MSG_ERROR([libgio-2.0 from glib-2.0 is required for profanity])]) @@ -179,8 +179,8 @@ PKG_CHECK_MODULES([curl], [libcurl], [], [AC_CHECK_LIB([curl], [main], [], [AC_MSG_ERROR([libcurl is required for profanity])])]) -PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.28.0], [], - [AC_MSG_ERROR([sqlite3 3.28.0 or higher is required for profanity profanity])]) +PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.27.0], [], + [AC_MSG_ERROR([sqlite3 3.27.0 or higher is required for profanity profanity])]) AS_IF([test "x$enable_icons_and_clipboard" != xno], [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], diff --git a/src/database.c b/src/database.c index 205b3a97..76f85a82 100644 --- a/src/database.c +++ b/src/database.c @@ -289,9 +289,15 @@ _add_to_db(ProfMessage *message, char *type, const Jid * const from_jid, const J gchar *date_fmt; if (message->timestamp) { - date_fmt = g_date_time_format_iso8601(message->timestamp); + // g_date_time_format_iso8601() is only availble from glib 2.62 on. + // To still support Debian buster lets use g_date_time_format() for now. + //date_fmt = g_date_time_format_iso8601(message->timestamp); + date_fmt = g_date_time_format(message->timestamp,"%FT%T%:::z"); } else { - date_fmt = g_date_time_format_iso8601(g_date_time_new_now_local()); + // g_date_time_format_iso8601() is only availble from glib 2.62 on. + // To still support Debian buster lets use g_date_time_format() for now. + //date_fmt = g_date_time_format_iso8601(g_date_time_new_now_local()); + date_fmt = g_date_time_format(g_date_time_new_now_local(), "%FT%T%:::z" ); } const char *enc = _get_message_enc_str(message->enc);