mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-16 19:50:19 +01:00
libraries/libupnp: Add upstream patch to remove a private header.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
96ccd6ab79
commit
d9dd305046
2 changed files with 45 additions and 1 deletions
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
PRGNAM=libupnp
|
PRGNAM=libupnp
|
||||||
VERSION=${VERSION:-1.8.3}
|
VERSION=${VERSION:-1.8.3}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -75,6 +75,8 @@ find -L . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
|
patch -p1 < $CWD/patches/01_remove_threadpool_h.patch
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
|
42
libraries/libupnp/patches/01_remove_threadpool_h.patch
Normal file
42
libraries/libupnp/patches/01_remove_threadpool_h.patch
Normal file
|
@ -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>
|
Loading…
Reference in a new issue