diff --git a/.gitignore b/.gitignore index 0149e6c..dd3f3b8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ pidgin-sipe-1.10.1.tar.bz2 /pidgin-sipe-1.23.2.tar.bz2 /pidgin-sipe-1.23.3.tar.bz2 /pidgin-sipe-1.24.0.tar.bz2 +/pidgin-sipe-1.25.0.tar.bz2 diff --git a/pidgin-sipe-1.24.0-ftbfs-fix-gettext-and-glib2.patch b/pidgin-sipe-1.24.0-ftbfs-fix-gettext-and-glib2.patch deleted file mode 100644 index 9809fe9..0000000 --- a/pidgin-sipe-1.24.0-ftbfs-fix-gettext-and-glib2.patch +++ /dev/null @@ -1,400 +0,0 @@ -From d005dafc695ec0e9c7a49ffe438f6a021f973649 Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Wed, 28 Aug 2019 19:53:09 +0300 -Subject: [PATCH 1/7] utils: use GDateTime when glib-2.0 >= 2.56.0 - -GTimeVal and related APIs will be marked as deprecated in 2.62.0. -All APIs we need to implement our functionality using GDateTime are -available since 2.56.0. ---- - src/core/sipe-utils.c | 75 ++++++++++++++++++++++++++++++++++++------- - 1 file changed, 63 insertions(+), 12 deletions(-) - -diff --git a/src/core/sipe-utils.c b/src/core/sipe-utils.c -index 1ac21d65..983b4352 100644 ---- a/src/core/sipe-utils.c -+++ b/src/core/sipe-utils.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2009-2018 SIPE Project -+ * Copyright (C) 2009-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -290,12 +290,26 @@ void sipe_utils_message_debug(struct sipe_transport_connection *conn, - - if (sipe_backend_debug_enabled()) { - /* unsafe debugging enabled - include message contents */ -- GTimeVal currtime; - gchar *time_str; -- gchar *tmp; -- -+ gchar *tmp = NULL; -+ -+#if GLIB_CHECK_VERSION(2,56,0) -+ // resolution is microseconds -+ GDateTime *datetime = g_date_time_new_now_utc(); -+ gint msecs = 0; -+ if (datetime) { -+ tmp = g_date_time_format(datetime, "%FT%T"); -+ msecs = g_date_time_get_microsecond(datetime); -+ g_date_time_unref(datetime); -+ } -+ time_str = g_strdup_printf("%s.%06dZ", tmp ? tmp : "", msecs); -+ g_free(tmp); -+#else -+ GTimeVal currtime; - g_get_current_time(&currtime); - time_str = g_time_val_to_iso8601(&currtime); -+#endif -+ - g_string_append_printf(str, "\nMESSAGE START %s %s(%p) - %s\n", marker, type, conn, time_str); - g_string_append(str, tmp = sipe_utils_str_replace(header, "\r\n", "\n")); - g_free(tmp); -@@ -332,8 +346,12 @@ sipe_strcase_equal(const gchar *left, const gchar *right) - time_t - sipe_utils_str_to_time(const gchar *timestamp) - { -+#if GLIB_CHECK_VERSION(2,56,0) -+ GDateTime *datetime = NULL; -+#else - GTimeVal time; - gboolean success = FALSE; -+#endif - - /* g_time_val_from_iso8601() warns about NULL pointer */ - if (timestamp) { -@@ -345,27 +363,60 @@ sipe_utils_str_to_time(const gchar *timestamp) - if (((len = strlen(timestamp)) > 0) && - isdigit(timestamp[len-1])) { - gchar *tmp = g_strdup_printf("%sZ", timestamp); -- success = g_time_val_from_iso8601(tmp, &time); -+#if GLIB_CHECK_VERSION(2,56,0) -+ datetime = g_date_time_new_from_iso8601(tmp, NULL); -+#else -+ success = g_time_val_from_iso8601(tmp, &time); -+#endif - g_free(tmp); - } else { -- success = g_time_val_from_iso8601(timestamp, &time); -+#if GLIB_CHECK_VERSION(2,56,0) -+ datetime = g_date_time_new_from_iso8601(timestamp, NULL); -+#else -+ success = g_time_val_from_iso8601(timestamp, &time); -+#endif - } - } - -- if (!success) { -- SIPE_DEBUG_ERROR("sipe_utils_str_to_time: failed to parse ISO8601 string '%s'", -- timestamp ? timestamp : ""); -- time.tv_sec = 0; -+#if GLIB_CHECK_VERSION(2,56,0) -+ if (datetime) { -+ time_t result = g_date_time_to_unix(datetime); -+ g_date_time_unref(datetime); -+ return(result); - } -+#else -+ if (success) -+ return(time.tv_sec); -+#endif - -- return time.tv_sec; -+ SIPE_DEBUG_ERROR("sipe_utils_str_to_time: failed to parse ISO8601 string '%s'", -+ timestamp ? timestamp : ""); -+ return(0); - } - - gchar * - sipe_utils_time_to_str(time_t timestamp) - { -+ gchar *result = NULL; -+ -+#if GLIB_CHECK_VERSION(2,56,0) -+ GDateTime *datetime = g_date_time_new_from_unix_utc(timestamp); -+ if (datetime) { -+ // resolution is seconds -+ result = g_date_time_format(datetime, "%FT%TZ"); -+ g_date_time_unref(datetime); -+ } -+#else - GTimeVal time = { timestamp, 0 }; -- return g_time_val_to_iso8601(&time); -+ result = g_time_val_to_iso8601(&time); -+#endif -+ -+ if (result) -+ return(result); -+ -+ SIPE_DEBUG_ERROR("sipe_utils_time_to_str: failed to convert %lu to ISO8601 string", -+ timestamp); -+ return(g_strdup("")); - } - - const gchar *sipe_utils_time_to_debug_str(const struct tm *tm) --- -2.21.0 - -From 771c44c74dcfdf5ebb26ae22bbc42e3cc2dde650 Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Wed, 28 Aug 2019 23:56:10 +0300 -Subject: [PATCH 3/7] configure: set min version for glib-2.0 >= 2.62.0 - -- libpurple API uses GParameter, which will be deprecated in 2.62.0. -- telepathy-glib API uses GTimeVal, which will be deprecated in 2.62.0. -- libpurple 2.x API uses G_CONST_RETURN, which has been deprecated since - 2.30.0, but only in 2.62.0 a versioned deprecation has been added. - -The configure code now sets GLIB_VERSION_MIN_REQUIRED to the lowest of -2_60, 2_30 or 2_28 depending on what backends are configured in the -build. ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0d93e538..1f41793a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -567,12 +567,24 @@ AM_CONDITIONAL(SIPE_HAVE_APPSHARE_SERVER, [test "x$ac_have_appshare_server" = xy - AS_IF([test "x$ac_have_appshare_server" == xyes], - [AC_DEFINE(HAVE_APPSHARE_SERVER, 1, [Define if appshare server is enabled.])]) - -+dnl libpurple API relies on GParameter (deprecated in glib-2.0 >= 2.62.0) -+AS_IF([test "x$enable_purple" != xno], -+ [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_60, -+ [We need GParameter for which no replacement is available]) -+ ]) - dnl telepathy code parts rely on interfaces that require GValueArray. This - dnl type has been declared "deprectated" in glib-2.0 >= 2.32.0, but there - dnl is no backward compatible replacement implementation possible -+dnl telepathy-glib API relies on GTimeVal (deprecated in glib-2.0 >= 2.62.0) - AS_IF([test "x$enable_telepathy" != xno], - [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, -- [We need GValueArray for which no replacement is available])]) -+ [We need GValueArray for which no replacement is available]) -+ ]) -+dnl libpurple 2.x API relies on G_CONST_RETURN (deprecated in glib-2.0 >= 2.30.0) -+AS_IF([test "x$purple_pkgconfig" == xpurple], -+ [AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_28, -+ [libpurple 2.x API uses G_CONST_RETURN]) -+ ]) - - dnl i18n - AC_MSG_CHECKING([locale_CPPFLAGS]) --- -2.21.0 - -From 62abeda9cfc5c0f84b820aedf005a4fdb80cb6e0 Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Wed, 28 Aug 2019 23:59:17 +0300 -Subject: [PATCH 4/7] purple: include config.h in more modules - -Otherwise GLIB_VERSION_MIN_REQUIRED is not defined, which causes build -failures due to new deprecations in glib-2.0 >= 2.62.0. ---- - src/purple/purple-connection.c | 6 +++++- - src/purple/purple-dnsquery.c | 6 +++++- - src/purple/purple-markup.c | 9 +++++++-- - src/purple/purple-notify.c | 6 +++++- - src/purple/purple-setting.c | 6 +++++- - src/purple/purple-status.c | 6 +++++- - 6 files changed, 32 insertions(+), 7 deletions(-) - -diff --git a/src/purple/purple-connection.c b/src/purple/purple-connection.c -index 299125fb..32d6074a 100644 ---- a/src/purple/purple-connection.c -+++ b/src/purple/purple-connection.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2010-2013 SIPE Project -+ * Copyright (C) 2010-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,6 +20,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "glib.h" - - #include "connection.h" -diff --git a/src/purple/purple-dnsquery.c b/src/purple/purple-dnsquery.c -index 9bc97566..eab40e41 100644 ---- a/src/purple/purple-dnsquery.c -+++ b/src/purple/purple-dnsquery.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2010-2018 SIPE Project -+ * Copyright (C) 2010-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,6 +20,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - - #include "version.h" -diff --git a/src/purple/purple-markup.c b/src/purple/purple-markup.c -index 2e594397..8ad62ac8 100644 ---- a/src/purple/purple-markup.c -+++ b/src/purple/purple-markup.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2010 SIPE Project -+ * Copyright (C) 2010-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,7 +20,12 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include "glib.h" -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+ - #include "util.h" - - #include "sipe-backend.h" -diff --git a/src/purple/purple-notify.c b/src/purple/purple-notify.c -index 4ca8f241..dad49ab8 100644 ---- a/src/purple/purple-notify.c -+++ b/src/purple/purple-notify.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2010-2013 SIPE Project -+ * Copyright (C) 2010-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,6 +20,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - - #include -diff --git a/src/purple/purple-setting.c b/src/purple/purple-setting.c -index e8e9a903..11fe07ce 100644 ---- a/src/purple/purple-setting.c -+++ b/src/purple/purple-setting.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2010-2016 SIPE Project -+ * Copyright (C) 2010-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,6 +20,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - - #include "account.h" -diff --git a/src/purple/purple-status.c b/src/purple/purple-status.c -index 84c3095f..eece1021 100644 ---- a/src/purple/purple-status.c -+++ b/src/purple/purple-status.c -@@ -3,7 +3,7 @@ - * - * pidgin-sipe - * -- * Copyright (C) 2011-2017 SIPE Project -+ * Copyright (C) 2011-2019 SIPE Project - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -20,6 +20,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include - - #include "account.h" --- -2.21.0 - -From 5e38fa0ce8ea8201f09ac699217615fe6a1f2b7c Mon Sep 17 00:00:00 2001 -From: Stefan Becker -Date: Thu, 29 Aug 2019 09:40:47 +0300 -Subject: [PATCH 7/7] configure: fix build against latest gettext - -- configure.ac: replace old macros with AM_GNU_GETTEXT -- ABOUT-NLS: empty file, but it must exist or auto* fails -- config.rpath: empty file, but it must exist or auto* fails ---- - .gitignore | 1 + - ABOUT-NLS | 0 - config.rpath | 0 - configure.ac | 5 +---- - 4 files changed, 2 insertions(+), 4 deletions(-) - create mode 100644 ABOUT-NLS - create mode 100644 config.rpath - -diff --git a/ABOUT-NLS b/ABOUT-NLS -new file mode 100644 -index 00000000..e69de29b -diff --git a/config.rpath b/config.rpath -new file mode 100644 -index 00000000..e69de29b -diff --git a/configure.ac b/configure.ac -index 1f41793a..8148ed90 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -591,12 +591,9 @@ AC_MSG_CHECKING([locale_CPPFLAGS]) - LOCALE_CPPFLAGS='-DLOCALEDIR=\"$(datadir)/locale\"' - AC_SUBST([LOCALE_CPPFLAGS]) - AC_MSG_RESULT([$LOCALE_CPPFLAGS]) --AM_GLIB_GNU_GETTEXT -+AM_GNU_GETTEXT([external]) - AC_SUBST(GETTEXT_PACKAGE, "${PACKAGE_NAME}") - --dnl codeset --AM_LANGINFO_CODESET -- - dnl substitutions and generated files - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_FILES([ --- -2.21.0 - diff --git a/pidgin-sipe.spec b/pidgin-sipe.spec index 9e69fcd..9489899 100644 --- a/pidgin-sipe.spec +++ b/pidgin-sipe.spec @@ -1,12 +1,11 @@ Name: pidgin-sipe Summary: Pidgin protocol plugin to connect to MS Office Communicator -Version: 1.24.0 -Release: 7%{?dist} +Version: 1.25.0 +Release: 1%{?dist} -License: GPLv2+ +License: GPL-2.0-or-later URL: http://sipe.sourceforge.net/ Source0: https://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-%{version}/pidgin-sipe-%{version}.tar.bz2 -Patch0: pidgin-sipe-1.24.0-ftbfs-fix-gettext-and-glib2.patch BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(farstream-0.2) @@ -24,6 +23,7 @@ BuildRequires: pkgconfig(purple) >= 2.8.0 BuildRequires: appstream BuildRequires: autoconf BuildRequires: automake +BuildRequires: flex BuildRequires: gcc BuildRequires: gettext BuildRequires: gssntlmssp-devel >= 0.5.0 @@ -52,7 +52,7 @@ This package provides the icon set for Pidgin. %package -n purple-sipe Summary: Libpurple protocol plugin to connect to MS Office Communicator -License: GPLv2+ +License: GPL-2.0-or-later Requires: gssntlmssp >= 0.5.0 @@ -72,10 +72,13 @@ This package provides the protocol plugin for libpurple clients. %prep %setup -q -%patch0 -p1 -b .ftbfs-fix-gettext-and-glib2 %build -autoreconf -f -i +# steps copied from "autogen.sh" in upstream source tree +autopoint --force +AUTOPOINT="intltoolize --copy --force --automake" \ + autoreconf --force --install + %configure \ --with-krb5 \ --enable-purple \ @@ -110,6 +113,13 @@ make %{?_smp_mflags} check %changelog +* Sat Oct 12 2019 Stefan Becker - 1.25.0-1 +- update to 1.25.0: + - provide idle start time for a buddy + - extract plain text from incoming RTF +- add BR flex +- copied latest build setup steps from upstream autogen.sh + * Thu Aug 29 2019 Stefan Becker - 1.24.0-7 - add upstream patches for glib-2.0 >= 2.62.0 and gettext >= 0.20.0 FTBFS diff --git a/sources b/sources index 41e669b..9941a0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pidgin-sipe-1.24.0.tar.bz2) = 10182b08c854f8c116a2ebb11c5cf47608fa70c159c23b1255a5e1922013541b87569c543418e1129b79f9b01a48ecb866be42691c61b575f01744598c714099 +SHA512 (pidgin-sipe-1.25.0.tar.bz2) = 37992bc133eadb05c3f187e97cd82cf8d8bf344d176a73827e78ff9521dbd66b3d0a8ff5d3b27bc1b7eb2797d3484b289390821634d11a7545c0cd2da38953b3