[libreoffice] 02/03: make no-packagekit-per-default.diff apply again and use --disable-optimized on noopt

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 72c9d5766a09526c3b5e7b23e2720bad279a80af
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 22 16:36:14 2017 +0200

    make no-packagekit-per-default.diff apply again and use --disable-optimized on noopt
---
 patches/no-packagekit-per-default.diff | 4 ++--
 rules                                  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 3e2b545..a16c1a4 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -34,10 +34,10 @@ diff --git a/config_host.mk.in b/config_host.mk.in
 index 6170227..2721820 100644
 --- a/config_host.mk.in
 +++ b/config_host.mk.in
-@@ -157,6 +157,7 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
- export ENABLE_OOENV=@ENABLE_OOENV@
+@@ -153,6 +153,7 @@
  export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
  export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
+ export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
 +export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
  export ENABLE_PCH=@ENABLE_PCH@
  export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
diff --git a/rules b/rules
index ed48c4b..98e4769 100755
--- a/rules
+++ b/rules
@@ -903,6 +903,9 @@ include /usr/share/dpkg/buildflags.mk
 ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CONFIGURE_FLAGS += --enable-debug
 endif
+ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CONFIGURE_FLAGS += --disable-optimized
+endif
 
 PYMAJOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[0])")
 PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git