From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/qu-prolog-10.0-associated-item.patch | 11 ++++++ .../qu-prolog/files/qu-prolog-10.0-configure.patch | 21 ++++++++++++ dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch | 38 ++++++++++++++++++++ .../qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch | 40 ++++++++++++++++++++++ .../qu-prolog/files/qu-prolog-9.1-cflags.patch | 34 ++++++++++++++++++ dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch | 33 ++++++++++++++++++ .../qu-prolog/files/qu-prolog-9.1-portage.patch | 32 +++++++++++++++++ .../qu-prolog/files/qu-prolog-9.5-cflags.patch | 34 ++++++++++++++++++ .../qu-prolog/files/qu-prolog-9.5-portage.patch | 32 +++++++++++++++++ 9 files changed, 275 insertions(+) create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-associated-item.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-configure.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-10.0-gcc6.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch (limited to 'dev-lang/qu-prolog/files') 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-9.1-cerr-ptr.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch new file mode 100644 index 000000000000..1fde09843e66 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.1-cerr-ptr.patch @@ -0,0 +1,40 @@ +diff -ur qp9.1.orig/src/gc.cc qp9.1/src/gc.cc +--- qp9.1.orig/src/gc.cc 2011-08-23 11:17:44.000000000 +1200 ++++ qp9.1/src/gc.cc 2011-11-20 07:14:14.000000000 +1300 +@@ -152,7 +152,7 @@ + { + cerr << size << endl; + heapobject* ptr = reinterpret_cast(term); +- cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; ++ cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; + return false; + } + return true; +diff -ur qp9.1.orig/src/objects.h qp9.1/src/objects.h +--- qp9.1.orig/src/objects.h 2011-08-23 11:17:44.000000000 +1200 ++++ qp9.1/src/objects.h 2011-11-20 07:14:14.000000000 +1300 +@@ -1242,18 +1242,12 @@ + << this->getName() << "\" "; + + #ifndef WIN32 +- switch (hasAssociatedItem()) +- { +- case AssociatedNone: +- std::cerr << "(no info)"; +- break; +- case AssociatedInteger: +- std::cerr << "int: " << getAssociatedInteger(); +- break; +- case AssociatedAtom: +- std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; +- break; +- } ++ if (hasAssociatedInteger()) ++ std::cerr << "int: " << getAssociatedInteger(); ++ else if (hasAssociatedAtom()) ++ std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; ++ else ++ std::cerr << "(no info)"; + #endif + } + #endif diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch new file mode 100644 index 000000000000..f53eb067b1fd --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.1-cflags.patch @@ -0,0 +1,34 @@ +diff -ur qp9.1.orig/Makefile.in qp9.1/Makefile.in +--- qp9.1.orig/Makefile.in 2011-08-23 11:17:54.000000000 +1200 ++++ qp9.1/Makefile.in 2012-01-14 12:57:16.000000000 +1300 +@@ -23,7 +23,7 @@ + + export PROLOG = prolog + +- ++export CXX=@CXX@ + + .PHONY: all + all: objects +diff -ur qp9.1.orig/src/Makefile.in qp9.1/src/Makefile.in +--- qp9.1.orig/src/Makefile.in 2011-08-23 11:17:54.000000000 +1200 ++++ qp9.1/src/Makefile.in 2012-01-14 12:48:33.000000000 +1300 +@@ -40,7 +40,7 @@ + + #export DEBUGGING= + +-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized ++#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized + export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized + + .PHONY: all +@@ -79,6 +79,9 @@ + + # Targets + ++.cc.o: ++ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $< ++ + .PHONY: commands + commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY) + @$(MAKE) $(ALL_COMMANDS) diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch new file mode 100644 index 000000000000..82d5bc7f7ebb --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.1-gcc.patch @@ -0,0 +1,33 @@ +diff -ur qp9.1.orig/src/pile.h qp9.1/src/pile.h +--- qp9.1.orig/src/pile.h 2011-08-23 01:17:44.000000000 +0200 ++++ qp9.1/src/pile.h 2013-01-09 12:07:44.000000000 +0100 +@@ -75,7 +75,7 @@ + // + // Push a StoredType onto the pile. + // +- void push(const StoredType s){ pushElement(s); } ++ void push(const StoredType s){ this->pushElement(s); } + + // + // Pop a StoredType off the pile. +@@ -85,7 +85,7 @@ + // + // Pop n entries of StoredType off the pile. + // +- void popNEntries(word32 n) { setTopOfStack(this->getTopOfStack() - n); } ++ void popNEntries(word32 n) { this->setTopOfStack(this->getTopOfStack() - n); } + + // + // Check whether the pile is empty or not. +diff -ur qp9.1.orig/src/system_support.cc qp9.1/src/system_support.cc +--- qp9.1.orig/src/system_support.cc 2011-08-23 01:17:44.000000000 +0200 ++++ qp9.1/src/system_support.cc 2013-01-09 12:07:16.000000000 +0100 +@@ -61,6 +61,8 @@ + #include + #ifdef WIN32 + #include ++#else ++#include + #endif //WIN32 + + using namespace std; diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch new file mode 100644 index 000000000000..4a1aa23607ac --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.1-portage.patch @@ -0,0 +1,32 @@ +diff -ur qp9.1.orig/bin/qc.in qp9.1/bin/qc.in +--- qp9.1.orig/bin/qc.in 2011-08-23 11:17:28.000000000 +1200 ++++ qp9.1/bin/qc.in 2011-11-20 07:16:18.000000000 +1300 +@@ -27,13 +27,13 @@ + + ############################## + +-preprocess='@QPHOME@/bin/qppp' +-expand='@QPHOME@/bin/qg' +-qpcompile='@QPHOME@/bin/qc1' ++preprocess='qppp' ++expand='qg' ++qpcompile='qc1' + compversion='qup' +-assemble='@QPHOME@/bin/qa' +-link='@QPHOME@/bin/ql' +-execute='@QPHOME@/bin/qem' ++assemble='qa' ++link='ql' ++execute='qem' + libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" + + ############################## +diff -ur qp9.1.orig/prolog/Makefile.in qp9.1/prolog/Makefile.in +--- qp9.1.orig/prolog/Makefile.in 2006-04-06 16:01:45.000000000 +1200 ++++ qp9.1/prolog/Makefile.in 2011-11-20 07:16:18.000000000 +1300 +@@ -1,3 +1,5 @@ ++PATH:=$(PATH):@QPHOME@/bin ++ + .DEFAULT: + @$(MAKE) -C compiler $@ + @$(MAKE) -C library $@ diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch new file mode 100644 index 000000000000..5bcce94d9b6b --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.5-cflags.patch @@ -0,0 +1,34 @@ +diff -ur qp9.5.orig/Makefile.in qp9.5/Makefile.in +--- qp9.5.orig/Makefile.in 2014-11-17 06:46:22.000000000 +0100 ++++ qp9.5/Makefile.in 2015-05-03 11:29:52.000000000 +0200 +@@ -23,7 +23,7 @@ + + export PROLOG = prolog + +- ++export CXX=@CXX@ + + .PHONY: all + all: objects +diff -ur qp9.5.orig/src/Makefile.in qp9.5/src/Makefile.in +--- qp9.5.orig/src/Makefile.in 2014-11-17 06:46:22.000000000 +0100 ++++ qp9.5/src/Makefile.in 2015-05-03 11:29:52.000000000 +0200 +@@ -40,7 +40,7 @@ + + #export DEBUGGING= + +-export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized ++#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized + export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized + + .PHONY: all +@@ -79,6 +79,9 @@ + + # Targets + ++.cc.o: ++ $(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $< ++ + .PHONY: commands + commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY) + @$(MAKE) $(ALL_COMMANDS) diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch new file mode 100644 index 000000000000..55dc08ffe474 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-9.5-portage.patch @@ -0,0 +1,32 @@ +diff -ur qp9.5.orig/bin/qc.in qp9.5/bin/qc.in +--- qp9.5.orig/bin/qc.in 2014-11-17 06:45:59.000000000 +0100 ++++ qp9.5/bin/qc.in 2015-05-03 11:31:54.000000000 +0200 +@@ -27,13 +27,13 @@ + + ############################## + +-preprocess='@QPHOME@/bin/qppp' +-expand='@QPHOME@/bin/qg' +-qpcompile='@QPHOME@/bin/qc1' ++preprocess='qppp' ++expand='qg' ++qpcompile='qc1' + compversion='qup' +-assemble='@QPHOME@/bin/qa' +-link='@QPHOME@/bin/ql' +-execute='@QPHOME@/bin/qem' ++assemble='qa' ++link='ql' ++execute='qem' + libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" + + ############################## +diff -ur qp9.5.orig/prolog/Makefile.in qp9.5/prolog/Makefile.in +--- qp9.5.orig/prolog/Makefile.in 2006-04-06 06:01:45.000000000 +0200 ++++ qp9.5/prolog/Makefile.in 2015-05-03 11:31:54.000000000 +0200 +@@ -1,3 +1,5 @@ ++PATH:=$(PATH):@QPHOME@/bin ++ + .DEFAULT: + @$(MAKE) -C compiler $@ + @$(MAKE) -C library $@ -- cgit v1.2.3