subject:"\[arch\-commits\] Commit in pidgin\/trunk \(3 files\)"

[arch-commits] Commit in pidgin/trunk (3 files)

2019-11-04 Thread Antonio Rojas via arch-commits

Date: Monday, November 4, 2019 @ 21:21:01
  Author: arojas
Revision: 366765

Add missing dbus-glib dependency, add fixes for python 3.8 and networkmanager 
1.0

Added:
  pidgin/trunk/pidgin-nm-1.0.patch
  pidgin/trunk/pidgin-python-3.8.patch
Modified:
  pidgin/trunk/PKGBUILD

-+
 PKGBUILD|   12 +++---
 pidgin-nm-1.0.patch |   52 ++
 pidgin-python-3.8.patch |   13 +++
 3 files changed, 74 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-04 20:48:48 UTC (rev 366764)
+++ PKGBUILD2019-11-04 21:21:01 UTC (rev 366765)
@@ -12,12 +12,14 @@
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
  'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream' 'tk'
- 'libnsl' 'avahi' 'ca-certificates' 'intltool' 'networkmanager')
+ 'libnsl' 'avahi' 'ca-certificates' 'intltool' 'networkmanager' 
'dbus-glib')
 
source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
-purple-remote-python3.patch)
+purple-remote-python3.patch pidgin-python-3.8.patch 
pidgin-nm-1.0.patch)
 sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
 'SKIP'
-'4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1')
+'4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1'
+'afc824771b7409859f06b18f88ed9db97e90e3a5b10e5bab60f880c19f058c4f'
+'ca00ab0f502690f7a1551020dfc9a0119edf1eabaae9127658313d6635acda33')
 validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich 
(grim) 
 
 prepare() {
@@ -25,6 +27,10 @@
 
   # 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
 }
 
 build() {

Added: pidgin-nm-1.0.patch
===
--- pidgin-nm-1.0.patch (rev 0)
+++ pidgin-nm-1.0.patch 2019-11-04 21:21:01 UTC (rev 366765)
@@ -0,0 +1,52 @@
+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;

Added: pidgin-python-3.8.patch
===
--- pidgin-python-3.8.patch (rev 0)
+++ pidgin-python-3.8.patch 2019-11-04 21:21:01 UTC (rev 366765)
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d916891..d8c39a0 100644
+---

[arch-commits] Commit in pidgin/trunk (3 files)

2016-06-24 Thread Evangelos Foutras

Date: Friday, June 24, 2016 @ 16:51:56
  Author: foutrelis
Revision: 270596

upgpkg: pidgin 2.11.0-1

New upstream release.

Added:
  pidgin/trunk/pidgin-py3-fixes.patch
(from rev 270595, pidgin/trunk/pidgin-2.10.12-py3-fixes.patch)
Modified:
  pidgin/trunk/PKGBUILD
Deleted:
  pidgin/trunk/pidgin-2.10.12-py3-fixes.patch

+
 PKGBUILD   |   10 ++--
 pidgin-2.10.12-py3-fixes.patch |   81 ---
 pidgin-py3-fixes.patch |   81 +++
 3 files changed, 86 insertions(+), 86 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-24 16:33:15 UTC (rev 270595)
+++ PKGBUILD2016-06-24 16:51:56 UTC (rev 270596)
@@ -6,8 +6,8 @@
 # Contributor: Lucien Immink 
 
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.12
-pkgrel=4
+pkgver=2.11.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pidgin.im/;
 license=('GPL')
@@ -15,8 +15,8 @@
  'libidn' 'libgadu' 'python' 'hicolor-icon-theme' 'farstream'
  'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager')
 
source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc}
-pidgin-2.10.12-py3-fixes.patch)
-sha256sums=('2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd'
+pidgin-py3-fixes.patch)
+sha256sums=('f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b'
 'SKIP'
 'e38bd61e0dcfcc2e5761078ea709b92c5bf8d025d5eb1288aa8a550715babb7e')
 validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032')
@@ -23,7 +23,7 @@
 
 prepare() {
   cd $pkgbase-$pkgver
-  patch -Np1 -i ../pidgin-2.10.12-py3-fixes.patch
+  patch -Np1 -i ../pidgin-py3-fixes.patch
 }
 
 build() {

Deleted: pidgin-2.10.12-py3-fixes.patch
===
--- pidgin-2.10.12-py3-fixes.patch  2016-06-24 16:33:15 UTC (rev 270595)
+++ pidgin-2.10.12-py3-fixes.patch  2016-06-24 16:51:56 UTC (rev 270596)
@@ -1,81 +0,0 @@
-diff -uprb pidgin-2.10.12.orig/libpurple/purple-remote 
pidgin-2.10.12/libpurple/purple-remote
 pidgin-2.10.12.orig/libpurple/purple-remote2016-01-01 
01:19:41.0 +0200
-+++ pidgin-2.10.12/libpurple/purple-remote 2016-01-02 06:23:14.082831498 
+0200
-@@ -3,13 +3,20 @@
- import codecs
- import dbus
- import re
--import urllib
- import sys
-+try:
-+from urllib.parse import unquote
-+except ImportError:
-+from urllib import unquote
- 
- import xml.dom.minidom 
- 
--sys.stdin = codecs.getwriter('utf-8')(sys.stdin);
--sys.stdout = codecs.getwriter('utf-8')(sys.stdout);
-+if sys.version_info[0] >= 3:
-+sys.stdin = codecs.getwriter('utf-8')(sys.stdin.buffer)
-+sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer)
-+else:
-+sys.stdin = codecs.getwriter('utf-8')(sys.stdin)
-+sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
- 
- xml.dom.minidom.Element.all   = xml.dom.minidom.Element.getElementsByTagName
- 
-@@ -41,7 +48,7 @@ class CheckedAttribute:
- return result
- 
- def show_help(requested=False):
--print """This program uses D-Bus to communicate with purple.
-+print("""This program uses D-Bus to communicate with purple.
- 
- Usage:
- 
-@@ -72,7 +79,7 @@ Examples of commands:
- 
- PurpleAccountsFindConnected?name==prpl-jabber
- PurpleAccountsFindConnected(,prpl-jabber)
--""" % sys.argv[0]
-+""" % sys.argv[0])
- if (requested):
- sys.exit(0)
- else:
-@@ -120,7 +127,7 @@ def execute(uri):
- if paramstring is not None:
- for param in paramstring.split("&"):
- key, value = extendlist(param.split("=",1), 2, "")
--params[key] = urllib.unquote(value)
-+params[key] = unquote(value)
- 
- accountname = params.get("account", "")
- 
-@@ -233,12 +240,11 @@ if len(sys.argv) == 1:
- elif (sys.argv[1] == "--help" or sys.argv[1] == "-h"):
- show_help(True)
- elif (obj == None):
--print "No existing libpurple instance detected."
-+print("No existing libpurple instance detected.")
- sys.exit(1);
- 
- for arg in sys.argv[1:]:
- output = execute(arg)
- 
- if (output != None):
--print output
--
-+print(output)
-diff -uprb pidgin-2.10.12.orig/libpurple/purple-url-handler 
pidgin-2.10.12/libpurple/purple-url-handler
 pidgin-2.10.12.orig/libpurple/purple-url-handler   2016-01-01 
01:19:41.0 +0200
-+++ pidgin-2.10.12/libpurple/purple-url-handler2016-01-02 
05:39:43.084532314 +0200
-@@ -249,7 +249,7 @@ def msnim(uri):
- 
- def myim(uri):
- protocol = "prpl-myspace"
--print "TODO: send uri: ", uri
-+print("TODO: send uri: %s" % uri)
- assert False, "Not implemented"
- 
- def sip(uri):

Copied: pidgin/trunk/pidgin-py3-fixes.patch (from rev 270595,

[arch-commits] Commit in pidgin/trunk (3 files)

2012-03-27 Thread Evangelos Foutras

Date: Tuesday, March 27, 2012 @ 10:35:13
  Author: foutrelis
Revision: 154398

upgpkg: pidgin 2.10.3-2

Rebuild with farstream patch for [gnome-unstable].

Added:
  pidgin/trunk/port-to-farstream-v3.patch
Modified:
  pidgin/trunk/PKGBUILD
Deleted:
  pidgin/trunk/port-to-farstream-v2.patch

+
 PKGBUILD   |   14 -
 port-to-farstream-v2.patch |  447 ---
 port-to-farstream-v3.patch |  447 +++
 3 files changed, 454 insertions(+), 454 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-27 14:31:30 UTC (rev 154397)
+++ PKGBUILD2012-03-27 14:35:13 UTC (rev 154398)
@@ -7,29 +7,29 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://pidgin.im/;
 license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
  'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10'
- 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool'
+ 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool'
  'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-port-to-farstream-v2.patch)
+port-to-farstream-v3.patch)
 sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b'
-'03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482')
+'4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
   # Apply patch for farsight - farstream transition
   # http://developer.pidgin.im/ticket/14936
-  #patch -Np1 -i $srcdir/port-to-farstream-v2.patch
+  patch -Np1 -i $srcdir/port-to-farstream-v3.patch
 
   # The farstream patch changes configure.ac
-  #autoreconf -vi
+  autoreconf -vi
 
   # Use Python 2
   sed -i 's/env python$/2/' */plugins/*.py \
@@ -77,7 +77,7 @@
 
 package_libpurple(){
   pkgdesc=IM library extracted from Pidgin
-  depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+  depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss')
   optdepends=('avahi: Bonjour protocol support'
   'dbus-python: for purple-remote and purple-url-handler')
 

Deleted: port-to-farstream-v2.patch
===
--- port-to-farstream-v2.patch  2012-03-27 14:31:30 UTC (rev 154397)
+++ port-to-farstream-v2.patch  2012-03-27 14:35:13 UTC (rev 154398)
@@ -1,447 +0,0 @@
-diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
 pidgin-2.10.1.orig/configure.ac2011-12-06 10:44:32.0 +0200
-+++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.0 +0200
-@@ -780,18 +780,18 @@ else
- fi
- 
- dnl ###
--dnl # Check for Farsight
-+dnl # Check for Farstream
- dnl ###
--AC_ARG_ENABLE(farsight,
--  [AC_HELP_STRING([--disable-farsight], [compile without farsight 
support])],
--  enable_farsight=$enableval, enable_farsight=yes)
--if test x$enable_farsight != xno; then
--  PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 = 0.0.9], [
--  AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
--  AC_SUBST(FARSIGHT_CFLAGS)
--  AC_SUBST(FARSIGHT_LIBS)
-+AC_ARG_ENABLE(farstream,
-+  [AC_HELP_STRING([--disable-farstream], [compile without farstream 
support])],
-+  enable_farstream=$enableval, enable_farstream=yes)
-+if test x$enable_farstream != xno; then
-+  PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
-+  AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
-+  AC_SUBST(FARSTREAM_CFLAGS)
-+  AC_SUBST(FARSTREAM_LIBS)
-   ], [
--  enable_farsight=no
-+  enable_farstream=no
-   ])
- fi
- 
-@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
-   [AC_HELP_STRING([--disable-vv], [compile without voice and video 
support])],
-   enable_vv=$enableval, enable_vv=yes)
- if test x$enable_vv != xno; then
--  if test x$enable_gstreamer != xno -a x$enable_gstinterfaces != 
xno -a x$enable_farsight != xno; then
-+  if test x$enable_gstreamer != xno -a x$enable_gstinterfaces != 
xno -a x$enable_farstream != xno; then
-   AC_DEFINE(USE_VV, 1, [Use voice and video])
-   else
-   enable_vv=no
-   if test x$force_deps = xyes; then
-   AC_MSG_ERROR([
- Dependencies for voice/video were not met.
--Install the necessary gstreamer and farsight packages first.
-+Install the necessary gstreamer and farstream packages first.
- Or use --disable-vv if you do not need voice/video support.
-   ])
-   fi
-   fi

[arch-commits] Commit in pidgin/trunk (3 files)

2010-07-21 Thread Ionut Biru

Date: Wednesday, July 21, 2010 @ 17:41:00
  Author: ibiru
Revision: 85889

upgpkg: pidgin 2.7.2-1 update to 2.7.2

Modified:
  pidgin/trunk/PKGBUILD
Deleted:
  pidgin/trunk/icq_fix.patch
  pidgin/trunk/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff

+
 PKGBUILD   |   14 --
 icq_fix.patch  |   19 ---
 oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff |   84 ---
 3 files changed, 4 insertions(+), 113 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-21 14:31:18 UTC (rev 85888)
+++ PKGBUILD2010-07-21 21:41:00 UTC (rev 85889)
@@ -6,8 +6,8 @@
 
 pkgbase=('pidgin')
 pkgname=('libpurple' 'pidgin' 'finch')
-pkgver=2.7.1
-pkgrel=2
+pkgver=2.7.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://pidgin.im/;
 license=('GPL')
@@ -15,18 +15,12 @@
  'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10-base' 
'farsight2' 'avahi'
  'tk' 'ca-certificates' 'intltool' 'networkmanager')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
-icq_fix.patch oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff)
-md5sums=('0dd2adb9e8214ac960f956823c84e7e2'
- '2ce887cf36e698282b9241832850defd'
- '29cb9bb0e74db8bf6c18c048e935a60a')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('c23d85bb6a197dd841d1b5585148327d')
 
 build() {
 cd ${srcdir}/${pkgbase}-${pkgver}
 
-patch -Np0 -i ${srcdir}/icq_fix.patch
-patch -Np0 -i 
${srcdir}/oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
-
 ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --disable-schemas-install \

Deleted: icq_fix.patch
===
--- icq_fix.patch   2010-07-21 14:31:18 UTC (rev 85888)
+++ icq_fix.patch   2010-07-21 21:41:00 UTC (rev 85889)
@@ -1,19 +0,0 @@
-#
-#
-# patch libpurple/protocols/oscar/oscar.c
-#  from [b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702]
-#to [6b8b45623896204448ac4b212a0c631655822ad1]
-#
-
 libpurple/protocols/oscar/oscar.c  b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702
-+++ libpurple/protocols/oscar/oscar.c  6b8b45623896204448ac4b212a0c631655822ad1
-@@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, cons
-   tmp2 = purple_markup_strip_html(tmp1);
-   is_html = FALSE;
-   } else {
--  tmp2 = g_strdup(tmp1);
-+  /* ICQ 6 wants its HTML wrapped in these tags. Oblige 
it. */
-+  tmp2 = g_strdup_printf(HTMLBODY%s/BODY/HTML, 
tmp1);
-   is_html = TRUE;
-   }
-   g_free(tmp1);

Deleted: oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff
===
--- oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff  2010-07-21 
14:31:18 UTC (rev 85888)
+++ oscar_xstatus_remote_crash_fix_2_for_pidgin_2.7.1.diff  2010-07-21 
21:41:00 UTC (rev 85889)
@@ -1,84 +0,0 @@
-#
-# old_revision [915eb72db575b96b63275f0f1d857378adbf3420]
-#
-# patch libpurple/protocols/oscar/family_icbm.c
-#  from [52688bc864209fd4471193bfce81c4547ba8ae51]
-#to [2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb]
-#
-
 libpurple/protocols/oscar/family_icbm.c
52688bc864209fd4471193bfce81c4547ba8ae51
-+++ libpurple/protocols/oscar/family_icbm.c
2a3a9ef76a6fd25b6e58b0e527df49bf8f83f2fb
-@@ -2687,7 +2687,6 @@ static int clientautoresp(OscarData *od,
-   int hdrlen;
-   int curpos;
-   int num1,num2;
--  char *desc, *title, *temp;
-   PurpleAccount *account;
-   PurpleBuddy *buddy;
-   PurplePresence *presence;
-@@ -2714,31 +2713,41 @@ static int clientautoresp(OscarData *od,
-   xml = byte_stream_getstr(bs, bs-len - curpos);
-   purple_debug_misc(oscar, X-Status: Received 
XML reply\n);
-   if(xml) {
--  /* purple_debug_misc(oscar, X-Status: XML 
reply: %s\n, (const char*) xml); */
--  if ((desc=strstr(xml,lt;descgt;)) 
!= NULL) {
--  
temp=strstr(xml,lt;/descgt;);
--  temp[0]=0;
--  desc=desc+12;
--  }
--  if ((title=strstr(xml,lt;titlegt;)) 
!= NULL) {
--  
temp=strstr(xml,lt;/titlegt;);
--

[arch-commits] Commit in pidgin/trunk (3 files)

[arch-commits] Commit in pidgin/trunk (3 files)

[arch-commits] Commit in pidgin/trunk (3 files)

[arch-commits] Commit in pidgin/trunk (3 files)

4 matches

Site Navigation

Mail list logo

Footer information