gentoo resync : 14.07.2018

4 files changed, 105 insertions, 0 deletions

diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch
new file mode 100644
index 000000000000..d5e992d51c26
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch
@@ -0,0 +1,11 @@
+--- qp10.0.orig/src/objects.h	2016-06-07 02:54:35.000000000 +0200
++++ qp10.0/src/objects.h	2016-10-03 18:26:49.924782008 +0200
+@@ -1210,7 +1210,7 @@
+        << this->getName() << "\" ";
+   
+ #ifndef WIN32
+-  switch (hasAssociatedItem())
++  switch (tag & AssociatedMask)
+     {
+     case AssociatedNone:
+ 	    std::cerr << "(no info)";
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch
new file mode 100644
index 000000000000..b3c109613912
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch
@@ -0,0 +1,21 @@
+--- qp10.0.orig/configure	2016-06-07 02:54:42.000000000 +0200
++++ qp10.0/configure	2016-10-03 18:30:22.360786524 +0200
+@@ -2256,12 +2256,16 @@
+ #
+ # Check for addtional command line options.
+ #
+-DEBUGGING=" -DNDEBUG "
+ # Check whether --enable-debug was given.
+ if test "${enable_debug+set}" = set; then :
+-  enableval=$enable_debug;  DEBUGGING=
++  enableval=$enable_debug;
+ fi
+ 
++if test "$enable_debug" = yes; then
++	DEBUGGING=
++else
++	DEBUGGING=" -DNDEBUG "
++fi
+ 
+ 
+ # Single versus multiple thread configuraation.
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch
new file mode 100644
index 000000000000..626a15b5de99
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch
@@ -0,0 +1,38 @@
+--- qp10.0/src/io_qp.h.old	2016-10-12 02:50:04.343499674 -0400
++++ qp10.0/src/io_qp.h	2016-10-12 02:50:10.605264154 -0400
+@@ -662,7 +662,7 @@
+ 
+   bool seekp(streampos pos, ios::seekdir d = ios::beg)
+     {
+-      return stream->seekp(pos, d);
++      return !stream->seekp(pos, d).fail();
+     }
+ 
+   bool put(char ch)
+@@ -736,7 +736,7 @@
+ 
+   bool seekp(streampos pos, ios::seekdir d = ios::beg)
+     {
+-      return stream.seekp(pos, d);
++      return !stream.seekp(pos, d).fail();
+     }
+ 
+   bool put(char ch)
+@@ -816,7 +816,7 @@
+ 
+   bool seekp(streampos pos, ios::seekdir d = ios::beg)
+     {
+-      return stream.seekp(pos, d);
++      return !stream.seekp(pos, d).fail();
+     }
+ 
+   bool put(char ch);
+@@ -876,7 +876,7 @@
+ 
+   bool seekp(streampos pos, ios::seekdir d = ios::beg)
+     {
+-      return stream.seekp(pos, d);
++      return !stream.seekp(pos, d).fail();
+     }
+ 
+   bool put(char ch);
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
new file mode 100644
index 000000000000..d82e78cada16
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.0-qt5.patch
@@ -0,0 +1,35 @@
+diff -ur qp10.0.orig/src/xqp/term.cc qp10.0/src/xqp/term.cc
+--- qp10.0.orig/src/xqp/term.cc	2008-07-09 07:32:37.000000000 +0200
++++ qp10.0/src/xqp/term.cc	2018-01-27 14:06:54.101545854 +0100
+@@ -38,7 +38,7 @@
+ 
+ bool graphic_char(QChar c)
+ {
+-    switch (c.toAscii())
++    switch (c.toLatin1())
+     {
+        case '-':
+        case '/':
+diff -ur qp10.0.orig/src/xqp/xqp.cc qp10.0/src/xqp/xqp.cc
+--- qp10.0.orig/src/xqp/xqp.cc	2011-07-14 01:08:42.000000000 +0200
++++ qp10.0/src/xqp/xqp.cc	2018-01-27 14:07:53.902543353 +0100
+@@ -167,7 +167,7 @@
+ 
+ void Xqp::send_cmd_to_qp(QString cmd)
+ {
+-   write(qp_stdin, cmd.toAscii(), cmd.length());
++   write(qp_stdin, cmd.toLatin1(), cmd.length());
+ }
+ 
+   
+diff -ur qp10.0.orig/src/xqp/xqp.pro qp10.0/src/xqp/xqp.pro
+--- qp10.0.orig/src/xqp/xqp.pro	2008-07-09 07:32:37.000000000 +0200
++++ qp10.0/src/xqp/xqp.pro	2018-01-27 14:01:24.764559627 +0100
+@@ -4,6 +4,7 @@
+ 
+ TEMPLATE = app
+ INCLUDEPATH += .
++QT += widgets
+ 
+ # Input
+ HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h