Notification time stamped 2021-04-30 17:57:28 UTC
From 88c5fbdd11ab370ac3536872f60536d89ab730aa Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad(a)redhat.com>
Date: Apr 30 2021 17:57:21 +0000
Subject: New version
Resolves: rhbz#1945753
---
diff --git a/.gitignore b/.gitignore
index b3b07e8..e67c5ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1 @@
-pidgin-2.7.2.tar.bz2
-pidgin-2.7.3.tar.bz2
-/pidgin-2.7.4.tar.bz2
-/pidgin-2.7.5.tar.bz2
-/pidgin-2.7.7.tar.bz2
-/pidgin-2.7.9.tar.bz2
-/pidgin-2.7.10.tar.bz2
-/pidgin-2.7.11.tar.bz2
-/pidgin-2.8.0.tar.bz2
-/pidgin-2.9.0.tar.bz2
-/pidgin-2.10.0.tar.bz2
-/pidgin-2.10.1.tar.bz2
-/pidgin-2.10.2.tar.bz2
-/pidgin-2.10.4.tar.bz2
-/pidgin-2.10.5.tar.bz2
-/pidgin-2.10.6.tar.bz2
-/pidgin-2.10.7.tar.bz2
-/pidgin-2.10.9.tar.bz2
-/pidgin-2.10.10.tar.bz2
-/pidgin-2.10.11.tar.bz2
-/pidgin-2.10.12.tar.bz2
-/pidgin-2.11.0.tar.bz2
-/pidgin-2.12.0.tar.bz2
-/pidgin-2.13.0.tar.bz2
-/pidgin-2.14.1.tar.bz2
+/pidgin-*.tar.bz2
diff --git a/pidgin-2.13.0-drop-aim.patch b/pidgin-2.13.0-drop-aim.patch
deleted file mode 100644
index f5f674b..0000000
--- a/pidgin-2.13.0-drop-aim.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urNp pidgin-2.13.0.orig/libpurple/protocols/oscar/Makefile.am
pidgin-2.13.0/libpurple/protocols/oscar/Makefile.am
---- pidgin-2.13.0.orig/libpurple/protocols/oscar/Makefile.am 2019-06-07
15:38:26.610979141 +0200
-+++ pidgin-2.13.0/libpurple/protocols/oscar/Makefile.am 2019-06-07 15:40:11.377723987
+0200
-@@ -51,25 +51,21 @@ OSCARSOURCES = \
-
- AM_CFLAGS = $(st)
-
--libaim_la_LDFLAGS = -module -avoid-version
- libicq_la_LDFLAGS = -module -avoid-version
- if STATIC_OSCAR
-
- st = -DPURPLE_STATIC_PRPL
- noinst_LTLIBRARIES = liboscar.la
--liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c
-+liboscar_la_SOURCES = $(OSCARSOURCES) libicq.c
- liboscar_la_CFLAGS = $(AM_CFLAGS)
-
- else
-
- st =
--pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la
-+pkg_LTLIBRARIES = liboscar.la libicq.la
- liboscar_la_SOURCES = $(OSCARSOURCES)
- liboscar_la_LIBADD = $(GLIB_LIBS)
-
--libaim_la_SOURCES = libaim.c
--libaim_la_LIBADD = liboscar.la
--
- libicq_la_SOURCES = libicq.c
- libicq_la_LIBADD = liboscar.la
-
diff --git a/pidgin-2.13.0-fix-msn-ft-crashes.patch
b/pidgin-2.13.0-fix-msn-ft-crashes.patch
deleted file mode 100644
index 8bfec09..0000000
--- a/pidgin-2.13.0-fix-msn-ft-crashes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libpurple/ft.c b/libpurple/ft.c
-index c15efcf..a9cadaf 100644
---- a/libpurple/ft.c
-+++ b/libpurple/ft.c
-@@ -1106,11 +1106,9 @@ purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize
size)
- r = write(xfer->fd, buffer, s);
- if (r < 0 && errno == EAGAIN)
- r = 0;
-+ if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
-+ purple_xfer_set_completed(xfer, TRUE);
- }
-- if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >=
purple_xfer_get_size(xfer) &&
-- !purple_xfer_is_completed(xfer))
-- purple_xfer_set_completed(xfer, TRUE);
--
-
- return r;
- }
diff --git a/pidgin-2.14.1-autoconf-2.71-build-fix.patch
b/pidgin-2.14.1-autoconf-2.71-build-fix.patch
deleted file mode 100644
index 718c047..0000000
--- a/pidgin-2.14.1-autoconf-2.71-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index e27c4d7..8adf0cb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,7 +257,7 @@ dnl
#######################################################################
- AC_ARG_ENABLE(nls, AC_HELP_STRING([--disable-nls], [disable installation of translation
files]), enable_i18n="$enableval", enable_i18n=yes)
-
- if test x$enable_i18n = xyes; then
-- AC_PROG_INTLTOOL
-+AC_PROG_INTLTOOL
- GETTEXT_PACKAGE=pidgin
- AC_SUBST(GETTEXT_PACKAGE)
-
diff --git a/pidgin-2.14.1-do-not-disable-wall.patch
b/pidgin-2.14.1-do-not-disable-wall.patch
deleted file mode 100644
index 9d1aa51..0000000
--- a/pidgin-2.14.1-do-not-disable-wall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 24678ee..e27c4d7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1278,11 +1278,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify],
[compile without FOR
-
- DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED
-DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
- if test "x$GCC" = "xyes"; then
-- dnl We enable -Wall later.
-- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts
the -Wno... flags.
-- dnl This leads to warnings we don't want.
-- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
--
- dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
- dnl
- dnl Future Possibilities
diff --git a/pidgin-2.14.1-valgrind.patch b/pidgin-2.14.1-valgrind.patch
deleted file mode 100644
index 31572f1..0000000
--- a/pidgin-2.14.1-valgrind.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
-index e9928cc..57244e2 100644
---- a/libpurple/Makefile.am
-+++ b/libpurple/Makefile.am
-@@ -283,8 +283,7 @@ libpurple_la_SOURCES = \
-
- noinst_HEADERS= \
- internal.h \
-- media/backend-fs2.h \
-- valgrind.h
-+ media/backend-fs2.h
-
- libpurpleincludedir=$(includedir)/libpurple
- libpurpleinclude_HEADERS = \
diff --git a/pidgin-2.14.4-do-not-disable-wall.patch
b/pidgin-2.14.4-do-not-disable-wall.patch
new file mode 100644
index 0000000..4571a72
--- /dev/null
+++ b/pidgin-2.14.4-do-not-disable-wall.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+index 1fe32c3..470453c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1258,11 +1258,6 @@ AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify],
[compile without FOR
+
+ DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED
-DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
+ if test "x$GCC" = "xyes"; then
+- dnl We enable -Wall later.
+- dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts
the -Wno... flags.
+- dnl This leads to warnings we don't want.
+- CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
+-
+ dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
+ dnl
+ dnl Future Possibilities
diff --git a/pidgin-2.14.4-fix-msn-ft-crashes.patch
b/pidgin-2.14.4-fix-msn-ft-crashes.patch
new file mode 100644
index 0000000..703c9f7
--- /dev/null
+++ b/pidgin-2.14.4-fix-msn-ft-crashes.patch
@@ -0,0 +1,18 @@
+diff --git a/libpurple/ft.c b/libpurple/ft.c
+index 89c9377..a672fc6 100644
+--- a/libpurple/ft.c
++++ b/libpurple/ft.c
+@@ -1107,11 +1107,9 @@ purple_xfer_write(PurpleXfer *xfer, const guchar *buffer, gsize
size)
+ r = write(xfer->fd, buffer, s);
+ if (r < 0 && errno == EAGAIN)
+ r = 0;
++ if ((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer))
++ purple_xfer_set_completed(xfer, TRUE);
+ }
+- if (r >= 0 && (purple_xfer_get_bytes_sent(xfer)+r) >=
purple_xfer_get_size(xfer) &&
+- !purple_xfer_is_completed(xfer))
+- purple_xfer_set_completed(xfer, TRUE);
+-
+
+ return r;
+ }
diff --git a/pidgin-2.14.4-valgrind.patch b/pidgin-2.14.4-valgrind.patch
new file mode 100644
index 0000000..ea5e01b
--- /dev/null
+++ b/pidgin-2.14.4-valgrind.patch
@@ -0,0 +1,14 @@
+diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
+index 2739cec..6f58739 100644
+--- a/libpurple/Makefile.am
++++ b/libpurple/Makefile.am
+@@ -282,8 +282,7 @@ libpurple_la_SOURCES = \
+
+ noinst_HEADERS= \
+ internal.h \
+- media/backend-fs2.h \
+- valgrind.h
++ media/backend-fs2.h
+
+ libpurpleincludedir=$(includedir)/libpurple
+ libpurpleinclude_HEADERS = \
diff --git a/pidgin.spec b/pidgin.spec
index 8d86036..1e991ab 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -124,8 +124,8 @@
%endif
Name: pidgin
-Version: 2.14.1
-Release: 5%{?dist}
+Version: 2.14.4
+Release: 1%{?dist}
License: BSD and GPLv2+ and GPLv2 and LGPLv2+ and MIT
# GPLv2+ - libpurple, finch, pidgin, most prpls
# GPLv2 - novell prpls
@@ -161,14 +161,12 @@ Source1: purple-fedora-prefs.xml
## Patches 0-99: Fedora specific or upstream wont accept
Patch0: pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
-Patch1: pidgin-2.14.1-valgrind.patch
-Patch3: pidgin-2.13.0-drop-aim.patch
+Patch1: pidgin-2.14.4-valgrind.patch
## Patches 100+: To be Included in Future Upstream
-Patch100: pidgin-2.13.0-fix-msn-ft-crashes.patch
+Patch100: pidgin-2.14.4-fix-msn-ft-crashes.patch
# upstream ticket
https://developer.pidgin.im/ticket/16593
-Patch102: pidgin-2.14.1-do-not-disable-wall.patch
-Patch103: pidgin-2.14.1-autoconf-2.71-build-fix.patch
+Patch102: pidgin-2.14.4-do-not-disable-wall.patch
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -465,7 +463,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
%patch0 -p1 -b .aplay
%endif
%patch1 -p1 -b .valgrind
-%patch3 -p1 -b .drop-aim
## Patches 100+: To be Included in Future Upstream
@@ -473,8 +470,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
%patch100 -p1 -b .ftcrash
#
https://developer.pidgin.im/ticket/16593
%patch102 -p1 -b .do-not-disable-wall
-#
https://issues.imfreedom.org/issue/PIDGIN-17509
-%patch103 -p1 -b .autoconf-2.71-build-fix
# Our preferences
cp %{SOURCE1} prefs.xml
@@ -636,7 +631,7 @@ find %{buildroot}/%{_libdir}/purple-2 -name \*.so\* -printf
'%f|' | sed -e 's/|$
%{_datadir}/applications/pidgin.desktop
%{_datadir}/pixmaps/pidgin/
%{_datadir}/icons/hicolor/*/apps/pidgin.*
-%{_datadir}/appdata/pidgin.appdata.xml
+%{_datadir}/metainfo/pidgin.appdata.xml
%if %{split_evolution}
%files evolution
@@ -709,6 +704,10 @@ find %{buildroot}/%{_libdir}/purple-2 -name \*.so\* -printf
'%f|' | sed -e 's/|$
%endif
%changelog
+* Fri Apr 30 2021 Jaroslav Škarvada <jskarvad(a)redhat.com> - 2.14.4-1
+- New version
+ Resolves: rhbz#1945753
+
* Tue Mar 30 2021 Jaroslav Škarvada <jskarvad(a)redhat.com> - 2.14.1-5
- Switched to upstream patch workarounding autoconf-2.71 bug
Related: rhbz#1943128
diff --git a/sources b/sources
index 3c46f37..e3cde06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pidgin-2.14.1.tar.bz2) =
6ce5c58f32fa680d7f67e37a42b0f77c8253018cee21df2895d52166d9eb6ecaf0458b1610adbd46f337d00e75933db7578c2f9808654bd22838ba5db0a13030
+SHA512 (pidgin-2.14.4.tar.bz2) =
78550b7c4678242861bc0b0a3c32ab03c9fd6e4f509a9b83f872f2e201fe69617c8407d4cc90205e74598f1b8fdddfeddc8f59b47179524a7af7a241eaf1fa0b
https://src.fedoraproject.org/rpms/pidgin/c/88c5fbdd11ab370ac3536872f6053...