[arch-commits] Commit in libnatpmp/trunk (PKGBUILD fix_header_issue.diff)

[Antonio Rojas]

    Date: Sunday, January 1, 2017 @ 21:03:48
  Author: arojas
Revision: 204132

Update to 20150609

Modified:
  libnatpmp/trunk/PKGBUILD
Deleted:
  libnatpmp/trunk/fix_header_issue.diff

-----------------------+
 PKGBUILD              |   12 +++------
 fix_header_issue.diff |   59 ------------------------------------------------
 2 files changed, 4 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-01 20:53:10 UTC (rev 204131)
+++ PKGBUILD	2017-01-01 21:03:48 UTC (rev 204132)
@@ -5,23 +5,19 @@
 # Contributor: Pierre Bourdon <delroth at gmail.com>
 
 pkgname=libnatpmp
-pkgver=20140401
-pkgrel=2
+pkgver=20150609
+pkgrel=1
 pkgdesc='A portable and fully compliant implementation of the NAT-PMP protocol'
 arch=(i686 x86_64)
 url='http://miniupnp.free.fr/libnatpmp.html'
 license=(BSD)
 depends=(glibc)
-source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz
-        fix_header_issue.diff)
-sha1sums=('e9511edecb9a75dbe8c9ed39c0469a18dc7e950b'
-          '58baa3fe61edfc117ae92452fbc8176d095bd7d2')
+source=(http://miniupnp.tuxfamily.org/files/libnatpmp-$pkgver.tar.gz)
+sha1sums=('8a4eb09b9512c73ebe4b44b6b66b43504cb69539')
 
 prepare() {
   cd $pkgname-$pkgver
   sed -e 's/CFLAGS = /CFLAGS += /' -i Makefile
-  # The patch comes from upstream https://github.com/miniupnp/libnatpmp/commit/f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
-  patch -p1 < "$srcdir"/fix_header_issue.diff 
 }
 
 build() {

Deleted: fix_header_issue.diff
===================================================================
--- fix_header_issue.diff	2017-01-01 20:53:10 UTC (rev 204131)
+++ fix_header_issue.diff	2017-01-01 21:03:48 UTC (rev 204132)
@@ -1,59 +0,0 @@
-commit f376ab72bc4de0b45f4e10c9b287b7ffe2a1fcd1
-Author: Thomas Bernard <miniupnp at free.fr>
-Date:   Thu Apr 10 23:09:44 2014 +0200
-
-    remove declspec.h problems. still has to be fixed definitely
-
-diff --git a/getgateway.h b/getgateway.h
-index d868f80..b3e17c6 100644
---- a/getgateway.h
-+++ b/getgateway.h
-@@ -1,6 +1,6 @@
- /* $Id: getgateway.h,v 1.7 2013/09/10 20:09:04 nanard Exp $ */
- /* libnatpmp
--Copyright (c) 2007-2013, Thomas BERNARD
-+Copyright (c) 2007-2014, Thomas BERNARD
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
-@@ -38,12 +38,12 @@ typedef unsigned short uint16_t;
- #endif
- #define in_addr_t uint32_t
- #endif
--#include "declspec.h"
-+/* #include "declspec.h" */
- 
- /* getdefaultgateway() :
-  * return value :
-  *    0 : success
-  *   -1 : failure    */
--LIBSPEC int getdefaultgateway(in_addr_t * addr);
-+/* LIBSPEC */int getdefaultgateway(in_addr_t * addr);
- 
- #endif
-diff --git a/natpmp.h b/natpmp.h
-index 62d113f..2399afb 100644
---- a/natpmp.h
-+++ b/natpmp.h
-@@ -1,6 +1,6 @@
- /* $Id: natpmp.h,v 1.19 2014/04/01 09:39:29 nanard Exp $ */
- /* libnatpmp
--Copyright (c) 2007-2013, Thomas BERNARD
-+Copyright (c) 2007-2014, Thomas BERNARD
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
-@@ -48,10 +48,12 @@ typedef unsigned short uint16_t;
- #define in_addr_t uint32_t
- #include "declspec.h"
- #else	/* WIN32 */
-+#define LIBSPEC
- #include <netinet/in.h>
- #endif	/* WIN32 */
- 
--#include "declspec.h"
-+/* causes problem when installing. Maybe should it be inlined ? */
-+/* #include "declspec.h" */
- 
- typedef struct {
- 	int s;	/* socket */