[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |    1 -
 solenv/flatpak-manifest.in             |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 851d90b25db848c36a6887023b7a5877e293004a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 8 09:50:31 2018 +0200

    solenv/flatpak-manifest.in: Properly disable debug information
    
    ...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in:
    Disable debug information again, for now" commit message
    
    Reviewed-on: https://gerrit.libreoffice.org/55453
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit a7db7f3ce699a46ce7e9eafdf4388a3213264464)
    Conflicts:
            solenv/flatpak-manifest.in
    
    Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b
    Reviewed-on: https://gerrit.libreoffice.org/55464
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
index 1f3e865eba14..7fc1fbca36ea 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,7 +1,6 @@
 --disable-gtk
 --disable-odk
 --enable-release-build
---enable-symbols
 --with-ant-home=/run/build/libreoffice/ant
 --with-extra-buildid=Flatpak version
 --with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ebeda89a78cc..a8ed8895462c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -587,7 +587,7 @@
             ],
             "buildsystem": "simple",
             "build-commands": [
-                "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)",
+                "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)",
                 "make $(if test \"$(uname -i)\" = i386; then printf build-nocheck; fi)",
                 "make distro-pack-install",
                 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",