Skip to content

Commits on Source 3

Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ e2131534
orthanc-postgresql (2.2-3) unstable; urgency=medium
* Fix build with PostgreSQL 11. Closes: #912108
-- Sebastien Jodogne <s.jodogne@gmail.com> Sun, 28 Oct 2018 12:04:52 +0100
orthanc-postgresql (2.2-2) unstable; urgency=medium
* Ignore loading of pg_trgm extension if insufficient privileges. Closes: #906771
......
debian/patches/postgresql-11 0 → 100644
View file @ e2131534
Description: Fix build with PostgreSQL 11
Author: Sebastien Jodogne <s.jodogne@gmail.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: OrthancPostgreSQL-2.2/Resources/CMake/FindPostgreSQL.cmake
===================================================================
--- OrthancPostgreSQL-2.2.orig/Resources/CMake/FindPostgreSQL.cmake
+++ OrthancPostgreSQL-2.2/Resources/CMake/FindPostgreSQL.cmake
@@ -75,7 +75,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
- "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
# Define additional search paths for root directories.
if ( WIN32 )
Index: OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLDatabase.cpp
===================================================================
--- OrthancPostgreSQL-2.2.orig/Framework/PostgreSQL/PostgreSQLDatabase.cpp
+++ OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLDatabase.cpp
@@ -26,6 +26,13 @@
#include "PostgreSQLTransaction.h"
#include "../Common/ImplicitTransaction.h"
+#include <pg_config.h>
+
+#if PG_VERSION_NUM >= 110000
+# include <postgres.h>
+# undef LOG // This one comes from <postgres.h>, and conflicts with <Core/Logging.h>
+#endif
+
#include <Core/Logging.h>
#include <Core/OrthancException.h>
Index: OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLResult.cpp
===================================================================
--- OrthancPostgreSQL-2.2.orig/Framework/PostgreSQL/PostgreSQLResult.cpp
+++ OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLResult.cpp
@@ -27,6 +27,13 @@
#include "../Common/NullValue.h"
#include "../Common/Utf8StringValue.h"
+#include <pg_config.h>
+
+#if PG_VERSION_NUM >= 110000
+# include <postgres.h>
+# undef LOG // This one comes from <postgres.h>, and conflicts with <Core/Logging.h>
+#endif
+
#include <Core/OrthancException.h>
#include <Core/Logging.h>
Index: OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLStatement.cpp
===================================================================
--- OrthancPostgreSQL-2.2.orig/Framework/PostgreSQL/PostgreSQLStatement.cpp
+++ OrthancPostgreSQL-2.2/Framework/PostgreSQL/PostgreSQLStatement.cpp
@@ -29,6 +29,13 @@
#include "../Common/Utf8StringValue.h"
#include "PostgreSQLResult.h"
+#include <pg_config.h>
+
+#if PG_VERSION_NUM >= 110000
+# include <postgres.h>
+# undef LOG // This one comes from <postgres.h>, and conflicts with <Core/Logging.h>
+#endif
+
#include <Core/Logging.h>
#include <Core/OrthancException.h>
#include <Core/Toolbox.h>
debian/patches/series
View file @ e2131534
find-orthanc-dev
shlibs
pg_trgm
postgresql-11