From c34c3b1c2b1006ebeede016cca578d5f571fc7a8 Mon Sep 17 00:00:00 2001
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
Date: Thu, 23 Nov 2023 10:23:58 +0100
Subject: gnu: Add plasp.

* gnu/packages/patches/plasp-fix-normalization.patch: New file.
* gnu/packages/patches/plasp-include-iostream.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register them here.
* gnu/packages/potassoc.scm (plasp): New variable.

Change-Id: I0d8d64153b180a7d1d8d81888f843458efdf5e51
---
 gnu/packages/patches/plasp-fix-normalization.patch | 51 ++++++++++++++++++++++
 gnu/packages/patches/plasp-include-iostream.patch  | 26 +++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 gnu/packages/patches/plasp-fix-normalization.patch
 create mode 100644 gnu/packages/patches/plasp-include-iostream.patch

(limited to 'gnu/packages/patches')

diff --git a/gnu/packages/patches/plasp-fix-normalization.patch b/gnu/packages/patches/plasp-fix-normalization.patch
new file mode 100644
index 0000000000..dc2d3e4b98
--- /dev/null
+++ b/gnu/packages/patches/plasp-fix-normalization.patch
@@ -0,0 +1,51 @@
+From cddbfa3ade23695dd9996f6e208615702a3a42e1 Mon Sep 17 00:00:00 2001
+From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
+Date: Thu, 23 Nov 2023 09:53:38 +0100
+Subject: [PATCH 1/2] normalization: No longer work around compiler bugs in
+ Precondition.
+To: Patrick Lühne <patrick-github@luehne.de>
+Cc: Martin Gebser <martin.gebser@aau.at>
+
+Newer versions of GCC (such as GCC 11) point out that std::move is meaningless
+in this position, so remove it.
+---
+ lib/pddl/src/pddl/detail/normalization/Precondition.cpp | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/lib/pddl/src/pddl/detail/normalization/Precondition.cpp b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp
+index 4eebfee..4297e52 100644
+--- a/lib/pddl/src/pddl/detail/normalization/Precondition.cpp
++++ b/lib/pddl/src/pddl/detail/normalization/Precondition.cpp
+@@ -83,8 +83,7 @@ normalizedAST::Literal normalizeNested(ast::AndPointer<ast::Precondition> &and_,
+ 
+ 	derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::And<normalizedAST::Literal>>(std::move(normalizedArguments));
+ 
+-	// TODO: investigate, could be a compiler bug
+-	return std::move(derivedPredicate);
++	return derivedPredicate;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -112,8 +111,7 @@ normalizedAST::Literal normalizeNested(ast::ExistsPointer<ast::Precondition> &ex
+ 			return normalizeTopLevel(x, normalizationContext);
+ 		});
+ 
+-	// TODO: investigate, could be a compiler bug
+-	return std::move(derivedPredicate);
++	return derivedPredicate;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -174,8 +172,7 @@ normalizedAST::Literal normalizeNested(ast::OrPointer<ast::Precondition> &or_, d
+ 
+ 	derivedPredicate->declaration->precondition = std::make_unique<normalizedAST::Or<normalizedAST::Literal>>(std::move(normalizedArguments));
+ 
+-	// TODO: investigate, could be a compiler bug
+-	return std::move(derivedPredicate);
++	return derivedPredicate;
+ }
+ 
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+-- 
+2.41.0
+
diff --git a/gnu/packages/patches/plasp-include-iostream.patch b/gnu/packages/patches/plasp-include-iostream.patch
new file mode 100644
index 0000000000..9722e6fc03
--- /dev/null
+++ b/gnu/packages/patches/plasp-include-iostream.patch
@@ -0,0 +1,26 @@
+From 95c6a506e14cf248e2a3cae2ed3f41ed1eedf278 Mon Sep 17 00:00:00 2001
+From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at>
+Date: Thu, 23 Nov 2023 09:53:38 +0100
+Subject: [PATCH 2/2] app: Add missing #include <iostream>.
+To: Patrick Lühne <patrick-github@luehne.de>
+Cc: Martin Gebser <martin.gebser@aau.at>
+
+---
+ app/include/plasp-app/Command.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/app/include/plasp-app/Command.h b/app/include/plasp-app/Command.h
+index 5755ee3..671804b 100644
+--- a/app/include/plasp-app/Command.h
++++ b/app/include/plasp-app/Command.h
+@@ -1,6 +1,7 @@
+ #ifndef __PLASP_APP__COMMAND_H
+ #define __PLASP_APP__COMMAND_H
+ 
++#include <iostream> // std::cout, std::endl
+ #include <tuple>
+ 
+ #include <cxxopts.hpp>
+-- 
+2.41.0
+
-- 
cgit v1.2.3