[Debian-l10n-commits] poedit branch master updated. debian/1.8.7.1-1-1-g983e7dc

[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  983e7dc320d68dd2591a6141994f0a774b68dc82 (commit)
      from  0364120849d1e1af47f00c1facbcf81dca991129 (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=983e7dc320d68dd2591a6141994f0a774b68dc82

commit 983e7dc320d68dd2591a6141994f0a774b68dc82
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Feb 23 19:08:49 2016 +0100

    Tweak patch, thanks @vslavik

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

Summary of changes:
 debian/patches/fix-arm-cpprest.patch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/fix-arm-cpprest.patch b/debian/patches/fix-arm-cpprest.patch
index 8002577..09e7c94 100644
--- a/debian/patches/fix-arm-cpprest.patch
+++ b/debian/patches/fix-arm-cpprest.patch
@@ -5,21 +5,21 @@ Author: Gianfranco Costamagna <locutusofborg at debian.org>
 
 --- poedit-1.8.7.1.orig/configure.ac
 +++ poedit-1.8.7.1/configure.ac
-@@ -73,7 +73,7 @@ AS_IF([test "x$with_cpprest" != "xno"],
+@@ -68,7 +68,7 @@ AS_IF([test "x$with_cpprest" != "xno"],
+       dnl it for this header too and it uses only the preprocessor in one
+       dnl of its two phases:
+       old_CPPFLAGS="$CPPFLAGS"
+-      CPPFLAGS="$CPPFLAGS $CXXFLAGS"
++      CPPFLAGS="$CPPFLAGS $CXXFLAGS -pthread"
+           AC_CHECK_HEADERS([cpprest/http_client.h],
                [
                    AC_MSG_CHECKING([for libcpprest >= 2.5])
-                   old_LIBS="$LIBS"
--                  LIBS="-lcpprest -lboost_system -lssl -lcrypto $LIBS"
-+                  LIBS="-lcpprest -lboost_system -lssl -lcrypto -lpthread $LIBS"
-                   AC_LINK_IFELSE([AC_LANG_PROGRAM(
-                       [
-                           #include <cpprest/version.h>
-@@ -96,7 +96,7 @@ AS_IF([test "x$with_cpprest" != "xno"],
- AS_IF([test "x$have_cpprest" = "xyes"],
-       [
-           AC_DEFINE([HAVE_HTTP_CLIENT])
--          CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto"
-+          CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto -lpthread"
+@@ -99,7 +99,7 @@ AS_IF([test "x$have_cpprest" = "xyes"],
+           CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto"
            AC_SUBST(CPPREST_LIBS)
            PKG_CHECK_MODULES([LIBSECRET], [libsecret-1], [
-               CXXFLAGS="$CXXFLAGS $LIBSECRET_CFLAGS"
+-              CXXFLAGS="$CXXFLAGS $LIBSECRET_CFLAGS"
++              CXXFLAGS="$CXXFLAGS $LIBSECRET_CFLAGS -pthread"
+               AC_SUBST(LIBSECRET_LIBS)
+           ])
+       ],
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit