[Debian-l10n-commits] [poedit] annotated tag debian/1.8.7.1-1 updated (ed8a8f4 -> ced8d15)

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a change to annotated tag debian/1.8.7.1-1
in repository poedit.

*** WARNING: tag debian/1.8.7.1-1 was modified! ***

      from  ed8a8f4   (tag)
        to  ced8d15   (tag)
   tagging  983e7dc320d68dd2591a6141994f0a774b68dc82 (commit)
  replaces  debian/1.8.7-2
 tagged by  Gianfranco Costamagna
        on  Tue Feb 23 19:09:26 2016 +0100

- Log -----------------------------------------------------------------
poedit Debian release 1.8.7.1-1

Gianfranco Costamagna (7):
      Revert back to >=2.5
      Enable cpprest on some more architectures
      Imported Upstream version 1.8.7.1
      Merge tag 'upstream/1.8.7.1'
      New upstream release, patch drop
      Add another little patch to enable cpprest on arm
      Tweak patch, thanks @vslavik

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

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

No new revisions were added by this update.

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