[med-svn] [Git][med-team/orthanc-postgresql][master] 3 commits: building 2.2-3

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc-postgresql


Commits:
fef9ba0b by jodogne-guest at 2018-10-28T11:06:20Z
building 2.2-3

- - - - -
1df38d09 by jodogne-guest at 2018-10-28T11:31:56Z
fixes to source code

- - - - -
e2131534 by jodogne-guest at 2018-10-28T11:36:39Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/postgresql-11
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc-postgresql (2.2-3) unstable; urgency=medium
+
+  * Fix build with PostgreSQL 11. Closes: #912108
+
+ -- Sebastien Jodogne <s.jodogne at 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,0 +1,71 @@
+Description: Fix build with PostgreSQL 11
+Author: Sebastien Jodogne <s.jodogne at 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
=====================================
@@ -1,3 +1,4 @@
 find-orthanc-dev
 shlibs
 pg_trgm
+postgresql-11



View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/compare/9683f775efc618409b7111cb664ccb2ad3444626...e21315343bf3e15d16b85dde3adf90b9f94ed4d8

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/compare/9683f775efc618409b7111cb664ccb2ad3444626...e21315343bf3e15d16b85dde3adf90b9f94ed4d8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181028/a07d49c0/attachment-0001.html>