[arch-commits] Commit in pidgin/repos/staging-x86_64 (4 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Jun 1 13:53:29 UTC 2019


    Date: Saturday, June 1, 2019 @ 13:53:28
  Author: foutrelis
Revision: 354708

archrelease: copy trunk to staging-x86_64

Added:
  pidgin/repos/staging-x86_64/PKGBUILD
    (from rev 354707, pidgin/trunk/PKGBUILD)
  pidgin/repos/staging-x86_64/purple-remote-python3.patch
    (from rev 354707, pidgin/trunk/purple-remote-python3.patch)
Deleted:
  pidgin/repos/staging-x86_64/PKGBUILD
  pidgin/repos/staging-x86_64/purple-remote-python3.patch

-----------------------------+
 PKGBUILD                    |  198 +++++++++++++++++++++---------------------
 purple-remote-python3.patch |   68 +++++++-------
 2 files changed, 133 insertions(+), 133 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-01 13:53:23 UTC (rev 354707)
+++ PKGBUILD	2019-06-01 13:53:28 UTC (rev 354708)
@@ -1,99 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.13.0
-pkgrel=6
-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' 'networkmanager')
-source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
-        purple-remote-python3.patch)
-sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
-            'SKIP'
-            '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1')
-validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <grim at reaperworld.com>
-
-prepare() {
-  cd $pkgbase-$pkgver
-
-  # https://developer.pidgin.im/ticket/17065
-  patch -Np1 -i ../purple-remote-python3.patch
-}
-
-build() {
-  cd $pkgbase-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
-
-  cd $pkgbase-$pkgver
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('farstream' 'libsasl' 'libidn' 'libnsl' 'libgadu' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'python-dbus: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-
-  cd $pkgbase-$pkgver
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=('libpurple' 'libx11' 'python')
-
-  cd $pkgbase-$pkgver
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:

Copied: pidgin/repos/staging-x86_64/PKGBUILD (from rev 354707, pidgin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-01 13:53:28 UTC (rev 354708)
@@ -0,0 +1,99 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
+
+pkgname=('pidgin' 'libpurple' 'finch')
+pkgver=2.13.0
+pkgrel=7
+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' 'networkmanager')
+source=(https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2{,.asc}
+        purple-remote-python3.patch)
+sha256sums=('2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f'
+            'SKIP'
+            '4eb6be9310e4d5d1b906b1d579c395000ee0af6d6f5056307233512151d1f4b1')
+validpgpkeys=('364E2EB38EA6A8D61FB963AD75FE259AA8AC8032') # Gary Kramlich (grim) <grim at reaperworld.com>
+
+prepare() {
+  cd $pkgbase-$pkgver
+
+  # https://developer.pidgin.im/ticket/17065
+  patch -Np1 -i ../purple-remote-python3.patch
+}
+
+build() {
+  cd $pkgbase-$pkgver
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --disable-schemas-install \
+    --disable-meanwhile \
+    --disable-gnutls \
+    --enable-cyrus-sasl \
+    --disable-doxygen \
+    --enable-nm \
+    --with-system-ssl-certs=/etc/ssl/certs
+    make
+}
+
+package_pidgin(){
+  pkgdesc="Multi-protocol instant messaging client"
+  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+           'gst-plugins-base' 'gst-plugins-good' 'hicolor-icon-theme')
+  optdepends=('aspell: for spelling correction')
+
+  cd $pkgbase-$pkgver
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C pidgin DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple(){
+  pkgdesc="IM library extracted from Pidgin"
+  depends=('farstream' 'libsasl' 'libidn' 'libnsl' 'libgadu' 'dbus-glib' 'nss')
+  optdepends=('avahi: Bonjour protocol support'
+              'ca-certificates: SSL CA certificates'
+              'python-dbus: for purple-remote and purple-url-handler'
+              'tk: Tcl/Tk scripting support')
+
+  cd $pkgbase-$pkgver
+
+  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+    make -C "$_dir" DESTDIR="$pkgdir" install
+  done
+}
+
+package_finch(){
+  pkgdesc="A ncurses-based messaging client"
+  depends=('libpurple' 'libx11' 'python')
+
+  cd $pkgbase-$pkgver
+
+  # For linking
+  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+  make -C finch DESTDIR="$pkgdir" install
+  make -C doc DESTDIR="$pkgdir" install
+
+  # Remove files that are packaged in libpurle
+  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+  rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: purple-remote-python3.patch
===================================================================
--- purple-remote-python3.patch	2019-06-01 13:53:23 UTC (rev 354707)
+++ purple-remote-python3.patch	2019-06-01 13:53:28 UTC (rev 354708)
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Evangelos Foutras <evangelos at 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
- 

Copied: pidgin/repos/staging-x86_64/purple-remote-python3.patch (from rev 354707, pidgin/trunk/purple-remote-python3.patch)
===================================================================
--- purple-remote-python3.patch	                        (rev 0)
+++ purple-remote-python3.patch	2019-06-01 13:53:28 UTC (rev 354708)
@@ -0,0 +1,34 @@
+# HG changeset patch
+# User Evangelos Foutras <evangelos at 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
+ 


More information about the arch-commits mailing list