Add patches for gcc7

4 files changed, 71 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66a504cc1165..6c520141848d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Sep 24 17:03:56 UTC 2017
+# Sun Sep 24 17:21:01 UTC 2017
 pkgbase = openni2-git
 	pkgdesc = Framework for sensor-based Natural Interaction (git version)
 	pkgver = 2.2.beta.r25.g1fce8ed
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/occipital/OpenNI2/
 	arch = i686
 	arch = x86_64
@@ -25,12 +25,16 @@ pkgbase = openni2-git
 	source = 0003-Use-system-wide-libjpeg.patch
 	source = 0005-change-default-ni-drivers-path.patch
 	source = 0013-Fix-GCC6-compilation.patch
+	source = 0014-fix-format-overflow-for-GCC7.patch
+	source = 0015-Initialize-variable-for-gcc7.patch
 	source = libopenni2.pc
 	sha256sums = SKIP
 	sha256sums = 368c0b41a26a65377359ce22a914cb8b6f4020e2972f67f151f2b9bdbf1a5a50
 	sha256sums = 1ca20e60ac10a193cbf0ca4759230ba7930479baa7d237476583359e7b62f604
 	sha256sums = 635c762230a2dc57977c7f42cc7d1c25438d3864baca7632360466e8c031e3b5
 	sha256sums = 0fd53b2c41a48cb4b28e67c6cfcedf4d17ffbe675bd2eb21793a683bbb0d85bb
+	sha256sums = 05e95ab2375294a37354dab5ed746ff5c6de6e5ed1792ad398f489d6d35af93e
+	sha256sums = 196128c92803cbfaa67643703e043247475b6c718af8cd9b4333806d2e04d762
 	sha256sums = 57c9236c77133437a533d3cac6775da4749a070dd468e88e29b07d7a83aaaab1
 
 pkgname = openni2-git
diff --git a/0014-fix-format-overflow-for-GCC7.patch b/0014-fix-format-overflow-for-GCC7.patch
new file mode 100644
index 000000000000..98c3922a8940
--- /dev/null
+++ b/0014-fix-format-overflow-for-GCC7.patch
@@ -0,0 +1,37 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Tue, 7 Feb 2017 17:30:41 +0100
+Subject: fix format-overflow for GCC7
+
+---
+ Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp | 4 ++--
+ Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp b/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
+index 9663e41..62cf1c7 100644
+--- a/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
++++ b/Source/Drivers/PS1080/Sensor/XnFrameStreamProcessor.cpp
+@@ -40,8 +40,8 @@ XnFrameStreamProcessor::XnFrameStreamProcessor(XnFrameStream* pStream, XnSensorS
+ 	m_nLastSOFPacketID(0),
+ 	m_nFirstPacketTimestamp(0)
+ {
+-	sprintf(m_csInDumpMask, "%sIn", pStream->GetType());
+-	sprintf(m_csInternalDumpMask, "Internal%s", pStream->GetType());
++	snprintf(m_csInDumpMask, 100, "%.90sIn", pStream->GetType());
++	snprintf(m_csInternalDumpMask, 100, "Internal%.90s", pStream->GetType());
+ 	m_InDump = xnDumpFileOpen(m_csInDumpMask, "%s_0.raw", m_csInDumpMask);
+ 	m_InternalDump = xnDumpFileOpen(m_csInternalDumpMask, "%s_0.raw", m_csInternalDumpMask);
+ }
+diff --git a/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp b/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
+index f93f333..d962ec0 100644
+--- a/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
++++ b/Source/Drivers/PS1080/Sensor/XnSensorFirmwareParams.cpp
+@@ -263,7 +263,7 @@ XnStatus XnSensorFirmwareParams::AddFirmwareParam(XnActualIntProperty& Property,
+ 	XN_IS_STATUS_OK(nRetVal);
+ 
+ 	XnChar csNewName[XN_DEVICE_MAX_STRING_LENGTH];
+-	sprintf(csNewName, "%s (%d)", Property.GetName(), nFirmwareParam);
++	snprintf(csNewName, XN_DEVICE_MAX_STRING_LENGTH, "%.150s (%d)", Property.GetName(), nFirmwareParam);
+ 
+ 	Property.UpdateName("Firmware", csNewName);
+ 	Property.SetLogSeverity(XN_LOG_VERBOSE);
diff --git a/0015-Initialize-variable-for-gcc7.patch b/0015-Initialize-variable-for-gcc7.patch
new file mode 100644
index 000000000000..321f0e1580e0
--- /dev/null
+++ b/0015-Initialize-variable-for-gcc7.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Tue, 8 Aug 2017 22:53:14 +0200
+Subject: Initialize variable for gcc7
+
+---
+ Source/Tools/NiViewer/Device.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/Tools/NiViewer/Device.cpp b/Source/Tools/NiViewer/Device.cpp
+index 28cbfee..7037320 100644
+--- a/Source/Tools/NiViewer/Device.cpp
++++ b/Source/Tools/NiViewer/Device.cpp
+@@ -364,7 +364,7 @@ void toggleMirror(int )
+ 
+ void toggleCloseRange(int )
+ {
+-	bool bCloseRange;
++	bool bCloseRange = false;
+ 	g_depthStream.getProperty(XN_STREAM_PROPERTY_CLOSE_RANGE, &bCloseRange);
+ 
+ 	bCloseRange = !bCloseRange;
diff --git a/PKGBUILD b/PKGBUILD
index b0b81134bc79..cd313f0085b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=openni2-git
 pkgver=2.2.beta.r25.g1fce8ed
-pkgrel=3
+pkgrel=4
 pkgdesc='Framework for sensor-based Natural Interaction (git version)'
 arch=('i686' 'x86_64')
 url='https://github.com/occipital/OpenNI2/'
@@ -16,12 +16,16 @@ source=('openni2-git'::'git+https://github.com/occipital/OpenNI2.git'
         '0003-Use-system-wide-libjpeg.patch'
         '0005-change-default-ni-drivers-path.patch'
         '0013-Fix-GCC6-compilation.patch'
+        '0014-fix-format-overflow-for-GCC7.patch'
+        '0015-Initialize-variable-for-gcc7.patch'
         'libopenni2.pc')
 sha256sums=('SKIP'
             '368c0b41a26a65377359ce22a914cb8b6f4020e2972f67f151f2b9bdbf1a5a50'
             '1ca20e60ac10a193cbf0ca4759230ba7930479baa7d237476583359e7b62f604'
             '635c762230a2dc57977c7f42cc7d1c25438d3864baca7632360466e8c031e3b5'
             '0fd53b2c41a48cb4b28e67c6cfcedf4d17ffbe675bd2eb21793a683bbb0d85bb'
+            '05e95ab2375294a37354dab5ed746ff5c6de6e5ed1792ad398f489d6d35af93e'
+            '196128c92803cbfaa67643703e043247475b6c718af8cd9b4333806d2e04d762'
             '57c9236c77133437a533d3cac6775da4749a070dd468e88e29b07d7a83aaaab1')
 
 prepare() {
@@ -40,6 +44,8 @@ prepare() {
     patch -Np1 -i "${srcdir}/0003-Use-system-wide-libjpeg.patch"
     patch -Np1 -i "${srcdir}/0005-change-default-ni-drivers-path.patch"
     patch -Np1 -i "${srcdir}/0013-Fix-GCC6-compilation.patch"
+    patch -Np1 -i "${srcdir}/0014-fix-format-overflow-for-GCC7.patch"
+    patch -Np1 -i "${srcdir}/0015-Initialize-variable-for-gcc7.patch"
 }
 
 pkgver() {