[Debian-l10n-commits] [poedit] branch master updated (462199e -> bb2ead6)

Gianfranco Costamagna locutusofborg-guest at moszumanska.debian.org
Mon Feb 22 12:13:45 UTC 2016


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

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

      from  462199e   Update copyright
       new  bb2ead6   Make cpprest enabled again

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/changelog                                 |  7 +++++++
 debian/patches/fix-cpprest-detection-build.patch | 25 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 33 insertions(+)
 create mode 100644 debian/patches/fix-cpprest-detection-build.patch

diff --git a/debian/changelog b/debian/changelog
index 9fd471a..92c8d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+poedit (1.8.7-2) unstable; urgency=medium
+
+  * Enable cpprest (crowdin) again (Closes: #815209)
+    - thanks Janusz for the bug report!
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 22 Feb 2016 13:11:35 +0100
+
 poedit (1.8.7-1) unstable; urgency=medium
 
   * Imported Upstream version 1.8.7
diff --git a/debian/patches/fix-cpprest-detection-build.patch b/debian/patches/fix-cpprest-detection-build.patch
new file mode 100644
index 0000000..f3e0f0d
--- /dev/null
+++ b/debian/patches/fix-cpprest-detection-build.patch
@@ -0,0 +1,25 @@
+Description: fix cpprest detection and build
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+
+Bug-Debian: https://bugs.debian.org/815209
+
+--- poedit-1.8.7.orig/configure.ac
++++ poedit-1.8.7/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 $LIBS"
++                  LIBS="-lcpprest -lboost_system -lssl -lcrypto $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"
++          CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto"
+           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..e642788 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-desktop.patch
 mv-poedit-dump-legacy.patch
+fix-cpprest-detection-build.patch

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



More information about the Debian-l10n-commits mailing list