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

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Tue Feb 23 16:43:08 UTC 2016


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  0364120849d1e1af47f00c1facbcf81dca991129 (commit)
      from  72113b8f32b106798f1b76291b7fdcc795525f6f (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=0364120849d1e1af47f00c1facbcf81dca991129

commit 0364120849d1e1af47f00c1facbcf81dca991129
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Feb 23 17:42:57 2016 +0100

    Add another little patch to enable cpprest on arm

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

Summary of changes:
 debian/changelog                     |  1 +
 debian/patches/fix-arm-cpprest.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 debian/patches/fix-arm-cpprest.patch

diff --git a/debian/changelog b/debian/changelog
index f18abd0..db204b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ poedit (1.8.7.1-1) unstable; urgency=medium
 
   * New upstream hotfix release (closes: #815547)
   * Remove fix-cpp-rest-detection-build.patch: upstream.
+    - add pthread to the build, fixing arm* link failures.
   * Add sh4 to cpprest ready architectures.
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 23 Feb 2016 13:33:49 +0100
diff --git a/debian/patches/fix-arm-cpprest.patch b/debian/patches/fix-arm-cpprest.patch
new file mode 100644
index 0000000..8002577
--- /dev/null
+++ b/debian/patches/fix-arm-cpprest.patch
@@ -0,0 +1,25 @@
+Description: Fix missing pthread on arm linker, and enable cpprest build
+ https://github.com/vslavik/poedit/pull/244
+
+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"],
+               [
+                   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"
+           AC_SUBST(CPPREST_LIBS)
+           PKG_CHECK_MODULES([LIBSECRET], [libsecret-1], [
+               CXXFLAGS="$CXXFLAGS $LIBSECRET_CFLAGS"
diff --git a/debian/patches/series b/debian/patches/series
index 4a09b37..94e689f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-desktop.patch
 mv-poedit-dump-legacy.patch
+fix-arm-cpprest.patch
-----------------------------------------------------------------------


hooks/post-receive
-- 
poedit



More information about the Debian-l10n-commits mailing list