[packages/pidgin] - enhanced nolibs patch to remove libgadu dependency from main libpurple library - more libpurple-de
qboosh
qboosh at pld-linux.org
Sun Feb 28 19:08:01 CET 2021
commit 1a9c7e58c678d0581fb5d806a9518fd1a0430464
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 28 19:08:17 2021 +0100
- enhanced nolibs patch to remove libgadu dependency from main libpurple library
- more libpurple-devel dependencies
pidgin-nolibs.patch | 16 ++++++++++++++++
pidgin.spec | 5 +++++
2 files changed, 21 insertions(+)
---
diff --git a/pidgin.spec b/pidgin.spec
index 5e31af7..086f7ce 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -64,6 +64,7 @@ BuildRequires: gettext-tools
BuildRequires: glib2-devel >= 1:%{glib2_ver}
%{?with_gnutls:BuildRequires: gnutls-devel}
BuildRequires: gstreamer-devel >= 1.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0
BuildRequires: gtk+2-devel >= 2:%{gtk2_ver}
%{?with_gtkspell:BuildRequires: gtkspell-devel >= 1:2.0.16-2}
BuildRequires: intltool
@@ -357,6 +358,10 @@ Requires: dbus-devel >= 0.60
Requires: dbus-glib-devel >= 0.70
%endif
Requires: farstream-devel >= 0.2.7
+Requires: glib2-devel >= 1:%{glib2_ver}
+Requires: gstreamer-devel >= 1.0
+Requires: gstreamer-plugins-base-devel >= 1.0
+Requires: libidn-devel
Requires: libxml2-devel >= 1:2.6.26
Obsoletes: pidgin-devel < 2.6.6-2
diff --git a/pidgin-nolibs.patch b/pidgin-nolibs.patch
index a88e1f7..4fad0c7 100644
--- a/pidgin-nolibs.patch
+++ b/pidgin-nolibs.patch
@@ -11,3 +11,19 @@
AC_CHECK_FUNC(socket, ,
[AC_CHECK_LIB(socket, socket, , [AC_MSG_ERROR([socket not found])])])
dnl If all goes well, by this point the previous two checks will have
+@@ -1098,6 +1098,7 @@
+ PKG_CHECK_MODULES(LIBGADU, [libgadu >= 1.12.0], [have_libgadu=yes], [have_libgadu=no])
+
+ if test "x$have_libgadu" = "xyes"; then
++ save_LIBS="$LIBS"
+ AC_CHECK_LIB(gadu, gg_is_gpl_compliant, , [
+ LIBGADU_LIBS=""
+ LIBGADU_CFLAGS=""
+@@ -1112,6 +1113,7 @@
+ Falling back to using our own copy of libgadu.
+ ])
+ ])
++ LIBS="$save_LIBS"
+ fi
+
+ AM_CONDITIONAL(HAVE_LIBGADU, test "x$have_libgadu" = "xyes")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pidgin.git/commitdiff/1a9c7e58c678d0581fb5d806a9518fd1a0430464
More information about the pld-cvs-commit
mailing list