aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Downgrade dependencies

Browse Source 
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.
This commit is contained in:
Michael Vetter 2020-04-07 11:10:41 +02:00
parent 9aefbdcb53
commit d3a387a0ec
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -166,8 +166,8 @@ AS_IF([test "x$ncurses_cv_wget_wch" != xyes],
[AC_MSG_ERROR([ncurses does not support wide characters])]) [AC_MSG_ERROR([ncurses does not support wide characters])])
### Check for glib libraries ### Check for glib libraries
PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.62], [], PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.56.0], [],
[AC_MSG_ERROR([glib 2.62 or higher is required for profanity])]) [AC_MSG_ERROR([glib 2.56.0 or higher is required for profanity])])
PKG_CHECK_MODULES([gio], [gio-2.0], [], PKG_CHECK_MODULES([gio], [gio-2.0], [],
[AC_MSG_ERROR([libgio-2.0 from glib-2.0 is required for profanity])]) [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_CHECK_LIB([curl], [main], [],
[AC_MSG_ERROR([libcurl is required for profanity])])]) [AC_MSG_ERROR([libcurl is required for profanity])])])
PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.28.0], [], PKG_CHECK_MODULES([SQLITE], [sqlite3 >= 3.27.0], [],
[AC_MSG_ERROR([sqlite3 3.28.0 or higher is required for profanity profanity])]) [AC_MSG_ERROR([sqlite3 3.27.0 or higher is required for profanity profanity])])
AS_IF([test "x$enable_icons_and_clipboard" != xno], AS_IF([test "x$enable_icons_and_clipboard" != xno],
[PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10], [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.24.10],

10
src/database.c
View File

@ -289,9 +289,15 @@ _add_to_db(ProfMessage *message, char *type, const Jid * const from_jid, const J
gchar *date_fmt; gchar *date_fmt;
if (message->timestamp) { 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 { } 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); const char *enc = _get_message_enc_str(message->enc);