[Debian-l10n-commits] [poedit] branch master updated (0364120 -> 983e7dc)

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a change to branch master
in repository poedit.

      from  0364120   Add another little patch to enable cpprest on arm
       new  983e7dc   Tweak patch, thanks @vslavik

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


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)
+           ])
+       ],

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/poedit.git