[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac desktop/Module_desktop.mk distro-configs/LibreOfficeOssFuzz.conf Makefile.in smoketest/Module_smoketest.mk vcl/commonfuzzer.mk vcl/Ex

2021-12-25 Thread Jan-Marek Glogowski (via logerrit) 
 Makefile.in|2 --
 bin/oss-fuzz-build.sh  |9 +
 configure.ac   |4 ++--
 desktop/Module_desktop.mk  |2 ++
 distro-configs/LibreOfficeOssFuzz.conf |2 ++
 smoketest/Module_smoketest.mk  |2 ++
 vcl/Executable_docxfuzzer.mk   |2 ++
 vcl/Executable_fodtfuzzer.mk   |2 ++
 vcl/Executable_htmlfuzzer.mk   |4 +++-
 vcl/Module_vcl.mk  |3 +--
 vcl/commonfuzzer.mk|4 +++-
 vcl/workben/docxfuzzer.cxx |5 -
 vcl/workben/fodtfuzzer.cxx |5 -
 vcl/workben/htmlfuzzer.cxx |2 --
 14 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 37106f20bd5cc016a473fbdb2e9e37da096cff5f
Author: Jan-Marek Glogowski 
AuthorDate: Sun Dec 12 22:03:49 2021 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Sat Dec 25 17:05:08 2021 +0100

oss-fuzz: convert to static cross-build

This way we can get rid of the pre-generated locale data and the
special fuzzers target, which invokes a full gbuild make for
every prereqisite, always parsing the whole tree, taking ages.

This also reverts:
- commit d0780b21cfe235c4446adf649eb690f9c1771dd5 ("fix oss-fuzz
  build") by adding epubgen and revenge dependencies.
- commit ff25d6a123beb42476bf42d189b3033a86835b2a ("ofz#41602 fix
  more build failure"), which shouldn't happen anymore since
  commit d47628f287f4377394c4ff488c433bfe254b6abe ("don't want to
  link to system static libs for DISABLE_DYNLOADING")

Change-Id: I3aed9ec62da507254b42e4e7470bae1097b4bc8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127031
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Makefile.in b/Makefile.in
index 3ac9ce6d3c22..7c30271cffb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -504,8 +504,6 @@ $(BUILDDIR)/vs-code.code-workspace: 
$(BUILDDIR)/vs-code.code-workspace.template
@test -e $@ || cp $< $@ && \
cmp -s $@ $< || echo "ATTN: $(@F) differs from $( templateservices.rdb
diff --git a/configure.ac b/configure.ac
index 1ba896d7defb..f85e0b1701f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3799,7 +3799,7 @@ if test -n "$WIN_MULTI_ARCH" -a -n "$WIN_OTHER_ARCH"; then
 fi
 
 
-if test "$build_cpu" != "$host_cpu" -o \( "$DISABLE_DYNLOADING" = TRUE -a 
"$enable_fuzzers" != yes \); then
+if test "$build_cpu" != "$host_cpu" -o "$DISABLE_DYNLOADING" = TRUE; then
 # To allow building Windows multi-arch releases without cross-tooling
 if test "$DISABLE_DYNLOADING" = TRUE -o \( -z "$WIN_MULTI_ARCH" -a -z 
"$WIN_OTHER_ARCH" \); then
 cross_compiling="yes"
@@ -9574,7 +9574,7 @@ else
 
LIBXML_LIBS="${WORKDIR}/UnpackedTarball/libxml2/win32/bin.msvc/libxml2.lib"
 else
 LIBXML_LIBS="-L${WORKDIR}/UnpackedTarball/libxml2/.libs -lxml2"
-if test "$DISABLE_DYNLOADING" = TRUE -a "$ENABLE_FUZZERS" != "TRUE"; 
then
+if test "$DISABLE_DYNLOADING" = TRUE; then
 LIBXML_LIBS="$LIBXML_LIBS -lm"
 fi
 fi
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index a03a552e4271..ce8f254d7af1 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -100,9 +100,11 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 else ifeq (,$(filter MACOSX ANDROID iOS HAIKU,$(OS)))
 
+ifeq (,$(filter FUZZERS,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
 Executable_oosplash \
 ))
+endif
 
 endif
 
diff --git a/distro-configs/LibreOfficeOssFuzz.conf 
b/distro-configs/LibreOfficeOssFuzz.conf
index 434452a673f0..5f50f2774bc5 100644
--- a/distro-configs/LibreOfficeOssFuzz.conf
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -8,6 +8,7 @@
 --disable-cups
 --disable-dbus
 --disable-dconf
+--disable-extensions
 --disable-firebird-sdbc
 --disable-gio
 --disable-gtk3
@@ -29,5 +30,6 @@
 --with-locales=en
 --with-system-lockfile
 --without-fonts
+--without-galleries
 --without-java
 --without-webdav
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 217dbfa6543a..5d66a0daa1e4 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -12,10 +12,12 @@ $(eval $(call gb_Module_Module,smoketest))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,smoketest,\
Library_smoketest \
Zip_smoketestdoc \
 ))
+endif
 
 ifneq ($(ENABLE_JAVA),)
 ifneq ($(filter EXTENSIONS,$(BUILD_TYPE)),)
diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index fbacbe92fd98..57bc9020713b 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_Executable_use_api,docxfuzzer,\
 
 $(eval $(call gb_Executable_use_externals,docxfuzzer,\
 $(fuzzer_externals) \
+epubgen \
+revenge \
 ))
 
 $(eval

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac download.lst extras/source solenv/flatpak-manifest.in

2020-11-19 Thread Ming Hua (via logerrit) 
 bin/oss-fuzz-build.sh|2 
 configure.ac |2 
 download.lst |2 
 extras/source/truetype/symbol/OpenSymbol.sfd |   98 +--
 solenv/flatpak-manifest.in   |6 -
 5 files changed, 100 insertions(+), 10 deletions(-)

New commits:
commit 52f1115571469f210192cbce6b52e8b7d1d85dc0
Author: Ming Hua 
AuthorDate: Wed Nov 18 09:02:26 2020 +0100
Commit: Mike Kaganski 
CommitDate: Thu Nov 19 16:14:36 2020 +0100

tdf#132938 Add glyphs U+F030-U+F039 to OpenSymbol

Add glyphs U+F030-U+F039 (in Private Use Area) as references to
U+0030-U+0039 (digits 0-9), because font Symbol.ttf has these glyphs and
they are necessary for compatibility with MS Office file formats.

Change-Id: If66ac3ee6fda9c161b36fd6eb459c99646e87541
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105997
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index ce4d110ce48a..4ebecd6f3c11 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -31,7 +31,7 @@ for a in *fuzzer; do
 #some minimal fonts required
 mv $a $OUT
 mkdir -p $OUT/$a.fonts
-cp 
$SRC/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
 ../share/fonts/truetype/Liberation* $OUT/$a.fonts
+cp 
$SRC/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 ../share/fonts/truetype/Liberation* $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
diff --git a/configure.ac b/configure.ac
index abaceb94ee0b..031308058854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12701,7 +12701,7 @@ if test "$enable_build_opensymbol" = "yes"; then
 fi
 else
 AC_MSG_RESULT([no])
-
OPENSYMBOL_TTF=884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf
+
OPENSYMBOL_TTF=f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
 BUILD_TYPE="$BUILD_TYPE OPENSYMBOL"
 fi
 AC_SUBST(OPENSYMBOL_TTF)
diff --git a/download.lst b/download.lst
index 1c932acc04f8..aa49f99d3e33 100644
--- a/download.lst
+++ b/download.lst
@@ -272,4 +272,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz
 
 NUMBERTEXT_EXTENSION_SHA256SUM := 
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
 UNOWINREG_SHA256SUM := 
eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
-OPENSYMBOL_SHA256SUM := 
884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
+OPENSYMBOL_SHA256SUM := 
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd 
b/extras/source/truetype/symbol/OpenSymbol.sfd
index c9e9baad1707..32885c1baf1e 100644
--- a/extras/source/truetype/symbol/OpenSymbol.sfd
+++ b/extras/source/truetype/symbol/OpenSymbol.sfd
@@ -3,8 +3,8 @@ FontName: OpenSymbol
 FullName: OpenSymbol
 FamilyName: OpenSymbol
 Weight: Book
-Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi Abe
-Version: 102.11
+Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 
Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> 
TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled 
Hosny\n(c) 2016 Mike Kaganski\nzero, one, two, three, four, five, six, seven, 
eight, nine, question, underscore, copyright, registered, uni2215, angle, 
therefore, lozenge (c) 2010 Google Corporation\nuni20D1 (c) 2019 Takeshi 
Abe\nuniF030 <-> uniF039 (c) 2020 Ming Hua
+Version: 102.12
 ItalicAngle: 0
 UnderlinePosition: -143
 UnderlineWidth: 20
@@ -20,7 +20,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1144938807
-ModificationTime: 1558881510
+ModificationTime: 1605567303
 PfmFamily: 81
 TTFWeight: 400
 TTFWidth: 5
@@ -784,7 +784,7 @@ FitToEm: 1
 WinInfo: 0 34 12
 BeginPrivate: 0
 EndPrivate
-BeginChars: 1053 1053
+BeginChars: 1063 1063
 
 StartChar: Alpha
 Encoding: 0 913 0
@@ -108724,5 +108724,95 @@ SplineSet
  98 1313 l 1,0,-1
 EndSplineSet
 EndChar
+
+StartChar: uniF030
+Encoding: 1053 61488 1053
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1031 48 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF031
+Encoding: 1054 61489 1054
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1032 49 N 1 0 0 1 0 0 2
+EndChar
+
+StartChar: uniF032
+Encoding: 1055 61490 1055
+Width: 1024
+Flags: W
+LayerCount: 2
+Fore
+Refer: 1033 50 N 1 0 0 1 0 0 2
+EndChar
+

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh configure.ac

2017-03-09 Thread Caolán McNamara 
 bin/oss-fuzz-build.sh |7 +--
 configure.ac  |6 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 3b7054e0bb86cec2db08b7c7654710a21cf66a94
Author: Caolán McNamara 
Date:   Thu Mar 9 10:24:22 2017 +

use a different resource dir for oss-fuzz

This reverts commit 754854674859560506b617ebf07e6563c197aac8.

Change-Id: I0863fb5e34608911c784bbdf19e76297b3c2d13e

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 2c54e13..b0d3d6e 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -24,10 +24,13 @@ make fuzzers
 cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
instdir/share/fonts/truetype/Liberation* $OUT
 #minimal runtime requirements
 rm -rf $OUT/services $OUT/types $OUT/resource $OUT/*rdb
-pushd instdir/program
-cp -r *fuzzer *rc *rdb services types resource $OUT
+pushd instdir
+cp -r resource $OUT
+pushd program
+cp -r *fuzzer *rc *rdb services types $OUT
 mv $OUT/services/services.rdb $OUT/services.rdb
 popd
+popd
 
 #starting corpuses
 cp $SRC/*_seed_corpus.zip $OUT
diff --git a/configure.ac b/configure.ac
index fb4441c..dd945c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3129,7 +3129,11 @@ else
 LIBO_SHARE_JAVA_FOLDER=program/classes
 LIBO_SHARE_PRESETS_FOLDER=presets
 LIBO_SHARE_READMES_FOLDER=readmes
-LIBO_SHARE_RESOURCE_FOLDER=program/resource
+if test "$enable_fuzzers" != yes; then
+LIBO_SHARE_RESOURCE_FOLDER=program/resource
+else
+LIBO_SHARE_RESOURCE_FOLDER=resource
+fi
 LIBO_SHARE_SHELL_FOLDER=program/shell
 LIBO_URE_BIN_FOLDER=program
 LIBO_URE_ETC_FOLDER=program
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits