diff options
| author | Ozan Türkyılmaz <ozan.turkyilmaz@gmail.com> | 2018-03-13 11:27:51 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-03-17 08:51:53 +0700 |
| commit | d9dd305046d1f1abd9404f847bde9192c7b19ee4 (patch) | |
| tree | 80c284cbd8a1d899de848cbf3940021ac9d7a179 /libraries/libupnp | |
| parent | 96ccd6ab79d7adc47cc640516a28687007c41267 (diff) | |
| download | slackbuilds-d9dd305046d1f1abd9404f847bde9192c7b19ee4.tar.gz | |
libraries/libupnp: Add upstream patch to remove a private header.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/libupnp')
| -rw-r--r-- | libraries/libupnp/libupnp.SlackBuild | 4 | ||||
| -rw-r--r-- | libraries/libupnp/patches/01_remove_threadpool_h.patch | 42 |
2 files changed, 45 insertions, 1 deletions
diff --git a/libraries/libupnp/libupnp.SlackBuild b/libraries/libupnp/libupnp.SlackBuild index db6a35e3fc..98174bf26c 100644 --- a/libraries/libupnp/libupnp.SlackBuild +++ b/libraries/libupnp/libupnp.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=libupnp VERSION=${VERSION:-1.8.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -75,6 +75,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/patches/01_remove_threadpool_h.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libupnp/patches/01_remove_threadpool_h.patch b/libraries/libupnp/patches/01_remove_threadpool_h.patch new file mode 100644 index 0000000000..c75541f7ca --- /dev/null +++ b/libraries/libupnp/patches/01_remove_threadpool_h.patch @@ -0,0 +1,42 @@ +From 9220f76b17816b476f7662bae959d9f403046a37 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Sat, 18 Nov 2017 18:32:48 +0100 +Subject: [PATCH] Remove ThreadPool.h inclusion in upnpdebug.h + +ThreadPool.h is now a private header which is not installed so remove +this header from upnpdebug.h otherwise an external application which +includes upnpdebug.h will crash + +Also add LinkedList.h to service_table.h as it was included by +ThreadPool.h in upnpdebug.h + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + upnp/inc/upnpdebug.h | 1 - + upnp/src/inc/service_table.h | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/upnp/inc/upnpdebug.h b/upnp/inc/upnpdebug.h +index 45a86bbb..fc31df5a 100644 +--- a/upnp/inc/upnpdebug.h ++++ b/upnp/inc/upnpdebug.h +@@ -37,7 +37,6 @@ + * \file + */ + +-#include "ThreadPool.h" + #include "upnpconfig.h" + #include "UpnpGlobal.h" /* for UPNP_INLINE */ + +diff --git a/upnp/src/inc/service_table.h b/upnp/src/inc/service_table.h +index e7b6d7b8..dfd58b75 100644 +--- a/upnp/src/inc/service_table.h ++++ b/upnp/src/inc/service_table.h +@@ -46,6 +46,7 @@ extern "C" { + #include "ixml.h" + #include "upnp.h" + #include "upnpdebug.h" ++#include "LinkedList.h" + + #include <stdio.h> + #include <time.h> |