gentoo resync : 14.07.2018

3 files changed, 54 insertions, 0 deletions

diff --git a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
new file mode 100644
index 000000000000..d1859fa25701
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
@@ -0,0 +1,20 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ae9ae09..5831e7a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,13 +1,11 @@
+ IF (WIN32)
+   ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+-  SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
++  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+   OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
+   IF (APVLV_ENABLE_DEBUG)
+-    SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
+-  ELSE (APVLV_ENABLE_DEBUG)
+-    SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
++    SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}")
+   ENDIF (APVLV_ENABLE_DEBUG)
+ ENDIF (WIN32)
+ 
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
new file mode 100644
index 000000000000..0ffe3659d6d7
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
+--- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
++++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
+@@ -90,7 +90,7 @@
+ 	return false;
+       }
+ 
+-    while ((getline (os, str)) != NULL)
++    while (getline (os, str))
+       {
+ 	string argu, data, crap;
+ 	stringstream is (str);
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
new file mode 100644
index 000000000000..e55f2771395a
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
@@ -0,0 +1,22 @@
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
++++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
+@@ -200,7 +200,7 @@ namespace apvlv
+ 
+     if (len >= 4
+ 	&& *s == '<'
+-	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
++	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
+       {
+ 	e++;
+ 	StringKeyMap::iterator it;
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
++++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
+@@ -90,7 +90,7 @@ namespace apvlv
+   {
+     mInuse = use;
+ 
+-    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
++    if (mInuse == false && !gView->hasloaded (filename (), type ()))
+       {
+ 	debug ("core :%p is not needed, delete it\n", this);
+ 	delete this;