[libreoffice] 01/05: set --with-gdrive-client-{id, secret} properly (closes: #780253)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 24beaa91ce4f0e194da9ec59977f954b26b8dd77
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 25 11:48:40 2016 +0100
set --with-gdrive-client-{id,secret} properly (closes: #780253)
---
changelog | 4 ++++
control | 2 ++
rules | 17 +++++++++++++++++
3 files changed, 23 insertions(+)
diff --git a/changelog b/changelog
index 56adaa1..faf0b5d 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ libreoffice (1:5.1.1~rc1-2) UNRELEASED; urgency=medium
* debian/rules:
- somewhen m68k vanished from OOO_ARCHS; readd ;)
+ - actually we can use Chromiums Google API keys, so set
+ --with-gdrive-client-{id,secret} properly (closes: #780253).
+ Don't copy them but use chromiums ones directly, which makes this
+ i386/amd64 only, but...
* debian/scripts/get_libebook_dep.sh: fix to work with new multiarchified
libebook
diff --git a/control b/control
index 3bbb329..5eb4b5e 100644
--- a/control
+++ b/control
@@ -11,6 +11,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
+ chromium (>= 39.0.2171.71-1) [i386 amd64],
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 9.20160115),
@@ -4371,6 +4372,7 @@ Depends: ant (>= 1.7.0),
bison,
build-essential,
bzip2,
+ chromium (>= 39.0.2171.71-1),
coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
coinor-libcoinutils-dev (>= 2.9.15-3.1),
debhelper (>= 9.20160115),
diff --git a/rules b/rules
index 0b91b7d..3564071 100755
--- a/rules
+++ b/rules
@@ -452,6 +452,16 @@ LIBCMIS_MINVER=0.5.0-3
else
LIBCMIS_MINVER=0.5.0
endif
+ifeq "$(DEB_VENDOR)" "Debian"
+ # chromium only available on i386/amd64...
+ ifeq "$(DEB_HOST_ARCH)" "amd64"
+ ENABLE_GDRIVE=y
+ else
+ ifeq "$(DEB_HOST_ARCH)" "i386"
+ ENABLE_GDRIVE=y
+ endif
+ endif
+endif
SYSTEM_STUFF += jpeg
SYSTEM_STUFF += libxml
SYSTEM_STUFF += expat
@@ -1229,6 +1239,13 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
+ifeq "$(ENABLE_GDRIVE)" "y"
+ # Google API stuff for GDrive access
+ BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 amd64]
+ include /etc/chromium.d/apikeys
+ CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLE_DEFAULT_CLIENT_ID) --with-gdrive-client-secret=$(GOOGLE_DEFAULT_CLIENT_SECRET)
+endif
+
ifeq "$(ENABLE_EOT)" "y"
CONFIGURE_FLAGS += --enable-eot
ifneq (,$(filter libeot, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: