From 57e3cdfbf460bd33214bfeb4f4e791e4e391b9062a0092b3a67015d36dc9a663 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 2 Nov 2016 13:47:07 +0000 Subject: [PATCH] Accepting request 438351 from home:posophe:branches:vdr fix build against liblirc OBS-URL: https://build.opensuse.org/request/show/438351 OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=75 --- ...-Ensure-build-on-unconfiguredclients.patch | 35 +++++++++++++++++++ lirc.changes | 5 +++ lirc.spec | 4 ++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch diff --git a/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch b/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch new file mode 100644 index 0000000..1dc08c9 --- /dev/null +++ b/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch @@ -0,0 +1,35 @@ +From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Tue, 25 Oct 2016 10:28:14 +0200 +Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients. + +--- + lib/curl_poll.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/curl_poll.h b/lib/curl_poll.h +index 6144c42..af25381 100644 +--- a/lib/curl_poll.h ++++ b/lib/curl_poll.h +@@ -21,7 +21,9 @@ + * KIND, either express or implied. + * + ***************************************************************************/ ++#ifdef HAVE_CONFIG_H + #include "config.h" ++#endif + + #ifdef __cplusplus + extern "C" { +@@ -29,7 +31,7 @@ extern "C" { + + #ifdef HAVE_SYS_POLL_H + #include +-#elif defined(HAVE_POLL_H) ++#else + #include + #endif + +-- +2.5.5 + diff --git a/lirc.changes b/lirc.changes index b896880..1a2c799 100644 --- a/lirc.changes +++ b/lirc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 2 13:46:41 UTC 2016 - p.drouand@gmail.com + +- Add lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch + ------------------------------------------------------------------- Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com diff --git a/lirc.spec b/lirc.spec index 636e854..25fcb15 100644 --- a/lirc.spec +++ b/lirc.spec @@ -31,6 +31,7 @@ Url: http://www.lirc.org/ Source0: http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2 Source1: baselibs.conf Patch0: lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch +Patch1: lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -212,8 +213,9 @@ sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf %setup -q if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep "is newer"; then -%patch0 +%patch0 -p1 fi +%patch1 -p1 %build %configure