core.git: Branch 'libreoffice-24-2' - bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6c2f1d03e73fa42ffcfd6817e32be472cef62e23
Author: Rene Engelhard
AuthorDate: Thu Aug 8 17:36:14 2024 +0200
Commit: Caolán McNamara
CommitDate: Fri Aug 9 09:17:32 2024 +0200
fix build on armhf with gcc 14
/uno2cpp.cxx: In function ‘void {anonymous}::callVirtualMethod(void*,
sal_Int32, void*, typelib_TypeDescriptionReference*, sal_uInt32*, sal_uInt32,
sal_uInt32*, sal_uInt32, double*)’:
/<>/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:278:5:
error: ‘asm’ operand has impossible constraints or there are not enough
registers
278 | __asm__ __volatile__ (
| ^~~
make[2]: *** [/<>/solenv/gbuild/LinkTarget.mk:338:
/<>/workdir/CxxObject/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.o]
Error 1
Just removing them makes it work, they are mentioned before anyway, too
(thanks Caolan)
Change-Id: Ibb9118b268a587ebdcfce343e2ee2605ac979915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171650
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit d9e818f3d706145aba95587d685cbcfdeb797edb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171668
Tested-by: Jenkins
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 001384e005fc..e08ec4ad8f85 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -298,7 +298,7 @@ void callVirtualMethod(
"mov %[r1], r1
"
: [r0]"=r" (r0), [r1]"=r" (r1)
: [pmethod]"m" (pMethod), [pgpr]"m" (pGPR), [pfpr]"m" (pFPR)
-: "r0", "r1", "r2", "r3", "r4", "r5");
+: "r2", "r3", "r4", "r5");
MapReturn(r0, r1, pReturnType, static_cast(pRegisterReturn));
}
core.git: Branch 'libreoffice-24-8' - bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit afc0ebe2590110dd5c472326f2117eea2409ec98
Author: Rene Engelhard
AuthorDate: Thu Aug 8 17:36:14 2024 +0200
Commit: Caolán McNamara
CommitDate: Fri Aug 9 09:17:24 2024 +0200
fix build on armhf with gcc 14
/uno2cpp.cxx: In function ‘void {anonymous}::callVirtualMethod(void*,
sal_Int32, void*, typelib_TypeDescriptionReference*, sal_uInt32*, sal_uInt32,
sal_uInt32*, sal_uInt32, double*)’:
/<>/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:278:5:
error: ‘asm’ operand has impossible constraints or there are not enough
registers
278 | __asm__ __volatile__ (
| ^~~
make[2]: *** [/<>/solenv/gbuild/LinkTarget.mk:338:
/<>/workdir/CxxObject/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.o]
Error 1
Just removing them makes it work, they are mentioned before anyway, too
(thanks Caolan)
Change-Id: Ibb9118b268a587ebdcfce343e2ee2605ac979915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171650
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit d9e818f3d706145aba95587d685cbcfdeb797edb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171669
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 001384e005fc..e08ec4ad8f85 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -298,7 +298,7 @@ void callVirtualMethod(
"mov %[r1], r1
"
: [r0]"=r" (r0), [r1]"=r" (r1)
: [pmethod]"m" (pMethod), [pgpr]"m" (pGPR), [pfpr]"m" (pFPR)
-: "r0", "r1", "r2", "r3", "r4", "r5");
+: "r2", "r3", "r4", "r5");
MapReturn(r0, r1, pReturnType, static_cast(pRegisterReturn));
}
core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d9e818f3d706145aba95587d685cbcfdeb797edb
Author: Rene Engelhard
AuthorDate: Thu Aug 8 17:36:14 2024 +0200
Commit: Caolán McNamara
CommitDate: Thu Aug 8 20:35:30 2024 +0200
fix build on armhf with gcc 14
/uno2cpp.cxx: In function ‘void {anonymous}::callVirtualMethod(void*,
sal_Int32, void*, typelib_TypeDescriptionReference*, sal_uInt32*, sal_uInt32,
sal_uInt32*, sal_uInt32, double*)’:
/<>/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:278:5:
error: ‘asm’ operand has impossible constraints or there are not enough
registers
278 | __asm__ __volatile__ (
| ^~~
make[2]: *** [/<>/solenv/gbuild/LinkTarget.mk:338:
/<>/workdir/CxxObject/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.o]
Error 1
Just removing them makes it work, they are mentioned before anyway, too
(thanks Caolan)
Change-Id: Ibb9118b268a587ebdcfce343e2ee2605ac979915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171650
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 001384e005fc..e08ec4ad8f85 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -298,7 +298,7 @@ void callVirtualMethod(
"mov %[r1], r1
"
: [r0]"=r" (r0), [r1]"=r" (r1)
: [pmethod]"m" (pMethod), [pgpr]"m" (pGPR), [pfpr]"m" (pFPR)
-: "r0", "r1", "r2", "r3", "r4", "r5");
+: "r2", "r3", "r4", "r5");
MapReturn(r0, r1, pReturnType, static_cast(pRegisterReturn));
}
core.git: Branch 'feature/cib_contract49' - configure.ac download.lst external/rhino Makefile.fetch solenv/flatpak-manifest.in
Makefile.fetch |1 -
configure.ac |7 ++-
download.lst |5 -
external/rhino/README |9 -
solenv/flatpak-manifest.in |7 ---
5 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 60a187494196de909abf65edd0e074cd58dd8062
Author: Rene Engelhard
AuthorDate: Wed Apr 3 23:26:08 2024 +0200
Commit: Thorsten Behrens
CommitDate: Thu Apr 11 07:32:45 2024 +0200
clean up after removal of patched rhino
Change-Id: I193fd0c10d297555faa7a832718dbd6cd929a406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165762
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/Makefile.fetch b/Makefile.fetch
index 625e781dc36a..412b9f16927f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -206,7 +206,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,REDLAND,REDLAND_TARBALL) \
$(call fetch_Optional,REVENGE,REVENGE_TARBALL) \
$(call fetch_Optional,RHINO,RHINO_TARBALL) \
- $(call fetch_Optional,RHINO,SWING_TARBALL) \
$(call fetch_Optional,SKIA,SKIA_TARBALL) \
$(call fetch_Optional,STAROFFICE,STAROFFICE_TARBALL) \
$(if $(filter WNT,$(OS)),TWAIN_DSM_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 1a19592bbc88..5558740e8be3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2356,11 +2356,8 @@ libo_FUZZ_ARG_ENABLE(scripting-javascript,
AC_ARG_WITH(system-rhino,
AS_HELP_STRING([--with-system-rhino],
-[Use rhino already on system.]),,)
-#[with_system_rhino="$with_system_jars"])
-# Above is not used as we have different debug interface
-# patched into internal rhino. This code needs to be fixed
-# before we can enable it by default.
+[Use rhino already on system.]),,
+[with_system_rhino="$with_system_jars"])
AC_ARG_WITH(rhino-jar,
AS_HELP_STRING([--with-rhino-jar=JARFILE],
diff --git a/download.lst b/download.lst
index b2af90eb35bc..3d5cdfabf905 100644
--- a/download.lst
+++ b/download.lst
@@ -517,11 +517,6 @@ STAROFFICE_TARBALL :=
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-SWING_SHA256SUM :=
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
-SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# three static lines
-# so that git cherry-pick
-# will not run into conflicts
TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6
TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
# three static lines
diff --git a/external/rhino/README b/external/rhino/README
index 83e4135d0b89..c60378c32262 100644
--- a/external/rhino/README
+++ b/external/rhino/README
@@ -3,12 +3,3 @@ JavaScript engine/interpreter written in Java, used to provide
JavaScript extens
The Scripting Framework makes use of the Rhino
([http://www.mozilla.org/rhino/])
JavaScript interpreter, available under the Mozilla Public License
([http://www.mozilla.org/MPL/MPL-1.1.html]).
-
-In addition, to support the debugging of scripts contained in OpenOffice.org
-documents, we have modified the Java source file Main.java.
-
-The Rhino source tarball is unpacked and patched with the modified code. The
-Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and
-built as part of this procesS) and delivered to the solver. The file
-rhino1_5R5.patch contains the changes made in order to build Rhino. The patch
-was generated using the command: diff -wurN
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 112747942471..b14797f252dc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -618,13 +618,6 @@
"dest": "external/tarballs",
"dest-filename": "@JFREEREPORT_SAC_TARBALL@"
},
-{
-"url":
"https://dev-www.libreoffice.org/src/@SWING_TARBALL@";,
-"sha256": "@SWING_SHA256SUM@",
-"type": "file",
-"dest": "external/tarballs",
-"dest-filename": "@SWING_TARBALL@"
-},
{
"url":
"https://dev-www.libreoffice.org/src/@LIBNUMBERTEXT_TARBALL@";,
"sha256": "@LIBNUMBERTEXT_SHA256SUM@",
core.git: configure.ac download.lst external/rhino Makefile.fetch solenv/flatpak-manifest.in
Makefile.fetch |1 -
configure.ac |7 ++-
download.lst |5 -
external/rhino/README |9 -
solenv/flatpak-manifest.in |7 ---
5 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 479a39cbf0f4564abe93066d7a3f6b2e82de0e76
Author: Rene Engelhard
AuthorDate: Wed Apr 3 23:26:08 2024 +0200
Commit: Stephan Bergmann
CommitDate: Mon Apr 8 10:48:19 2024 +0200
clean up after removal of patched rhino
Change-Id: I193fd0c10d297555faa7a832718dbd6cd929a406
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165762
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/Makefile.fetch b/Makefile.fetch
index b96cb573c2bf..afb7d176e79e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -224,7 +224,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,REDLAND,REDLAND_TARBALL) \
$(call fetch_Optional,REVENGE,REVENGE_TARBALL) \
$(call fetch_Optional,RHINO,RHINO_TARBALL) \
- $(call fetch_Optional,RHINO,SWING_TARBALL) \
$(call fetch_Optional,SKIA,SKIA_TARBALL) \
$(call fetch_Optional,STAROFFICE,STAROFFICE_TARBALL) \
$(if $(filter WNT,$(OS)),TWAIN_DSM_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 507fef7e9d34..799b88d39abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2390,11 +2390,8 @@ libo_FUZZ_ARG_ENABLE(scripting-javascript,
AC_ARG_WITH(system-rhino,
AS_HELP_STRING([--with-system-rhino],
-[Use rhino already on system.]),,)
-#[with_system_rhino="$with_system_jars"])
-# Above is not used as we have different debug interface
-# patched into internal rhino. This code needs to be fixed
-# before we can enable it by default.
+[Use rhino already on system.]),,
+[with_system_rhino="$with_system_jars"])
AC_ARG_WITH(rhino-jar,
AS_HELP_STRING([--with-rhino-jar=JARFILE],
diff --git a/download.lst b/download.lst
index 8c732bdb41b0..d8793dbeb620 100644
--- a/download.lst
+++ b/download.lst
@@ -602,11 +602,6 @@ STAROFFICE_TARBALL :=
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-SWING_SHA256SUM :=
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
-SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-# three static lines
-# so that git cherry-pick
-# will not run into conflicts
TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6
TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
# three static lines
diff --git a/external/rhino/README b/external/rhino/README
index 83e4135d0b89..c60378c32262 100644
--- a/external/rhino/README
+++ b/external/rhino/README
@@ -3,12 +3,3 @@ JavaScript engine/interpreter written in Java, used to provide
JavaScript extens
The Scripting Framework makes use of the Rhino
([http://www.mozilla.org/rhino/])
JavaScript interpreter, available under the Mozilla Public License
([http://www.mozilla.org/MPL/MPL-1.1.html]).
-
-In addition, to support the debugging of scripts contained in OpenOffice.org
-documents, we have modified the Java source file Main.java.
-
-The Rhino source tarball is unpacked and patched with the modified code. The
-Rhino Jar file (js.jar) is then built (download/swingExSrc.zip is unpacked and
-built as part of this procesS) and delivered to the solver. The file
-rhino1_5R5.patch contains the changes made in order to build Rhino. The patch
-was generated using the command: diff -wurN
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 74beb39f21b9..1ba678b81d12 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -709,13 +709,6 @@
"dest": "external/tarballs",
"dest-filename": "@JFREEREPORT_SAC_TARBALL@"
},
-{
-"url":
"https://dev-www.libreoffice.org/src/@SWING_TARBALL@";,
-"sha256": "@SWING_SHA256SUM@",
-"type": "file",
-"dest": "external/tarballs",
-"dest-filename": "@SWING_TARBALL@"
-},
{
"url":
"https://dev-www.libreoffice.org/src/@LIBNUMBERTEXT_TARBALL@";,
"sha256": "@LIBNUMBERTEXT_SHA256SUM@",
core.git: vcl/unx
vcl/unx/generic/window/salframe.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 10831c8b7b39f058452e640ba804f5a928441ed9
Author: Rene Engelhard
AuthorDate: Sun Mar 17 17:42:43 2024 +0100
Commit: Michael Weghorn
CommitDate: Thu Mar 21 09:04:08 2024 +0100
fix 32bit build with clang
seen in a build-with-clang experiment:
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:39:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setPosSize({ x, y }, { w, h });
^
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:39:
note: insert an explicit cast to silence this issue
maGeometry.setPosSize({ x, y }, { w, h });
^
static_cast( )
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:42:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setPosSize({ x, y }, { w, h });
^
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:42:
note: insert an explicit cast to silence this issue
maGeometry.setPosSize({ x, y }, { w, h });
^
static_cast( )
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:34:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setSize({ pState->GetMaximizedWidth(),
pState->GetMaximizedHeight() });
^~~
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:34:
note: insert an explicit cast to silence this issue
maGeometry.setSize({ pState->GetMaximizedWidth(),
pState->GetMaximizedHeight() });
^~~
static_cast( )
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:63:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setSize({ pState->GetMaximizedWidth(),
pState->GetMaximizedHeight() });
^~~~
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:63:
note: insert an explicit cast to silence this issue
maGeometry.setSize({ pState->GetMaximizedWidth(),
pState->GetMaximizedHeight() });
^~~~
static_cast( )
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:60:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h });
^
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:60:
note: insert an explicit cast to silence this issue
maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h });
^
static_cast( )
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:63:
error: non-constant-expression cannot be narrowed from type 'unsigned int' to
'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing]
maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h });
^
/home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:63:
note: insert an explicit cast to silence this issue
maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h });
^
static_cast( )
6 errors generated.
make[2]: ***
[/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:340:
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/unx/generic/window/salframe.o]
Error 1
Fails with clang 16, builds with gcc 12
Change-Id: I668e3178aaaf528947c96db090f7b458e7f76
core.git: bin/lo-xlate-lang
bin/lo-xlate-lang |1 + 1 file changed, 1 insertion(+) New commits: commit 82e90e1b2a8873334f1fcd00dde769e45af37b5b Author: Rene Engelhard AuthorDate: Sat Jan 27 18:03:37 2024 +0100 Commit: René Engelhard CommitDate: Tue Jan 30 21:03:34 2024 +0100 add hy to bin/lo-xlate-lang Change-Id: I1205da81fc179affa58478860928e74a501d4c0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162644 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: René Engelhard diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang index 06530621731a..9b939012e99a 100755 --- a/bin/lo-xlate-lang +++ b/bin/lo-xlate-lang @@ -177,6 +177,7 @@ __DATA__ :am:amharic :gug:guarani :szl:upper_silesian +:hy:armenian 01:en-US:english_american 03:pt:portuguese 07:ru:russian
core.git: Branch 'libreoffice-24-2' - bin/lo-xlate-lang
bin/lo-xlate-lang |1 + 1 file changed, 1 insertion(+) New commits: commit be1a96a9090f7b71598882f6f9a2ac5bf1ce6e58 Author: Rene Engelhard AuthorDate: Sat Jan 27 18:03:37 2024 +0100 Commit: Christian Lohmaier CommitDate: Mon Jan 29 11:38:07 2024 +0100 add hy to bin/lo-xlate-lang Change-Id: I1205da81fc179affa58478860928e74a501d4c0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162618 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang index 06530621731a..9b939012e99a 100755 --- a/bin/lo-xlate-lang +++ b/bin/lo-xlate-lang @@ -177,6 +177,7 @@ __DATA__ :am:amharic :gug:guarani :szl:upper_silesian +:hy:armenian 01:en-US:english_american 03:pt:portuguese 07:ru:russian
core.git: desktop/test
desktop/test/deployment/update/platform/linux_loongarch64.oxt |binary desktop/test/deployment/update/platform/linux_riscv64.oxt |binary desktop/test/deployment/update/platform/linux_sparc64.oxt |binary 3 files changed New commits: commit 979ec95a0af2457e71b82d50e3fd9c34a3cf7701 Author: Rene Engelhard AuthorDate: Tue Jul 11 17:16:54 2023 +0200 Commit: Stephan Bergmann CommitDate: Sun Jan 28 19:16:37 2024 +0100 add sparc64, riscv64 and loongarch64 test extensions forgotten in 3cb45765f2accfa749cc56a087059600ec467f28 and bc9487f745befde6534fd46058e119256952323d and d3625d968901eb93a9680db8d1165f70de3fd64e Probably academic since none of those archs will have something in LO doing online-update anyway, but... Change-Id: I10bcc909df42ee7f51f2135b60fbb33c135f2554 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154335 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/desktop/test/deployment/update/platform/linux_loongarch64.oxt b/desktop/test/deployment/update/platform/linux_loongarch64.oxt new file mode 100644 index ..3353ea1f0334 Binary files /dev/null and b/desktop/test/deployment/update/platform/linux_loongarch64.oxt differ diff --git a/desktop/test/deployment/update/platform/linux_riscv64.oxt b/desktop/test/deployment/update/platform/linux_riscv64.oxt new file mode 100644 index ..3268e59a3a4a Binary files /dev/null and b/desktop/test/deployment/update/platform/linux_riscv64.oxt differ diff --git a/desktop/test/deployment/update/platform/linux_sparc64.oxt b/desktop/test/deployment/update/platform/linux_sparc64.oxt new file mode 100644 index ..4bd1afdd6508 Binary files /dev/null and b/desktop/test/deployment/update/platform/linux_sparc64.oxt differ
core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a9008aa942c1f98f8b00b2bd2f73edc576713e92
Author: Rene Engelhard
AuthorDate: Mon Jan 1 18:13:20 2024 +0100
Commit: Thorsten Behrens
CommitDate: Mon Jan 1 23:28:32 2024 +0100
update LIBO_THIS_YEAR
Change-Id: I023baa2238c6cdbbd54a7e6b0fcdb128510bbd4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161522
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index 1c2a9c86cf5e..737ad29d7364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -520,7 +520,7 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
-LIBO_THIS_YEAR=${git_date:-2023}
+LIBO_THIS_YEAR=${git_date:-2024}
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
dnl ===
core.git: Branch 'libreoffice-24-2' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a63480d6e5f11bd258431e1cfbb98c594ce4a741
Author: Rene Engelhard
AuthorDate: Mon Jan 1 18:13:20 2024 +0100
Commit: Thorsten Behrens
CommitDate: Mon Jan 1 23:28:47 2024 +0100
update LIBO_THIS_YEAR
Change-Id: I023baa2238c6cdbbd54a7e6b0fcdb128510bbd4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161419
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index d841c7cc76fa..ef27ed166df5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -520,7 +520,7 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
-LIBO_THIS_YEAR=${git_date:-2023}
+LIBO_THIS_YEAR=${git_date:-2024}
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
dnl ===
core.git: configure.ac external/pdfium
configure.ac | 19 +--
external/pdfium/Library_pdfium.mk |5 +
external/pdfium/UnpackedTarball_pdfium.mk |2 ++
external/pdfium/system-abseil.diff| 15 +++
4 files changed, 23 insertions(+), 18 deletions(-)
New commits:
commit d7577174b541e68158d228aa41192227c10a252f
Author: Rene Engelhard
AuthorDate: Fri Dec 15 23:45:04 2023 +0100
Commit: Miklos Vajna
CommitDate: Mon Dec 18 08:51:38 2023 +0100
fix system-abseil build even with 2022 version
actually it seems it was a internal abseil header from pdfium vs. system
header mismatch. Include proper absl/container/inlined_vector.h if using
system-abseil.
While at it we can also just use pkg-config, no idea why I did it
without back then. Also gets the advantage that it knows that the libs
needed for absl_inlined_vector is actually
-labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity
This effectively reverts e89723103313ec4366ee58144c47d7a5c16bf838
Change-Id: Ide4f79860b4e0673c5c6587d503058bdd2930744
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160846
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/configure.ac b/configure.ac
index 97de2b514d3a..586e31f8bae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12234,24 +12234,7 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
AC_MSG_RESULT([external])
SYSTEM_ABSEIL=TRUE
AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_HEADER(absl/types/bad_variant_access.h, [],
-[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_LIB([absl_bad_optional_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_optional_access library not
found.])])
-AC_CHECK_LIB([absl_bad_variant_access], [main], [],
- [AC_MSG_ERROR([libabsl_bad_variant_access library not
found.])])
-ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
- AC_MSG_CHECKING([whether abseil is >= 20230125])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include
- #if ABSL_LTS_RELEASE_VERSION < 20230125
- #error Too old.
-#endif
- ])],
-[AC_MSG_RESULT([ok])],
-[AC_MSG_ERROR([too old. Need >= 20230125])])
+PKG_CHECK_MODULES(ABSEIL, absl_bad_optional_access
absl_bad_variant_access absl_inlined_vector )
AC_LANG_POP([C++])
ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
FilterLibs "${ABSEIL_LIBS}"
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index fc0903d873d1..85f9d953b752 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -40,6 +40,11 @@ $(eval $(call gb_Library_add_defs,pdfium,\
-DUSE_SYSTEM_LIBOPENJPEG2 \
))
endif
+ifeq ($(SYSTEM_ABSEIL),TRUE)
+$(eval $(call gb_Library_add_defs,pdfium,\
+-DUSE_SYSTEM_ABSEIL \
+))
+endif
$(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp))
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk
b/external/pdfium/UnpackedTarball_pdfium.mk
index 924bbe23a8b8..f8d95d2785c7 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -16,6 +16,8 @@ pdfium_patches += c++20-comparison.patch
pdfium_patches += constexpr-template.patch
+pdfium_patches += system-abseil.diff
+
$(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))
$(eval $(call gb_UnpackedTarball_set_tarball,pdfium,$(PDFIUM_TARBALL)))
diff --git a/external/pdfium/system-abseil.diff
b/external/pdfium/system-abseil.diff
new file mode 100644
index ..841bc8ce9468
--- /dev/null
+++ b/external/pdfium/system-abseil.diff
@@ -0,0 +1,15 @@
+--- core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:10.955659091
+0100
core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:43.420136476
+0100
+@@ -16,8 +16,11 @@
+ #include "core/fxcrt/cfx_bitstream.h"
+ #include "core/fxcrt/fx_memory_wrappers.h"
+ #include "core/fxcrt/fx_safe_types.h"
++#ifdef USE_SYSTEM_ABSEIL
++#include
++#else
+ #include "third_party/abseil-cpp/absl/container/inlined_vector.h"
+-
++#endif
+ namespace {
+
+ // See PDF Reference 1.7, page 170, table 3.36.
core.git: Branch 'libreoffice-24-2' - vcl/qa
vcl/qa/cppunit/a11y/atspi2/atspi2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0034d2ab9382da86340738137218791a4ccc9c90
Author: Rene Engelhard
AuthorDate: Sun Dec 17 12:38:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Sun Dec 17 20:36:47 2023 +0100
fix 32 bit build
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:
In static member function 'static void Atspi2TestTree::compareObjects(const
com::sun::star::uno::Reference&,
const Atspi::Accessible&, sal_uInt16)':
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
error: no matching function for call to 'assertEquals(const long int&, int,
CppUnit::SourceLine, const char [1])'
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
/usr/include/cppunit/TestAssert.h:161:6: note: candidate: 'template void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&)'
161 | void assertEquals( const T& expected,
| ^~~~
/usr/include/cppunit/TestAssert.h:161:6: note: template argument
deduction/substitution failed:
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
note: deduced conflicting types for parameter 'const T' ('long int' and
'int')
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
make: ***
[/home/rene/LibreOffice/git/libreoffice-24-2/solenv/gbuild/LinkTarget.mk:340:
/home/rene/LibreOffice/git/libreoffice-24-2/workdir/CxxObject/vcl/qa/cppunit/a11y/atspi2/atspi2.o]
Error 1
Change-Id: I7b7e3e756b135d1066af631e92738e7dfc1ede4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit ffa28c3565ca0474312c0fabca18689e8a80381b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160865
Tested-by: René Engelhard
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 85110eeddecb..7ef2efeca0ef 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -359,7 +359,7 @@ void Atspi2TestTree::compareObjects(const
uno::Reference(pAtspiRelation.getNTargets()));
if (recurseFlags & RecurseFlags::RELATIONS_TARGETS)
{
core.git: vcl/qa
vcl/qa/cppunit/a11y/atspi2/atspi2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e7f298e8e35935de86ea0373fa68eabc343ee091
Author: Rene Engelhard
AuthorDate: Sun Dec 17 12:38:11 2023 +0100
Commit: Michael Weghorn
CommitDate: Sun Dec 17 19:45:17 2023 +0100
fix 32 bit build
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:
In static member function 'static void Atspi2TestTree::compareObjects(const
com::sun::star::uno::Reference&,
const Atspi::Accessible&, sal_uInt16)':
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
error: no matching function for call to 'assertEquals(const long int&, int,
CppUnit::SourceLine, const char [1])'
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
/usr/include/cppunit/TestAssert.h:161:6: note: candidate: 'template void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&)'
161 | void assertEquals( const T& expected,
| ^~~~
/usr/include/cppunit/TestAssert.h:161:6: note: template argument
deduction/substitution failed:
/home/rene/LibreOffice/git/libreoffice-24-2/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx:362:9:
note: deduced conflicting types for parameter 'const T' ('long int' and
'int')
362 | CPPUNIT_ASSERT_EQUAL(nLOTargetsCount,
pAtspiRelation.getNTargets());
| ^
make: ***
[/home/rene/LibreOffice/git/libreoffice-24-2/solenv/gbuild/LinkTarget.mk:340:
/home/rene/LibreOffice/git/libreoffice-24-2/workdir/CxxObject/vcl/qa/cppunit/a11y/atspi2/atspi2.o]
Error 1
Change-Id: I7b7e3e756b135d1066af631e92738e7dfc1ede4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index 85110eeddecb..7ef2efeca0ef 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -359,7 +359,7 @@ void Atspi2TestTree::compareObjects(const
uno::Reference(pAtspiRelation.getNTargets()));
if (recurseFlags & RecurseFlags::RELATIONS_TARGETS)
{
core.git: configure.ac
configure.ac |9 +
1 file changed, 9 insertions(+)
New commits:
commit e89723103313ec4366ee58144c47d7a5c16bf838
Author: Rene Engelhard
AuthorDate: Fri Dec 15 17:45:27 2023 +0100
Commit: René Engelhard
CommitDate: Fri Dec 15 19:32:10 2023 +0100
check abseil version
since 918515d6fc6e2eaa000c4a997d604b7b00b492e3 updated to a pdfium
version which only builds with >= 20230125.3 (earliest I could get hand
on).
Ideally we should test for the feature, but this suffices too and we do
that for other libs, too...
Change-Id: I14719186d415b9df82f607b26233c9be154492c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160833
Tested-by: René Engelhard
Tested-by: Jenkins
Reviewed-by: René Engelhard
diff --git a/configure.ac b/configure.ac
index 151f68f7bb22..97de2b514d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12243,6 +12243,15 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
AC_CHECK_LIB([absl_bad_variant_access], [main], [],
[AC_MSG_ERROR([libabsl_bad_variant_access library not
found.])])
ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
+ AC_MSG_CHECKING([whether abseil is >= 20230125])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include
+ #if ABSL_LTS_RELEASE_VERSION < 20230125
+ #error Too old.
+#endif
+ ])],
+[AC_MSG_RESULT([ok])],
+[AC_MSG_ERROR([too old. Need >= 20230125])])
AC_LANG_POP([C++])
ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
FilterLibs "${ABSEIL_LIBS}"
core.git: Branch 'libreoffice-24-2' - vcl/qa
vcl/qa/cppunit/complextext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2c8e0630097477cdfbcd481d27893f34a179a69e
Author: Rene Engelhard
AuthorDate: Sat Dec 9 09:30:22 2023 +0100
Commit: Tomaž Vajngerl
CommitDate: Mon Dec 11 10:21:53 2023 +0100
add missing #if MORE_FONTS
since it nededs Source Han Sans since
9b5964cf5931d7c09e4fd624d68595891c2afb58
Change-Id: I35bd30048b298e8cbdaf6de22ae2022d51415aa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160477
Tested-by: René Engelhard
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 37f4fbc0766c..8a847def8763 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -529,6 +529,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest,
testMixedCJKLatinScript_glyph_advanceme
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
{
+#if HAVE_MORE_FONTS
#if !defined _WIN32 // TODO: Fails on jenkins but passes locally
vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
@@ -574,6 +575,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
CPPUNIT_ASSERT_EQUAL(3, nStart);
}
#endif
+#endif
}
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107612)
core.git: vcl/qa
vcl/qa/cppunit/complextext.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 94d0cf4d4e308627922c4afb5e38523ea4f6af37
Author: Rene Engelhard
AuthorDate: Sat Dec 9 09:30:22 2023 +0100
Commit: René Engelhard
CommitDate: Sun Dec 10 09:05:54 2023 +0100
add missing #if MORE_FONTS
since it nededs Source Han Sans since
9b5964cf5931d7c09e4fd624d68595891c2afb58
Change-Id: I35bd30048b298e8cbdaf6de22ae2022d51415aa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160512
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
Reviewed-by: René Engelhard
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 37f4fbc0766c..8a847def8763 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -529,6 +529,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest,
testMixedCJKLatinScript_glyph_advanceme
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
{
+#if HAVE_MORE_FONTS
#if !defined _WIN32 // TODO: Fails on jenkins but passes locally
vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72));
@@ -574,6 +575,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718)
CPPUNIT_ASSERT_EQUAL(3, nStart);
}
#endif
+#endif
}
CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107612)
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk RepositoryExternal.mk solenv/gbuild
RepositoryExternal.mk | 13 + config_host.mk.in |1 + configure.ac | 24 external/Module_external.mk|2 +- solenv/gbuild/extensions/pre_BuildTools.mk |2 +- 5 files changed, 40 insertions(+), 2 deletions(-) New commits: commit 82a955498bf1e0d4ca7a582425bd30866ca7eb75 Author: Rene Engelhard AuthorDate: Mon Oct 30 20:27:12 2023 +0100 Commit: René Engelhard CommitDate: Mon Nov 6 20:02:07 2023 +0100 add --with-system-zxcvbn Change-Id: I9a90585d8eb498861a6ef4752ab85dcff8eeaab6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158674 Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0a0be689fd07..0eddf400a77c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4287,6 +4287,17 @@ endef endif # SYSTEM_BOX2D +ifneq ($(SYSTEM_ZXCVBN),) +define gb_LinkTarget__use_zxcvbn-c +$(call gb_LinkTarget_set_include,$(1),\ + -DSYSTEM_ZXCVBN \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),-lzxcvbn) +endef + +else + define gb_LinkTarget__use_zxcvbn-c $(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c) $(call gb_LinkTarget_set_include,$(1),\ @@ -4297,6 +4308,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ zxcvbn-c \ ) endef +endif + ifneq ($(SYSTEM_ZXING),) diff --git a/config_host.mk.in b/config_host.mk.in index c8990ddab3ae..f71fe453051e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -686,6 +686,7 @@ SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ SYSTEM_POPPLER=@SYSTEM_POPPLER@ SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ SYSTEM_PYTHON=@SYSTEM_PYTHON@ +SYSTEM_ZXCVBN=@SYSTEM_ZXCVBN@ SYSTEM_ZXING=@SYSTEM_ZXING@ SYSTEM_QXP=@SYSTEM_QXP@ SYSTEM_REDLAND=@SYSTEM_REDLAND@ diff --git a/configure.ac b/configure.ac index 7b821c6343d5..c3a43716c6b9 100644 --- a/configure.ac +++ b/configure.ac @@ -2499,6 +2499,11 @@ AC_ARG_WITH(system-zxing, [Use libzxing already on system.]),, [with_system_zxing="$with_system_libs"]) +AC_ARG_WITH(system-zxcvbn, +AS_HELP_STRING([--with-system-zxcvbn], +[Use libzxcvbn already on system.]),, +[with_system_zxcvbn="$with_system_libs"]) + AC_ARG_WITH(system-box2d, AS_HELP_STRING([--with-system-box2d], [Use box2d already on system.]),, @@ -5858,6 +5863,7 @@ if test "$cross_compiling" = "yes"; then PYTHON SCRIPTING ZLIB +ZXCVBN " # converts BUILD_TYPE and PERMITTED_BUILD_TARGETS into non-whitespace, # newlined lists, to use grep as a filter @@ -11198,6 +11204,24 @@ AC_SUBST(SYSTEM_HUNSPELL) AC_SUBST(HUNSPELL_CFLAGS) AC_SUBST(HUNSPELL_LIBS) +dnl === +dnl Check for system zxcvbn +dnl === +AC_MSG_CHECKING([which zxcvbn to use]) +if test "$with_system_zxcvbn" = "yes"; then +AC_MSG_RESULT([external]) +SYSTEM_ZXCVBN=TRUE +AC_CHECK_HEADER(zxcvbn.h, [], + [ AC_MSG_ERROR(zxcvbn headers not foundd.)], []) +AC_CHECK_LIB(zxcvbn, ZxcvbnMatch, [], +[ AC_MSG_ERROR(zxcvbn library not found.)], []) +else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE ZXCVBN" + SYSTEM_ZXCVBN= +fi +AC_SUBST(SYSTEM_ZXCVBN) + dnl === dnl Check for system zxing dnl === diff --git a/external/Module_external.mk b/external/Module_external.mk index 2b2cd99ff399..11588c51dcf0 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -90,7 +90,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ $(call gb_Helper_optional,PYTHON,python3) \ $(call gb_Helper_optional,QXP,libqxp) \ - zxcvbn-c \ + $(call gb_Helper_optional,ZXCVBN,zxcvbn-c) \ $(call gb_Helper_optional,ZXING,zxing) \ $(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,REVENGE,librevenge) \ diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk b/solenv/gbuild/extensions/pre_BuildTools.mk index 891d478262b5..deaaf0b0aff7 100644 --- a/solenv/gbuild/extensions/pre_BuildTools.mk +++ b/solenv/gbuild/extensions/pre_BuildTools.mk @@ -48,7 +48,7 @@ gb_BUILD_TOOLS = \ $(foreach executable,$(gb_BUILD_TOOLS_executables),$(call gb_Executable_get_runtime_dependencies,$(executable))) \ $(foreach executable,$(gb_BUILD_TOOLS_executables_extern),$(call gb_ExternalExecutable_get_dependencies,$(executable))) \ $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \ - $(call gb_ExternalProject_get_target_for_build,zxcvbn-c) \ + $(if $(SYSTEM_ZXCVBN),,$(call gb_ExternalProject_get_target_for_build,zxcvbn-c)) \ endif
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - desktop/source
desktop/source/deployment/misc/dp_platform.cxx |4 1 file changed, 4 insertions(+) New commits: commit 39ef35d69d1c4c5d6a3964997acb1c53c9501c58 Author: Rene Engelhard AuthorDate: Tue Jul 11 16:56:02 2023 +0200 Commit: Stephan Bergmann CommitDate: Wed Jul 12 08:22:54 2023 +0200 add linux_riscv64 and linux_loongarch64 to dp_platform.cxx forgotten in bc9487f745befde6534fd46058e119256952323d and d3625d968901eb93a9680db8d1165f70de3fd64e Change-Id: I7f33c1db54b8f66e797a29cd1ccf96d19a88cc60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154333 Tested-by: Jenkins Reviewed-by: René Engelhard (cherry picked from commit 5d70ee0b3fd53438eb8a8d92ce49e9f9a4926dfb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154316 Reviewed-by: Stephan Bergmann diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index ad1b5ea13fed..b2af59f9b926 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -126,6 +126,10 @@ namespace ret = checkOSandCPU(u"Linux", u"ALPHA"); else if (token == u"linux_aarch64") ret = checkOSandCPU(u"Linux", u"AARCH64"); +else if (token == u"linux_riscv64") +ret = checkOSandCPU(u"Linux", u"RISCV64"); +else if (token == u"linux_loongarch64") +ret = checkOSandCPU(u"Linux", u"LOONGARCH64"); else if (token == u"freebsd_x86") ret = checkOSandCPU(u"FreeBSD", u"x86"); else if (token == u"freebsd_x86_64")
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/misc/dp_platform.cxx |4 1 file changed, 4 insertions(+) New commits: commit 091eec9828c3cba728fb52924ad9a4103175e41f Author: Rene Engelhard AuthorDate: Tue Jul 11 16:56:02 2023 +0200 Commit: René Engelhard CommitDate: Wed Jul 12 00:41:17 2023 +0200 add linux_riscv64 and linux_loongarch64 to dp_platform.cxx forgotten in bc9487f745befde6534fd46058e119256952323d and d3625d968901eb93a9680db8d1165f70de3fd64e Change-Id: I7f33c1db54b8f66e797a29cd1ccf96d19a88cc60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154333 Tested-by: Jenkins Reviewed-by: René Engelhard diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index ad1b5ea13fed..b2af59f9b926 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -126,6 +126,10 @@ namespace ret = checkOSandCPU(u"Linux", u"ALPHA"); else if (token == u"linux_aarch64") ret = checkOSandCPU(u"Linux", u"AARCH64"); +else if (token == u"linux_riscv64") +ret = checkOSandCPU(u"Linux", u"RISCV64"); +else if (token == u"linux_loongarch64") +ret = checkOSandCPU(u"Linux", u"LOONGARCH64"); else if (token == u"freebsd_x86") ret = checkOSandCPU(u"FreeBSD", u"x86"); else if (token == u"freebsd_x86_64")
[Libreoffice-commits] core.git: bin/generate-bash-completion.py
bin/generate-bash-completion.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5b1f68461ccfa475f70640cafd0af769b814e3fa Author: Rene Engelhard AuthorDate: Tue Jul 4 23:25:08 2023 +0200 Commit: René Engelhard CommitDate: Wed Jul 5 17:53:37 2023 +0200 add .pages to bin/generate-bash-completion.py Change-Id: I7ec0244dad1b80eb577bfbe0bb6e3e46b14dce9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154011 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/bin/generate-bash-completion.py b/bin/generate-bash-completion.py index db6f49e814b5..1c0377b97387 100755 --- a/bin/generate-bash-completion.py +++ b/bin/generate-bash-completion.py @@ -39,7 +39,7 @@ WEBDOCS = ["htm", "html", "stw", "txt", "vor", "oth"] WRITERDOCS = ["doc", "dot", "rtf", "sxw", "stw", "sdw", "vor", "txt", "htm?", "xml", "wp", "wpd", "wps", "odt", "ott", "fodt", "docm", "docx", - "dotm", "dotx"] + "dotm", "dotx", "pages"] TEMPLATES = ["stw", "dot", "vor", "stc", "xlt", "sti", "pot", "std", "stw", "dotm", "dotx", "potm", "potx", "xltm", "xltx"]
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - external/skia
external/skia/Library_skia.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit afed68d15d1e62e43ced81787e54f11782ec8af2 Author: Rene Engelhard AuthorDate: Tue Jul 4 20:36:46 2023 +0200 Commit: René Engelhard CommitDate: Wed Jul 5 17:53:28 2023 +0200 don't use SSE in skia on "INTEL" (except on Windows...) as i386/i686 in Debian is non-MMX, non-SSE, cf. https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 Regression from 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 which claims to have set the define instead of skia_sk_cpu_sse_level_0_by_default.patch.1 but actually sets it to SSE2... Change-Id: I4157a580470732fd7bbc5cf1b2384b76182340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153984 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 451f15888a7f3e747a34d24a047d4ec73a40c6c5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154035 Reviewed-by: René Engelhard diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 4b7d9ee56407..7a7f59eccdb3 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ -DSKIA_DLL \ -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ -$(if $(filter INTEL X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ +$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \ +$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ )) # SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.
[Libreoffice-commits] core.git: external/skia
external/skia/Library_skia.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 451f15888a7f3e747a34d24a047d4ec73a40c6c5 Author: Rene Engelhard AuthorDate: Tue Jul 4 20:36:46 2023 +0200 Commit: Noel Grandin CommitDate: Wed Jul 5 14:57:20 2023 +0200 don't use SSE in skia on "INTEL" (except on Windows...) as i386/i686 in Debian is non-MMX, non-SSE, cf. https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 Regression from 9c9a711ac5d8f32ac318d0e4ecab7b3a26bc2150 which claims to have set the define instead of skia_sk_cpu_sse_level_0_by_default.patch.1 but actually sets it to SSE2... Change-Id: I4157a580470732fd7bbc5cf1b2384b76182340cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153984 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 4b7d9ee56407..7a7f59eccdb3 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -20,7 +20,8 @@ $(eval $(call gb_Library_add_defs,skia,\ -DSKIA_IMPLEMENTATION=1 \ -DSKIA_DLL \ -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ -$(if $(filter INTEL X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ +$(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \ +$(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \ )) # SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk RepositoryExternal.mk
RepositoryExternal.mk | 10 +- config_host.mk.in |2 ++ configure.ac| 26 ++ external/Module_external.mk |2 +- 4 files changed, 38 insertions(+), 2 deletions(-) New commits: commit cd9afc213d768b9870c81c580fbb00282c0cf1c4 Author: Rene Engelhard AuthorDate: Sat Jun 17 14:38:27 2023 +0200 Commit: Tomaž Vajngerl CommitDate: Sun Jun 18 13:31:37 2023 +0200 add --with-system-frozen Change-Id: Ia09254cab5696fa0a3530fcafa5b48acca631ff2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153208 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 631466f0001a..b105e1d755d0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4298,6 +4298,14 @@ endif # ENABLE_ZXING endif # SYSTEM_ZXING +ifneq ($(SYSTEM_FROZEN),) +define gb_LinkTarget__use_frozen +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(FROZEN_CFLAGS) +) +endef +else define gb_LinkTarget__use_frozen $(call gb_LinkTarget_use_unpacked,$(1),frozen) $(call gb_LinkTarget_set_include,$(1),\ @@ -4305,6 +4313,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) endef - +endif # vim: set noet sw=4 ts=4: diff --git a/config_host.mk.in b/config_host.mk.in index 6a120c2098cc..eb5e751e100b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -134,6 +134,7 @@ export DOCDIR=@DOCDIR@ export DOXYGEN=@DOXYGEN@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@ export DRAGONBOX_CFLAGS=@DRAGONBOX_CFLAGS@ +export FROZEN_CFLAGS=@FROZEN_CFLAGS@ export DPKG=@DPKG@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@ @@ -158,6 +159,7 @@ export ENABLE_DBUS=@ENABLE_DBUS@ export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@ +SYSTEM_FROZEN=@SYSTEM_FROZEN@ export ENABLE_EPOXY=@ENABLE_EPOXY@ export ENABLE_EOT=@ENABLE_EOT@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@ diff --git a/configure.ac b/configure.ac index 4c1efff0799e..af24f1c4fdb5 100644 --- a/configure.ac +++ b/configure.ac @@ -2452,6 +2452,11 @@ AC_ARG_WITH(system-dragonbox, [Use dragonbox already on system.]),, [with_system_dragonbox="$with_system_headers"]) +AC_ARG_WITH(system-frozen, +AS_HELP_STRING([--with-system-frozen], +[Use frozen already on system.]),, +[with_system_frozen="$with_system_headers"]) + AC_ARG_WITH(system-libfixmath, AS_HELP_STRING([--with-system-libfixmath], [Use libfixmath already on system.]),, @@ -10542,6 +10547,27 @@ fi AC_SUBST([SYSTEM_DRAGONBOX]) AC_SUBST([DRAGONBOX_CFLAGS]) +dnl === +dnl Check for system frozen +dnl === +AC_MSG_CHECKING([which frozen to use]) +if test "$with_system_frozen" = "yes"; then +AC_MSG_RESULT([external]) +SYSTEM_FROZEN=TRUE +AC_LANG_PUSH([C++]) +save_CPPFLAGS=$CPPFLAGS +AC_CHECK_HEADER([frozen/unordered_map.h], [], + [AC_MSG_ERROR([frozen/unordered_map.h not found. install frozen headers])], []) +AC_LANG_POP([C++]) +CPPFLAGS=$save_CPPFLAGS +else +AC_MSG_RESULT([internal]) +BUILD_TYPE="$BUILD_TYPE FROZEN" +SYSTEM_FROZEN= +fi +AC_SUBST([SYSTEM_FROZEN]) +AC_SUBST([FROZEN_CFLAGS]) + dnl === dnl Check for system libfixmath dnl === diff --git a/external/Module_external.mk b/external/Module_external.mk index cd9c5924d71d..9feb4e21addf 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ - frozen \ + $(call gb_Helper_optional,FROZEN,frozen) \ $(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GPGMEPP,gpgmepp) \ $(call gb_Helper_optional,GRAPHITE,graphite) \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-0' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bd805279bfa1e952fdc8e4de6014ffda8cfdc29c
Author: Rene Engelhard
AuthorDate: Sun Jan 22 11:58:41 2023 +0100
Commit: Christian Lohmaier
CommitDate: Wed Jan 25 13:54:56 2023 +
check for harfbuzz >= 2.6.8
because of hb_ot_layout_lookup_get_glyph_alternates() usage, see
https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/commit/?h=wip/lunar-7.5&id=97d1a9d48f30394d86db0ce948c4fb8986afc701
and
https://harfbuzz.github.io/harfbuzz-hb-ot-layout.html#hb-ot-layout-lookup-get-glyph-alternates:
"Since: 2.6.8"
Change-Id: I755c42745f3bdd647fcd7c101ea7e5fde24c5a6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145965
Reviewed-by: خالد حسني
Tested-by: René Engelhard
(cherry picked from commit a180a99e2d53a2ca04e8fe31a38f6994e42bf69b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145938
(cherry picked from commit 76742388b3dcfe69d8af33137bc51135e58fbfa0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146086
Reviewed-by: Xisco Fauli
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/configure.ac b/configure.ac
index db37f61449ec..74d657a02d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10855,7 +10855,7 @@
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.0])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 07c49eeaee97fbe084205ea2b52e3b4f4b1c4173 Author: Rene Engelhard AuthorDate: Sun Jan 22 20:53:35 2023 +0100 Commit: Caolán McNamara CommitDate: Tue Jan 24 08:51:00 2023 + update hardcoded dragonbox include to 1.1.3 since dragonbox now installs to that one, and 1.1.3 is default for the internal case anyway since dd1610146528cba8642caad3bf72e27b9ca6c153. Change-Id: Ibd0449b1bd1191a1872c233bfe9810af1d1215cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145985 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Tested-by: René Engelhard Reviewed-by: René Engelhard (cherry picked from commit f8604f08ed5e07e50a65b5d35f3c0c18bf19044a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146024 Reviewed-by: Caolán McNamara diff --git a/configure.ac b/configure.ac index b3d38c882546..e626c925f49b 100644 --- a/configure.ac +++ b/configure.ac @@ -10535,7 +10535,7 @@ if test "$with_system_dragonbox" = "yes"; then AC_LANG_PUSH([C++]) save_CPPFLAGS=$CPPFLAGS # This is where upstream installs to, unfortunately no .pc or so... -DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0 +DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.1.3 CPPFLAGS="$CPPFLAGS $DRAGONBOX_CFLAGS" AC_CHECK_HEADER([dragonbox/dragonbox.h], [], [AC_MSG_ERROR([dragonbox/dragonbox.h not found. install dragonbox])], [])
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f8604f08ed5e07e50a65b5d35f3c0c18bf19044a Author: Rene Engelhard AuthorDate: Sun Jan 22 20:53:35 2023 +0100 Commit: René Engelhard CommitDate: Mon Jan 23 18:22:08 2023 + update hardcoded dragonbox include to 1.1.3 since dragonbox now installs to that one, and 1.1.3 is default for the internal case anyway since dd1610146528cba8642caad3bf72e27b9ca6c153. Change-Id: Ibd0449b1bd1191a1872c233bfe9810af1d1215cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145985 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/configure.ac b/configure.ac index d981eba2bab8..8bad8873443d 100644 --- a/configure.ac +++ b/configure.ac @@ -10544,7 +10544,7 @@ if test "$with_system_dragonbox" = "yes"; then AC_LANG_PUSH([C++]) save_CPPFLAGS=$CPPFLAGS # This is where upstream installs to, unfortunately no .pc or so... -DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0 +DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.1.3 CPPFLAGS="$CPPFLAGS $DRAGONBOX_CFLAGS" AC_CHECK_HEADER([dragonbox/dragonbox.h], [], [AC_MSG_ERROR([dragonbox/dragonbox.h not found. install dragonbox])], [])
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 26 commits - configure.ac cui/source desktop/qa include/svl include/svtools oox/source sc/qa sc/source sd/qa svtools/source svx/sou
configure.ac |2 cui/source/tabpages/numfmt.cxx | 24 desktop/qa/desktop_lib/test_desktop_lib.cxx|4 include/svl/zforlist.hxx |6 include/svtools/scrolladaptor.hxx |1 oox/source/ppt/slidepersist.cxx| 72 ++ sc/qa/uitest/calc_tests/formatCells.py |8 sc/source/ui/inc/tabview.hxx |1 sc/source/ui/miscdlgs/acredlin.cxx | 96 +-- sc/source/ui/view/tabview.cxx | 11 sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx |binary sd/qa/unit/data/pptx/tdf153036_resizedConnectorL.pptx |binary sd/qa/unit/export-tests-ooxml3.cxx |5 sd/qa/unit/import-tests.cxx| 16 svtools/source/control/scrolladaptor.cxx |5 svx/source/dialog/fntctrl.cxx | 17 svx/source/dialog/svxruler.cxx |6 sw/CppunitTest_sw_rtfimport.mk |1 sw/inc/IDocumentSettingAccess.hxx |1 sw/inc/doc.hxx |3 sw/qa/extras/layout/data/Hyphenated-link.fodt | 254 ++ sw/qa/extras/layout/data/Hyphenated-link.rtf | 41 + sw/qa/extras/layout/data/hidden-para-separator.docx|binary sw/qa/extras/layout/layout2.cxx| 63 ++ sw/qa/extras/ooxmlexport/data/custom-styles-TOC-comma.docx |binary sw/qa/extras/ooxmlexport/data/custom-styles-TOC-semicolon.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 49 + sw/qa/extras/rtfimport/data/hidden-para-separator.rtf | 67 ++ sw/qa/extras/rtfimport/rtfimport.cxx | 37 + sw/qa/filter/html/html.cxx | 30 + sw/source/core/crsr/bookmark.cxx |3 sw/source/core/doc/DocumentSettingManager.cxx |9 sw/source/core/doc/doctxm.cxx |5 sw/source/core/docnode/ndsect.cxx |2 sw/source/core/inc/DocumentSettingManager.hxx |1 sw/source/core/inc/UndoSection.hxx |5 sw/source/core/inc/rootfrm.hxx |9 sw/source/core/layout/newfrm.cxx |3 sw/source/core/layout/wsfrm.cxx| 22 sw/source/core/text/guess.cxx | 30 + sw/source/core/text/redlnitr.cxx | 76 ++ sw/source/core/undo/unsect.cxx | 14 sw/source/core/view/viewsh.cxx |8 sw/source/filter/html/css1atr.cxx | 11 sw/source/filter/html/htmltabw.cxx | 14 sw/source/filter/ww8/ww8atr.cxx| 27 - sw/source/filter/ww8/ww8par.cxx|1 sw/source/filter/xml/xmlimp.cxx| 10 sw/source/uibase/docvw/HeaderFooterWin.cxx |9 sw/source/uibase/uno/SwXDocumentSettings.cxx | 18 ucb/source/ucp/webdav-curl/CurlSession.cxx | 12 unoxml/inc/node.hxx|3 unoxml/source/dom/attr.cxx |2 unoxml/source/dom/attr.hxx |3 unoxml/source/dom/document.cxx |8 unoxml/source/dom/document.hxx |3 unoxml/source/dom/documentfragment.cxx |2 unoxml/source/dom/documentfragment.hxx |3 unoxml/source/dom/element.cxx |2 unoxml/source/dom/element.hxx |3 unoxml/source/dom/entity.cxx |2 unoxml/source/dom/entity.hxx |3 unoxml/source/dom/entityreference.cxx |2 unoxml/source/dom/entityreference.hxx |3 unoxml/source/dom/node.cxx |8 vcl/inc/osx/salframeview.h |7 vcl/inc/osx/salinst.h |1 vcl/inc/svdata.hxx |1 vcl/osx/a11ytextattributeswrapper.mm |6 vc
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 76742388b3dcfe69d8af33137bc51135e58fbfa0
Author: Rene Engelhard
AuthorDate: Sun Jan 22 11:58:41 2023 +0100
Commit: René Engelhard
CommitDate: Sun Jan 22 11:16:54 2023 +
check for harfbuzz >= 2.6.8
because of hb_ot_layout_lookup_get_glyph_alternates() usage, see
https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/commit/?h=wip/lunar-7.5&id=97d1a9d48f30394d86db0ce948c4fb8986afc701
and
https://harfbuzz.github.io/harfbuzz-hb-ot-layout.html#hb-ot-layout-lookup-get-glyph-alternates:
"Since: 2.6.8"
Change-Id: I755c42745f3bdd647fcd7c101ea7e5fde24c5a6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145965
Reviewed-by: خالد حسني
Tested-by: René Engelhard
(cherry picked from commit a180a99e2d53a2ca04e8fe31a38f6994e42bf69b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145938
diff --git a/configure.ac b/configure.ac
index b6d09d4a8b83..b3d38c882546 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10855,7 +10855,7 @@
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.0])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a180a99e2d53a2ca04e8fe31a38f6994e42bf69b
Author: Rene Engelhard
AuthorDate: Sun Jan 22 11:58:41 2023 +0100
Commit: René Engelhard
CommitDate: Sun Jan 22 11:12:01 2023 +
check for harfbuzz >= 2.6.8
because of hb_ot_layout_lookup_get_glyph_alternates() usage, see
https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/commit/?h=wip/lunar-7.5&id=97d1a9d48f30394d86db0ce948c4fb8986afc701
and
https://harfbuzz.github.io/harfbuzz-hb-ot-layout.html#hb-ot-layout-lookup-get-glyph-alternates:
"Since: 2.6.8"
Change-Id: I755c42745f3bdd647fcd7c101ea7e5fde24c5a6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145965
Reviewed-by: خالد حسني
Tested-by: René Engelhard
diff --git a/configure.ac b/configure.ac
index 47b6702df669..d981eba2bab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10864,7 +10864,7 @@
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.0])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
[Libreoffice-commits] core.git: vcl/Library_vcl.mk
vcl/Library_vcl.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 50582d73c61165f17c38ce28f216739a3a34664b Author: Rene Engelhard AuthorDate: Wed Nov 16 21:58:05 2022 +0100 Commit: Caolán McNamara CommitDate: Thu Nov 17 17:55:50 2022 +0100 fix system-libfixmath build without mergelibs missing -llibfixmath do it doesn't get it while it seems to get it via tools/libtl (which has it) in the mergelibs case Change-Id: Idb6a0079a63ffb1cff0fc1cafb2c11dfa3bec5b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142817 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d0087d682d22..cff520ccb03f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -570,6 +570,12 @@ vcl_headless_freetype_code=\ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ +ifeq ($(SYSTEM_LIBFIXMATH),TRUE) +$(eval $(call gb_Library_add_libs,vcl,\ +-llibfixmath \ +)) +endif + ifeq ($(USING_X11),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/window/screensaverinhibitor \
[Libreoffice-commits] core.git: config_host.mk.in
config_host.mk.in |1 + 1 file changed, 1 insertion(+) New commits: commit 1caf3f2554ffac3624d43defb4252a5b40945bbc Author: Rene Engelhard AuthorDate: Sat Nov 12 18:31:02 2022 +0100 Commit: Caolán McNamara CommitDate: Tue Nov 15 11:09:29 2022 +0100 actually don't compile tools/source/misc/fix16.cxx with system-libfixmath 90babff28406d5366df153e2d3c6d4206f06d614 missed the config_host.mk.in part Change-Id: Ic18964f02fc80b0f9b3de6518e069038f03932af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142637 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/config_host.mk.in b/config_host.mk.in index 9de974e472f9..1352749754e3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -645,6 +645,7 @@ export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@ export SYSTEM_LIBEOT=@SYSTEM_LIBEOT@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ +export SYSTEM_LIBFIXMATH=@SYSTEM_LIBFIXMATH@ export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@ export SYSTEM_LIBNUMBERTEXT=@SYSTEM_LIBNUMBERTEXT@ export SYSTEM_LIBNUMBERTEXT_DATA=@SYSTEM_LIBNUMBERTEXT_DATA@
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 75e16fdc9d111aad9663b7de1b229fbd2a61b51e Author: Rene Engelhard AuthorDate: Sat Oct 29 15:23:20 2022 +0200 Commit: Miklos Vajna CommitDate: Sat Oct 29 16:49:44 2022 +0200 require xmlsec1-nss >= 1.2.35 1.2.34 apparently doesn't have xmlSecBase64Decode_ex (needed since 19e998aa98d966cffca98bed9408d5758d91d9be): [build CXX] xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx /home/rene/LibreOffice/git/master/xmlsecurity/source/gpg/SecurityEnvironment.cxx: In member function 'virtual com::sun::star::uno::Reference SecurityEnvironmentGpg::getCertificate(const rtl::OUString&, const com::sun::star::uno::Sequence&)': /home/rene/LibreOffice/git/master/xmlsecurity/source/gpg/SecurityEnvironment.cxx:166:16: error: 'xmlSecBase64Decode_ex' was not declared in this scope; did you mean 'xmlSecBase64Decode'? 166 | int nRet = xmlSecBase64Decode_ex(strKeyId, const_cast(strKeyId), xmlStrlen(strKeyId), &nWritten); |^ |xmlSecBase64Decode make[3]: *** [/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:337: /home/rene/LibreOffice/git/master/workdir/CxxObject/xmlsecurity/source/gpg/SecurityEnvironment.o] Error 1 and is neither in a grep -r on the header directory Change-Id: Ie7948ed9b796cc9823e44982824d3c3c61c9a46b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142023 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/configure.ac b/configure.ac index 8446105fceac..e98a71342a46 100644 --- a/configure.ac +++ b/configure.ac @@ -9623,7 +9623,7 @@ libo_CHECK_SYSTEM_MODULE([expat], [EXPAT], [expat]) dnl === dnl Check for system xmlsec dnl === -libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28]) +libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.35]) AC_MSG_CHECKING([whether to enable Embedded OpenType support]) if test "$enable_eot" = "yes"; then
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 6cfa43fcf214eaf556e998438bb9754cc210c3d8 Author: Rene Engelhard AuthorDate: Fri Sep 30 20:42:37 2022 +0200 Commit: René Engelhard CommitDate: Fri Sep 30 21:38:01 2022 +0200 remove obsolete sfx2_emojiconfig from Repository.mk since the installer fails because it cannot find it. (was removed in 5f1eb2a12b6e6ee646b5e9536822531ad0bd3259) Change-Id: Id7d843b461bc10a447d8d5d48009bc48f6d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140807 Reviewed-by: خالد حسني Tested-by: Jenkins diff --git a/Repository.mk b/Repository.mk index 7e8d3c2ede18..dbaff65fd5f1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -970,7 +970,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ oox_generated \ package_dtd \ sd_web \ - sfx2_emojiconfig \ $(call gb_Helper_optional,DESKTOP,\ $(if $(filter-out WNT,$(OS)),$(if $(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \ $(call gb_Helper_optional,DESKTOP,$(if $(filter-out EMSCRIPTEN MACOSX WNT,$(OS)),svx_gengal)) \
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit d480af79c6d67341e650a5b920bf66c2865309e0
Author: Rene Engelhard
AuthorDate: Wed Sep 14 18:29:39 2022 +0200
Commit: René Engelhard
CommitDate: Wed Sep 14 22:50:46 2022 +0200
fix system-abseil build
after c97c60f70e9e6de594f7e0e0b85f17944c640dcf
"external: update pdfium to 5298"
Change-Id: I4a0a37ebf6cbc070d2fc5e17c89fd307a53de7fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139949
Tested-by: René Engelhard
Tested-by: Jenkins
Reviewed-by: René Engelhard
diff --git a/configure.ac b/configure.ac
index 12cc87525782..340e87d75b55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12044,8 +12044,13 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
[AC_MSG_ERROR(abseil headers not found.)], [])
-AC_CHECK_LIB([absl_bad_optional_access], [main],
[ABSEIL_LIBS=-labsl_bad_optional_access],
+AC_CHECK_HEADER(absl/types/bad_variant_access.h, [],
+[AC_MSG_ERROR(abseil headers not found.)], [])
+AC_CHECK_LIB([absl_bad_optional_access], [main], [],
[AC_MSG_ERROR([libabsl_bad_optional_access library not
found.])])
+AC_CHECK_LIB([absl_bad_variant_access], [main], [],
+ [AC_MSG_ERROR([libabsl_bad_variant_access library not
found.])])
+ ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
AC_LANG_POP([C++])
ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
FilterLibs "${ABSEIL_LIBS}"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dbf584e9fbf1563fb63a0daeeadb91f323cc149d
Author: Rene Engelhard
AuthorDate: Mon Sep 12 17:46:57 2022 +0200
Commit: René Engelhard
CommitDate: Mon Sep 12 19:35:03 2022 +0200
bump harfbuzz dependency to >= 2.1.0
as we already use hb_ot_name_get_utf8() and HB_OT_NAME_ID_FONT_FAMILY
https: //harfbuzz.github.io/harfbuzz-hb-ot-name.html says
Since: 2.1.0
Change-Id: I19bac8be529e4919c4df5a4d2be4ea3363e4a249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139814
Reviewed-by: Rico Tzschichholz
Reviewed-by: René Engelhard
Tested-by: René Engelhard
(cherry picked from commit b4fbffe25a4b8c78843b3e04d8336a46aa2a6925)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139669
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/configure.ac b/configure.ac
index e6671da20ce2..4065b7623bdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10871,7 +10871,7 @@
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.42])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.1.0])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 455f0ac6c019da7299bc779a4fa2b0aade2fb9cb
Author: Rene Engelhard
AuthorDate: Mon Sep 12 17:46:57 2022 +0200
Commit: René Engelhard
CommitDate: Mon Sep 12 18:55:51 2022 +0200
bump harfbuzz dependency to >= 2.1.0
as we already use hb_ot_name_get_utf8() and HB_OT_NAME_ID_FONT_FAMILY
https: //harfbuzz.github.io/harfbuzz-hb-ot-name.html says
Since: 2.1.0
Change-Id: I19bac8be529e4919c4df5a4d2be4ea3363e4a249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139814
Reviewed-by: Rico Tzschichholz
Reviewed-by: René Engelhard
Tested-by: René Engelhard
diff --git a/configure.ac b/configure.ac
index c7509fef481d..067dbae1292e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10882,7 +10882,7 @@
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.0.0])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.1.0])
if test "$COM" = "MSC"; then # override the above
GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
[Libreoffice-commits] core.git: android/source bin/find-german-comments configure.ac .git-hooks/commit-msg odk/config slideshow/qa
.git-hooks/commit-msg |4 ++--
android/source/gradlew |4 ++--
bin/find-german-comments |2 +-
configure.ac |6 +++---
odk/config/configure.pl|4 ++--
slideshow/qa/debug/nodetree.sh |2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit fd42cea5f301a10cdeaa29959f04b111de534132
Author: Rene Engelhard
AuthorDate: Wed Sep 7 21:34:42 2022 +0200
Commit: Christian Lohmaier
CommitDate: Thu Sep 8 14:43:53 2022 +0200
replace egrep/fgrep calls with grep -E/grep -F
as egrep/fgrep is deprecated since long amd grep 3.8+ now actually warns
(e.g. "egrep: warning: egrep is obsolescent; using grep -E")
Change-Id: I5b10f05dffdd09081deb05cef974e3cdb2907315
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139614
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
index eebca62cb6f7..950a6b709d9a 100755
--- a/.git-hooks/commit-msg
+++ b/.git-hooks/commit-msg
@@ -49,8 +49,8 @@ if [ "$len" -gt 79 ] ; then
fi
fdo_regex='fdo#[0-9]+'
-if egrep -q "$fdo_regex" $1; then
-for bugid in `head -n 1 $1 |egrep -o "$fdo_regex" |sed 's/fdo#//'`
+if grep -E -q "$fdo_regex" $1; then
+for bugid in `head -n 1 $1 | grep -E -o "$fdo_regex" |sed 's/fdo#//'`
do
if [ "`echo $bugid |sed 's/fdo#//'`" -gt 88775 ]; then
abort "$1" "The first line contains a suspicious fdo# rereference:
'fdo#$bugid', did you mean tdf#?"
diff --git a/android/source/gradlew b/android/source/gradlew
index 91a7e269e19d..b7029853b09f 100755
--- a/android/source/gradlew
+++ b/android/source/gradlew
@@ -130,8 +130,8 @@ if $cygwin ; then
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
-CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-CHECK2=`echo "$arg"|egrep -c "^-"` ###
Determine if an option
+CHECK=`echo "$arg"|grep -E -c "$OURCYGPATTERN" -`
+CHECK2=`echo "$arg"|grep -E -c "^-"`
### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then###
Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
diff --git a/bin/find-german-comments b/bin/find-german-comments
index a38b435ce870..175af6f22420 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -235,7 +235,7 @@ class Parser:
# Change into the given dir, so "git ls-tree" does work.
os.chdir(directory)
-sock = os.popen(r"git ls-tree -r HEAD --name-only |egrep
'\.(c|cc|cpp|cxx|h|hxx|mm)$'")
+sock = os.popen(r"git ls-tree -r HEAD --name-only | grep -E
'\.(c|cc|cpp|cxx|h|hxx|mm)$'")
lines = sock.readlines()
sock.close()
diff --git a/configure.ac b/configure.ac
index 7b03df8ee0aa..7c82578933cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2945,7 +2945,7 @@ AC_SUBST(GNUPARALLEL)
AC_MSG_CHECKING([for GNU or BSD tar])
for a in $GNUTAR gtar gnutar tar bsdtar /usr/sfw/bin/gtar; do
-$a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null
+$a --version 2> /dev/null | grep -E "GNU|bsdtar" 2>&1 > /dev/null
if test $? -eq 0; then
GNUTAR=$a
break
@@ -2958,11 +2958,11 @@ fi
AC_SUBST(GNUTAR)
AC_MSG_CHECKING([for tar's option to strip components])
-$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null
+$GNUTAR --help 2> /dev/null | grep -E "bsdtar|strip-components" 2>&1 >/dev/null
if test $? -eq 0; then
STRIP_COMPONENTS="--strip-components"
else
-$GNUTAR --help 2> /dev/null | egrep "strip-path" 2>&1 >/dev/null
+$GNUTAR --help 2> /dev/null | grep -E "strip-path" 2>&1 >/dev/null
if test $? -eq 0; then
STRIP_COMPONENTS="--strip-path"
else
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index f3d0e08b3440..756db5a3c76b 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -242,7 +242,7 @@ while ( (!$main::correctVersion) &&
} else
{
#check version
-my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | egrep Zip | head -n
1`;
+my $testVersion = `$OO_SDK_ZIP_HOME/zip -h 2>&1 | grep -E Zip | head
-n 1`;
$testVersion =~ s#Zip ([\d.]+) .*#$1#go;
if ( $testVersion eq "")
{
@@ -414,7 +414,7 @@ while ( (!$main::correctVersion) &&
} else
{
#check version
-my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1
| egrep "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e
's#".*##'`;
+my $testVersion = `$main::OO_SDK_JAVA_HOME/bin/java -version 2>&1
| grep -E "java version" | head -n 1 | sed -e 's#.*version "##' | sed -e
's#".*##'`;
$testVersion =~ s#([^\n]+)\n#$1#go;
$main::correctVersion =
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 429a4af9bb53bd0b69170e5e518352c47b3c00a0
Author: Rene Engelhard
AuthorDate: Thu Sep 8 05:07:45 2022 +0200
Commit: René Engelhard
CommitDate: Thu Sep 8 05:18:35 2022 +0200
revert configure.ac check for graphite2 to 0.9.3
root@frodo:/# grep Version /usr/lib/x86_64-linux-gnu/pkgconfig/graphite2.pc
Version: 3.0.1
root@frodo:/# dpkg -l libgraphite2-dev
Desired=Unknown/Install/Remove/Purge/Hold
|
Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
|/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
||/ Name Version Architecture Description
+++-==---==>
ii libgraphite2-dev:amd64 1.3.14-1 amd64Development files for
libg
2.0.0 is a internal version (see
https://github.com/silnrsi/graphite/commit/175151a45f4c228af912d52f8c299b96b124a136).
At least 2.0.0 is fullfilled, but probably we shouldn't use it
for checks
Change-Id: I70ac1ff20ca5d583bbfa961bfd275ff6432d243c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139627
Reviewed-by: خالد حسني
Tested-by: René Engelhard
diff --git a/configure.ac b/configure.ac
index 6f8158940266..7b03df8ee0aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10878,7 +10878,7 @@ dnl
===
GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include
-DGRAPHITE2_STATIC"
GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 2.0.0])
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
-lharfbuzz"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac
configure.ac |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit aa0b2b756c17d43d2e8c828a909ee2815e332377 Author: Rene Engelhard AuthorDate: Wed Aug 24 09:55:33 2022 +0200 Commit: René Engelhard CommitDate: Thu Aug 25 12:06:11 2022 +0200 Make configure work with gpgme >= 1.18 Sam James wrote: > gpgme-1.18.0 dropped a bunch of internal symbols, > including progress_callback (see e.g. callbacks.h > which has a comment at the top saying it's internal). Plausibly the workaround to not link against older KDE-specific distro packages is not needed anymore. Check for main as a workaround as we do for other C++ libraries, too. Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 Tested-by: Jenkins Reviewed-by: Sam James Reviewed-by: René Engelhard (cherry picked from commit b4a94d681a99a6a3eeb6aaa4d2f4dfab8f7c000b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138553 Tested-by: René Engelhard diff --git a/configure.ac b/configure.ac index e5d202bfe82f..94f1224df8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -12537,12 +12537,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) -# progress_callback is the only func with plain C linkage -# checking for it also filters out older, KDE-dependent libgpgmepp versions -AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -[AC_MSG_ERROR(gpgmepp not found or not functional)], []) AC_CHECK_HEADER(gpgme.h, [], [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) +AC_CHECK_LIB(gpgmepp, main, [], +[AC_MSG_ERROR(gpgmepp not found or not functional)], []) + GPGMEPP_LIBS=-lgpgmepp else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit f7e170eb084cd4e92818de966b287330184749a8 Author: Rene Engelhard AuthorDate: Wed Aug 24 09:55:33 2022 +0200 Commit: René Engelhard CommitDate: Thu Aug 25 07:52:18 2022 +0200 Make configure work with gpgme >= 1.18 Sam James wrote: > gpgme-1.18.0 dropped a bunch of internal symbols, > including progress_callback (see e.g. callbacks.h > which has a comment at the top saying it's internal). Plausibly the workaround to not link against older KDE-specific distro packages is not needed anymore. Check for main as a workaround as we do for other C++ libraries, too. Change-Id: I57065a5b5b23b9eadb73b01e4f3a289552c3bde4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138667 Tested-by: Jenkins Reviewed-by: Sam James Reviewed-by: René Engelhard diff --git a/configure.ac b/configure.ac index 24cb01aa0db0..61806988b94b 100644 --- a/configure.ac +++ b/configure.ac @@ -12539,12 +12539,11 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin" \) -a "$ENABLE_NSS" = TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp >= 1.14 development package])], []) -# progress_callback is the only func with plain C linkage -# checking for it also filters out older, KDE-dependent libgpgmepp versions -AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -[AC_MSG_ERROR(gpgmepp not found or not functional)], []) AC_CHECK_HEADER(gpgme.h, [], [AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], []) +AC_CHECK_LIB(gpgmepp, main, [], +[AC_MSG_ERROR(gpgmepp not found or not functional)], []) + GPGMEPP_LIBS=-lgpgmepp else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 4316171fc89c0b19a1be0e09773d985018a5d22d
Author: Rene Engelhard
AuthorDate: Sun Aug 7 11:04:15 2022 +0200
Commit: Caolán McNamara
CommitDate: Sun Aug 7 17:59:54 2022 +0200
add libebook-1.2.so.21
comparing the Debian packages of 3.44.1 and 3.45.2 the actual headers
didn't change, so no code changes needed afaics
Change-Id: Ifae6395831ca538bb1699a7f2ba4cb504e552baa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137825
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 8f6a6f7083d0..9ec8e0d44e32 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
static const char *eBookLibNames[] = {
+"libebook-1.2.so.21", // evolution-data-server 3.45.2+
"libebook-1.2.so.20", // evolution-data-server 3.33.2+
"libebook-1.2.so.19", // evolution-data-server 3.24+
"libebook-1.2.so.16"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 636c2c68564de585b07e00dc1bff08ef57956a2e
Author: Rene Engelhard
AuthorDate: Sun Aug 7 11:04:15 2022 +0200
Commit: Caolán McNamara
CommitDate: Sun Aug 7 17:59:26 2022 +0200
add libebook-1.2.so.21
comparing the Debian packages of 3.44.1 and 3.45.2 the actual headers
didn't change, so no code changes needed afaics
Change-Id: Ifae6395831ca538bb1699a7f2ba4cb504e552baa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137824
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 8f6a6f7083d0..9ec8e0d44e32 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
static const char *eBookLibNames[] = {
+"libebook-1.2.so.21", // evolution-data-server 3.45.2+
"libebook-1.2.so.20", // evolution-data-server 3.33.2+
"libebook-1.2.so.19", // evolution-data-server 3.24+
"libebook-1.2.so.16"
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 47cd7055ba076275dbe6d8d502dd00feae82ad50
Author: Rene Engelhard
AuthorDate: Sun Aug 7 11:04:15 2022 +0200
Commit: Caolán McNamara
CommitDate: Sun Aug 7 16:25:37 2022 +0200
add libebook-1.2.so.21
comparing the Debian packages of 3.44.1 and 3.45.2 the actual headers
didn't change, so no code changes needed afaics
Change-Id: Ifae6395831ca538bb1699a7f2ba4cb504e552baa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137918
Reviewed-by: Julien Nabet
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx
b/connectivity/source/drivers/evoab2/EApi.cxx
index 8f6a6f7083d0..9ec8e0d44e32 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -21,6 +21,7 @@
#define DECLARE_FN_POINTERS 1
#include "EApi.h"
static const char *eBookLibNames[] = {
+"libebook-1.2.so.21", // evolution-data-server 3.45.2+
"libebook-1.2.so.20", // evolution-data-server 3.33.2+
"libebook-1.2.so.19", // evolution-data-server 3.24+
"libebook-1.2.so.16"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/qa
sc/qa/uitest/statistics/descriptiveStatistics.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12471cec3e731cd552b2eb54c17c7b835cf76949 Author: Rene Engelhard AuthorDate: Thu Dec 23 16:42:21 2021 +0100 Commit: Eike Rathke CommitDate: Thu Jul 28 10:27:33 2022 +0200 work around rounding difference on i386 in descriptiveStatistics test No idea why this only appears now, but: == FAIL: test_descriptive_statistics (descriptiveStatistics.descriptiveStatistics) -- Traceback (most recent call last): File "/home/rene/tmp/autopkgtest-lxc.4j23khs6/downtmp/build.zIT/src/sc/qa/uitest/statistics/descriptiveStatistics.py", line 108, in te st_descriptive_statistics self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),14) , 0.01524095329036) AssertionError: 0.01524095329035 != 0.01524095329036 Change-Id: I496daf61a9542ea0da78e6092dd7070a2665ab0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127363 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Eike Rathke (cherry picked from commit c6f7d7d5b3f11ea054532608c542bad3da28f398) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137522 diff --git a/sc/qa/uitest/statistics/descriptiveStatistics.py b/sc/qa/uitest/statistics/descriptiveStatistics.py index 8241089fc710..48a15e641141 100644 --- a/sc/qa/uitest/statistics/descriptiveStatistics.py +++ b/sc/qa/uitest/statistics/descriptiveStatistics.py @@ -104,7 +104,7 @@ class descriptiveStatistics(UITestCase): self.assertEqual(round(get_cell_by_position(document, 0, 6, 7).getValue(),11) , 139.49090909091) self.assertEqual(round(get_cell_by_position(document, 0, 6, 8).getValue(),12) , 11.810626955878) self.assertEqual(round(get_cell_by_position(document, 0, 6, 9).getValue(),13) , -1.4621677980825) -self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),14) , 0.01524095329036) +self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),13) , 0.0152409532904) self.assertEqual(get_cell_by_position(document, 0, 6, 11).getValue() , 31) self.assertEqual(get_cell_by_position(document, 0, 6, 12).getValue() , 26) self.assertEqual(get_cell_by_position(document, 0, 6, 13).getValue() , 57)
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/statistics/descriptiveStatistics.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7091a5416e6e1d5ff8c3b40646de30fe1458db24 Author: Rene Engelhard AuthorDate: Thu Dec 23 16:42:21 2021 +0100 Commit: René Engelhard CommitDate: Thu Jul 28 10:20:45 2022 +0200 work around rounding difference on i386 in descriptiveStatistics test No idea why this only appears now, but: == FAIL: test_descriptive_statistics (descriptiveStatistics.descriptiveStatistics) -- Traceback (most recent call last): File "/home/rene/tmp/autopkgtest-lxc.4j23khs6/downtmp/build.zIT/src/sc/qa/uitest/statistics/descriptiveStatistics.py", line 108, in te st_descriptive_statistics self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),14) , 0.01524095329036) AssertionError: 0.01524095329035 != 0.01524095329036 Change-Id: I496daf61a9542ea0da78e6092dd7070a2665ab0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127363 Tested-by: René Engelhard Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/sc/qa/uitest/statistics/descriptiveStatistics.py b/sc/qa/uitest/statistics/descriptiveStatistics.py index 8241089fc710..48a15e641141 100644 --- a/sc/qa/uitest/statistics/descriptiveStatistics.py +++ b/sc/qa/uitest/statistics/descriptiveStatistics.py @@ -104,7 +104,7 @@ class descriptiveStatistics(UITestCase): self.assertEqual(round(get_cell_by_position(document, 0, 6, 7).getValue(),11) , 139.49090909091) self.assertEqual(round(get_cell_by_position(document, 0, 6, 8).getValue(),12) , 11.810626955878) self.assertEqual(round(get_cell_by_position(document, 0, 6, 9).getValue(),13) , -1.4621677980825) -self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),14) , 0.01524095329036) +self.assertEqual(round(get_cell_by_position(document, 0, 6, 10).getValue(),13) , 0.0152409532904) self.assertEqual(get_cell_by_position(document, 0, 6, 11).getValue() , 31) self.assertEqual(get_cell_by_position(document, 0, 6, 12).getValue() , 26) self.assertEqual(get_cell_by_position(document, 0, 6, 13).getValue() , 57)
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c4f7043c593823b8c5605e779371ff430659eb20 Author: Rene Engelhard AuthorDate: Wed Jul 27 12:43:50 2022 +0200 Commit: René Engelhard CommitDate: Wed Jul 27 12:44:52 2022 +0200 HPPA is 32bit as already handled as such in postprocess/CustomTarget_registry.mk Change-Id: Idc7ead94db8f14e656c36db0438c916b0f2565e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137498 Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/configure.ac b/configure.ac index 52d21a3f88e3..15eaca30b2d4 100644 --- a/configure.ac +++ b/configure.ac @@ -8608,7 +8608,7 @@ if test "$ENABLE_JAVA" != ""; then JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"` elif test "$cross_compiling" != "yes"; then case $CPUNAME in -AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|MIPS64) +AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|MIPS64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then AC_MSG_WARN([You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit]) AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk configure.ac postprocess/CustomTarget_registry.mk solenv/gbuild
bridges/Library_cpp_uno.mk |4 ++-- configure.ac | 10 +- postprocess/CustomTarget_registry.mk |2 +- 3 files changed, 8 insertions(+), 8 deletions(-) New commits: commit c559dbd86474e4b0e5c2d0711508ab7f5efed6b5 Author: Rene Engelhard AuthorDate: Wed Jul 27 08:26:12 2022 +0200 Commit: René Engelhard CommitDate: Wed Jul 27 11:52:23 2022 +0200 rename GODSON/GODSON64 to MIPS/MIPS64 as that what it actually is and the compiler defines are already -DMIPS/-DMIPS64 anyway (as are the PLATFORMID and the bridges' name mips/mips64) Change-Id: I274e7a3b0e140375a8e697c1790cbdb972251d29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137489 Tested-by: René Engelhard Reviewed-by: Caolán McNamara Reviewed-by: René Engelhard diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index e2de3c1678b4..a5d2a72c202b 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -97,7 +97,7 @@ bridges_SELECTED_BRIDGE := gcc3_linux_m68k bridge_noopt_objects := cpp2uno except uno2cpp endif -else ifeq ($(CPUNAME),GODSON) +else ifeq ($(CPUNAME),MIPS) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips @@ -105,7 +105,7 @@ bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except endif -else ifeq ($(CPUNAME),GODSON64) +else ifeq ($(CPUNAME),MIPS64) ifneq ($(filter LINUX,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_linux_mips64 diff --git a/configure.ac b/configure.ac index 33dc0fb96316..52d21a3f88e3 100644 --- a/configure.ac +++ b/configure.ac @@ -5190,25 +5190,25 @@ linux-gnu*|linux-musl*) PLATFORMID=linux_ia64 ;; mips) -CPUNAME=GODSON +CPUNAME=MIPS RTL_ARCH=MIPS_EB EPM_FLAGS="-a mips" PLATFORMID=linux_mips_eb ;; mips64) -CPUNAME=GODSON64 +CPUNAME=MIPS64 RTL_ARCH=MIPS64_EB EPM_FLAGS="-a mips64" PLATFORMID=linux_mips64_eb ;; mips64el) -CPUNAME=GODSON64 +CPUNAME=MIPS64 RTL_ARCH=MIPS64_EL EPM_FLAGS="-a mips64el" PLATFORMID=linux_mips64_el ;; mipsel) -CPUNAME=GODSON +CPUNAME=MIPS RTL_ARCH=MIPS_EL EPM_FLAGS="-a mipsel" PLATFORMID=linux_mips_el @@ -8608,7 +8608,7 @@ if test "$ENABLE_JAVA" != ""; then JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"` elif test "$cross_compiling" != "yes"; then case $CPUNAME in -AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|GODSON64) +AARCH64|AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64|MIPS64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then AC_MSG_WARN([You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit]) AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK]) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 9e7fbb1398ae..cf9a3432f1ce 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -322,7 +322,7 @@ else postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibnumbertextdata.xcu endif -ifneq ($(filter POWERPC INTEL ARM HPPA GODSON M68K SPARC S390,$(CPUNAME)),) +ifneq ($(filter POWERPC INTEL ARM HPPA MIPS M68K SPARC S390,$(CPUNAME)),) postprocess_FILES_main += \ $(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu endif diff --git a/solenv/gbuild/platform/LINUX_GODSON64_GCC.mk b/solenv/gbuild/platform/LINUX_MIPS64_GCC.mk similarity index 100% rename from solenv/gbuild/platform/LINUX_GODSON64_GCC.mk rename to solenv/gbuild/platform/LINUX_MIPS64_GCC.mk diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk b/solenv/gbuild/platform/LINUX_MIPS_GCC.mk similarity index 100% rename from solenv/gbuild/platform/LINUX_GODSON_GCC.mk rename to solenv/gbuild/platform/LINUX_MIPS_GCC.mk
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - config_host/config_skia.h.in
config_host/config_skia.h.in |4 1 file changed, 4 deletions(-) New commits: commit cc3d8995fc28ca98c4ad38c5066977ea48cef9a1 Author: Rene Engelhard AuthorDate: Mon Jun 13 18:28:34 2022 +0200 Commit: René Engelhard CommitDate: Thu Jun 16 18:16:08 2022 +0200 Revert "enable Skia on big-endian too" This reverts commit b06663135f9c7c08f5866a87a1fb0932df5af8bd. Still/Again fails to build. See https://lists.freedesktop.org/archives/libreoffice/2022-June/089026.html Change-Id: I195c1584256d1da5fee3bbd1d7291a6639428acf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135771 Tested-by: Jenkins Tested-by: René Engelhard Reviewed-by: René Engelhard (cherry picked from commit 5b5c91190c60088c6998166250acc55574d5b543) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136014 diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in index c81e648a0d6f..b98ba14d31ec 100644 --- a/config_host/config_skia.h.in +++ b/config_host/config_skia.h.in @@ -62,10 +62,6 @@ are the same. // the default X11 visual is actually also BGRA. #define SK_R32_SHIFT 16 -// Enable skia on big-endian too. Despite the disclaimer it reportedly -// actually works fine. -#define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN 1 - // Enable Skia's internal checks depending on DBG_UTIL mode. ENABLE_SKIA_DEBUG // controls whether to build with or without optimizations (set in Makefile). #ifdef DBG_UTIL
[Libreoffice-commits] core.git: config_host/config_skia.h.in
config_host/config_skia.h.in |4 1 file changed, 4 deletions(-) New commits: commit 26cc731adeba5ac434f7ee76a4fe5b57e42c6702 Author: Rene Engelhard AuthorDate: Mon Jun 13 18:28:34 2022 +0200 Commit: René Engelhard CommitDate: Thu Jun 16 18:14:48 2022 +0200 Revert "enable Skia on big-endian too" This reverts commit b06663135f9c7c08f5866a87a1fb0932df5af8bd. Still/Again fails to build. See https://lists.freedesktop.org/archives/libreoffice/2022-June/089026.html Change-Id: I195c1584256d1da5fee3bbd1d7291a6639428acf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135771 Tested-by: Jenkins Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in index c81e648a0d6f..b98ba14d31ec 100644 --- a/config_host/config_skia.h.in +++ b/config_host/config_skia.h.in @@ -62,10 +62,6 @@ are the same. // the default X11 visual is actually also BGRA. #define SK_R32_SHIFT 16 -// Enable skia on big-endian too. Despite the disclaimer it reportedly -// actually works fine. -#define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN 1 - // Enable Skia's internal checks depending on DBG_UTIL mode. ENABLE_SKIA_DEBUG // controls whether to build with or without optimizations (set in Makefile). #ifdef DBG_UTIL
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit cd35eebe4dde6e012c2a939461a87b58b2b7a497 Author: Rene Engelhard AuthorDate: Mon Jun 13 18:30:05 2022 +0200 Commit: René Engelhard CommitDate: Thu Jun 16 18:14:02 2022 +0200 fail big-endian builds with --enable-skia. Point to --disable-skia Change-Id: I0a1e5289a36e39eeea00e0fd67fbcf1fe7c902f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135772 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/configure.ac b/configure.ac index 8c24eb84fd5e..2963f05e3326 100644 --- a/configure.ac +++ b/configure.ac @@ -12078,6 +12078,10 @@ if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; th ENABLE_SKIA_DEBUG= fi ENABLE_SKIA=TRUE + if test "$ENDIANNESS" = "big" && test "$ENABLE_SKIA" = "TRUE"; then + AC_MSG_ERROR([skia doesn't work/isn't supported upstream on big-endian. Use --disable-skia]) + fi + AC_DEFINE(HAVE_FEATURE_SKIA) BUILD_TYPE="$BUILD_TYPE SKIA"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - toolkit/qa
toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx |8
toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 37ca4d9fa7e63631799fba9e3faf1bfdbb66b11e
Author: Rene Engelhard
AuthorDate: Fri Jun 10 21:35:43 2022 +0200
Commit: René Engelhard
CommitDate: Sat Jun 11 09:08:31 2022 +0200
fix 32bit build in new a11y cppunit tests
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx: In
member function ‘void XAccessibleComponentTester::testBounds()’:
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5:
error: no matching function for call to ‘assertGreaterEqual(int, sal_Int32&,
CppUnit::SourceLine, const char [1])’
51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
| ^
/usr/include/cppunit/TestAssert.h:251:6: note: candidate: ‘template void CppUnit::assertGreaterEqual(const T&, const T&, CppUnit::SourceLine,
const string&)’
251 | void assertGreaterEqual( const T& expected,
| ^~
/usr/include/cppunit/TestAssert.h:251:6: note: template argument
deduction/substitution failed:
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5:
note: deduced conflicting types for parameter ‘const T’ (‘int’ and
‘sal_Int32’ {aka ‘long int’})
51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
| ^
etc.
Regression from d2a5b4bc0b8c8d1dd82133719a3ef5cc01b0cbbe
Change-Id: I123894e5ed6d6f3bcf46b1c5b37f1f49cb5f9f99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135630
Tested-by: Jenkins
Tested-by: René Engelhard
Reviewed-by: René Engelhard
(cherry picked from commit 69c964bbd56ff49324d1ca649739fae354dd4c16)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135634
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
index 5613724786b9..ea46ff778575 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
@@ -48,10 +48,10 @@ void XAccessibleComponentTester::testBounds()
auto bounds = mxComponent->getBounds();
std::cout << "bounds: " << bounds.Width << "x" << bounds.Height <<
std::showpos << bounds.X
<< bounds.Y << std::noshowpos << std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
-CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.Y);
-CPPUNIT_ASSERT_GREATER(0, bounds.Width);
-CPPUNIT_ASSERT_GREATER(0, bounds.Height);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.X);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.Y);
+CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Width);
+CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Height);
}
/**
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
index 3a7eb70e9dd5..b8c7898f963f 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
@@ -57,7 +57,7 @@ void XAccessibleContextTester::testGetAccessibleChildCount()
{
auto childCount = mxContext->getAccessibleChildCount();
std::cout << childCount << " children found." << std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(0, childCount);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), childCount);
}
/**
@@ -130,10 +130,10 @@ void
XAccessibleContextTester::testGetAccessibleRelationSet()
*/
void XAccessibleContextTester::testGetAccessibleRole()
{
-sal_Int16 role = mxContext->getAccessibleRole();
+sal_Int32 role = mxContext->getAccessibleRole();
std::cout << "The role is " << role << " (" <<
AccessibilityTools::getRoleName(role) << ")"
<< std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role);
}
/**
@@ -157,8 +157,8 @@ void XAccessibleContextTester::testGetLocale()
{
auto loc = mxContext->getLocale();
std::cout << "The locale is " << loc.Language << "," << loc.Country <<
std::endl;
-CPPUNIT_ASSERT_GREATER(0, loc.Language.getLength());
-CPPUNIT_ASSERT_GREATER(0, loc.Country.getLength());
+CPPUNIT_ASSERT_GREATER(static_cast(0),
loc.Language.getLength());
+CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Country.getLength());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx |8
toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx | 10 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 69c964bbd56ff49324d1ca649739fae354dd4c16
Author: Rene Engelhard
AuthorDate: Fri Jun 10 21:35:43 2022 +0200
Commit: René Engelhard
CommitDate: Sat Jun 11 09:07:44 2022 +0200
fix 32bit build in new a11y cppunit tests
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx: In
member function ‘void XAccessibleComponentTester::testBounds()’:
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5:
error: no matching function for call to ‘assertGreaterEqual(int, sal_Int32&,
CppUnit::SourceLine, const char [1])’
51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
| ^
/usr/include/cppunit/TestAssert.h:251:6: note: candidate: ‘template void CppUnit::assertGreaterEqual(const T&, const T&, CppUnit::SourceLine,
const string&)’
251 | void assertGreaterEqual( const T& expected,
| ^~
/usr/include/cppunit/TestAssert.h:251:6: note: template argument
deduction/substitution failed:
/<>/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx:51:5:
note: deduced conflicting types for parameter ‘const T’ (‘int’ and
‘sal_Int32’ {aka ‘long int’})
51 | CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
| ^
etc.
Regression from d2a5b4bc0b8c8d1dd82133719a3ef5cc01b0cbbe
Change-Id: I123894e5ed6d6f3bcf46b1c5b37f1f49cb5f9f99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135630
Tested-by: Jenkins
Tested-by: René Engelhard
Reviewed-by: René Engelhard
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
index 5613724786b9..ea46ff778575 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx
@@ -48,10 +48,10 @@ void XAccessibleComponentTester::testBounds()
auto bounds = mxComponent->getBounds();
std::cout << "bounds: " << bounds.Width << "x" << bounds.Height <<
std::showpos << bounds.X
<< bounds.Y << std::noshowpos << std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.X);
-CPPUNIT_ASSERT_GREATEREQUAL(0, bounds.Y);
-CPPUNIT_ASSERT_GREATER(0, bounds.Width);
-CPPUNIT_ASSERT_GREATER(0, bounds.Height);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.X);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), bounds.Y);
+CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Width);
+CPPUNIT_ASSERT_GREATER(static_cast(0), bounds.Height);
}
/**
diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
index 3a7eb70e9dd5..b8c7898f963f 100644
--- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
+++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx
@@ -57,7 +57,7 @@ void XAccessibleContextTester::testGetAccessibleChildCount()
{
auto childCount = mxContext->getAccessibleChildCount();
std::cout << childCount << " children found." << std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(0, childCount);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), childCount);
}
/**
@@ -130,10 +130,10 @@ void
XAccessibleContextTester::testGetAccessibleRelationSet()
*/
void XAccessibleContextTester::testGetAccessibleRole()
{
-sal_Int16 role = mxContext->getAccessibleRole();
+sal_Int32 role = mxContext->getAccessibleRole();
std::cout << "The role is " << role << " (" <<
AccessibilityTools::getRoleName(role) << ")"
<< std::endl;
-CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role);
+CPPUNIT_ASSERT_GREATEREQUAL(static_cast(0), role);
}
/**
@@ -157,8 +157,8 @@ void XAccessibleContextTester::testGetLocale()
{
auto loc = mxContext->getLocale();
std::cout << "The locale is " << loc.Language << "," << loc.Country <<
std::endl;
-CPPUNIT_ASSERT_GREATER(0, loc.Language.getLength());
-CPPUNIT_ASSERT_GREATER(0, loc.Country.getLength());
+CPPUNIT_ASSERT_GREATER(static_cast(0),
loc.Language.getLength());
+CPPUNIT_ASSERT_GREATER(static_cast(0), loc.Country.getLength());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source
sw/source/filter/ww8/ww8scan.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1ba2eee704c94043b1a0cba744ed211acaf894a3 Author: Rene Engelhard AuthorDate: Fri Jun 10 19:45:46 2022 +0200 Commit: René Engelhard CommitDate: Sat Jun 11 08:45:07 2022 +0200 really fix bigendian builds this time - since I missed to take over one rename between trees. sigh. Continues 089c91b1ad16232f130cb50266732509f83c52eb Change-Id: I726410ab1024b995937952fbce1214866ee8ba19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135629 Tested-by: René Engelhard Reviewed-by: René Engelhard (cherry picked from commit f18b06ca5108d9e4f4bcfe0081bc1017acdef76d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135553 diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index d6e3a81b4bf1..f9529062cde1 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2159,7 +2159,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); #ifdef OSL_BIGENDIAN -for( m_nIdx = 0; m_nIdx <= m_nIMax; nIdx++ ) +for( m_nIdx = 0; m_nIdx <= m_nIMax; m_nIdx++ ) m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx] ); m_nIdx = 0; #endif // OSL_BIGENDIAN
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8scan.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f18b06ca5108d9e4f4bcfe0081bc1017acdef76d Author: Rene Engelhard AuthorDate: Fri Jun 10 19:45:46 2022 +0200 Commit: René Engelhard CommitDate: Sat Jun 11 08:44:10 2022 +0200 really fix bigendian builds this time - since I missed to take over one rename between trees. sigh. Continues 089c91b1ad16232f130cb50266732509f83c52eb Change-Id: I726410ab1024b995937952fbce1214866ee8ba19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135629 Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index d6e3a81b4bf1..f9529062cde1 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -2159,7 +2159,7 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, sal_uInt32 nFilePos, m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct ); #ifdef OSL_BIGENDIAN -for( m_nIdx = 0; m_nIdx <= m_nIMax; nIdx++ ) +for( m_nIdx = 0; m_nIdx <= m_nIMax; m_nIdx++ ) m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx] ); m_nIdx = 0; #endif // OSL_BIGENDIAN
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx |2 +-
sw/source/filter/ww8/ww8scan.cxx | 16
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 089c91b1ad16232f130cb50266732509f83c52eb
Author: Rene Engelhard
AuthorDate: Thu Jun 9 15:51:33 2022 +0200
Commit: René Engelhard
CommitDate: Thu Jun 9 19:32:10 2022 +0200
fix bigendian builds
after 410a64b472ae9de0bb06ddd8f4b55fd16686c860 and
6624721b3226ace33f5032b1c1ce595c19f1915c which changed the
surrounding places but missed the occurence in #ifdef OSL_BIGENDIAN:
Change-Id: I610b0e19a37207b925668d7f2315b27abce21b2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135558
Tested-by: René Engelhard
Reviewed-by: René Engelhard
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 2a25fdc8a1e3..fdf0bd056de9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1239,7 +1239,7 @@ void WW8_WrFkp::Combine()
sal_uInt16 i; // the Sprms must be rotated elsewhere
sal_uInt32* p;
-for( i = 0, p = (sal_uInt32*)pFkp; i <= nIMax; i++, p++ )
+for( i = 0, p = (sal_uInt32*)m_pFkp; i <= m_nIMax; i++, p++ )
*p = OSL_SWAPDWORD( *p );
#endif // ifdef OSL_BIGENDIAN
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 51aa725e36b8..79ad6b110530 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2159,9 +2159,9 @@ WW8PLCFspecial::WW8PLCFspecial(SvStream* pSt, sal_uInt32
nFilePos,
m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
#ifdef OSL_BIGENDIAN
-for( nIdx = 0; nIdx <= nIMax; nIdx++ )
-pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] );
-nIdx = 0;
+for( m_nIdx = 0; m_nIdx <= m_nIMax; nIdx++ )
+m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx] );
+m_nIdx = 0;
#endif // OSL_BIGENDIAN
if( nStruct ) // Pointer to content array
m_pPLCF_Contents =
reinterpret_cast(&m_pPLCF_PosArray[m_nIMax + 1]);
@@ -2327,9 +2327,9 @@ void WW8PLCF::ReadPLCF(SvStream& rSt, WW8_FC nFilePos,
sal_uInt32 nPLCF)
if (bValid)
{
#ifdef OSL_BIGENDIAN
-for( nIdx = 0; nIdx <= nIMax; nIdx++ )
-pPLCF_PosArray[nIdx] = OSL_SWAPDWORD( pPLCF_PosArray[nIdx] );
-nIdx = 0;
+for( m_nIdx = 0; m_nIdx <= m_nIMax; m_nIdx++ )
+m_pPLCF_PosArray[m_nIdx] = OSL_SWAPDWORD( m_pPLCF_PosArray[m_nIdx]
);
+m_nIdx = 0;
#endif // OSL_BIGENDIAN
// Pointer to content array
m_pPLCF_Contents =
reinterpret_cast(&m_pPLCF_PosArray[m_nIMax + 1]);
@@ -2545,8 +2545,8 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos,
m_nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
#ifdef OSL_BIGENDIAN
-for( tools::Long nI = 0; nI <= nIMax; nI++ )
- pPLCF_PosArray[nI] = OSL_SWAPDWORD( pPLCF_PosArray[nI] );
+for( tools::Long nI = 0; nI <= m_nIMax; nI++ )
+ m_pPLCF_PosArray[nI] = OSL_SWAPDWORD( m_pPLCF_PosArray[nI] );
#endif // OSL_BIGENDIAN
// Pointer to content array
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/property/ChainablePropertySet.cxx |1 +
comphelper/source/property/MasterPropertySet.cxx|1 +
2 files changed, 2 insertions(+)
New commits:
commit 197a28ae5038d7faed9b075877b2377c981bc97a
Author: Rene Engelhard
AuthorDate: Wed Jun 1 19:23:00 2022 +0200
Commit: René Engelhard
CommitDate: Wed Jun 1 22:30:12 2022 +0200
fix build
add #include , since:
[build CXX] comphelper/source/property/ChainablePropertySetInfo.cxx
/home/rene/LibreOffice/git/master/comphelper/source/property/ChainablePropertySet.cxx:
In member function 'virtual void
comphelper::ChainablePropertySet::setPropertyValue(const rtl::OUString&, const
com::sun::star::uno::Any&)':
/home/rene/LibreOffice/git/master/comphelper/source/property/ChainablePropertySet.cxx:54:10:
error: 'optional' is not a member of 'std'
54 | std::optional< osl::Guard< comphelper::SolarMutex > >
xMutexGuard;
| ^~~~
/home/rene/LibreOffice/git/master/comphelper/source/property/ChainablePropertySet.cxx:23:1:
note: 'std::optional' is defined in header ''; did you forget to
'#include '?
22 | #include
+++ |+#include
23 |
happens since 49b9401465730b1151917bffcbc0ad1f0622fcee
Change-Id: I643e7811f1ec7588ccde5453303cd57675c6165e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135252
Tested-by: Jenkins
Tested-by: René Engelhard
Reviewed-by: René Engelhard
diff --git a/comphelper/source/property/ChainablePropertySet.cxx
b/comphelper/source/property/ChainablePropertySet.cxx
index 7c9caa17582a..0805afe72bcf 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -23,6 +23,7 @@
#include
+#include
using namespace ::comphelper;
using namespace ::com::sun::star;
diff --git a/comphelper/source/property/MasterPropertySet.cxx
b/comphelper/source/property/MasterPropertySet.cxx
index 51fdd4deb620..922a4c1c69b4 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -27,6 +27,7 @@
#include
#include
+#include
namespace {
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79f2773115c30278363a778d6cdfb586145abde6 Author: Rene Engelhard AuthorDate: Sat May 21 15:48:57 2022 +0100 Commit: Caolán McNamara CommitDate: Sat May 21 18:35:34 2022 +0200 fix system libtiff detection Change-Id: I9cd29a48a0b46bae9d265b502b250709ec8a3247 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134710 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/configure.ac b/configure.ac index 186c472b7d45..2e1e3c8b58d3 100644 --- a/configure.ac +++ b/configure.ac @@ -13559,7 +13559,7 @@ dnl === dnl Test whether to build libtiff or rely on the system version dnl === -libo_CHECK_SYSTEM_MODULE([libtiff],[LIBTIFF],[libtiff]) +libo_CHECK_SYSTEM_MODULE([libtiff],[LIBTIFF],[libtiff-4]) dnl === dnl Test whether to build libwebp or rely on the system version
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 69d621d833fcfe76156c1e078ba24c5bb1c0 Author: Rene Engelhard AuthorDate: Fri Apr 15 08:38:52 2022 +0200 Commit: Eike Rathke CommitDate: Sat Apr 16 22:36:37 2022 +0200 apply ICU test workaround to < 70 to "fix" test with ICU 71 See also 263961306ede0656ebb7904034a2172615ce81d0 Change-Id: Ib64ec43dba59ffddb34fe7f1a0f0d2e589c3455c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133063 Tested-by: René Engelhard Reviewed-by: Eike Rathke (cherry picked from commit 67c577c692faaa0382d26c3c3f47b5ffa9deaa77) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133046 Tested-by: Jenkins diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index b74ff4222be4..cdcbff9be535 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -856,11 +856,11 @@ void TestBreakIterator::testLao() i18n::WordType::DICTIONARY_WORD, true); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos); -#if (U_ICU_VERSION_MAJOR_NUM != 70) +#if (U_ICU_VERSION_MAJOR_NUM < 70) CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); #else // FIXME: -// In ICU 70 for yet unknown reason the word boundary 9 is not detected and +// In ICU 70/71 for yet unknown reason the word boundary 9 is not detected and // instead the length 12 is returned as endpos. // Deep in // icu_70::RuleBasedBreakIterator::BreakCache::next()
[Libreoffice-commits] core.git: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 67c577c692faaa0382d26c3c3f47b5ffa9deaa77 Author: Rene Engelhard AuthorDate: Fri Apr 15 08:38:52 2022 +0200 Commit: Eike Rathke CommitDate: Fri Apr 15 20:23:13 2022 +0200 apply ICU test workaround to < 70 to "fix" test with ICU 71 See also 263961306ede0656ebb7904034a2172615ce81d0 Change-Id: Ib64ec43dba59ffddb34fe7f1a0f0d2e589c3455c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133063 Tested-by: René Engelhard Reviewed-by: Eike Rathke diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index b74ff4222be4..cdcbff9be535 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -856,11 +856,11 @@ void TestBreakIterator::testLao() i18n::WordType::DICTIONARY_WORD, true); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos); -#if (U_ICU_VERSION_MAJOR_NUM != 70) +#if (U_ICU_VERSION_MAJOR_NUM < 70) CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos); #else // FIXME: -// In ICU 70 for yet unknown reason the word boundary 9 is not detected and +// In ICU 70/71 for yet unknown reason the word boundary 9 is not detected and // instead the length 12 is returned as endpos. // Deep in // icu_70::RuleBasedBreakIterator::BreakCache::next()
[Libreoffice-commits] core.git: configure.ac tools/Library_tl.mk vcl/Library_vcl.mk vcl/source
configure.ac | 23 +++ tools/Library_tl.mk | 13 - vcl/Library_vcl.mk|1 + vcl/source/fontsubset/sft.cxx |4 4 files changed, 40 insertions(+), 1 deletion(-) New commits: commit 90babff28406d5366df153e2d3c6d4206f06d614 Author: Rene Engelhard AuthorDate: Sun Mar 20 14:45:28 2022 +0100 Commit: René Engelhard CommitDate: Sun Mar 20 22:26:29 2022 +0100 add system-libfixmath Change-Id: Ia0bd884d6fefde77c75889bf2ea831ebf1b401cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131876 Tested-by: Jenkins Tested-by: René Engelhard Reviewed-by: Caolán McNamara Reviewed-by: René Engelhard diff --git a/configure.ac b/configure.ac index 1e26c8be4225..250de34971ab 100644 --- a/configure.ac +++ b/configure.ac @@ -2439,6 +2439,11 @@ AC_ARG_WITH(system-dragonbox, [Use dragonbox already on system.]),, [with_system_dragonbox="$with_system_headers"]) +AC_ARG_WITH(system-libfixmath, +AS_HELP_STRING([--with-system-libfixmath], +[Use libfixmath already on system.]),, +[with_system_libfixmath="$with_system_libs"]) + AC_ARG_WITH(system-glm, AS_HELP_STRING([--with-system-glm], [Use glm already on system.]),, @@ -10578,6 +10583,24 @@ fi AC_SUBST([SYSTEM_DRAGONBOX]) AC_SUBST([DRAGONBOX_CFLAGS]) +dnl === +dnl Check for system libfixmath +dnl === +AC_MSG_CHECKING([which libfixmath to use]) +if test "$with_system_libfixmath" = "yes"; then +AC_MSG_RESULT([external]) +SYSTEM_LIBFIXMATH=TRUE +AC_LANG_PUSH([C++]) +AC_CHECK_HEADER([libfixmath/fix16.hpp], [], + [AC_MSG_ERROR([libfixmath/fix16.hpp not found. install libfixmath])], []) +AC_CHECK_LIB([libfixmath], [fix16_mul], [:], [AC_MSG_ERROR(libfixmath lib not found or functional)], []) +AC_LANG_POP([C++]) +else +AC_MSG_RESULT([internal]) +SYSTEM_LIBFIXMATH= +fi +AC_SUBST([SYSTEM_LIBFIXMATH]) + dnl === dnl Check for system glm dnl === diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 63a048aa565d..bccbf95a2a01 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/memtools/multisel \ tools/source/misc/cpuid \ tools/source/misc/extendapplicationenvironment \ -tools/source/misc/fix16 \ tools/source/misc/json_writer \ tools/source/ref/globname \ tools/source/ref/ref \ @@ -82,6 +81,12 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/xml/XmlWalker \ )) +ifneq ($(SYSTEM_LIBFIXMATH),TRUE) +$(eval $(call gb_Library_add_exception_objects,tl,\ +tools/source/misc/fix16 \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,tl, \ tools/source/stream/strmwnt \ @@ -108,6 +113,12 @@ $(eval $(call gb_Library_add_libs,tl,\ )) endif +ifeq ($(SYSTEM_LIBFIXMATH),TRUE) +$(eval $(call gb_Library_add_libs,tl,\ + -llibfixmath \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,tl,\ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d580ff3d2f6a..31cf81c8bd0d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \ $(if $(SYSTEM_GLM),-DGLM_ENABLE_EXPERIMENTAL) \ +$(if $(SYSTEM_LIBFIXMATH),-DSYSTEM_LIBFIXMATH) \ )) $(eval $(call gb_Library_use_sdk_api,vcl)) diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 800f161a744a..a164757a886d 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -36,7 +36,11 @@ #endif #include #include +#ifdef SYSTEM_LIBFIXMATH +#include +#else #include +#endif #include "ttcr.hxx" #include "xlat.hxx" #include
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk Makefile.fetch RepositoryExternal.mk
Makefile.fetch |2 +- RepositoryExternal.mk | 14 +- config_host.mk.in |2 ++ configure.ac| 30 ++ external/Module_external.mk |2 +- 5 files changed, 47 insertions(+), 3 deletions(-) New commits: commit 19b0ba55ea7058b35b13f9e2ae0e8d4add374eef Author: Rene Engelhard AuthorDate: Sun Feb 20 12:13:19 2022 +0100 Commit: René Engelhard CommitDate: Tue Feb 22 15:53:59 2022 +0100 add system-dragonbox Missed in 9eb9083ff2fdaeb96399a0830a4394de4e29ef64 Change-Id: I1d001b39f55c8504a76bfbdadd1423b414adc9c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130209 Tested-by: René Engelhard Reviewed-by: René Engelhard diff --git a/Makefile.fetch b/Makefile.fetch index af6f0ce7aa5f..8fc0ab397da4 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -110,7 +110,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ $(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \ - DRAGONBOX_TARBALL \ + $(call fetch_Optional,DRAGONBOX,DRAGONBOX_TARBALL) \ DTOA_TARBALL \ $(call fetch_Optional,LIBCMIS,LIBCMIS_TARBALL) \ $(call fetch_Optional,COINMP,COINMP_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 779e318ebc49..f63c95c142ea 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4132,15 +4132,27 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif +ifneq ($(SYSTEM_DRAGONBOX),) + +define gb_LinkTarget__use_dragonbox +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $$(DRAGONBOX_CFLAGS) \ +) +endef + +else + define gb_LinkTarget__use_dragonbox $(call gb_LinkTarget_use_unpacked,$(1),dragonbox) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,dragonbox/include/)\ $$(INCLUDE) \ ) - endef +endif + define gb_LinkTarget__use_dtoa $(call gb_LinkTarget_use_unpacked,$(1),dtoa) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/config_host.mk.in b/config_host.mk.in index dee4375023fc..0cb682c4862c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -130,6 +130,7 @@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DOCDIR=@DOCDIR@ export DOXYGEN=@DOXYGEN@ export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@ +export DRAGONBOX_CFLAGS=@DRAGONBOX_CFLAGS@ export DPKG=@DPKG@ export EBOOK_CFLAGS=$(gb_SPACE)@EBOOK_CFLAGS@ export EBOOK_LIBS=$(gb_SPACE)@EBOOK_LIBS@ @@ -154,6 +155,7 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@ export ENABLE_DBUS=@ENABLE_DBUS@ export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ +export SYSTEM_DRAGONBOX=@SYSTEM_DRAGONBOX@ export ENABLE_EPOXY=@ENABLE_EPOXY@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@ export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@ diff --git a/configure.ac b/configure.ac index b22d8e17c6da..1b5303125466 100644 --- a/configure.ac +++ b/configure.ac @@ -2438,6 +2438,11 @@ AC_ARG_WITH(system-cuckoo, [Use libcuckoo already on system.]),, [with_system_cuckoo="$with_system_headers"]) +AC_ARG_WITH(system-dragonbox, +AS_HELP_STRING([--with-system-dragonbox], +[Use dragonbox already on system.]),, +[with_system_dragonbox="$with_system_headers"]) + AC_ARG_WITH(system-glm, AS_HELP_STRING([--with-system-glm], [Use glm already on system.]),, @@ -5712,6 +5717,7 @@ if test "$cross_compiling" = "yes"; then CURL DBCONNECTIVITY DESKTOP +DRAGONBOX DYNLOADING EPOXY EXPAT @@ -10524,6 +10530,30 @@ else fi AC_SUBST([SYSTEM_CUCKOO]) +dnl === +dnl Check for system dragonbox +dnl === +AC_MSG_CHECKING([which dragonbox to use]) +if test "$with_system_dragonbox" = "yes"; then +AC_MSG_RESULT([external]) +SYSTEM_DRAGONBOX=TRUE +AC_LANG_PUSH([C++]) +save_CPPFLAGS=$CPPFLAGS +# This is where upstream installs to, unfortunately no .pc or so... +DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0 +CPPFLAGS="$CPPFLAGS $DRAGONBOX_CFLAGS" +AC_CHECK_HEADER([dragonbox/dragonbox.h], [], + [AC_MSG_ERROR([dragonbox/dragonbox.h not found. install dragonbox])], []) +AC_LANG_POP([C++]) +CPPFLAGS=$save_CPPFLAGS +else +AC_MSG_RESULT([internal]) +BUILD_TYPE="$BUILD_TYPE DRAGONBOX" +SYSTEM_DRAGONBOX= +fi +AC_SUBST([SYSTEM_DRAGONBOX]) +AC_SUBST([DRAGONBOX_CFLAGS]) + dnl === dnl Check for system glm dnl === diff --git a/external/Module_external.mk b/external/Module_external.mk index 5420092797a1
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-5' - uitest/impress_tests
uitest/impress_tests/drawinglayer.py |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 677c2cf2a64ae3d92081648a3b5b5cab0bf5a347
Author: Rene Engelhard
AuthorDate: Sat Sep 4 19:58:13 2021 +0200
Commit: Noel Grandin
CommitDate: Tue Dec 28 18:01:06 2021 +0100
work around off-by-ones on i386 in uicheck uitests...
<@x1sc0> _rene__, I guess we could use assertAlmostEqual with delta=1 there,
but maybe once we add it, the next assert also fails for you?
Change-Id: Ic64641ccdf9ca721997b4a842b646cf4b9e30f16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121641
Reviewed-by: Xisco Fauli
Reviewed-by: René Engelhard
Tested-by: René Engelhard
Tested-by: Jenkins
(cherry picked from commit 46ebf8c0ad191f9d9d94c898475dd953fb48d9fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127368
(cherry picked from commit 744f227e78fafb423d40f3014dde331308ea0cd0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127369
Reviewed-by: Jan-Marek Glogowski
Reviewed-by: Noel Grandin
diff --git a/uitest/impress_tests/drawinglayer.py
b/uitest/impress_tests/drawinglayer.py
index 7b33e369d2e6..82fb81d257c7 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -78,7 +78,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -88,7 +88,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(12600, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(4568, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertIsNone(document.CurrentSelection)
@@ -127,7 +127,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(0, document.DrawPages[0].getByIndex(1).RotateAngle)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -138,7 +138,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(3000, document.DrawPages[0].getByIndex(1).RotateAngle)
self.assertIsNone(document.CurrentSelection)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit be5e8e00ce08a7386b0c2ad223e4df16195313fe Author: Rene Engelhard AuthorDate: Mon Dec 20 11:32:34 2021 +0100 Commit: René Engelhard CommitDate: Sun Dec 26 22:03:20 2021 +0100 bump liborcus dependency in pkg-config check to >= 0.17.2 since that is what is needed now since aadbac5467bb6ab768f87ed6ec003c55159d54aa to make the tests pass. (One could do a version-check like done with libmwaw etc, too, but didn't follow that route) Change-Id: Id70871104b5c12462db12f14b637c6884a98954c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127144 Tested-by: Jenkins Reviewed-by: Kohei Yoshida (cherry picked from commit e31191d45c27965bb1a73577b9fcc99b5d88795a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127374 diff --git a/configure.ac b/configure.ac index ace149ccfc88..e1b75d2c10ad 100644 --- a/configure.ac +++ b/configure.ac @@ -10696,7 +10696,7 @@ AC_SUBST(ENABLE_FUZZERS) dnl === dnl Orcus dnl === -libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.0]) +libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.2]) if test "$with_system_orcus" != "yes"; then if test "$SYSTEM_BOOST" = "TRUE"; then dnl Link with Boost.System
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e31191d45c27965bb1a73577b9fcc99b5d88795a Author: Rene Engelhard AuthorDate: Mon Dec 20 11:32:34 2021 +0100 Commit: René Engelhard CommitDate: Fri Dec 24 09:03:20 2021 +0100 bump liborcus dependency in pkg-config check to >= 0.17.2 since that is what is needed now since aadbac5467bb6ab768f87ed6ec003c55159d54aa to make the tests pass. (One could do a version-check like done with libmwaw etc, too, but didn't follow that route) Change-Id: Id70871104b5c12462db12f14b637c6884a98954c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127144 Tested-by: Jenkins Reviewed-by: Kohei Yoshida diff --git a/configure.ac b/configure.ac index bd22499cb75b..1ba896d7defb 100644 --- a/configure.ac +++ b/configure.ac @@ -10678,7 +10678,7 @@ AC_SUBST(DEFAULT_CRASHDUMP_VALUE) dnl === dnl Orcus dnl === -libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.0]) +libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.2]) if test "$with_system_orcus" != "yes"; then if test "$SYSTEM_BOOST" = "TRUE"; then dnl Link with Boost.System
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - uitest/impress_tests
uitest/impress_tests/drawinglayer.py |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 744f227e78fafb423d40f3014dde331308ea0cd0
Author: Rene Engelhard
AuthorDate: Sat Sep 4 19:58:13 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Dec 23 15:49:22 2021 +0100
work around off-by-ones on i386 in uicheck uitests...
<@x1sc0> _rene__, I guess we could use assertAlmostEqual with delta=1 there,
but maybe once we add it, the next assert also fails for you?
Change-Id: Ic64641ccdf9ca721997b4a842b646cf4b9e30f16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121641
Reviewed-by: Xisco Fauli
Reviewed-by: René Engelhard
Tested-by: René Engelhard
Tested-by: Jenkins
(cherry picked from commit 46ebf8c0ad191f9d9d94c898475dd953fb48d9fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127368
diff --git a/uitest/impress_tests/drawinglayer.py
b/uitest/impress_tests/drawinglayer.py
index 7b33e369d2e6..82fb81d257c7 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -78,7 +78,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -88,7 +88,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(12600, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(4568, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertIsNone(document.CurrentSelection)
@@ -127,7 +127,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(0, document.DrawPages[0].getByIndex(1).RotateAngle)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -138,7 +138,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199, document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629, document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199, document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134, document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(3000, document.DrawPages[0].getByIndex(1).RotateAngle)
self.assertIsNone(document.CurrentSelection)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - uitest/impress_tests
uitest/impress_tests/drawinglayer.py |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 467bd1e6598dc85751ac464a2dd79f578387314c
Author: Rene Engelhard
AuthorDate: Sat Sep 4 19:58:13 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Dec 23 15:48:59 2021 +0100
work around off-by-ones on i386 in uicheck uitests...
<@x1sc0> _rene__, I guess we could use assertAlmostEqual with delta=1 there,
but maybe once we add it, the next assert also fails for you?
Change-Id: Ic64641ccdf9ca721997b4a842b646cf4b9e30f16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121641
Reviewed-by: Xisco Fauli
Reviewed-by: René Engelhard
Tested-by: René Engelhard
Tested-by: Jenkins
(cherry picked from commit 46ebf8c0ad191f9d9d94c898475dd953fb48d9fd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127367
diff --git a/uitest/impress_tests/drawinglayer.py
b/uitest/impress_tests/drawinglayer.py
index 1e582ef2e49c..18cdce5cf57d 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -72,7 +72,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -85,7 +85,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(12600,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertIsNone(document.CurrentSelection)
@@ -116,7 +116,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(0,
document.DrawPages[0].getByIndex(1).RotateAngle)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -130,7 +130,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(3000,
document.DrawPages[0].getByIndex(1).RotateAngle)
self.assertIsNone(document.CurrentSelection)
[Libreoffice-commits] core.git: uitest/impress_tests
uitest/impress_tests/drawinglayer.py |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 46ebf8c0ad191f9d9d94c898475dd953fb48d9fd
Author: Rene Engelhard
AuthorDate: Sat Sep 4 19:58:13 2021 +0200
Commit: René Engelhard
CommitDate: Thu Dec 23 14:01:11 2021 +0100
work around off-by-ones on i386 in uicheck uitests...
<@x1sc0> _rene__, I guess we could use assertAlmostEqual with delta=1 there,
but maybe once we add it, the next assert also fails for you?
Change-Id: Ic64641ccdf9ca721997b4a842b646cf4b9e30f16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121641
Reviewed-by: Xisco Fauli
Reviewed-by: René Engelhard
Tested-by: René Engelhard
Tested-by: Jenkins
diff --git a/uitest/impress_tests/drawinglayer.py
b/uitest/impress_tests/drawinglayer.py
index e8095a1d68fc..acd1dbffe6fc 100644
--- a/uitest/impress_tests/drawinglayer.py
+++ b/uitest/impress_tests/drawinglayer.py
@@ -74,7 +74,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -87,7 +87,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(12600,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(4568,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertIsNone(document.CurrentSelection)
@@ -118,7 +118,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(0,
document.DrawPages[0].getByIndex(1).RotateAngle)
xEditWin = xImpressDoc.getChild("impress_win")
@@ -132,7 +132,7 @@ class ImpressDrawinglayerTest(UITestCase):
self.assertEqual(25199,
document.DrawPages[0].getByIndex(0).Size.Width)
self.assertEqual(2629,
document.DrawPages[0].getByIndex(0).Size.Height)
self.assertEqual(25199,
document.DrawPages[0].getByIndex(1).Size.Width)
-self.assertEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height)
+self.assertAlmostEqual(9134,
document.DrawPages[0].getByIndex(1).Size.Height,delta=1)
self.assertEqual(3000,
document.DrawPages[0].getByIndex(1).RotateAngle)
self.assertIsNone(document.CurrentSelection)
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/pdfium
config_host.mk.in |6
configure.ac | 46 ++
external/pdfium/Library_pdfium.mk | 25 +++-
3 files changed, 76 insertions(+), 1 deletion(-)
New commits:
commit 214fa28c09156c67f85818b6a2ea6b3235bd
Author: Rene Engelhard
AuthorDate: Fri Nov 19 16:36:22 2021 +0100
Commit: René Engelhard
CommitDate: Fri Nov 19 22:23:42 2021 +0100
add with-system-abseil/with-system-openjpeg for pdfium
Change-Id: I270cbb75cde2a44416b61978b8eefdf267720031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125559
Tested-by: Jenkins
Reviewed-by: René Engelhard
diff --git a/config_host.mk.in b/config_host.mk.in
index a03ac19747bc..e17d3f73cf57 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -576,6 +576,9 @@ export STAROFFICE_LIBS=$(gb_SPACE)@STAROFFICE_LIBS@
export STRIP=@STRIP@
export STRIP_COMPONENTS=@STRIP_COMPONENTS@
export SYSBASE=@SYSBASE@
+export SYSTEM_ABSEIL=@SYSTEM_ABSEIL@
+export ABSEIL_CFLAGS=@ABSEIL_CFLAGS@
+export ABSEIL_LIBS=@ABSEIL_LIBS@
export SYSTEM_ABW=@SYSTEM_ABW@
export SYSTEM_APR=@SYSTEM_APR@
export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@
@@ -638,6 +641,9 @@ export SYSTEM_NEON=@SYSTEM_NEON@
export SYSTEM_NSS=@SYSTEM_NSS@
export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
+export SYSTEM_OPENJPEG2=@SYSTEM_OPENJPEG2@
+export OPENJPEG2_CFLAGS=@OPENJPEG2_CFLAGS@
+export OPENJPEG2_LIBS=@OPENJPEG2_LIBS@
export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
diff --git a/configure.ac b/configure.ac
index 0ee46bed9c74..d2104fab57f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2175,6 +2175,16 @@ AC_ARG_WITH(system-poppler,
[Use system poppler (only needed for PDF import).]),,
[with_system_poppler="$with_system_libs"])
+AC_ARG_WITH(system-abseil,
+AS_HELP_STRING([--with-system-abseil],
+[Use the abseil libraries already on system.]),,
+[with_system_abseil="$with_system_libs"])
+
+AC_ARG_WITH(system-openjpeg,
+AS_HELP_STRING([--with-system-openjpeg],
+[Use the OpenJPEG library already on system.]),,
+[with_system_openjpeg="$with_system_libs"])
+
libo_FUZZ_ARG_ENABLE(gpgmepp,
AS_HELP_STRING([--disable-gpgmepp],
[Disable building gpgmepp. Do not use in normal cases unless you want
to fix potential problems it causes.])
@@ -11944,6 +11954,42 @@ else
fi
AC_SUBST(ENABLE_PDFIUM)
+if test "$ENABLE_PDFIUM" = "TRUE"; then
+ AC_MSG_CHECKING([which OpenJPEG library to use])
+ if test "$with_system_openjpeg" = "yes"; then
+ SYSTEM_OPENJPEG2=TRUE
+ AC_MSG_RESULT([external])
+ PKG_CHECK_MODULES( OPENJPEG2, libopenjp2 )
+ OPENJPEG2_CFLAGS=$(printf '%s' "$OPENJPEG2_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
+ FilterLibs "${OPENJPEG2_LIBS}"
+ OPENJPEG2_LIBS="${filteredlibs}"
+ else
+ SYSTEM_OPENJPEG2=FALSE
+ AC_MSG_RESULT([internal])
+ fi
+ AC_MSG_CHECKING([which Abseil library to use])
+ if test "$with_system_abseil" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_ABSEIL=TRUE
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
+ [AC_MSG_ERROR(abseil headers not found.)], [])
+ #ABSEIL_CFLAGS=-I/usr/include
+ AC_CHECK_LIB([absl_bad_optional_access], [main],
[ABSEIL_LIBS=-labsl_bad_optional_access],
+ [ AC_MSG_ERROR([libabsl_bad_optional_access library not
found.]) ])
+ AC_LANG_POP([C++])
+ ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
+ FilterLibs "${ABSEIL_LIBS}"
+ ABSEIL_LIBS="${filteredlibs}"
+ else
+ AC_MSG_RESULT([internal])
+ fi
+fi
+AC_SUBST(SYSTEM_OPENJPEG2)
+AC_SUBST(SYSTEM_ABSEIL)
+AC_SUBST(ABSEIL_CFLAGS)
+AC_SUBST(ABSEIL_LIBS)
+
dnl ===
dnl Check for poppler
dnl ===
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index ee2917fbfd5d..fd355a026b5a 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -19,7 +19,8 @@ $(eval $(call gb_Library_set_include,pdfium,\
-I$(call gb_UnpackedTarball_get_dir,pdfium) \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \
-I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/agg23 \
--I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp \
+$(if $(filter TRUE,$(SYSTEM_ABSEIL)),$(ABSEIL_CFLAGS),-I$(call
gb_UnpackedTarball_get_dir,pdfium)/third_party/abseil-cpp) \
+$(if $(filter TRUE,$(SYSTEM_OPENJPEG2)),$(OPENJPEG2_C
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkframe.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2ed0c2f7ce1ac80dd0315043eb656fff41f24bfc Author: Rene Engelhard AuthorDate: Fri Nov 19 20:28:10 2021 +0100 Commit: Caolán McNamara CommitDate: Fri Nov 19 21:47:15 2021 +0100 fix gtk4 build res is only defined if NDEBUG is *not* defined. So it doesn't exist in a "standard" build using -DNDEBUG and shouldn't be used. Change-Id: Iebae9898d50030f994a7289e2bc3fe3052172dee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125582 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index a42a745aa988..66fa98d08cb5 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -4713,10 +4713,12 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* bool res = #endif g_idle_remove_by_data(this); +#ifndef NDEBUG #if !GTK_CHECK_VERSION(4, 0, 0) assert(res); #else (void)res; +#endif #endif css::datatransfer::dnd::DropTargetDropEvent aEvent;
[Libreoffice-commits] core.git: include/vcl
include/vcl/metaact.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c26c9115245a7ed9a6117924d22fcd5634217b99
Author: Rene Engelhard
AuthorDate: Tue Oct 12 19:50:32 2021 +0200
Commit: Tomaž Vajngerl
CommitDate: Wed Oct 13 19:39:20 2021 +0200
fix (cppunit test) build with --enable-mergelibs again
=/home/rene/LibreOffice/git/master && I=$S/instdir && W=$S/workdir &&
/usr/bin/ccache x86_64-linux-gnu-g++ -pthread -shared -Wl,-z,noexecstack
-flto=4 -fuse-linker-plugin -O2 -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library'
-Wl,-rpath-link,$I/program -Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib
-Wl,-z,combreloc -Wl,--hash-style=gnu -Wl,-Bsymbolic-functions
-L$W/LinkTarget/StaticLibrary -L$I/sdk/lib -L$I/program -L$I/program
-L$W/LinkTarget/Library -Wl,-z,relro$W/CxxObject/vcl/qa/api/XGraphicTest.o
-Wl,--start-group -lcppunit -Wl,--end-group -Wl,--no-as-needed
-lmergedlo -luno_cppu -luno_cppuhelpergcc3 -luno_sal -ltest -lunotest -o
$W/LinkTarget/CppunitTest/libtest_vcl_apitests.so
/usr/bin/ld: /tmp/cc9oq9Pr.ltrans2.ltrans.o: in function
`VclOutdevTest::testDrawPolyLine()':
:(.text+0x9e91): undefined reference to `typeinfo for
MetaPolyLineAction'
/usr/bin/ld: :(.text+0xa115): undefined reference to `typeinfo
for MetaPolyLineAction'
/usr/bin/ld: :(.text+0xa824): undefined reference to `typeinfo
for MetaPolyLineAction'
collect2: error: ld returned 1 exit status
make[4]: ***
[/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:799:
/home/rene/LibreOffice/git/master/workdir/LinkTarget/CppunitTest/libtest_vcl_outdev.so]
Error 1
make[4]: *** Waiting for unfinished jobs
Change-Id: I0c22c2b2786660060e39fb272396a6d9af20433f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123530
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 6d10d5d2635d..c51c1e790a85 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -377,7 +377,7 @@ public:
voidSetEndPoint(const Point& rPoint) { maEndPt = rPoint; }
};
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPolyLineAction final : public
MetaAction
+class VCL_DLLPUBLIC MetaPolyLineAction final : public MetaAction
{
private:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - external/skia
external/skia/UnpackedTarball_skia.mk |1 + external/skia/disable-freetype-colrv1.1 | 22 ++ 2 files changed, 23 insertions(+) New commits: commit 60e2f8b60cc9f3bbe87b7900a547af397b86e10a Author: Rene Engelhard AuthorDate: Tue Sep 14 21:17:11 2021 +0200 Commit: René Engelhard CommitDate: Thu Sep 16 07:32:26 2021 +0200 fix skia build with newer freetypes extracted (and adapted for 7.2.x) from masters catch-all-commit a0edcc68f94915a78fcc08e70d2cdd752abd9ebb: Additionally patch out Skia's use of TT_SUPPORT_COLRV1, which seems to be an unstable freetype API from the git version and it doesn't even compile with the latest stable 2.9.11 release Change-Id: Iba22fbc74dcd75bc6d1d91e2f537caf9d179e885 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122096 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index e1ea21b3cd35..104b307f2d64 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -39,6 +39,7 @@ skia_patches := \ fast-png-write.patch.1 \ skia_sk_cpu_sse_level_0_by_default.patch.1 \ fix-warnings.patch.1 \ +disable-freetype-colrv1.1 \ $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1)) diff --git a/external/skia/disable-freetype-colrv1.1 b/external/skia/disable-freetype-colrv1.1 new file mode 100644 index ..7d38a4d40c2a --- /dev/null +++ b/external/skia/disable-freetype-colrv1.1 @@ -0,0 +1,22 @@ +diff -urN skia-old/src/ports/SkFontHost_FreeType_common.cpp skia/src/ports/SkFontHost_FreeType_common.cpp +--- skia-old/src/ports/SkFontHost_FreeType_common.cpp 2021-03-01 15:53:09.178606791 +0100 skia/src/ports/SkFontHost_FreeType_common.cpp 2021-09-14 21:58:59.996633457 +0200 +@@ -372,6 +372,7 @@ + // Only build COLRv1 rendering code if FreeType is new enough to have COLRv1 + // additions. FreeType defines a macro in the ftoption header to tell us whether + // it does support these features. ++#undef TT_SUPPORT_COLRV1 // Unstable API. + #ifdef TT_SUPPORT_COLRV1 + + bool generateFacePathCOLRv1(FT_Face face, SkGlyphID glyphID, SkPath* path); +diff -urN skia-old/src/ports/SkFontHost_FreeType.cpp skia/src/ports/SkFontHost_FreeType.cpp +--- skia-old/src/ports/SkFontHost_FreeType.cpp 2021-03-01 15:53:09.178606791 +0100 skia/src/ports/SkFontHost_FreeType.cpp 2021-09-14 21:59:08.916715446 +0200 +@@ -1299,6 +1299,7 @@ + FT_UInt layerGlyphIndex; + FT_UInt layerColorIndex; + ++#undef TT_SUPPORT_COLRV1 // Unstable API. + #ifdef TT_SUPPORT_COLRV1 + FT_OpaquePaint opaqueLayerPaint; + opaqueLayerPaint.p = nullptr;
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 5979076a14098f6887b61e937cfc9059ff7f2506
Author: Rene Engelhard
AuthorDate: Mon Aug 23 22:37:54 2021 +0200
Commit: Christian Lohmaier
CommitDate: Mon Sep 13 15:03:12 2021 +0200
fix ccache size detection with ccache 4.4
which changed format. but ccache -p has the same format in 4.2 and 4.4
so use that one
Change-Id: I4de0241109c580becb96ce0c1b461c2642a4631e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120928
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/configure.ac b/configure.ac
index 45d19327d19d..a2dd5dc5eeb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3127,7 +3127,9 @@ AC_SUBST(CCACHE_DEPEND_MODE)
# skip on windows - sccache defaults are good enough
if test "$CCACHE" != "" -a "$_os" != "WINNT"; then
-ccache_size_msg=$([ccache -s | tail -n 1 | sed 's/^[^0-9]*//' | sed -e
's/\.[0-9]*//'])
+# e.g. (/home/rene/.config/ccache/ccache.conf) max_size = 20.0G
+# -p works with both 4.2 and 4.4
+ccache_size_msg=$([ccache -p | $AWK /max_size/'{ print $4 }' | sed -e
's/\.[0-9]*//'])
ccache_size=$(echo "$ccache_size_msg" | grep "G" | sed -e 's/G.*$//')
if test "$ccache_size" = ""; then
ccache_size=$(echo "$ccache_size_msg" | grep "M" | sed -e 's/\ M.*$//')
[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_text.mk
vcl/CppunitTest_vcl_text.mk | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) New commits: commit a866d63e0ac9de4ff7e59b3928f09ec21877bef3 Author: Rene Engelhard AuthorDate: Sun Aug 29 21:05:39 2021 +0200 Commit: Tomaž Vajngerl CommitDate: Tue Aug 31 01:35:00 2021 +0200 fix build CppunitTest_vcl_text needs icuuc now, not only icu headers /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()': ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()' /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()': ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()' /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()': ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UMemory::operator delete(void*)' /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::~ScriptRun()': ././vcl/inc/scrptrun.h:61: undefined reference to `icu_67::UObject::~UObject()' /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o: in function `vcl::ScriptRun::ScriptRun(char16_t const*, int)': ././vcl/inc/scrptrun.h:116: undefined reference to `icu_67::UObject::~UObject()' /usr/bin/ld: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/text.o:(.data.rel.ro._ZTIN3vcl9ScriptRunE[_ZTIN3vcl9ScriptRunE]+0x8): undefined reference to `typeinfo for icu_67::UObject' collect2: error: ld returned 1 exit status make[4]: *** [/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:731: /home/rene/LibreOffice/git/master/workdir/LinkTarget/CppunitTest/libtest_vcl_text.so] Error 1 make[4]: *** Waiting for unfinished jobs. Change-Id: I3e94e0f97694c99c6388f6268054fe1c57a881cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121240 Reviewed-by: Chris Sherlock Reviewed-by: Tomaž Vajngerl Tested-by: Jenkins diff --git a/vcl/CppunitTest_vcl_text.mk b/vcl/CppunitTest_vcl_text.mk index ffc307e094f1..4ffa3b1990ca 100644 --- a/vcl/CppunitTest_vcl_text.mk +++ b/vcl/CppunitTest_vcl_text.mk @@ -23,9 +23,18 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_text, \ $(eval $(call gb_CppunitTest_use_externals,vcl_text,\ boost_headers \ harfbuzz \ - icu_headers \ )) +ifeq ($(SYSTEM_ICU),TRUE) +$(eval $(call gb_CppunitTest_use_externals,vcl_text,\ + icuuc \ +)) +else +$(eval $(call gb_CppunitTest_use_externals,vcl_text,\ +icu_headers \ +)) +endif + $(eval $(call gb_CppunitTest_use_libraries,vcl_text, \ comphelper \ cppu \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-0' - Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e4a55135042a734367ad98ff2e92f877f0959247 Author: Rene Engelhard AuthorDate: Thu Jul 29 12:58:32 2021 +0200 Commit: Caolán McNamara CommitDate: Wed Aug 4 20:39:48 2021 +0200 fix install with --disable-cmis Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119626 (cherry picked from commit e5dd63f1904582fe40f848675bc23630d24e9334) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119867 Reviewed-by: Eike Rathke Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/Repository.mk b/Repository.mk index 218a4417f96e..0f3d2458a867 100644 --- a/Repository.mk +++ b/Repository.mk @@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ucpexpand1 \ ucpext \ ucpimage \ - ucpcmis1 \ + $(if $(ENABLE_LIBCMIS),ucpcmis1) \ ucptdoc1 \ unordf \ unoxml \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e5dd63f1904582fe40f848675bc23630d24e9334 Author: Rene Engelhard AuthorDate: Thu Jul 29 12:58:32 2021 +0200 Commit: Christian Lohmaier CommitDate: Tue Aug 3 16:40:29 2021 +0200 fix install with --disable-cmis Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119626 diff --git a/Repository.mk b/Repository.mk index 218a4417f96e..0f3d2458a867 100644 --- a/Repository.mk +++ b/Repository.mk @@ -431,7 +431,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ucpexpand1 \ ucpext \ ucpimage \ - ucpcmis1 \ + $(if $(ENABLE_LIBCMIS),ucpcmis1) \ ucptdoc1 \ unordf \ unoxml \
[Libreoffice-commits] core.git: Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 299b72e4c9ad239d747e47eaf004400f5a590695 Author: Rene Engelhard AuthorDate: Thu Jul 29 12:58:32 2021 +0200 Commit: Christian Lohmaier CommitDate: Sat Jul 31 20:05:01 2021 +0200 fix install with --disable-cmis Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/Repository.mk b/Repository.mk index 9d3ef1bcc1e3..c19e3f264250 100644 --- a/Repository.mk +++ b/Repository.mk @@ -433,7 +433,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ucpexpand1 \ ucpext \ ucpimage \ - ucpcmis1 \ + $(if $(ENABLE_LIBCMIS),ucpcmis1) \ ucptdoc1 \ unordf \ unoxml \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sd/qa sw/qa
sc/qa/unit/tiledrendering/tiledrendering.cxx | 16
sd/qa/unit/tiledrendering/tiledrendering.cxx |8
sw/qa/extras/tiledrendering/tiledrendering.cxx |8
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 947bbe2ae33724f445968f50acf186305fb361e3
Author: Rene Engelhard
AuthorDate: Fri Jun 18 06:14:09 2021 +0200
Commit: Noel Grandin
CommitDate: Sat Jun 19 09:23:04 2021 +0200
fix 32bit build of tiledrendering tests
Squash of commits
49849a09e2823ac6edb42693daf7eac5312f2eb9
d7b9b9e8e02aefd61669e07543fc370b0c58207f
Change-Id: I2f10b7bb37b05961f73fad9ee2e716ed8177d8ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117474
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 07ebef6086d9..aed61f58a6cf 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -460,13 +460,13 @@ struct EditCursorMessage final {
std::string aVal =
aTree.get_child("refpoint").get_value();
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
-CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
aVal = aTree.get_child("relrect").get_value();
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
-CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
m_aRelRect.setX(aSeq[0].toInt32());
m_aRelRect.setY(aSeq[1].toInt32());
m_aRelRect.setWidth(aSeq[2].toInt32());
@@ -512,7 +512,7 @@ struct TextSelectionMessage
std::string("0, 0") :
aStr.substr(nRefDelimStart + 2, aStr.length() - 2 -
nRefDelimStart);
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRefPointString.c_str()));
-CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
@@ -525,7 +525,7 @@ struct TextSelectionMessage
std::string aRectString = aRectListString.substr(nStart, nEnd -
nStart);
{
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRectString.c_str()));
-CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
tools::Rectangle aRect;
aRect.setX(aSeq[0].toInt32());
aRect.setY(aSeq[1].toInt32());
@@ -818,7 +818,7 @@ void ScTiledRenderingTest::testViewLock()
CPPUNIT_ASSERT(!aView1.m_bViewLock);
}
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id,
sal_uInt32& x, sal_uInt32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -847,10 +847,10 @@ void ScTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_uInt32 id, x, y;
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_uInt32 oldX = x;
+sal_uInt32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", uno::makeAny(id)},
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 02f1968a8232..02856dd0043e 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2627,7 +2627,7 @@ void SdTiledRenderingTest::testSlideDuplicateUndo()
namespace
{
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id,
sal_uInt32& x, sal_uInt32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -2660,10 +2660,10 @@ void SdTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_uInt32 id, x, y;
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_uInt32 oldX = x;
+sal_uInt32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", u
[Libreoffice-commits] core.git: sd/qa sw/qa
sd/qa/unit/tiledrendering/tiledrendering.cxx |8
sw/qa/extras/tiledrendering/tiledrendering.cxx |8
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 51754ca5349d7bf655d57ded37381188d0bc4bcf
Author: Rene Engelhard
AuthorDate: Fri Jun 18 06:14:09 2021 +0200
Commit: René Engelhard
CommitDate: Fri Jun 18 17:54:35 2021 +0200
more 32bit build fixes
Change-Id: I5906ef714a482afffe40e59e90fd709fe857d3ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117404
Tested-by: Jenkins
Tested-by: René Engelhard
Reviewed-by: René Engelhard
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 02f1968a8232..02856dd0043e 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2627,7 +2627,7 @@ void SdTiledRenderingTest::testSlideDuplicateUndo()
namespace
{
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x,
int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id,
sal_uInt32& x, sal_uInt32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -2660,10 +2660,10 @@ void SdTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_uInt32 id, x, y;
lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_uInt32 oldX = x;
+sal_uInt32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", uno::makeAny(id)},
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b991f06b3c0a..54f4ecc7b9a9 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2860,7 +2860,7 @@ void
SwTiledRenderingTest::testDropDownFormFieldButtonNoSelection()
}
}
-static void lcl_extractHandleParameters(const OString& selection, int& id,
int& x, int& y)
+static void lcl_extractHandleParameters(const OString& selection, sal_Int32&
id, sal_Int32& x, sal_Int32& y)
{
OString extraInfo = selection.copy(selection.indexOf("{"));
std::stringstream aStream(extraInfo.getStr());
@@ -2892,10 +2892,10 @@ void SwTiledRenderingTest::testMoveShapeHandle()
CPPUNIT_ASSERT(!m_ShapeSelection.isEmpty());
{
-int id, x, y;
+sal_Int32 id, x, y;
lcl_extractHandleParameters(m_ShapeSelection, id, x ,y);
-int oldX = x;
-int oldY = y;
+sal_Int32 oldX = x;
+sal_Int32 oldY = y;
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
{
{"HandleNum", uno::makeAny(id)},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit ad92c7dfa64c9e08aa2bcf612a9a4a68e9deae22 Author: Rene Engelhard AuthorDate: Sat Mar 20 10:02:05 2021 +0100 Commit: Mike Kaganski CommitDate: Sat Mar 20 21:36:51 2021 +0100 fix system zxing build Change-Id: I248471718def63f85525c49d46855340cde4b222 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112789 Tested-by: René Engelhard Reviewed-by: Mike Kaganski diff --git a/configure.ac b/configure.ac index 851a8af76b6c..5e80cbfdb791 100644 --- a/configure.ac +++ b/configure.ac @@ -10812,6 +10812,7 @@ else AC_LANG_PUSH([C++]) AC_CHECK_HEADER(ZXing/MultiFormatWriter.h, [], [AC_MSG_ERROR(zxing headers not found.)], [#include ]) +ZXING_CFLAGS=-I/usr/include/ZXing AC_CHECK_LIB([ZXing], [main], [ZXING_LIBS=-lZXing], [ AC_CHECK_LIB([ZXingCore], [main], [ZXING_LIBS=-lZXingCore], [ AC_MSG_ERROR(zxing C++ library not found.) ])], []) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - bean/BUCK BUCK javaunohelper/BUCK jurt/BUCK ridljar/BUCK ridljar/source solenv/bin solenv/buck solenv/maven
BUCK |9 + bean/BUCK |5 ++--- javaunohelper/BUCK| 27 ++- jurt/BUCK | 28 +++- ridljar/BUCK | 34 ++ ridljar/source/unoloader/BUCK |1 + solenv/bin/version.py |3 ++- solenv/buck/build.defs|2 ++ solenv/maven/BUCK |3 +++ solenv/maven/mvn.py |1 + 10 files changed, 79 insertions(+), 34 deletions(-) New commits: commit f5caffb74a5336014e84121b90196769d9a29d56 Author: Rene Engelhard AuthorDate: Fri May 8 14:19:45 2020 +0200 Commit: Christian Lohmaier CommitDate: Wed Mar 10 16:19:45 2021 +0100 Adapt buck build to jars merged into libreoffice.jar Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and 35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars were merged into libreoffice.jar. Adapt the buck build correspondingly. Preserve the publishing of merged jars for now with dummy content and consider to remove them in future releases. Test Plan: 1. To replace version number with upcoming release version: $ solenv/bin/version.py 7.1.0 2. To install the API to local Maven repository: $ VERBOSE=1 buck build api_install 3. To deploy the API to Maven Central: $ VERBOSE=1 buck build api_deploy Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit ea8d6cd59670854cb153c4e984cb4044093e5994) diff --git a/BUCK b/BUCK index 66b0dbdabcec..18f5cf488e4f 100644 --- a/BUCK +++ b/BUCK @@ -34,6 +34,12 @@ prebuilt_jar( visibility = ['PUBLIC'], ) +prebuilt_jar( + name = 'libreoffice', + binary_jar = 'instdir/program/classes/libreoffice.jar', + visibility = ['PUBLIC'], +) + zip_file( name = 'api', srcs = [ @@ -55,5 +61,8 @@ zip_file( ':unoloader', '//ridljar/source/unoloader:unoloader-src', '//ridljar/source/unoloader:unoloader-javadoc', + ':libreoffice', + '//ridljar:libreoffice-src', + '//ridljar:libreoffice-javadoc', ] ) diff --git a/bean/BUCK b/bean/BUCK index 94a235b0a87a..0a0ac72b60ea 100644 --- a/bean/BUCK +++ b/bean/BUCK @@ -2,6 +2,7 @@ java_sources( name = 'officebean-src', srcs = glob(['com/**']), + root = '.', visibility = ['PUBLIC'], ) @@ -14,10 +15,8 @@ java_doc( paths = ['.'], srcs = glob(['com/**']), deps = [ -'//:juh', +'//:libreoffice', '//:officebean', -'//:unoil', -'//:ridl', ], visibility = ['PUBLIC'], ) diff --git a/javaunohelper/BUCK b/javaunohelper/BUCK index 7f1120dab5f5..a33df7b9d347 100644 --- a/javaunohelper/BUCK +++ b/javaunohelper/BUCK @@ -1,20 +1,21 @@ - -java_sources( +genrule( name = 'juh-src', - srcs = glob(['com/**']), + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'juh-src.jar', visibility = ['PUBLIC'], ) -java_doc( +genrule( name = 'juh-javadoc', - title = 'LibreOffice Makes it easier to use UNO with Java', - pkgs = [ -'com.sun.star', - ], - paths = ['.'], - srcs = glob(['com/**']), - deps = [ -'//:juh', - ], + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'juh-javadoc.jar', visibility = ['PUBLIC'], ) diff --git a/jurt/BUCK b/jurt/BUCK index f2349aa017e0..1af7706d9203 100644 --- a/jurt/BUCK +++ b/jurt/BUCK @@ -1,21 +1,23 @@ -java_sources( +genrule( name = 'jurt-src', - srcs = glob(['com/**']), + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'jurt-src.jar', visibility = ['PUBLIC'], ) -java_doc( +genrule( name = 'jurt-javadoc', - title = 'LibreOffice Java Uno Runtime', - pkgs = [ -'com.sun.star', - ], - paths = ['.'], - srcs = glob(['com/**']), - deps = [ -'//:jurt', -'//:unoloader', - ], + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'jurt-javadoc.jar', visibility = ['PUBLIC'], ) + diff --git a/ridljar/BUCK b/ridljar/BUCK index 382287d09ff9..b67d1c6a1166 100644 --- a/ridljar/BUCK +++ b/ridljar/BUCK @@ -1,20 +1,46 @@ -java_sources( +genrule( name = 'ridl-src', + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'ridl-src.jar', + visibility = ['PUBLIC'], +) + +genrule( + name = 'ridl-javadoc', + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'ridl-javadoc.jar', + visibility = ['PUBLIC'], +) + +java_sources( + name = 'libreoffice-src', srcs = glob(['com/**']),
[Libreoffice-commits] core.git: external/pdfium
external/pdfium/Library_pdfium.mk |8 1 file changed, 8 deletions(-) New commits: commit 6406c4fc6127bef053b4c4f7da6ebf51e72e13ae Author: Rene Engelhard AuthorDate: Fri Jan 29 12:09:50 2021 +0100 Commit: Miklos Vajna CommitDate: Wed Feb 3 10:11:18 2021 +0100 don't build third_party/bigint for pdfium since it's apparently not needed. builds fine even after removing it Change-Id: I5626c8f9920c3e33d91afd51610b815ffae4ed86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110131 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index f08ff51a31a3..81cdbe859ba2 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -503,14 +503,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/pwl/cpwl_wnd \ )) -# third_party/bigint -$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ -UnpackedTarball/pdfium/third_party/bigint/BigInteger \ -UnpackedTarball/pdfium/third_party/bigint/BigIntegerUtils \ -UnpackedTarball/pdfium/third_party/bigint/BigUnsigned \ -UnpackedTarball/pdfium/third_party/bigint/BigUnsignedInABase \ -)) - # third_party/fx_agg $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/agg23/agg_curves \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf4942e06c39ec21cbe18f42bb51c6459a1bd2f5 Author: Rene Engelhard AuthorDate: Wed Jan 20 12:17:12 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 20 12:17:12 2021 +0100 Update git submodules * Update dictionaries from branch 'libreoffice-7-1-0' to 625cc9846854ed05246a007a24095b580eebf8cf - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109332 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Michael Stahl Tested-by: René Engelhard diff --git a/dictionaries b/dictionaries index 50086014570f..625cc9846854 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 50086014570f7f1bc612a8c5eb5aa08227878a4f +Subproject commit 625cc9846854ed05246a007a24095b580eebf8cf ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-1-0' - it_IT/it_IT.dic
it_IT/it_IT.dic | 4886 1 file changed, 2443 insertions(+), 2443 deletions(-) New commits: commit 625cc9846854ed05246a007a24095b580eebf8cf Author: Rene Engelhard AuthorDate: Fri Jan 15 09:44:21 2021 +0100 Commit: Michael Stahl CommitDate: Wed Jan 20 12:17:12 2021 +0100 deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109332 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Michael Stahl Tested-by: René Engelhard diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic index 394734e..c5ed82b 100644 --- a/it_IT/it_IT.dic +++ b/it_IT/it_IT.dic @@ -38,7 +38,7 @@ ab abaco/OTqr Abacuc abadessa/QTUqrs -abaliet�/TU +abalietà/TU abanese/STUqrs Abano/Tqr abarica/QTU @@ -157,7 +157,7 @@ abbicare/ALKhlTXI abbicata/QTU abbicato/EyT abbicatura/QTUqs -abbicc�/Tq +abbiccì/Tq abbiente/STUqrs abbietta/QTU abbietto/OTYW @@ -399,7 +399,7 @@ abilitata/QTU abilitativa/QTU abilitativo/OT abilitato/EyT -abilit�/TUqs +abilità/TUqs abilitazione/STUqs abiogenesi/Tq abiogenetica/QTU @@ -413,7 +413,7 @@ Abissinia/TUqrs abissino/OTqr abisso/OTqr abitabile/STU -abitabilit�/TUqs +abitabilità/TUqs abitacolo/OTq abitando/D abitante/STUqrs @@ -428,13 +428,13 @@ abitazione/STUqs abitino/OTq abito/OTq abituale/SYTU -abitualit�/TUqs +abitualità/TUqs abituando/D abituare/ALKhlTXI abituata/QTU abituato/EyT abitudinaria/QTUqrs -abitudinariet�/TUqs +abitudinarietà/TUqs abitudinario/OTYqr abitudine/STUqs abituro/OTq @@ -507,7 +507,7 @@ Abramo/T^ abrasero abrasione/STUqrs abrasiva/QTUqrs -abrasivit�/TUqs +abrasività/TUqs abrasivo/OTqr abraso/oT abreazione/STUqs @@ -545,11 +545,11 @@ abusata/QTU abusato/EyT abusiva/QTUqrs abusivismo/OTq -abusivit�/Tqs +abusività/Tqs abusivo/OTYWqr abuso/OTq acacia/QTUqs -acagi�/T +acagiù/T acantacea/QTUqrs acantocefalo/OTq acanto/OTqr @@ -591,7 +591,7 @@ accadimento/OTq accado/OTq accadrai accadranno/X -accadr�/X +accadrà/X accadrebbero accadrebbe/X accadrei @@ -600,7 +600,7 @@ accadremo accadreste accadresti accadrete -accadr� +accadrò accaduta/QTU accaduto/EyT accagliamento/OTq @@ -840,7 +840,7 @@ accerchiata/QTU accerchiato/EyT accerchiatura/QTUqs accertabile/STU -accertabilit�/TUqs +accertabilità/TUqs accertamento/OTq accertando/DJ accertare/ALKhlJTXI @@ -853,7 +853,7 @@ accesissima/QTU accesissimo/OT acceso/OYT accessibile/STU -accessibilit�/TUqs +accessibilità/TUqs accessione/STUqrs accesso/OTqr accessoriabile/STU @@ -862,7 +862,7 @@ accessoria/QTU accessoriare/ALKhlTXI accessoriata/QTU accessoriato/EyT -accessoriet�/TUqs +accessorietà/TUqs accessorio/OTqY accessorista/QRTUqrs accessuale/SYTU @@ -874,7 +874,7 @@ accestito/OT accettabile/SYTU accettabilissima/QTU accettabilissimo/OT -accettabilit�/TUqs +accettabilità/TUqs accettando/DJ accettante/STUqrs accetta/QTUqs @@ -945,7 +945,7 @@ acciarpata/QTU acciarpato/EyT accidempoli/Tqr accidentale/STUYq -accidentalit�/TUqs +accidentalità/TUqs accidentata/QTU accidentato/OT accidente/STUqrs @@ -968,7 +968,7 @@ accinsero/T accinse/STUqrs accinta/QTU accinto/OT -acciocch�/Tqr +acciocché/Tqr acciottolando/D acciottolare/ALKhlTXI acciottolata/QTU @@ -1016,7 +1016,7 @@ acclimatrice/STUqrs acclimazione/STUqs accline/STUqrs acclive/STUqrs -acclivit�/TUqs +acclività/TUqs accludendo/D accludere/BTXI acclusa/QTU @@ -1301,7 +1301,7 @@ accuratezza/QTUqrs accurato/OTWYqr Accursio/T^ accusabile/STU -accusabilit�/TUqs +accusabilità/TUqs accusando/D accusa/QTUqs accusare/ALKhlTXI @@ -1323,7 +1323,7 @@ acerba/QTUqrs acerbezza/QTUqs acerbissima/QTU acerbissimo/OT -acerbit�/TUqs +acerbità/TUqs acerbo/OTY Acerenza acereta/QTUqs @@ -1385,7 +1385,7 @@ acetonuria/QTUqs aceto/OTq acetosa/QTUqs acetosella/QTUqs -acetosit�/TUqs +acetosità/TUqs acetoso/OT ace/TUq achea/QTUqrs @@ -1408,7 +1408,7 @@ achiria/QTUqs Aci aciatici/Tqr aciclica/QTU -aciclicit�/TU +aciclicità/TU aciclico/nT acicolare/STU acicula/QTUqs @@ -1423,7 +1423,7 @@ acidificata/QTU acidificato/EyT acidificazione/STUqs acidimetria/QTUqrs -acidit�/TUqs +acidità/TUqs acidofila/QTU acidofilo/OT acidolisi/TUqs @@ -1471,12 +1471,12 @@ acneico/nT acne/STUq acolia/QTUqs aconcettuale/STUqrs -aconcettualit�/TUqs +aconcettualità/TUqs acondroplasia/QTUqs acondroplasica/QTUqrs acondroplasico/nTqr aconfessionale/STUqrs -aconfessionalit�/TUqs +aconfessionalità/TUqs aconitina/QTUq aconito/OTq aconzio/OTqs @@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs Acquasparta acquata/QTUqrs acquatica/QTU -acquaticit�/TUqs +acquaticità/TUqs acquatico/nTq acquatile/STU acquatinta/TUqs @@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs acquitrinoso/OTqr acquolina/QTUqrs acquosa/QTUqrs -acquosit�/
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e38db1bdcf8ffef8491bfd8b375acab48210325c Author: Rene Engelhard AuthorDate: Wed Jan 20 09:47:44 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 20 09:47:44 2021 +0100 Update git submodules * Update dictionaries from branch 'libreoffice-7-1' to 28be227a705917bd78ee47f7c50a4adaf31740a7 - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109291 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Tested-by: René Engelhard diff --git a/dictionaries b/dictionaries index 0f14b9278300..28be227a7059 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 0f14b92783008b49eedd6d3dbf40b7becd71746d +Subproject commit 28be227a705917bd78ee47f7c50a4adaf31740a7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-7-1' - it_IT/it_IT.dic
it_IT/it_IT.dic | 4886 1 file changed, 2443 insertions(+), 2443 deletions(-) New commits: commit 28be227a705917bd78ee47f7c50a4adaf31740a7 Author: Rene Engelhard AuthorDate: Fri Jan 15 09:44:21 2021 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jan 20 09:47:44 2021 +0100 deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109291 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Tested-by: René Engelhard diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic index 394734e..c5ed82b 100644 --- a/it_IT/it_IT.dic +++ b/it_IT/it_IT.dic @@ -38,7 +38,7 @@ ab abaco/OTqr Abacuc abadessa/QTUqrs -abaliet�/TU +abalietà/TU abanese/STUqrs Abano/Tqr abarica/QTU @@ -157,7 +157,7 @@ abbicare/ALKhlTXI abbicata/QTU abbicato/EyT abbicatura/QTUqs -abbicc�/Tq +abbiccì/Tq abbiente/STUqrs abbietta/QTU abbietto/OTYW @@ -399,7 +399,7 @@ abilitata/QTU abilitativa/QTU abilitativo/OT abilitato/EyT -abilit�/TUqs +abilità/TUqs abilitazione/STUqs abiogenesi/Tq abiogenetica/QTU @@ -413,7 +413,7 @@ Abissinia/TUqrs abissino/OTqr abisso/OTqr abitabile/STU -abitabilit�/TUqs +abitabilità/TUqs abitacolo/OTq abitando/D abitante/STUqrs @@ -428,13 +428,13 @@ abitazione/STUqs abitino/OTq abito/OTq abituale/SYTU -abitualit�/TUqs +abitualità/TUqs abituando/D abituare/ALKhlTXI abituata/QTU abituato/EyT abitudinaria/QTUqrs -abitudinariet�/TUqs +abitudinarietà/TUqs abitudinario/OTYqr abitudine/STUqs abituro/OTq @@ -507,7 +507,7 @@ Abramo/T^ abrasero abrasione/STUqrs abrasiva/QTUqrs -abrasivit�/TUqs +abrasività/TUqs abrasivo/OTqr abraso/oT abreazione/STUqs @@ -545,11 +545,11 @@ abusata/QTU abusato/EyT abusiva/QTUqrs abusivismo/OTq -abusivit�/Tqs +abusività/Tqs abusivo/OTYWqr abuso/OTq acacia/QTUqs -acagi�/T +acagiù/T acantacea/QTUqrs acantocefalo/OTq acanto/OTqr @@ -591,7 +591,7 @@ accadimento/OTq accado/OTq accadrai accadranno/X -accadr�/X +accadrà/X accadrebbero accadrebbe/X accadrei @@ -600,7 +600,7 @@ accadremo accadreste accadresti accadrete -accadr� +accadrò accaduta/QTU accaduto/EyT accagliamento/OTq @@ -840,7 +840,7 @@ accerchiata/QTU accerchiato/EyT accerchiatura/QTUqs accertabile/STU -accertabilit�/TUqs +accertabilità/TUqs accertamento/OTq accertando/DJ accertare/ALKhlJTXI @@ -853,7 +853,7 @@ accesissima/QTU accesissimo/OT acceso/OYT accessibile/STU -accessibilit�/TUqs +accessibilità/TUqs accessione/STUqrs accesso/OTqr accessoriabile/STU @@ -862,7 +862,7 @@ accessoria/QTU accessoriare/ALKhlTXI accessoriata/QTU accessoriato/EyT -accessoriet�/TUqs +accessorietà/TUqs accessorio/OTqY accessorista/QRTUqrs accessuale/SYTU @@ -874,7 +874,7 @@ accestito/OT accettabile/SYTU accettabilissima/QTU accettabilissimo/OT -accettabilit�/TUqs +accettabilità/TUqs accettando/DJ accettante/STUqrs accetta/QTUqs @@ -945,7 +945,7 @@ acciarpata/QTU acciarpato/EyT accidempoli/Tqr accidentale/STUYq -accidentalit�/TUqs +accidentalità/TUqs accidentata/QTU accidentato/OT accidente/STUqrs @@ -968,7 +968,7 @@ accinsero/T accinse/STUqrs accinta/QTU accinto/OT -acciocch�/Tqr +acciocché/Tqr acciottolando/D acciottolare/ALKhlTXI acciottolata/QTU @@ -1016,7 +1016,7 @@ acclimatrice/STUqrs acclimazione/STUqs accline/STUqrs acclive/STUqrs -acclivit�/TUqs +acclività/TUqs accludendo/D accludere/BTXI acclusa/QTU @@ -1301,7 +1301,7 @@ accuratezza/QTUqrs accurato/OTWYqr Accursio/T^ accusabile/STU -accusabilit�/TUqs +accusabilità/TUqs accusando/D accusa/QTUqs accusare/ALKhlTXI @@ -1323,7 +1323,7 @@ acerba/QTUqrs acerbezza/QTUqs acerbissima/QTU acerbissimo/OT -acerbit�/TUqs +acerbità/TUqs acerbo/OTY Acerenza acereta/QTUqs @@ -1385,7 +1385,7 @@ acetonuria/QTUqs aceto/OTq acetosa/QTUqs acetosella/QTUqs -acetosit�/TUqs +acetosità/TUqs acetoso/OT ace/TUq achea/QTUqrs @@ -1408,7 +1408,7 @@ achiria/QTUqs Aci aciatici/Tqr aciclica/QTU -aciclicit�/TU +aciclicità/TU aciclico/nT acicolare/STU acicula/QTUqs @@ -1423,7 +1423,7 @@ acidificata/QTU acidificato/EyT acidificazione/STUqs acidimetria/QTUqrs -acidit�/TUqs +acidità/TUqs acidofila/QTU acidofilo/OT acidolisi/TUqs @@ -1471,12 +1471,12 @@ acneico/nT acne/STUq acolia/QTUqs aconcettuale/STUqrs -aconcettualit�/TUqs +aconcettualità/TUqs acondroplasia/QTUqs acondroplasica/QTUqrs acondroplasico/nTqr aconfessionale/STUqrs -aconfessionalit�/TUqs +aconfessionalità/TUqs aconitina/QTUq aconito/OTq aconzio/OTqs @@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs Acquasparta acquata/QTUqrs acquatica/QTU -acquaticit�/TUqs +acquaticità/TUqs acquatico/nTq acquatile/STU acquatinta/TUqs @@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs acquitrinoso/OTqr acquolina/QTUqrs acquosa/QTUqrs -acquosit�/TUqs +acquosità/TUqs
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9527955dd78618f14e12018e4f0ff533d2823d1 Author: Rene Engelhard AuthorDate: Wed Jan 20 09:47:03 2021 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 20 09:47:03 2021 +0100 Update git submodules * Update dictionaries from branch 'master' to 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f - deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109321 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Tested-by: René Engelhard diff --git a/dictionaries b/dictionaries index a706f520e612..87ca82e1a22b 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a706f520e612d1148c6d259b595ba4815be99f50 +Subproject commit 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: it_IT/it_IT.dic
it_IT/it_IT.dic | 4886 1 file changed, 2443 insertions(+), 2443 deletions(-) New commits: commit 87ca82e1a22bfc40c6fef0ddaa210053cf79f25f Author: Rene Engelhard AuthorDate: Fri Jan 15 09:44:21 2021 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jan 20 09:47:03 2021 +0100 deb#979439 tdf#139193 recode it_IT/it_IT.dic to UTF-8 since that is what .aff is anyway/.aff specifies. Otherwise it doesn't work. Change-Id: I89fac7d4eeb7f0d4f8df316978c27c3a8677e2f5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/109321 Reviewed-by: Julien Nabet Reviewed-by: Adolfo Jayme Barrientos Tested-by: René Engelhard diff --git a/it_IT/it_IT.dic b/it_IT/it_IT.dic index 394734e..c5ed82b 100644 --- a/it_IT/it_IT.dic +++ b/it_IT/it_IT.dic @@ -38,7 +38,7 @@ ab abaco/OTqr Abacuc abadessa/QTUqrs -abaliet�/TU +abalietà/TU abanese/STUqrs Abano/Tqr abarica/QTU @@ -157,7 +157,7 @@ abbicare/ALKhlTXI abbicata/QTU abbicato/EyT abbicatura/QTUqs -abbicc�/Tq +abbiccì/Tq abbiente/STUqrs abbietta/QTU abbietto/OTYW @@ -399,7 +399,7 @@ abilitata/QTU abilitativa/QTU abilitativo/OT abilitato/EyT -abilit�/TUqs +abilità/TUqs abilitazione/STUqs abiogenesi/Tq abiogenetica/QTU @@ -413,7 +413,7 @@ Abissinia/TUqrs abissino/OTqr abisso/OTqr abitabile/STU -abitabilit�/TUqs +abitabilità/TUqs abitacolo/OTq abitando/D abitante/STUqrs @@ -428,13 +428,13 @@ abitazione/STUqs abitino/OTq abito/OTq abituale/SYTU -abitualit�/TUqs +abitualità/TUqs abituando/D abituare/ALKhlTXI abituata/QTU abituato/EyT abitudinaria/QTUqrs -abitudinariet�/TUqs +abitudinarietà/TUqs abitudinario/OTYqr abitudine/STUqs abituro/OTq @@ -507,7 +507,7 @@ Abramo/T^ abrasero abrasione/STUqrs abrasiva/QTUqrs -abrasivit�/TUqs +abrasività/TUqs abrasivo/OTqr abraso/oT abreazione/STUqs @@ -545,11 +545,11 @@ abusata/QTU abusato/EyT abusiva/QTUqrs abusivismo/OTq -abusivit�/Tqs +abusività/Tqs abusivo/OTYWqr abuso/OTq acacia/QTUqs -acagi�/T +acagiù/T acantacea/QTUqrs acantocefalo/OTq acanto/OTqr @@ -591,7 +591,7 @@ accadimento/OTq accado/OTq accadrai accadranno/X -accadr�/X +accadrà/X accadrebbero accadrebbe/X accadrei @@ -600,7 +600,7 @@ accadremo accadreste accadresti accadrete -accadr� +accadrò accaduta/QTU accaduto/EyT accagliamento/OTq @@ -840,7 +840,7 @@ accerchiata/QTU accerchiato/EyT accerchiatura/QTUqs accertabile/STU -accertabilit�/TUqs +accertabilità/TUqs accertamento/OTq accertando/DJ accertare/ALKhlJTXI @@ -853,7 +853,7 @@ accesissima/QTU accesissimo/OT acceso/OYT accessibile/STU -accessibilit�/TUqs +accessibilità/TUqs accessione/STUqrs accesso/OTqr accessoriabile/STU @@ -862,7 +862,7 @@ accessoria/QTU accessoriare/ALKhlTXI accessoriata/QTU accessoriato/EyT -accessoriet�/TUqs +accessorietà/TUqs accessorio/OTqY accessorista/QRTUqrs accessuale/SYTU @@ -874,7 +874,7 @@ accestito/OT accettabile/SYTU accettabilissima/QTU accettabilissimo/OT -accettabilit�/TUqs +accettabilità/TUqs accettando/DJ accettante/STUqrs accetta/QTUqs @@ -945,7 +945,7 @@ acciarpata/QTU acciarpato/EyT accidempoli/Tqr accidentale/STUYq -accidentalit�/TUqs +accidentalità/TUqs accidentata/QTU accidentato/OT accidente/STUqrs @@ -968,7 +968,7 @@ accinsero/T accinse/STUqrs accinta/QTU accinto/OT -acciocch�/Tqr +acciocché/Tqr acciottolando/D acciottolare/ALKhlTXI acciottolata/QTU @@ -1016,7 +1016,7 @@ acclimatrice/STUqrs acclimazione/STUqs accline/STUqrs acclive/STUqrs -acclivit�/TUqs +acclività/TUqs accludendo/D accludere/BTXI acclusa/QTU @@ -1301,7 +1301,7 @@ accuratezza/QTUqrs accurato/OTWYqr Accursio/T^ accusabile/STU -accusabilit�/TUqs +accusabilità/TUqs accusando/D accusa/QTUqs accusare/ALKhlTXI @@ -1323,7 +1323,7 @@ acerba/QTUqrs acerbezza/QTUqs acerbissima/QTU acerbissimo/OT -acerbit�/TUqs +acerbità/TUqs acerbo/OTY Acerenza acereta/QTUqs @@ -1385,7 +1385,7 @@ acetonuria/QTUqs aceto/OTq acetosa/QTUqs acetosella/QTUqs -acetosit�/TUqs +acetosità/TUqs acetoso/OT ace/TUq achea/QTUqrs @@ -1408,7 +1408,7 @@ achiria/QTUqs Aci aciatici/Tqr aciclica/QTU -aciclicit�/TU +aciclicità/TU aciclico/nT acicolare/STU acicula/QTUqs @@ -1423,7 +1423,7 @@ acidificata/QTU acidificato/EyT acidificazione/STUqs acidimetria/QTUqrs -acidit�/TUqs +acidità/TUqs acidofila/QTU acidofilo/OT acidolisi/TUqs @@ -1471,12 +1471,12 @@ acneico/nT acne/STUq acolia/QTUqs aconcettuale/STUqrs -aconcettualit�/TUqs +aconcettualità/TUqs acondroplasia/QTUqs acondroplasica/QTUqrs acondroplasico/nTqr aconfessionale/STUqrs -aconfessionalit�/TUqs +aconfessionalità/TUqs aconitina/QTUq aconito/OTq aconzio/OTqs @@ -1529,7 +1529,7 @@ acquasantiera/QTUqrs Acquasparta acquata/QTUqrs acquatica/QTU -acquaticit�/TUqs +acquaticità/TUqs acquatico/nTq acquatile/STU acquatinta/TUqs @@ -1595,7 +1595,7 @@ acquitrinosa/QTUqrs acquitrinoso/OTqr acquolina/QTUqrs acquosa/QTUqrs -acquosit�/TUqs +acquosità/TUqs
[Libreoffice-commits] core.git: compilerplugins/clang connectivity/Configuration_mork.mk connectivity/CppunitTest_connectivity_mork.mk connectivity/Executable_mork_helper.mk connectivity/IwyuFilter_co
compilerplugins/clang/constantparam.numbers.results |8 compilerplugins/clang/unusedenumconstants.writeonly.results | 10 compilerplugins/clang/unusedfields.untouched.results|2 compilerplugins/clang/unusedfields.writeonly.results|2 compilerplugins/clang/unusedmethods.results |2 connectivity/Configuration_mork.mk | 20 connectivity/CppunitTest_connectivity_mork.mk | 56 connectivity/Executable_mork_helper.mk | 30 connectivity/IwyuFilter_connectivity.yaml |9 connectivity/Library_mork.mk| 62 connectivity/Library_mozbootstrap.mk| 35 connectivity/Module_connectivity.mk | 15 connectivity/qa/connectivity/mork/DriverTest.cxx| 195 - connectivity/qa/connectivity/mork/abook_10_john_does.mab| 159 connectivity/registry/mork/org/openoffice/Office/DataAccess/Drivers.xcu | 51 connectivity/source/drivers/mork/MCatalog.cxx | 104 connectivity/source/drivers/mork/MCatalog.hxx | 50 connectivity/source/drivers/mork/MColumnAlias.cxx | 133 connectivity/source/drivers/mork/MColumnAlias.hxx | 70 connectivity/source/drivers/mork/MColumns.cxx | 80 connectivity/source/drivers/mork/MColumns.hxx | 46 connectivity/source/drivers/mork/MConnection.cxx| 377 -- connectivity/source/drivers/mork/MConnection.hxx| 98 connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 959 - connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 189 - connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx| 123 connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx| 37 connectivity/source/drivers/mork/MDriver.cxx| 133 connectivity/source/drivers/mork/MDriver.hxx| 79 connectivity/source/drivers/mork/MErrorResource.hxx | 54 connectivity/source/drivers/mork/MPreparedStatement.cxx | 486 -- connectivity/source/drivers/mork/MPreparedStatement.hxx | 132 connectivity/source/drivers/mork/MQueryHelper.cxx | 321 - connectivity/source/drivers/mork/MQueryHelper.hxx | 182 - connectivity/source/drivers/mork/MResultSet.cxx | 1711 -- connectivity/source/drivers/mork/MResultSet.hxx | 347 -- connectivity/source/drivers/mork/MResultSetMetaData.cxx | 192 - connectivity/source/drivers/mork/MResultSetMetaData.hxx | 86 connectivity/source/drivers/mork/MStatement.cxx | 471 -- connectivity/source/drivers/mork/MStatement.hxx | 182 - connectivity/source/drivers/mork/MTable.cxx | 57 connectivity/source/drivers/mork/MTable.hxx | 59 connectivity/source/drivers/mork/MTables.cxx| 66 connectivity/source/drivers/mork/MTables.hxx| 45 connectivity/source/drivers/mork/MorkParser.cxx | 757 connectivity/source/drivers/mork/MorkParser.hxx | 152 connectivity/source/drivers/mork/README | 41 connectivity/source/drivers/mork/dllapi.h | 25 connectivity/source/drivers/mork/license.txt| 31 connectivity/source/drivers/mork/mork.component | 17 connectivity/source/drivers/mork/mork_helper.cxx| 54 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 139 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 81 connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 159 connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx | 31 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx| 93 connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx| 57 connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 209 - connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 80 connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component | 26 extensions/source/abpilot/typeselectionpage.cxx |3 postproce
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - odk/CustomTarget_unowinreg.mk
odk/CustomTarget_unowinreg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a9d8d1ab16f8bead44b3383b0315e32f86a82e08 Author: Rene Engelhard AuthorDate: Sat Dec 5 10:47:36 2020 +0100 Commit: Michael Stahl CommitDate: Fri Dec 11 12:32:22 2020 +0100 use -static-libgcc for unowinreg.dll to fix " For another, at least the unowinreg.dll resulting from --enable-build-unowinreg on Fedora 33 would have had a dependency on libgcc_s_dw2-1.dll that would generally not have been available in a target Windows environment. " mentioned in 01241113947fc7bd7f7b765dd897bb023c8ca99 Change-Id: Ib247c816f05de8c4ef20a939a86e780df5e40dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107253 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 328988babda60300fd854a116ceca742a4bd79ca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107538 diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk index 3a46ddfd6860..a847e1d6bb38 100644 --- a/odk/CustomTarget_unowinreg.mk +++ b/odk/CustomTarget_unowinreg.mk @@ -19,7 +19,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ $(if $(filter FREEBSD,$(OS)),-I$(JAVA_HOME)/include/freebsd \ -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\ $(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \ - -shared -o $@ $< \ + -shared -static-libgcc -o $@ $< \ -Wl,--kill-at -lkernel32 -ladvapi32 && \ $(MINGWSTRIP) $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - odk/CustomTarget_unowinreg.mk
odk/CustomTarget_unowinreg.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 328988babda60300fd854a116ceca742a4bd79ca Author: Rene Engelhard AuthorDate: Sat Dec 5 10:47:36 2020 +0100 Commit: Michael Stahl CommitDate: Thu Dec 10 15:25:09 2020 +0100 use -static-libgcc for unowinreg.dll to fix " For another, at least the unowinreg.dll resulting from --enable-build-unowinreg on Fedora 33 would have had a dependency on libgcc_s_dw2-1.dll that would generally not have been available in a target Windows environment. " mentioned in 01241113947fc7bd7f7b765dd897bb023c8ca99 Change-Id: Ib247c816f05de8c4ef20a939a86e780df5e40dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107253 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/odk/CustomTarget_unowinreg.mk b/odk/CustomTarget_unowinreg.mk index 3a46ddfd6860..a847e1d6bb38 100644 --- a/odk/CustomTarget_unowinreg.mk +++ b/odk/CustomTarget_unowinreg.mk @@ -19,7 +19,7 @@ $(call gb_CustomTarget_get_workdir,odk/unowinreg)/unowinreg.dll : \ $(if $(filter FREEBSD,$(OS)),-I$(JAVA_HOME)/include/freebsd \ -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/linux,\ $(if $(filter NETBSD,$(OS)),-I$(JAVA_HOME)/include/netbsd))) \ - -shared -o $@ $< \ + -shared -static-libgcc -o $@ $< \ -Wl,--kill-at -lkernel32 -ladvapi32 && \ $(MINGWSTRIP) $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/Library_sd.mk
sd/Library_sd.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit df54b0a99fd6b43548a3a7a3d44ada6c01cb2362 Author: Rene Engelhard AuthorDate: Thu Dec 3 23:21:49 2020 +0100 Commit: Caolán McNamara CommitDate: Tue Dec 8 09:41:52 2020 +0100 move bluez_bluetooth_headers use_externals into ENABLE_SDREMOTE_BLUETOOTH case ... since it's where it is used, and otherwise one gets a -I$S/external/bluez_bluetooth when we don't want or even need that Change-Id: If3757adb7960ad5adfc857052bb8322f8754ecdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107178 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107298 Reviewed-by: Caolán McNamara diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 43b168be8d8c..67ecf25c7289 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ @@ -576,6 +575,10 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) +$(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ +)) + endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/Library_sd.mk
sd/Library_sd.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit c08fa2bce3de3b0e0ff80903210942b31ba68bcb Author: Rene Engelhard AuthorDate: Thu Dec 3 23:21:49 2020 +0100 Commit: Thorsten Behrens CommitDate: Mon Dec 7 13:35:49 2020 +0100 move bluez_bluetooth_headers use_externals into ENABLE_SDREMOTE_BLUETOOTH case ... since it's where it is used, and otherwise one gets a -I$S/external/bluez_bluetooth when we don't want or even need that Change-Id: If3757adb7960ad5adfc857052bb8322f8754ecdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107178 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107297 Reviewed-by: Thorsten Behrens diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9d399e8e3f5a..d70b5216fe05 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ @@ -575,6 +574,10 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) +$(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ +)) + endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/Library_sd.mk
sd/Library_sd.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 9c98bf224d1dc8c5cb91d49273836eeb6111d697 Author: Rene Engelhard AuthorDate: Thu Dec 3 23:21:49 2020 +0100 Commit: David Tardon CommitDate: Sun Dec 6 18:03:12 2020 +0100 move bluez_bluetooth_headers use_externals into ENABLE_SDREMOTE_BLUETOOTH case ... since it's where it is used, and otherwise one gets a -I$S/external/bluez_bluetooth when we don't want or even need that Change-Id: If3757adb7960ad5adfc857052bb8322f8754ecdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107178 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 9d399e8e3f5a..d70b5216fe05 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -99,7 +99,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - bluez_bluetooth_headers \ boost_headers \ libxml2 \ dbus \ @@ -575,6 +574,10 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) +$(eval $(call gb_Library_use_externals,sd,\ + bluez_bluetooth_headers \ +)) + endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bean/BUCK BUCK javaunohelper/BUCK jurt/BUCK ridljar/BUCK ridljar/source solenv/bin solenv/buck solenv/maven
BUCK |9 + bean/BUCK |5 ++--- javaunohelper/BUCK| 27 ++- jurt/BUCK | 28 +++- ridljar/BUCK | 34 ++ ridljar/source/unoloader/BUCK |1 + solenv/bin/version.py |3 ++- solenv/buck/build.defs|2 ++ solenv/maven/BUCK |3 +++ solenv/maven/mvn.py |1 + 10 files changed, 79 insertions(+), 34 deletions(-) New commits: commit ea8d6cd59670854cb153c4e984cb4044093e5994 Author: Rene Engelhard AuthorDate: Fri May 8 14:19:45 2020 +0200 Commit: Christian Lohmaier CommitDate: Mon Nov 30 11:27:47 2020 +0100 Adapt buck build to jars merged into libreoffice.jar Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and 35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars were merged into libreoffice.jar. Adapt the buck build correspondingly. Preserve the publishing of merged jars for now with dummy content and consider to remove them in future releases. Test Plan: 1. To replace version number with upcoming release version: $ solenv/bin/version.py 7.1.0 2. To install the API to local Maven repository: $ VERBOSE=1 buck build api_install 3. To deploy the API to Maven Central: $ VERBOSE=1 buck build api_deploy Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/BUCK b/BUCK index 66b0dbdabcec..18f5cf488e4f 100644 --- a/BUCK +++ b/BUCK @@ -34,6 +34,12 @@ prebuilt_jar( visibility = ['PUBLIC'], ) +prebuilt_jar( + name = 'libreoffice', + binary_jar = 'instdir/program/classes/libreoffice.jar', + visibility = ['PUBLIC'], +) + zip_file( name = 'api', srcs = [ @@ -55,5 +61,8 @@ zip_file( ':unoloader', '//ridljar/source/unoloader:unoloader-src', '//ridljar/source/unoloader:unoloader-javadoc', + ':libreoffice', + '//ridljar:libreoffice-src', + '//ridljar:libreoffice-javadoc', ] ) diff --git a/bean/BUCK b/bean/BUCK index 94a235b0a87a..0a0ac72b60ea 100644 --- a/bean/BUCK +++ b/bean/BUCK @@ -2,6 +2,7 @@ java_sources( name = 'officebean-src', srcs = glob(['com/**']), + root = '.', visibility = ['PUBLIC'], ) @@ -14,10 +15,8 @@ java_doc( paths = ['.'], srcs = glob(['com/**']), deps = [ -'//:juh', +'//:libreoffice', '//:officebean', -'//:unoil', -'//:ridl', ], visibility = ['PUBLIC'], ) diff --git a/javaunohelper/BUCK b/javaunohelper/BUCK index 7f1120dab5f5..a33df7b9d347 100644 --- a/javaunohelper/BUCK +++ b/javaunohelper/BUCK @@ -1,20 +1,21 @@ - -java_sources( +genrule( name = 'juh-src', - srcs = glob(['com/**']), + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'juh-src.jar', visibility = ['PUBLIC'], ) -java_doc( +genrule( name = 'juh-javadoc', - title = 'LibreOffice Makes it easier to use UNO with Java', - pkgs = [ -'com.sun.star', - ], - paths = ['.'], - srcs = glob(['com/**']), - deps = [ -'//:juh', - ], + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'juh-javadoc.jar', visibility = ['PUBLIC'], ) diff --git a/jurt/BUCK b/jurt/BUCK index f2349aa017e0..1af7706d9203 100644 --- a/jurt/BUCK +++ b/jurt/BUCK @@ -1,21 +1,23 @@ -java_sources( +genrule( name = 'jurt-src', - srcs = glob(['com/**']), + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'jurt-src.jar', visibility = ['PUBLIC'], ) -java_doc( +genrule( name = 'jurt-javadoc', - title = 'LibreOffice Java Uno Runtime', - pkgs = [ -'com.sun.star', - ], - paths = ['.'], - srcs = glob(['com/**']), - deps = [ -'//:jurt', -'//:unoloader', - ], + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'jurt-javadoc.jar', visibility = ['PUBLIC'], ) + diff --git a/ridljar/BUCK b/ridljar/BUCK index 382287d09ff9..b67d1c6a1166 100644 --- a/ridljar/BUCK +++ b/ridljar/BUCK @@ -1,20 +1,46 @@ -java_sources( +genrule( name = 'ridl-src', + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE SOURCE ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'ridl-src.jar', + visibility = ['PUBLIC'], +) + +genrule( + name = 'ridl-javadoc', + cmd = ' && '.join([ +'cd $TMP', +'echo "FAKE JAVADOC ARCHIVE" > README', +'zip -qr $OUT *', + ]), + out = 'ridl-javadoc.jar', + visibility = ['PUBLIC'], +) + +java_sources( + name = 'libreoffice-src', srcs = glob(['com/**']), + root = '.', visibility = ['PUBLIC'], ) java_doc( - name = 'rid
[Libreoffice-commits] core.git: bin/generate-bash-completion.py
bin/generate-bash-completion.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8ef56c7cb4008c6290da82b305ec2deefc8d94d5 Author: Rene Engelhard AuthorDate: Tue Nov 3 20:34:01 2020 +0100 Commit: Rene Engelhard CommitDate: Tue Nov 3 20:34:16 2020 +0100 add pdf to DRAWDOCS for bash-completion Change-Id: I02195cb235774d205e9f9cc8821b897a841fa54f diff --git a/bin/generate-bash-completion.py b/bin/generate-bash-completion.py index 0702a3635774..db6f49e814b5 100755 --- a/bin/generate-bash-completion.py +++ b/bin/generate-bash-completion.py @@ -27,7 +27,7 @@ DRAWDOCS = ["sxd", "std", "dxf", "emf", "eps", "met", "pct", "sgf", "sgv", "sda" "sdd", "vor", "svm", "wmf", "bmp", "gif", "jpg", "jpeg", "jfif", "fif", "jpe", "pcd", "pcx", "pgm", "png", "ppm", "psd", "ras", "tga", "tif", "tiff", "xbm", "xpm", "odg", "otg", "fodg", "odc", "odi", "sds", -"wpg", "svg", "vdx", "vsd", "vsdm", "vsdx"] +"wpg", "svg", "vdx", "vsd", "vsdm", "vsdx", "pdf"] IMPRESSDOCS = ["sxi", "sti", "ppt", "pps", "pot", "sxd", "sda", "sdd", "sdp", "vor", "cgm", "odp", "otp", "fodp", "ppsm", "ppsx", "pptm", "pptx", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Author: Rene Engelhard AuthorDate: Sun Nov 1 18:30:49 2020 +0100 Commit: Eike Rathke CommitDate: Mon Nov 2 17:48:35 2020 +0100 fix build with ICU 68 use standard true. /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); |^~~~ /usr/include/unicode/umachine.h says: @deprecated ICU 68 Use standard "true" instead. Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b7ae49fbd96e..59ee46fa0e0f 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); int32_t nZoneOffset, nDSTOffset; UErrorCode status = U_ZERO_ERROR; -body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); +body->getTimeZone().getOffset( fR, +#if U_ICU_VERSION_MAJOR_NUM >= 68 +true, +#else +TRUE, +#endif +nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; status = U_ZERO_ERROR; body->setTime( fR - (nZoneOffset + nDSTOffset), status ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 9cdcc20dee02a13e065b6117ff0d574e567c6112 Author: Rene Engelhard AuthorDate: Sun Nov 1 18:30:49 2020 +0100 Commit: Eike Rathke CommitDate: Sun Nov 1 23:39:37 2020 +0100 fix build with ICU 68 use standard true. /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); |^~~~ /usr/include/unicode/umachine.h says: @deprecated ICU 68 Use standard "true" instead. Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105151 Tested-by: René Engelhard Reviewed-by: Eike Rathke diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 69fb08797ab3..f05fc96009ca 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -360,7 +360,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); int32_t nZoneOffset, nDSTOffset; UErrorCode status = U_ZERO_ERROR; -body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); +body->getTimeZone().getOffset( fR, +#if U_ICU_VERSION_MAJOR_NUM >= 68 +true, +#else +TRUE, +#endif +nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; status = U_ZERO_ERROR; body->setTime( fR - (nZoneOffset + nDSTOffset), status ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_box2d.h.in configure.ac slideshow/source
config_host/config_box2d.h.in |7 +++
configure.ac | 21 -
slideshow/source/engine/box2dtools.cxx |3 ++-
3 files changed, 25 insertions(+), 6 deletions(-)
New commits:
commit d0601cd3812cbcdaa0decf81c81d73d41a6ccb91
Author: Rene Engelhard
AuthorDate: Sat Oct 17 11:24:42 2020 +0200
Commit: Caolán McNamara
CommitDate: Sat Oct 17 14:19:44 2020 +0200
fix build with box2d 2.4.0
Change-Id: I60f25f04e2bfcdabf832f42b44ba3d945f4ec169
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104456
Tested-by: Jenkins
Tested-by: René Engelhard
Reviewed-by: Caolán McNamara
diff --git a/config_host/config_box2d.h.in b/config_host/config_box2d.h.in
new file mode 100644
index ..cc761536dc04
--- /dev/null
+++ b/config_host/config_box2d.h.in
@@ -0,0 +1,7 @@
+#ifndef CONFIG_BOX2D_H
+#define CONFIG_BOX2D_H
+
+/* Box2D/Box2D.h is 2.3, 2.4 has box2d/box2d.h */
+#define BOX2D_HEADER
+
+#endif
diff --git a/configure.ac b/configure.ac
index 08c4e39cbe64..894efc1b7eaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10724,11 +10724,21 @@ if test "$with_system_box2d" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_BOX2D=TRUE
AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(Box2D/Box2D.h, [],
-[AC_MSG_ERROR(box2d headers not found.)], [])
-AC_CHECK_LIB([Box2D], [main], [:],
-[ AC_MSG_ERROR(box2d library not found.) ], [])
-BOX2D_LIBS=-lBox2D
+AC_CHECK_HEADER(box2d/box2d.h, [BOX2D_H_FOUND='TRUE'],
+[BOX2D_H_FOUND='FALSE'])
+if test "$BOX2D_H_FOUND" = "TRUE"; then # 2.4.0+
+ _BOX2D_LIB=box2d
+ AC_DEFINE(BOX2D_HEADER,)
+else
+ # fail this. there's no other alternative to check when we are here.
+ AC_CHECK_HEADER([Box2D/Box2D.h], [],
+ [AC_MSG_ERROR(box2d headers not found.)])
+ _BOX2D_LIB=Box2D
+ AC_DEFINE(BOX2D_HEADER,)
+fi
+AC_CHECK_LIB([$_BOX2D_LIB], [main], [:],
+ [ AC_MSG_ERROR(box2d library not found.) ], [])
+BOX2D_LIBS=-l$_BOX2D_LIB
AC_LANG_POP([C++])
BOX2D_CFLAGS=$(printf '%s' "$BOX2D_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
FilterLibs "${BOX2D_LIBS}"
@@ -13946,6 +13956,7 @@ AC_CONFIG_FILES([config_host.mk
instsetoo_native/util/openoffice.lst
sysui/desktop/macosx/Info.plist])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
+AC_CONFIG_HEADERS([config_host/config_box2d.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_dconf.h])
AC_CONFIG_HEADERS([config_host/config_eot.h])
diff --git a/slideshow/source/engine/box2dtools.cxx
b/slideshow/source/engine/box2dtools.cxx
index db91ccbb57e7..c822f564a008 100644
--- a/slideshow/source/engine/box2dtools.cxx
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -8,7 +8,8 @@
*/
#include
-#include
+#include
+#include BOX2D_HEADER
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - javaunohelper/pom.juh.xml jurt/pom.jurt.xml ridljar/pom.ridl.xml unoil/pom.unoil.xml
javaunohelper/pom.juh.xml | 10 ++ jurt/pom.jurt.xml | 10 ++ ridljar/pom.ridl.xml | 10 ++ unoil/pom.unoil.xml | 10 ++ 4 files changed, 40 insertions(+) New commits: commit b99fb41679c5ab4074a0bc23dc25e475b87e1c22 Author: Rene Engelhard AuthorDate: Thu Jul 16 21:06:03 2020 +0200 Commit: Thorsten Behrens CommitDate: Tue Aug 18 09:00:52 2020 +0200 add dependency to juh,jurt,ridl,unoil poms They are dummies now and empty (except Class-Path:). Thus maven should pull in libreoffice.jar, too Change-Id: I63753deddceef6480fd4f5122b4892b707a9dd20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98929 Tested-by: Jenkins Reviewed-by: David Ostrovsky (cherry picked from commit c6cec621aa19ff09b82044f91228c4a08df6bbb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100352 Reviewed-by: Thorsten Behrens diff --git a/javaunohelper/pom.juh.xml b/javaunohelper/pom.juh.xml index 6bf4cd98bb86..8bfcbab80eb3 100644 --- a/javaunohelper/pom.juh.xml +++ b/javaunohelper/pom.juh.xml @@ -8,6 +8,16 @@ Java UNO helper https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/jurt/pom.jurt.xml b/jurt/pom.jurt.xml index 881153959244..4db9ff575714 100644 --- a/jurt/pom.jurt.xml +++ b/jurt/pom.jurt.xml @@ -8,6 +8,16 @@ Java Uno Runtime https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/ridljar/pom.ridl.xml b/ridljar/pom.ridl.xml index 9a90d30e6c9a..9990dd45e23c 100644 --- a/ridljar/pom.ridl.xml +++ b/ridljar/pom.ridl.xml @@ -8,6 +8,16 @@ Types for the Java Uno typesystem https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 diff --git a/unoil/pom.unoil.xml b/unoil/pom.unoil.xml index 819b704980c0..9991ed572d85 100644 --- a/unoil/pom.unoil.xml +++ b/unoil/pom.unoil.xml @@ -8,6 +8,16 @@ Maps IDL into java classes definitions https://www.libreoffice.org + + + +org.libreoffice +libreoffice +@version@ + + + + Mozilla Public License, Version 2.0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
