[arch-commits] Commit in mldonkey/trunk (PKGBUILD fix_upnpDiscover.patch)

[Anatol Pomozov]

    Date: Thursday, February 4, 2016 @ 19:27:35
  Author: anatolik
Revision: 160335

FS#48030: use upstream patch for libminiupnpc 1.9

Modified:
  mldonkey/trunk/PKGBUILD
Deleted:
  mldonkey/trunk/fix_upnpDiscover.patch

------------------------+
 PKGBUILD               |    9 +++++----
 fix_upnpDiscover.patch |   13 -------------
 2 files changed, 5 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-04 18:26:58 UTC (rev 160334)
+++ PKGBUILD	2016-02-04 18:27:35 UTC (rev 160335)
@@ -3,7 +3,7 @@
 
 pkgname=mldonkey
 pkgver=3.1.5
-pkgrel=6
+pkgrel=7
 pkgdesc='A multi-network P2P client'
 arch=(i686 x86_64)
 url='http://mldonkey.sourceforge.net/'
@@ -20,7 +20,7 @@
         mldonkey.tmpfiles
         http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz
         https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz
-	fix_upnpDiscover.patch)
+        libminiupnpc19.patch::https://github.com/ygrek/mldonkey/commit/d0f0cd5ce38bac67ecc55e4cc5dd2e1883ebc2e4.patch)
 sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
             'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
             '778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
@@ -27,11 +27,12 @@
             '45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
             'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
             '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
-            'd304bb2eca218dcfbcf7c420bc7375fa2316d5c360325a4e9b48d78d7cf1b7c7')
+            'f7193a666a27a2cab9c76d08018faa5a4537861fae02b290cacb42946bea0174')
 
 prepare() {
   cd mldonkey-$pkgver
-  patch -p1 < ../fix_upnpDiscover.patch
+  # https://github.com/ygrek/mldonkey/issues/13
+  patch -p1 < ../libminiupnpc19.patch
 }
 
 build() {

Deleted: fix_upnpDiscover.patch
===================================================================
--- fix_upnpDiscover.patch	2016-02-04 18:26:58 UTC (rev 160334)
+++ fix_upnpDiscover.patch	2016-02-04 18:27:35 UTC (rev 160335)
@@ -1,13 +0,0 @@
-diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c
-index 41942f3..272b0cb 100644
---- a/src/utils/net/upnp_stubs.c
-+++ b/src/utils/net/upnp_stubs.c
-@@ -640,7 +640,7 @@ upnpPulse( ml_upnpmp_t * map )
-     {
-         struct UPNPDev * devlist;
-         errno = 0;
--        devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 );
-+        devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0, NULL );
-         if( devlist == NULL )
-         {
-             dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno,  str_errno( errno ) );