distro-configs/LibreOfficeFlatpak.conf | 1 -
solenv/flatpak-manifest.in | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 7841362f9cc0622559e6984735febb035c46812d
Author: Stephan Bergmann <sberg...@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
Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b
Reviewed-on: https://gerrit.libreoffice.org/55453
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit a7db7f3ce699a46ce7e9eafdf4388a3213264464)
Reviewed-on: https://gerrit.libreoffice.org/55463
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index 23b3780c934e..4440c3aaf589 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/openjdk10/jvm/openjdk-10
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 42d2189935c2..3c602517d187 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -593,7 +593,7 @@
],
"buildsystem": "simple",
"build-commands": [
- "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak --disable-symbols",
+ "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak",
"make $(if test \"$(uname -i)\" = i386; then printf
build-nocheck; fi)",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
