Skip to contentSkip to conversation

package/kodi-pvr-stalker: fix gcc7 compile

PATCH New Bernd Kuhls 2 participants 4 messages May 13, 2017 – Jun 9, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/kodi-pvr-stalker: fix gcc7 compile

---
 .../0001-src-CWatchdog.h-Fix-gcc7-build.patch      | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch new file +33 -0
new file mode 100644
index 0000000000..54d18a996c
@@ -0,0 +1,33 @@
+From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 13 May 2017 20:22:08 +0200
+Subject: [PATCH 1/1] src/CWatchdog.h: Fix gcc7 build
+
+Building with gcc7 is broken:
+
+src/CWatchdog.h:31:58: error: 'std::function' has not been declared
+    CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback);
+                                                     ^~~~~~~~
+
+Patch sent upstream as PR 93.
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+---
+ src/CWatchdog.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CWatchdog.h b/src/CWatchdog.h
+index c465e91..239d95d 100644
+--- a/src/CWatchdog.h
++++ b/src/CWatchdog.h
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <thread>
++#include <functional>
+ 
+ #include "SAPI.h"
+ 
+-- 
+2.11.0
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/kodi-pvr-stalker: fix gcc7 compile

Hi,

Am Sat, 13 May 2017 20:29:44 +0200 schrieb Bernd Kuhls:

package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch line 30

Quoted 7 lines
package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch new file +7 -0
+  */
+
+ #include <thread>
++#include <functional>
+
+ #include "SAPI.h"
+

please note that all lines of the patch need DOS line endings.

Regards, Bernd

#2 lore raw

PATCH 1/1 package/kodi-pvr-stalker: fix gcc7 compile

In reply to Bernd Kuhls

Hello,

package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch line 4

Quoted 10 lines · Bernd Kuhls
package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch new file +4 -0
new file mode 100644
index 0000000000..54d18a996c
@@ -0,0 +1,33 @@
+From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <[email protected]>
+Date: Sat, 13 May 2017 20:22:08 +0200
+Subject: [PATCH 1/1] src/CWatchdog.h: Fix gcc7 build

Please use [PATCH] instead of [PATCH 1/1], i.e use git format-patch -N.

package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch line 12

Quoted 7 lines
package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch new file +7 -0
+Building with gcc7 is broken:
+
+src/CWatchdog.h:31:58: error: 'std::function' has not been declared
+    CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback);
+                                                     ^~~~~~~~
+
+Patch sent upstream as PR 93.

A link is better than "PR 93".

I've fixed both, and applied, after also adjusting DOS line endings as you mentioned (I tested that the patch applies properly).

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 package/kodi-pvr-stalker: fix gcc7 compile

Hi Thomas,

Am Thu, 08 Jun 2017 23:36:48 +0200 schrieb Thomas Petazzoni:

Quoted 1 line

Please use [PATCH] instead of [PATCH 1/1], i.e use git format-patch -N.

ok.

Quoted 3 lines
Quoted 1 line

+Patch sent upstream as PR 93.

A link is better than "PR 93".

I was told not to do include links to pull requests because it spams the linked pull requests:
https://github.com/xbmc/xbmc/pull/9731#issuecomment-236360427

The same happens when adding "PR xxx" into the subject:
https://github.com/xbmc/xbmc/pull/8953#issuecomment-232179102

This happened because I am uploading my patches also to my personal github repo.

Regards, Bernd