[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-1' - configure.ac distro-configs/NISZ_32.conf distro-configs/NISZ_64.conf

[Gabor Kelemen (via logerrit)]

 configure.ac                |    2 +-
 distro-configs/NISZ_32.conf |    1 +
 distro-configs/NISZ_64.conf |    3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9994ddaa1a0b88c5299386d75d8a733902f3fa55
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Jun 22 08:58:49 2021 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Tue Jun 22 10:40:34 2021 +0200

    Add --disable-community-flavor and --host=x86_64-pc-cygwin
    
    Change-Id: Id45f138710caa669637ada049782b22acf808d7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117610
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/configure.ac b/configure.ac
index cdb8ee28d510..c97688f81fc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice],[7.1.4.2-N1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.4.2.N1],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
diff --git a/distro-configs/NISZ_32.conf b/distro-configs/NISZ_32.conf
index eef085b982c6..4927f45e3ccf 100644
--- a/distro-configs/NISZ_32.conf
+++ b/distro-configs/NISZ_32.conf
@@ -18,6 +18,7 @@
 --disable-cve-tests
 --with-package-format=msi
 --without-helppack-integration
+--disable-community-flavor
 
 # NISZ build
 --with-vendor=NISZ Zrt.
diff --git a/distro-configs/NISZ_64.conf b/distro-configs/NISZ_64.conf
index 8f55d2e6eeff..8c0521d3f378 100644
--- a/distro-configs/NISZ_64.conf
+++ b/distro-configs/NISZ_64.conf
@@ -18,7 +18,8 @@
 --disable-cve-tests
 --with-package-format=msi
 --without-helppack-integration
---enable-64-bit
+--host=x86_64-pc-cygwin
+--disable-community-flavor
 
 # NISZ build
 --with-vendor=NISZ Zrt.