Date: Wednesday, June 10, 2020 @ 18:58:23
Author: foutrelis
Revision: 388765
upgpkg: pidgin 2.14.0-1: new upstream release
Modified:
pidgin/trunk/PKGBUILD
Deleted:
pidgin/trunk/pidgin-nm-1.0.patch
pidgin/trunk/pidgin-python-3.8.patch
pidgin/trunk/purple-remote-python3.patch
-----------------------------+
PKGBUILD | 30 +++++++-----------------
pidgin-nm-1.0.patch | 52 ------------------------------------------
pidgin-python-3.8.patch | 13 ----------
purple-remote-python3.patch | 34 ---------------------------
4 files changed, 9 insertions(+), 120 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-10 18:58:05 UTC (rev 388764)
+++ PKGBUILD 2020-06-10 18:58:23 UTC (rev 388765)
@@ -5,34 +5,22 @@
# Contributor: Lucien Immink <l.imm...@student.fnt.hvu.nl>
pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.13.0
-pkgrel=10
+pkgver=2.14.0
+pkgrel=1
arch=('x86_64')
url="https://pidgin.im/";
license=('GPL')
makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' 'tk'
- 'libnsl' 'avahi' 'ca-certificates' 'intltool' 'libnm' 'dbus-glib')
-source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
- purple-remote-python3.patch pidgin-python-3.8.patch
pidgin-nm-1.0.patch)
-sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
- 'SKIP'
- '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1'
- 'afc824771b7409859f06b18f88ed9db97e90e3a5b10e5bab60f880c19f058c4f'
- 'ca00ab0f502690f7a1551020dfc9a0119edf1eabaae9127658313d6635acda33')
-validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich
(grim) <g...@reaperworld.com>
+ 'libnsl' 'avahi' 'ca-certificates' 'intltool' 'libnm' 'dbus-glib'
+ 'libgnt')
+source=(https://downloads.sourceforge.net/project/pidgin/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc})
+sha256sums=('d06ec08b1174c1a9534664ac3e997ee9b6a67eded126dfca9041c2f7db56c82f'
+ 'SKIP')
+validpgpkeys=('40DE1DC7288FE3F50AB938C548F66AFFD9BDB729') # Gary Kramlich
<g...@reaperworld.com>
prepare() {
cd $pkgbase-$pkgver
-
- # https://developer.pidgin.im/ticket/17065
- patch -Np1 -i ../purple-remote-python3.patch
- # Fix networkmanager 1.0 detection (Fedora)
- patch -p1 -i ../pidgin-nm-1.0.patch
- # Fix build with python 3.8
- patch -p1 -i ../pidgin-python-3.8.patch
-
- autoreconf -vif
}
build() {
@@ -89,7 +77,7 @@
package_finch(){
pkgdesc="A ncurses-based messaging client"
- depends=('libpurple' 'libx11' 'python')
+ depends=('libpurple' 'libgnt' 'libx11')
cd $pkgbase-$pkgver
Deleted: pidgin-nm-1.0.patch
===================================================================
--- pidgin-nm-1.0.patch 2020-06-10 18:58:05 UTC (rev 388764)
+++ pidgin-nm-1.0.patch 2020-06-10 18:58:23 UTC (rev 388765)
@@ -1,52 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 04836fa..0a2d451 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1423,18 +1423,24 @@ fi
- dnl Check for NetworkManager.h; if we don't have it, oh well
- if test "x$enable_dbus" = "xyes" ; then
- if test "x$enable_nm" = "xyes" ; then
-- PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
-+ PKG_CHECK_MODULES(NETWORKMANAGER, [libnm], [
- AC_SUBST(NETWORKMANAGER_CFLAGS)
- AC_SUBST(NETWORKMANAGER_LIBS)
- AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have
NetworkManager.])
- ], [
-- enable_nm=no
-- if test "x$force_deps" = "xyes" ; then
-- AC_MSG_ERROR([
-+ PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >=
0.5.0], [
-+ AC_SUBST(NETWORKMANAGER_CFLAGS)
-+ AC_SUBST(NETWORKMANAGER_LIBS)
-+ AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we
have NetworkManager.])
-+ ], [
-+ enable_nm=no
-+ if test "x$force_deps" = "xyes" ; then
-+ AC_MSG_ERROR([
- NetworkManager development headers not found.
- Use --disable-nm if you do not need NetworkManager support.
- ])
-- fi])
-+ fi])
-+ ])
- fi
- else
- enable_nm=no
-diff --git a/libpurple/network.c b/libpurple/network.c
-index c43e3c7..b17e439 100644
---- a/libpurple/network.c
-+++ b/libpurple/network.c
-@@ -939,8 +939,13 @@ nm_update_state(NMState state)
- #if NM_CHECK_VERSION(0,8,992)
- case NM_STATE_DISCONNECTING:
- #endif
-+#if NM_CHECK_VERSION(1,0,0)
-+ if (prev != NM_STATE_CONNECTED_GLOBAL && prev !=
NM_STATE_UNKNOWN)
-+ break;
-+#else
- if (prev != NM_STATE_CONNECTED && prev !=
NM_STATE_UNKNOWN)
- break;
-+#endif
- if (ui_ops != NULL && ui_ops->network_disconnected !=
NULL)
- ui_ops->network_disconnected();
- break;
Deleted: pidgin-python-3.8.patch
===================================================================
--- pidgin-python-3.8.patch 2020-06-10 18:58:05 UTC (rev 388764)
+++ pidgin-python-3.8.patch 2020-06-10 18:58:23 UTC (rev 388765)
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d916891..d8c39a0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1565,7 +1565,7 @@ if test "x$enable_consoleui" = "xyes" -a ! -z "$PYTHON"
-a x"$PYTHON" != x"no" ;
- AC_MSG_CHECKING(for Python compile flags)
- if test -f ${PYTHON}-config; then
- PY_CFLAGS=`${PYTHON}-config --includes`
-- PY_LIBS=`${PYTHON}-config --libs`
-+ PY_LIBS=`${PYTHON}-config --libs --embed` ||
PY_LIBS=`${PYTHON}-config --libs`
- AC_DEFINE(USE_PYTHON, [1], [Define if python headers are
available.])
- AC_MSG_RESULT(ok)
- else
Deleted: purple-remote-python3.patch
===================================================================
--- purple-remote-python3.patch 2020-06-10 18:58:05 UTC (rev 388764)
+++ purple-remote-python3.patch 2020-06-10 18:58:23 UTC (rev 388765)
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Evangelos Foutras <evange...@foutrelis.com>
-# Date 1520583640 -7200
-# Fri Mar 09 10:20:40 2018 +0200
-# Branch release-2.x.y
-# Node ID ac2e05444162f1dc0fd60e4d5c8b4cbe2969b695
-# Parent 02df346d26d00cb9a1420c11a59fccb35d92f04e
-Adjust purple-remote to work with Python 3
-
-Fixes the following error:
-
- Traceback (most recent call last):
- File "./libpurple/purple-remote", line 241, in <module>
- print("No existing libpurple instance detected.")
- File "/usr/lib/python3.6/codecs.py", line 377, in write
- self.stream.write(data)
- TypeError: write() argument must be str, not bytes
-
-diff -r 02df346d26d0 -r ac2e05444162 libpurple/purple-remote
---- a/libpurple/purple-remote Thu Mar 08 22:51:37 2018 -0600
-+++ b/libpurple/purple-remote Fri Mar 09 10:20:40 2018 +0200
-@@ -13,8 +13,10 @@
-
- import xml.dom.minidom
-
--sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
--sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
-+if hasattr(sys.stdout, 'buffer'):
-+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer)
-+else:
-+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
-
- xml.dom.minidom.Element.all = xml.dom.minidom.Element.getElementsByTagName
-
