[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4-1-339-gbcbcb4c
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 8c55d47ea59c82f4e10f3a28c8496c5a8e99f3c5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Dec 10 19:46:24 2012 +0100
backport fix for configure checking for wget/curl even when fetching is disabled
diff --git a/changelog b/changelog
index 35032ac..6affef0 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.0~beta1-0ubuntu1~ppa2) raring; urgency=low
+
+ * dont check for wget/curl (backported temp. patch)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 10 Dec 2012 19:45:05 +0100
+
libreoffice (1:4.0.0~beta1-0ubuntu1~ppa1) raring; urgency=low
* beta -- first port to raring
diff --git a/patches/libreoffice40beta-dont-check-for-wget-curl.diff b/patches/libreoffice40beta-dont-check-for-wget-curl.diff
new file mode 100644
index 0000000..50a888f
--- /dev/null
+++ b/patches/libreoffice40beta-dont-check-for-wget-curl.diff
@@ -0,0 +1,37 @@
+From ed8615a44e98c24e7e8b09ad02bd9d18cb74fc03 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Mon, 10 Dec 2012 19:06:48 +0100
+Subject: [PATCH] no need for wget/curl when not fetching anything
+
+Change-Id: I097675450a0eed87eccf90356c81657485609d13
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ad5e9f3..5d48f02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11493,6 +11493,10 @@ AC_SUBST(SCPDEFS)
+ #
+ WGET=
+ MD5SUM=
++CURL=
++
++if test "$enable_fetch_external" != "no"; then
++
+ CURL=`which curl 2>/dev/null`
+
+ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
+@@ -11534,6 +11538,8 @@ if test -z "$MD5SUM"; then
+ add_warning "no md5sum: found!"
+ fi
+
++fi
++
+ AC_SUBST(WGET)
+ AC_SUBST(CURL)
+ AC_SUBST(MD5SUM)
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 8d43d6b..f13e7a0 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,4 @@ build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+libreoffice40beta-dont-check-for-wget-curl.diff
--
LibreOffice packaging repository
Reply to: