Control: tags -1 + patch
On Fri, 1 Dec 2017 13:49:00 +0200 Juhani Numminen wrote:
> I found a similar bug in Fedora bug tracker. I think the Fedora packager
> fixed the compilation by adding "-fpermissive" (even though the
> changelog and commit message don't mention the bug).
I believe I found how upstream actually fixed the bug, plase see
missing-include.patch. It is based on:
https://github.com/worldforge/cyphesis/commit/18bab9f4a04d3d21b6045e4921406c1c51b3fa0a
However, I was not able to build the package in unstable (using
cowbuilder) since configure wouldn't detect postresql, perhaps due to
possibly changed output of `pg_config --version`. No help from upstream
git on that, since they have moved on to CMake. So another patch was
needed and there it is: psql-version-detect.patch.
Cheers,
Juhani
Description: Added missing include.
Author: Erik Ogenvik <e...@ogenvik.org>
Origin: upstream, https://github.com/worldforge/cyphesis/commit/18bab9f4a04d3d21b6045e4921406c1c51b3fa0a
Bug-Debian: https://bugs.debian.org/853363
Bug-Fedora: https://bugzilla.redhat.com/1423321
Last-Update: 2017-12-02
--- a/rulesets/PythonScriptFactory_impl.h
+++ b/rulesets/PythonScriptFactory_impl.h
@@ -21,7 +21,8 @@
#include "PythonScriptFactory.h"
-#include "rulesets/PythonEntityScript.h"
+#include "PythonEntityScript.h"
+#include "Python_Script_Utils.h"
/// \brief PythonScriptFactory constructor
///
Description: Fix PostgreSQL version detection
Author: Juhani Numminen <juhani.nummi...@gmail.com>
Forwarded: not-needed, upstream has switched to CMake
Last-Update: 2017-12-02
--- a/m4/libpq.m4
+++ b/m4/libpq.m4
@@ -52,6 +52,9 @@
sed 's/PostgreSQL \([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\).*$/\2/'`
psql_micro_version=`$PG_CONFIG $psql_config_args --version | \
sed 's/PostgreSQL \([[0-9]]*\).\([[0-9]]*\)\(.\([[0-9]]*\)\).*$/\4/'`
+ if test "x$psql_minor_version" = "x" ; then
+ psql_minor_version=0
+ fi
if test "x$psql_micro_version" = "x" ; then
psql_micro_version=0
fi
