[Debian-l10n-commits] poedit branch master updated. debian/2.0-1_exp1-1-g4c26dfe

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".

The branch, master has been updated
       via  4c26dfeb02ea8c3555f96e645e0735f0ad7083bd (commit)
      from  81b90d388fca752a1285d48cb7ea5e34470c9d32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/poedit.git;a=commitdiff;h=4c26dfeb02ea8c3555f96e645e0735f0ad7083bd

commit 4c26dfeb02ea8c3555f96e645e0735f0ad7083bd
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Mon Apr 3 22:47:43 2017 +0200

    Update patch with upstreamed one

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/use-system-json.patch | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/patches/use-system-json.patch b/debian/patches/use-system-json.patch
index d835d6c..338dd69 100644
--- a/debian/patches/use-system-json.patch
+++ b/debian/patches/use-system-json.patch
@@ -1,14 +1,34 @@
 Author: Gianfranco Costamagna <locutusofborg at debian.org>
 Description: use system json library
+Forwarded: https://github.com/vslavik/poedit/pull/374
 
---- poedit-2.0.orig/src/json.h
-+++ poedit-2.0/src/json.h
-@@ -28,7 +28,7 @@
+diff --git a/src/json.h b/src/json.h
+index c4413d1..0fb8a98 100644
+--- a/src/json.h
++++ b/src/json.h
+@@ -28,7 +28,12 @@
  
  #include "str_helpers.h"
  
--#include "json/src/json.hpp"
++#ifdef HAVE_JSON_HPP
 +#include <json.hpp>
++#else
+ #include "json/src/json.hpp"
++#endif
++
  using json = nlohmann::json;
  
  
+diff --git a/configure.ac b/configure.ac
+index 3ab1ff6..92b4e6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,7 +119,7 @@ AS_IF([test "x$have_cpprest" = "xyes"],
+       ])
+ AM_CONDITIONAL([HAVE_CPPREST], [test "x$have_cpprest" != "xno"])
+ 
+-
++AC_CHECK_HEADERS([json.hpp])
+ 
+ WX_CONFIG_CHECK([3.0.1], [WXFOUND=1], [WXFOUND=0], [$WXLIBS_USED], [--unicode])
+ 
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit