Re: Build failure with gpgme-1.18.0
Hi, Sam James wrote: > > On 16 Aug 2022, at 20:23, Andreas Radke wrote: > > > > Removing that configure check isn't enough. I've posted some > > build log messages a few days ago to #libreoffice-dev. I've moved to > > internal gpgme/libgpg-error/libassuan until a fix is available. > > > > It seems to have worked fine for us in Gentoo by exporting > the cache variable. > Up for removal: - https://gerrit.libreoffice.org/c/core/+/138667 Andreas, if you could perhaps paste your error logs in that patch, so there's a record? I'll then look into it. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/wasm' - 2 commits - android/default-document config_host/config_wasm_strip.h.in config_host.mk.in configure.ac extensions/Module_extensions.mk external/
Rebased ref, commits from common ancestor: commit c9c583e270bc6de89b43c2e7184c3bb72f1227e9 Author: Thorsten Behrens AuthorDate: Fri Aug 19 21:36:01 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 19 21:36:01 2022 +0200 Fixup missing vfs files Rebase made these two required additions Change-Id: I45888529e8c3e9bcaa82dd665d270968a5598f6e diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index 071a8af1a82b..d263a7262b3d 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -1070,6 +1070,7 @@ gb_emscripten_fs_image_files := \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/xmlsourcedialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/zoombox.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/scalc/ui/ztestdialog.ui \ +$(INSTROOT)/$(LIBO_SHARE_FOLDER)/calc/styles.xml \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/addtargetdialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/alienwarndialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/sfx/ui/autoredactdialog.ui \ @@ -1157,6 +1158,7 @@ gb_emscripten_fs_image_files := \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/printersetupdialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/querydeletedialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/restartdialog.ui \ +$(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/scrollbars.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/spinfieldcontrol.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/subtoolbar.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/svt/ui/tabbaredit.ui \ commit a98d8c040daa10c06f8e1316d5a931d6a696d084 Author: Balazs Varga AuthorDate: Mon Aug 8 10:49:20 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 19 18:02:16 2022 +0200 WIP: WASM activate and fix the Calc build and running Temporarily allow accessibility for calc build. (lots of dependencies in calc) This commit also revert: 26603bc9ef0116ed31c510dab82b69d3666447b5 (WASM fix orcus native exception handling (NEH)) Change-Id: I4c330ef8eea7d08214bf357531ee0bf7383ab788 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 287bd12b8323..7c30540dfe0c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -50,14 +50,12 @@ endif $(eval $(call gb_Module_add_moduledirs,libreoffice,\ android \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ animations \ ) \ apple_remote \ avmedia \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ basctl \ -) \ basegfx \ basic \ bean \ @@ -129,28 +127,26 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ sal \ salhelper \ sax \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ sc \ scaddins \ sccomp \ -) \ $(call gb_Helper_optional,DESKTOP,scp2) \ scripting \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ sd \ sdext \ ) \ $(call gb_Helper_optional,DESKTOP,setup_native) \ sfx2 \ shell \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ slideshow \ ) \ smoketest \ solenv \ soltools \ sot \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ starmath \ ) \ $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),static) \ diff --git a/android/default-document/example_test.ods b/android/default-document/example_test.ods new file mode 100644 index ..4ee7cb7e60ea Binary files /dev/null and b/android/default-document/example_test.ods differ diff --git a/config_host.mk.in b/config_host.mk.in index 5afb150745d3..6956ec936d6e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -214,8 +214,8 @@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@ export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_WASM_EXCEPTIONS=@ENABLE_WASM_EXCEPTIONS@ -export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@ -export ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@ +export ENABLE_WASM_STRIP_ACCESSIBILITY= +export ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_CHART= export ENABLE_WASM_STRIP_DBACCESS
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util sfx2/source
Rebased ref, commits from common ancestor:
commit 5f0a5e522e7a6a6106d66641cdee00d0db769208
Author: Thorsten Behrens
AuthorDate: Fri Aug 19 10:50:46 2022 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 19 11:16:42 2022 +0200
Bump version to 6.1.7.36
Change-Id: I17d2ecf5015a1f8aaf035f8a3e003f52b2ccbe50
diff --git a/configure.ac b/configure.ac
index 3654054067c9..7acafadac987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([CIB Office],[6.1.7.35],[],[],[https://www.cib.de/ciboffice/])
+AC_INIT([CIB Office],[6.1.7.36],[],[],[https://www.cib.de/ciboffice/])
AC_PREREQ([2.59])
commit 2e290b1068ccd85b9751cfa4f38089d7686aea88
Author: Thorsten Behrens
AuthorDate: Fri Aug 19 10:49:53 2022 +0200
Commit: Thorsten Behrens
CommitDate: Fri Aug 19 11:16:12 2022 +0200
[CIBO] Update product URLs
Change-Id: Ibae24aa103d96c451e6f5ae9b632d1f1d63fb1b4
diff --git a/configure.ac b/configure.ac
index 5dd920612bc6..3654054067c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([CIB Office],[6.1.7.35],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([CIB Office],[6.1.7.35],[],[],[https://www.cib.de/ciboffice/])
AC_PREREQ([2.59])
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 1e78c7476822..dab2e830f194 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,9 +8,9 @@ ApplicationUsersAllUsers
ALLUSERS 1
ARPCOMMENTSARPCOMMENTSTEMPLATE
ARPCONTACT CIB software GmbH
-ARPHELPLINKhttps://libreoffice.cib.eu
-ARPURLINFOABOUThttps://libreoffice.cib.eu
-ARPURLUPDATEINFO https://libreoffice.cib.eu
+ARPHELPLINKhttps://www.cib.de/ciboffice
+ARPURLINFOABOUThttps://www.cib.de/ciboffice
+ARPURLUPDATEINFO https://www.cib.de/ciboffice
DefaultUIFont Tahoma8
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 45b64218e455..2becd6ce9b99 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -71,7 +71,7 @@ CIBOffice
CHANGETARGETDIR 1
PATCHCODEFILE ooo_patchcodes.txt
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.eu
+STARTCENTER_INFO_URL https://www.cib.de/ciboffice
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -124,7 +124,7 @@ CIBOfficeDev
CODEFILENAME codes_ooodev.txt
LOCALUSERDIR $ORIGIN/..
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.eu
+STARTCENTER_INFO_URL https://www.cib.de/ciboffice
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
@@ -165,7 +165,7 @@ CIBOffice_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.eu
+STARTCENTER_INFO_URL https://www.cib.de/ciboffice
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
@@ -210,7 +210,7 @@ CIBOfficeDev_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.eu
+STARTCENTER_INFO_URL https://www.cib.de/ciboffice
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f0524f2dd803..66026e064921 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -532,10 +532,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SEND_FEEDBACK:
{
-OUString lang =
Application::GetSett
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - brand/cib configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util sfx2/source svx/source
brand/cib/Image.svg | 78 +- brand/cib/banner.svg| 86 +- brand/cib/intro-highres.png |binary brand/cib/intro-highres.svg | 266 ++- brand/cib/intro.png |binary brand/cib/intro.svg | 365 +- configure.ac|2 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |6 instsetoo_native/util/openoffice.lst.in |8 sfx2/source/appl/appserv.cxx|2 svx/source/dialog/SafeModeDialog.cxx|2 11 files changed, 569 insertions(+), 246 deletions(-) New commits: commit 533c0d698c1210046f78f03a4f4569b0fff05308 Author: Thorsten Behrens AuthorDate: Fri Aug 19 11:09:26 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 19 11:09:26 2022 +0200 [CIBO] Update product URLs Change-Id: I4e72c4ba69648a30d5debf13af4276071bde5729 diff --git a/configure.ac b/configure.ac index 2aa441329064..687bae94c8e2 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.9],[],[],[https://www.cib.de/libreoffice-poweredbycib/]) +AC_INIT([CIB Office],[6.4.0.9],[],[],[https://www.cib.de/ciboffice/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index 6f92cc4a621e..dab2e830f194 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -8,9 +8,9 @@ ApplicationUsersAllUsers ALLUSERS 1 ARPCOMMENTSARPCOMMENTSTEMPLATE ARPCONTACT CIB software GmbH -ARPHELPLINKhttps://www.cib.de/libreoffice-poweredbycib -ARPURLINFOABOUThttps://www.cib.de/libreoffice-poweredbycib -ARPURLUPDATEINFO https://www.cib.de/libreoffice-poweredbycib +ARPHELPLINKhttps://www.cib.de/ciboffice +ARPURLINFOABOUThttps://www.cib.de/ciboffice +ARPURLUPDATEINFO https://www.cib.de/ciboffice DefaultUIFont Tahoma8 DialogCaption Windows Installer DiskPrompt [1] diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 109392ee5ef6..d64b3fd5280e 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -70,7 +70,7 @@ CIBOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib +STARTCENTER_INFO_URL https://www.cib.de/ciboffice STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -123,7 +123,7 @@ CIBOfficeDev CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib +STARTCENTER_INFO_URL https://www.cib.de/ciboffice STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ } @@ -164,7 +164,7 @@ CIBOffice_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib +STARTCENTER_INFO_URL https://www.cib.de/ciboffice STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ } @@ -209,7 +209,7 @@ CIBOfficeDev_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib +STARTCENTER_INFO_URL https://www.cib.de/ciboffice STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ DICT_REPO_URL https://extensions.libreoffice.org
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 3 commits - brand/cib configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util sfx2/source
brand/cib/Image.svg | 78 +- brand/cib/banner.svg| 86 +- brand/cib/intro-highres.png |binary brand/cib/intro-highres.svg | 266 ++- brand/cib/intro.png |binary brand/cib/intro.svg | 365 +- configure.ac|2 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |6 instsetoo_native/util/openoffice.lst.in |8 sfx2/source/appl/appserv.cxx|2 10 files changed, 568 insertions(+), 245 deletions(-) New commits: commit bbc27aef77931db64a20c0c89f78a725f6c21208 Author: Thorsten Behrens AuthorDate: Fri Aug 19 10:50:46 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 19 10:50:46 2022 +0200 Bump version to 6.1.7.36 Change-Id: I17d2ecf5015a1f8aaf035f8a3e003f52b2ccbe50 diff --git a/configure.ac b/configure.ac index 551d6cd9dab6..457d381f1580 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.1.7.35],[],[],[https://ciboffice.cib.de/]) +AC_INIT([CIB Office],[6.1.7.36],[],[],[https://ciboffice.cib.de/]) AC_PREREQ([2.59]) commit 7bf19e426d4df5049cbe643471dfeb7b767a6b31 Author: Thorsten Behrens AuthorDate: Fri Aug 19 10:49:53 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Aug 19 10:49:53 2022 +0200 [CIBO] Update product URLs Change-Id: Ibae24aa103d96c451e6f5ae9b632d1f1d63fb1b4 diff --git a/configure.ac b/configure.ac index 5dd920612bc6..551d6cd9dab6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.1.7.35],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([CIB Office],[6.1.7.35],[],[],[https://ciboffice.cib.de/]) AC_PREREQ([2.59]) diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index 1e78c7476822..bf49364da56f 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -8,9 +8,9 @@ ApplicationUsersAllUsers ALLUSERS 1 ARPCOMMENTSARPCOMMENTSTEMPLATE ARPCONTACT CIB software GmbH -ARPHELPLINKhttps://libreoffice.cib.eu -ARPURLINFOABOUThttps://libreoffice.cib.eu -ARPURLUPDATEINFO https://libreoffice.cib.eu +ARPHELPLINKhttps://ciboffice.cib.de +ARPURLINFOABOUThttps://ciboffice.cib.de +ARPURLUPDATEINFO https://ciboffice.cib.de DefaultUIFont Tahoma8 DialogCaption Windows Installer DiskPrompt [1] diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 45b64218e455..9318b37aa132 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -71,7 +71,7 @@ CIBOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://libreoffice.cib.eu +STARTCENTER_INFO_URL https://ciboffice.cib.de STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -124,7 +124,7 @@ CIBOfficeDev CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://libreoffice.cib.eu +STARTCENTER_INFO_URL https://ciboffice.cib.de STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ } @@ -165,7 +165,7 @@ CIBOffice_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/ -STARTCENTER_INFO_URL https://libreoffice.cib.eu +STARTCENTER_INFO_URL https://ciboffice.cib.de STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/ DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/ } @@ -210,7 +210,7 @@ CIBOfficeDev_SDK
Re: Build failure with gpgme-1.18.0
Hi Sam, 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). > > Unfortunately, this is what LibreOffice uses to detect [0] > gpgme: > The reason for that was some kde distro packages shipping their own copy of gpgmepp. I've got no insight what's the current story there, but plausibly we can get away with dropping that test now? Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Crash test update, "validation?"
Hi Miklos, hi Caolán, Miklos Vajna wrote: > On Mon, Aug 15, 2022 at 03:08:17PM +0100, Caolán McNamara wrote: > > Do we care about the "validationErrors", I've never looked at them and > > maybe the turnaround time might be faster if we drop validation? > > I think it's useful information, but looking at the cost of generating > them with that java-based tool and the benefit (vs crashtest data, > user-supplied bugreports, etc), perhaps it's an overkill to run these > all the time. > That was added IIRC quite a few years ago to make sure we're not inadvertently breaking filters - so I'd agree it's useful to have. If we're not acting on it currently, then there's no harm running it less frequently (or perhaps it should be part of the (ESC) reporting, so it gets more attention?) Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/wasm' - 2 commits - android/default-document config_host/config_wasm_strip.h.in config_host.mk.in configure.ac extensions/Module_extensions.mk lingucomp
Rebased ref, commits from common ancestor: commit 187a0d66675e37bb73b6c043080db9aec0864b13 Author: Thorsten Behrens AuthorDate: Sat Aug 13 08:52:43 2022 +0200 Commit: Thorsten Behrens CommitDate: Sat Aug 13 08:52:43 2022 +0200 Disable languagetool for WASM build Change-Id: Icd0face05c33bbb1b56230a59015402d5f565422 diff --git a/config_host.mk.in b/config_host.mk.in index 0a0b29b31d90..6956ec936d6e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -223,6 +223,7 @@ export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_EXTRA=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_GUESSLANG=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_HUNSPELL= +export ENABLE_WASM_STRIP_LANGUAGETOOL=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_LOCALES=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_PINGUSER=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_PREMULTIPLY=@ENABLE_WASM_STRIP@ diff --git a/configure.ac b/configure.ac index d1a9bbffcd5f..6bd4587da6c4 100644 --- a/configure.ac +++ b/configure.ac @@ -3056,6 +3056,7 @@ if test "$enable_wasm_strip" = "yes"; then AC_DEFINE(ENABLE_WASM_STRIP_EXTRA) AC_DEFINE(ENABLE_WASM_STRIP_GUESSLANG) #AC_DEFINE(ENABLE_WASM_STRIP_HUNSPELL) +AC_DEFINE(ENABLE_WASM_STRIP_LANGUAGETOOL) AC_DEFINE(ENABLE_WASM_STRIP_PINGUSER) AC_DEFINE(ENABLE_WASM_STRIP_PREMULTIPLY) AC_DEFINE(ENABLE_WASM_STRIP_RECENT) diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk index 13f1a829d98a..87e1b1f4d585 100644 --- a/lingucomponent/Module_lingucomponent.mk +++ b/lingucomponent/Module_lingucomponent.mk @@ -25,10 +25,15 @@ $(eval $(call gb_Module_add_targets,lingucomponent,\ )) endif +ifneq ($(ENABLE_WASM_STRIP_LANGUAGETOOL),TRUE) +$(eval $(call gb_Module_add_targets,lingucomponent,\ + Library_LanguageTool \ +)) +endif + $(eval $(call gb_Module_add_targets,lingucomponent,\ $(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \ Library_numbertext \ - Library_LanguageTool \ )) # vim: set noet sw=4 ts=4: commit c27638113cc80f7f812cfe810d5bf1041aafe58c Author: Balazs Varga AuthorDate: Mon Aug 8 10:49:20 2022 +0200 Commit: Thorsten Behrens CommitDate: Sat Aug 13 08:52:27 2022 +0200 WIP: WASM re-activate and fix the Calc build Temporarily allow accessibility for calc build. (lots of dependencies in calc) Wasm build is succesfull but, still crashing while opening a calc file. (feature/wasm version of https://gerrit.libreoffice.org/c/core/+/137946) Change-Id: I4c330ef8eea7d08214bf357531ee0bf7383ab788 diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 287bd12b8323..7c30540dfe0c 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -50,14 +50,12 @@ endif $(eval $(call gb_Module_add_moduledirs,libreoffice,\ android \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ animations \ ) \ apple_remote \ avmedia \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ basctl \ -) \ basegfx \ basic \ bean \ @@ -129,28 +127,26 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ sal \ salhelper \ sax \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ sc \ scaddins \ sccomp \ -) \ $(call gb_Helper_optional,DESKTOP,scp2) \ scripting \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ sd \ sdext \ ) \ $(call gb_Helper_optional,DESKTOP,setup_native) \ sfx2 \ shell \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ slideshow \ ) \ smoketest \ solenv \ soltools \ sot \ -$(if $(ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS),, \ +$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \ starmath \ ) \ $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),static) \ diff --git a/android/default-document/example_test.ods b/android/default-document/example_test.ods new file mode 100644 index ..4ee7cb7e60ea Binary files /dev/null and b/android/default-document/example_test.ods differ diff --git a/config_host.mk.in b/config_host.mk.in index 5d5d5d681b83..0a0b29b31d90 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -214,8 +214,8 @@ export ENABLE_SKIA_DEBUG=@ENABLE_SKIA_DEBUG@ export ENABLE_SYMBOLS_FOR=@ENABLE_SYMBOLS_FOR@ export ENABLE_VALGRIND=@ENABLE_VALGRIND@ export ENABLE_WASM_EXCEPTIONS=@ENABLE_WASM_EXCEPTIONS@ -export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@ -export ENABLE_WASM_STRIP_BASIC_CALC_DRAW_MATH_IMPRESS=@ENABLE_WASM_STRIP@ +export ENABLE_WASM_STRIP_AC
ESC meeting minutes: 2022-08-11
seEvent const &) - Thanks to Xisco - SwFEShell::SelectObj(Point const &,unsigned char,SdrObject *) - Thanks to Miklos - sw::sidebar::WriterInspectorTextPanel::`scalar deleting destructor'(unsigned int) - Thanks to Caolán - GrVkPipelineState::setAndBindInputAttachment - Thanks to Luboš - rtl_stringbuffer_insert - Thanks to Stephan + Regression in 7.3.5.2 - https://crashreport.libreoffice.org/stats/signature/vcl::Window::IsVisible()%20const - tdf#150242 - crash saving document. no steps to reproduce it though - related to tdf#147708 ? + 7.3.5.2 crashes shared in the mailing list - https://lists.freedesktop.org/archives/libreoffice/2022-August/089227.html * mentoring/easyhack update (Hossein) committer... 1 week 1 month 3 months12 months open 74(14) 123(14) 137(18) 137(18) reviews 378(2) 1174(58)2928(70)12228(-64) merged 271(62) 935(144) 3367(-23) 15101(-10) abandoned 10(-6) 50(-6) 152(-9) 808(-1) own commits 202(47) 678(131) 2363(-56) 11742(-12) review commits 26(-22)181(4) 594(-15)3313(-19) contributor... 1 week 1 month 3 months12 months open 69(18) 102(2) 113(5) 118(5) reviews 826(144) 2524(274) 7592(-10) 33176(-2) merged 20(1) 100(0) 201(8) 1212(3) abandoned 8(6) 39(-1) 108(2) 455(-13) own commits 11(-1) 72(0) 175(-4) 1223(1) review commits 0(0)0(0)0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 2(2) cleanup_comments 301(301) total 365(365) assigned 15(15) open 319(319) + top 10 contributors: Paris Oplopoios made 34 patches in 1 month, and 53 patches in 1 year Hannah Meeks made 15 patches in 1 month, and 19 patches in 1 year Colomban Wendling made 7 patches in 1 month, and 9 patches in 1 year خالد حسني made 5 patches in 1 month, and 6 patches in 1 year Srebotnjak, Martin made 2 patches in 1 month, and 24 patches in 1 year Nagy Tibor made 1 patches in 1 month, and 28 patches in 1 year Attila Bakos made 1 patches in 1 month, and 33 patches in 1 year Matt K made 1 patches in 1 month, and 2 patches in 1 year Ehsan Movahedian made 1 patches in 1 month, and 3 patches in 1 year Nazanin Yadi made 1 patches in 1 month, and 2 patches in 1 year + top 10 reviewers: Vajngerl, Tomaž made 146 review comments in 1 month, and 416 in 1 year Thorsten Behrens made 104 review comments in 1 month, and 856 in 1 year Adolfo Jayme Barrientos made 92 review comments in 1 month, and 1076 in 1 year Michael Stahl made 86 review comments in 1 month, and 1212 in 1 year McNamara, Caolán made 78 review comments in 1 month, and 584 in 1 year Nabet, Julien made 76 review comments in 1 month, and 672 in 1 year Xisco Fauli made 70 review comments in 1 month, and 932 in 1 year Kaganski, Mike made 64 review comments in 1 month, and 656 in 1 year Grandin, Noel made 40 review comments in 1 month, and 394 in 1 year Vajna, Miklos made 40 review comments in 1 month, and 506 in 1 year + Patches automatically abandoned: WIP: tdf#124098: sc: new document setting "ForceRowHeightRecalc" ( Vasily Melenchuk ) - https://gerrit.libreoffice.org/#/c/129300 tdf#89387 Use Parallel Walk to improve Matrix Operations ( Sarrah Bastawala ) - https://gerrit.libreoffice.org/#/c/132453 don't overwrite searchname with the glyph fallback GetFallbackForUnicode name ( Caolán McNamara ) - https://gerrit.libreoffice.org/#/c/134685 tdf#149252 update help for Entire Paragraph Area positioning ( Seth Chaiklin ) - https://gerrit.libreoffice.org/#/c/135008 Update Italian hyphenation and dictionary ( Emanuele Goldoni ) - https://gerrit.libreoffice.org/#/c/135435 + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: Stanislav Lopatin Niko Fink + cleaned up easy hacks a bit (Hossein) + New blog post: + Get familiar with ODF standard by changing LibreOffice code (draft) https://dev.blog.documentfoundation.org/?p=525&preview=1&_ppp=43f050d709 + Ideas and comments are welcome (Hossein) * GSoC (Hossein/Ilmari) + Timeline: https://developers.google.com/open-source/gsoc/timeline + students approached for GSoC panel at libocon + next review/final week: September 12 * Commit Access + None th
ESC meeting agenda: 2022-08-11 16:00 CEST
104540(+133)
+ 6.1.0.0812(+0)
+ 6.1.0.1646(+0)
+ 6.1.0.2431(+0)
+ 6.1.0.3170434(+201)
+ 6.1.1.1535(+0)
+ 6.1.1.280807(+39)
+ 6.1.2.1233693(+180)
+ 6.1.3.1310(+0)
+ 6.1.3.2169072(+192)
+ 6.1.4.1209(+0)
+ 6.1.4.2149023(+217)
+ 6.1.5.1926(+0)
+ 6.1.5.2207072(+924)
+ 6.1.6.2179(+4)
+ 6.1.6.3136905(+328)
+ 6.2.0.0875(+0)
+ 6.2.0.1638(+1)
+ 6.2.0.2788(+2)
+ 6.2.0.3131154(+283)
+ 6.2.1.1481(+9)
+ 6.2.1.268341(+151)
+ 6.2.2.11507(+5)
+ 6.2.2.2109720(+224)
+ 6.2.3.1157(+0)
+ 6.2.3.2105829(+150)
+ 6.2.4.1223(+0)
+ 6.2.4.2166658(+257)
+ 6.2.5.2140898(+314)
+ 6.2.6.237601(+142)
+ 6.2.7.1142133(+577)
+ 6.2.8.2112057(+300)
+ 6.3.0.1771(+2)
+ 6.3.0.21815(+5)
+ 6.3.0.3302(+0)
+ 6.3.0.4381873(+525)
+ 6.3.1.1893(+6)
+ 6.3.1.2103179(+149)
+ 6.3.2.2141003(+236)
+ 6.3.3.1154(+0)
+ 6.3.3.2178324(+312)
+ 6.3.4.2171474(+345)
+ 6.3.5.291486(+142)
+ 6.3.6.2102180(+276)
+ 6.4.0.12244(+16)
+ 6.4.0.2634(+0)
+ 6.4.0.3317884(+689)
+ 6.4.1.2128667(+267)
+ 6.4.2.2164608(+260)
+ 6.4.3.2172733(+343)
+ 6.4.4.2258067(+632)
+ 6.4.5.2115779(+512)
+ 6.4.6.2102362(+623)
+ 6.4.7.2111751(+760)
+ 7.0.0.03956(+21)
+ 7.0.0.2572(+0)
+ 7.0.0.3191390(+796)
+ 7.0.1.2214846(+759)
+ 7.0.2.2102423(+396)
+ 7.0.3.1254831(+1000)
+ 7.0.4.180(+0)
+ 7.0.4.2235188(+1158)
+ 7.0.5.275427(+515)
+ 7.0.6.270794(+616)
+ 7.1.0.0408(+2)
+ 7.1.0.1663(+2)
+ 7.1.0.2691(+9)
+ 7.1.0.3228760(+1119)
+ 7.1.1.2202983(+1216)
+ 7.1.2.2200994(+1059)
+ 7.1.3.2166122(+1428)
+ 7.1.4.2154398(+1336)
+ 7.1.5.299541(+816)
+ 7.1.6.234321(+327)
+ 7.1.7.220003(+245)
+ 7.1.8.130585(+368)
+ 7.2.0.01911(+3)
+ 7.2.0.1672(+1)
+ 7.2.0.2306(+1)
+ 7.2.0.3123(+0)
+ 7.2.0.483186(+721)
+ 7.2.1.261922(+493)
+ 7.2.2.273394(+683)
+ 7.2.3.212240(+143)
+ 7.2.4.145782(+627)
+ 7.2.5.138(+0)
+ 7.2.5.261535(+805)
+ 7.2.6.219594(+558)
+ 7.2.7.29580(+885)
+ 7.3.0.2190(+2)
+ 7.3.0.345279(+680)
+ 7.3.1.335967(+901)
+ 7.3.2.244854(+1497)
+ 7.3.3.222993(+996)
+ 7.3.4.219761(+2312)
+ 7.3.5.23061(+1380)
* mentoring/easyhack update
committer... 1 week 1 month 3 months12 months
open 74(14) 123(14) 137(18) 137(18)
reviews 378(2) 1174(58)2928(70)12228(-64)
merged 271(62) 935(144) 3367(-23) 15101(-10)
abandoned 10(-6) 50(-6) 152(-9) 808(-1)
own commits 202(47) 678(131) 2363(-56) 11742(-12)
review commits 26(-22)181(4) 594(-15)3313(-19)
contributor... 1 week 1 month 3 months12 months
open 69(18) 102(2) 113(5) 118(5)
reviews 826(144) 2524(274) 7592(-10) 33176(-2)
merged 20(1) 100(0) 201(8) 1212(3)
abandoned 8(6) 39(-1) 108(2) 455(-13)
own commits 11(-1) 72(0) 175(-4) 1223(1)
review commits 0(0)0(0)0(0) 0(0)
+ easyHack statistics:
needsDevEval 8(8) needsUXEval 2(2) cleanup_comments 301(301)
total 365(365) assigned 15(15) open 319(319)
+ top 10 contributors:
Paris Oplopoios made 34 patches in 1 month, and 53 patches in 1 year
Hannah Meeks made 15 patches in 1 month, and 19 patches in 1 year
Colomban Wendling made 7 patches in 1 month, and 9 patches in 1 year
خالد حسني made 5 patches in 1 month, and 6 patches in 1 year
Srebotnjak, Martin made 2 patches in 1 month, and 24 patches in 1 year
Nagy Tibor made 1 patches in 1 month, and 28 patches in 1 year
Attila Bakos made 1 patches in 1 month, and 33 patches in 1 year
Matt K made 1 patches in 1 month, and 2 patches in 1 year
Ehsan Movahedian made 1 patches in 1 month, and 3 patches in 1 year
Nazanin Yadi made 1 patches in 1 month, and 2 patches in 1 year
+ top 10 reviewers:
Vajngerl, Tomaž made 146 review comments in 1 month, and 416 in 1 year
Thorsten Behrens made 104 review comments in 1 month, and 856 in 1
year
Adolfo Jayme Barrientos made 92 review comments in 1 month, and 1076
in 1 year
Michael Stahl made 86 review comment
[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype bin/get-forum-attachments.py
bin/get-bugzilla-attachments-by-mimetype |3 ++-
bin/get-forum-attachments.py |4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 7716a43e76fe26ba31393b31cfa967f5fcb6e747
Author: Thorsten Behrens
AuthorDate: Sat Aug 6 00:48:16 2022 +0200
Commit: Thorsten Behrens
CommitDate: Sat Aug 6 00:53:47 2022 +0200
Make parallelism configurable for BZ attachment fetchers
Both forum and BZ document fetchers use a hardcoded size for their
threadpools. Use the habitual env var PARALLELISM to override that
optionally.
Change-Id: I374a33ab0cfe481e0940a1f4d5d9a53ae647f135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137888
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 349f428f73bc..6ce2a82d30eb 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -415,7 +415,8 @@ def generate_multi_threading():
jobs.join()
-max_threads = 20 # Number of threads to create, (1 = without multi-threading)
+# Number of threads to create, (1 = without multi-threading, default = 20)
+max_threads = int(os.environ.get('PARALLELISM', 20))
jobs = queue.Queue()
generate_multi_threading()
diff --git a/bin/get-forum-attachments.py b/bin/get-forum-attachments.py
index 18e9259d2133..92d30ccb183a 100755
--- a/bin/get-forum-attachments.py
+++ b/bin/get-forum-attachments.py
@@ -160,8 +160,8 @@ if __name__ == '__main__':
sys.exit(1)
processes = []
-# 10 at a time seems to work fine
-with ThreadPoolExecutor(max_workers=10) as executor:
+# by default, 10 at a time seems to work fine
+with ThreadPoolExecutor(max_workers=int(os.environ.get('PARALLELISM',
10))) as executor:
for lang, config in forums.items():
processes.append(executor.submit(get_attachments_from_url, lang,
config, pathes))
[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 00014558d615c7004e133e2a2cb535d07f4691a2 Author: Thorsten Behrens AuthorDate: Sat Aug 6 00:47:04 2022 +0200 Commit: Thorsten Behrens CommitDate: Sat Aug 6 00:53:21 2022 +0200 Disable abisource from BZ attachment fetcher Expired TLS cert since a while, worth checking if it comes back. Change-Id: I4bd98d847ede6ac25d6d4a3361d7365396ad40fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137887 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index 609e6683a0aa..349f428f73bc 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -344,7 +344,8 @@ def get_launchpad_bugs(prefix): os.rename(tmpfile, download) rss_bugzillas = ( -( 'abi', 'http://bugzilla.abisource.com/buglist.cgi' ), #added for abiword +# note: currently abisource has an expired TLS cert +#( 'abi', 'http://bugzilla.abisource.com/buglist.cgi' ), #added for abiword ( 'fdo', 'http://bugs.freedesktop.org/buglist.cgi' ), ( 'gentoo', 'http://bugs.gentoo.org/buglist.cgi' ), ( 'gnome', 'http://bugzilla.gnome.org/buglist.cgi' ), # added for gnumeric
Re: untangling the EOT mess
Hi Rene, Rene Engelhard wrote: > was disabling EOT intended? Should it be enableable? > Pretty sure that was not intended, and it should be enable-able. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.2.8.2.M9'
Tag 'mimo-6.2.8.2.M9' created by Andras Timar at 2022-07-27 13:57 + mimo-6.2.8.2.M9 Changes since mimo-6.2.8.2.M8-6: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.4.7.2.M6'
Tag 'mimo-6.4.7.2.M6' created by Andras Timar at 2022-07-27 13:56 + mimo-6.4.7.2.M6 Changes since mimo-6.4.7.2.M5-6: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M10'
Tag 'mimo-7.0.7.0.M10' created by Andras Timar at 2022-07-27 13:55 + mimo-7.0.7.0.M10 Changes since mimo-7.0.7.0.M9-7: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - external/gpgmepp external/libassuan external/libgpg-error
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 +- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 81791d2ef3552db26c458a1eb0de33fce061502c Author: Thorsten Behrens AuthorDate: Tue Jun 15 18:03:27 2021 +0200 Commit: Andras Timar CommitDate: Wed Jul 27 15:54:07 2022 +0200 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 989844465f1f..4cf9c217700e 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 565d38ff9a1c..137f1a229539 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index cf0b594dca24..814876cc0810 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) $(call gb_Trace_EndRange,libgpg-error,EXTERNAL)
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - external/gpgmepp external/libassuan external/libgpg-error
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 +- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit fc90416b283b85fb2d2448a4f701c8c3e5e497e3 Author: Thorsten Behrens AuthorDate: Tue Jun 15 18:03:27 2021 +0200 Commit: Andras Timar CommitDate: Wed Jul 27 15:53:38 2022 +0200 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 8ecdf60e6f87..d7835622ca21 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(call gb_Module__symbols_enabled,gpgmepp),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 83d79a520988..899c21e4cec9 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) else
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - external/gpgmepp external/libassuan external/libgpg-error
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 +- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit a8f1dd36db1188d18ab0d56674a89a6f8f8c40ea Author: Thorsten Behrens AuthorDate: Tue Jun 15 18:03:27 2021 +0200 Commit: Andras Timar CommitDate: Wed Jul 27 15:52:43 2022 +0200 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens (cherry picked from commit 9fafa67c9bc85d9e5a13d18b7b7ecbc8de700c04) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129750 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 452f922750d6..dac2fad1361b 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 83d79a520988..899c21e4cec9 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) else
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138d' - bin/symstore.sh
bin/symstore.sh |2 ++ 1 file changed, 2 insertions(+) New commits: commit fe44469723fc735af6fb565a299b8692afb5b8f8 Author: Thorsten Behrens AuthorDate: Wed Aug 18 22:48:46 2021 +0200 Commit: Thorsten Behrens CommitDate: Mon Jul 11 00:29:34 2022 +0200 Teach symstore more duplicated DLLs Amending commit b4dfba947768834ffecc09056992019878711c8b with adding the copied DLLs here, too (symstore complains otherwise) Change-Id: If5cc155cf2fe11b0f97cd152993609fd2c835316 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120686 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens (cherry picked from commit 133352645a8c10fc0d13795480a3c2f93c36a61f) diff --git a/bin/symstore.sh b/bin/symstore.sh index c4e9870c9aa5..2734f1b22a58 100755 --- a/bin/symstore.sh +++ b/bin/symstore.sh @@ -16,6 +16,8 @@ EXCLUDE_LIST="python.exe" # # Same format as for EXCLUDE_LIST above MOREPDBS_OKLIST="libcurl.dll +libcrypto-1_1.dll +libssl-1_1.dll freebl3.dll libeay32.dll nspr4.dll
Re: libreoffice-7.4.0.0.beta1 build failure on MacOS Monterey 12.4
Hi *, Christian Lohmaier wrote: > I don't remember the reason why they were added to the ignore list, > maybe Thorsten remembers... > Yes, they're a problem to have e.g. for Debian. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/qa
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 37 -
1 file changed, 37 deletions(-)
New commits:
commit 26125ed92058abc419db7db453073e2bcb0b7f30
Author: Thorsten Behrens
AuthorDate: Mon Jun 27 00:58:24 2022 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jun 27 00:58:24 2022 +0200
Revert unit test from tdf#148706 fix
This reverts the test from commit
5b58b8a4c3d6473deb91ed8cb1a33f87ba4d5de9 - needs more tweaks on the
old branch.
Change-Id: Id2bbc7138680c2751968a25ed2a769be8f2dea2f
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 645e4487a149..344a74f87521 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -110,7 +110,6 @@ public:
void testSofthyphenPos();
void testTdf107013();
void testTdf107018();
-void testTdf148706();
void testTdf107089();
void testTdf99680();
void testTdf99680_2();
@@ -156,7 +155,6 @@ public:
CPPUNIT_TEST(testSofthyphenPos);
CPPUNIT_TEST(testTdf107013);
CPPUNIT_TEST(testTdf107018);
-CPPUNIT_TEST(testTdf148706);
CPPUNIT_TEST(testTdf107089);
CPPUNIT_TEST(testTdf99680);
CPPUNIT_TEST(testTdf99680_2);
@@ -751,41 +749,6 @@ void PdfExportTest::testTdf107018()
CPPUNIT_ASSERT_EQUAL(OString("Pages"), pName->GetValue());
}
-void PdfExportTest::testTdf148706()
-{
-// Import the bugdoc and export as PDF.
-aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
-saveAsPDF(u"tdf148706.odt");
-
-// Parse the export result with pdfium.
-std::unique_ptr pPdfDocument = parseExport();
-CPPUNIT_ASSERT(pPdfDocument);
-
-// The document has one page.
-CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
-std::unique_ptr pPdfPage =
pPdfDocument->openPage(/*nIndex=*/0);
-CPPUNIT_ASSERT(pPdfPage);
-
-// The page has one annotation.
-CPPUNIT_ASSERT_EQUAL(1, pPdfPage->getAnnotationCount());
-std::unique_ptr pAnnot =
pPdfPage->getAnnotation(0);
-
-CPPUNIT_ASSERT(pAnnot->hasKey("V"));
-CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFObjectType::String,
pAnnot->getValueType("V"));
-OUString aV = pAnnot->getString("V");
-
-// Without the fix in place, this test would have failed with
-// - Expected: 1821.84
-// - Actual :
-CPPUNIT_ASSERT_EQUAL(OUString("1821.84"), aV);
-
-CPPUNIT_ASSERT(pAnnot->hasKey("DV"));
-CPPUNIT_ASSERT_EQUAL(vcl::pdf::PDFObjectType::String,
pAnnot->getValueType("DV"));
-OUString aDV = pAnnot->getString("DV");
-
-CPPUNIT_ASSERT_EQUAL(OUString("1821.84"), aDV);
-}
-
void PdfExportTest::testTdf107089()
{
vcl::filter::PDFDocument aDocument;
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-35'
Tag 'cib-6.1-35' created by Thorsten Behrens at 2022-06-20 22:32 + Release LibreOffice powered by CIB 6.1-35 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmKw9X5fFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/jFrQ//RK4yysJkDp+DcHpJoy0SDgW+/RJEC9X4F4u3D7fs6cTnKbVxGSqkRYCk /UyJBG+YOUJGifehfbICn2c8VUIHMlVXPgSF4xQB1FjydQz1bROyuipvQo88Pw0J 2uuptatjiCuz701fdXBY1D+bhd2Yh1Rgd3XtLw8JkX9xGAS51zDjQnwUu4n69XCp DDFE4pf8uWHO6bWCw4ojSUAcQNhxdXpFNBoeU33BaP0aPtvTCdESLd/nqW3h59oW QFdWLEFZ7cTJ58F2V0Qqh9gorEVDe2KiCL8FSthugK7tI0oVIacNZigHcVNP1HIt 88cb5i8hTviSWs7GnQBlhdBuT8A5dE+69eVZa+YxPzCAGH2GB7gzHeWv6crIgtOl aXqt03oZOcW5yT6kwawyzYYAkW3urP5xb8CM4Jienmly+FVPVfpUL1/BaiI6XJlQ Owc1qBzdXK1BctcpooyfznqU3UM4elf40UYcrDMTfwpYT7aIp+42snhN+MVKbRfw Q8TIPxrzuvZhW0y6XPCob/ObFcytW8KhnfjyocH7+X0/mL8Q/HEdGGm9eXf63BAp 2vjj46il1faIVTzdwWQyXPdrB/Rxa+jCWbcqalD0+mGDk5HwrwL907JuJrQXqUEM GsQ/IJUZsIPTwH6eqm4rRBinEyKUfT1wKpxp6gcJJ6ixzTKykB0= =She6 -END PGP SIGNATURE- Changes since cib-6.1-34-3: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c90f68490430246a53180b6cf35d696021502911 Author: Thorsten Behrens AuthorDate: Mon Jun 20 11:12:06 2022 +0200 Commit: Thorsten Behrens CommitDate: Mon Jun 20 11:12:06 2022 +0200 Bump version to 6.4.0.9 Change-Id: I92aef966a5842fde8a1589165282d8eb9706960b diff --git a/configure.ac b/configure.ac index dbf980544554..e104a4dd5a27 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.8],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.9],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
Re: GSOC intro
Hi Hannah, Hannah Meeks wrote: > I’m Hannah a first year undergrad studying engineering, and looking forward > to a summer full of coding! > Welcome to GSoC with LibreOffice! :) Have fun & happy hacking, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a5b56b609930441c2ee70a46afb250731b5def4 Author: Thorsten Behrens AuthorDate: Fri Jun 17 16:12:52 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Jun 17 16:12:52 2022 +0200 Bump version to 6.1.7.35 Change-Id: I2af0f13bb6224fb0f3ad95909be45cadc7475442 diff --git a/configure.ac b/configure.ac index de4f83a6606c..84c66a9de130 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.34],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.35],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - configure.ac
configure.ac |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 57cfe79e9646e27b8f8f11a8cc71b7f7ef3704a7
Author: Thorsten Behrens
AuthorDate: Tue Jun 14 14:10:04 2022 +0200
Commit: Xisco Fauli
CommitDate: Wed Jun 15 11:38:17 2022 +0200
Fix with-vendor for cross-build targets some more
Regression from be2252c8d3e5d892ec1e6b12a2b55c2026597cb9 where spaces
in --with-vendor end up being poorly quoted.
Opted to pass down --with-vendor to sub-configure unconditionally even
if empty, due to the need of word splitting generally being needed for
the sub_conf_opts variable.
Change-Id: Id3740255bc8fbf98adf7464de7e2836fcde9f2fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135826
Reviewed-by: Balazs Varga
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 47f1602b2681130e1400a37909fac3dfa7f667bb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135878
Reviewed-by: Xisco Fauli
diff --git a/configure.ac b/configure.ac
index a36fb02c7fc3..3487f2ff9754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5664,7 +5664,6 @@ if test "$cross_compiling" = "yes"; then
test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts
--enable-wasm-strip"
test "${with_system_lockfile+set}" = set && sub_conf_opts="$sub_conf_opts
--with-system-lockfile=${with_system_lockfile}"
test "${enable_fuzzers}" = yes && sub_conf_opts="$sub_conf_opts
--without-system-libxml"
-test -n "$with_vendor" -a "$with_vendor" != "no" &&
sub_conf_opts="$sub_conf_opts --with-vendor=$with_vendor"
if test "$_os" = "Emscripten"; then
sub_conf_opts="$sub_conf_opts --without-system-libxml
--without-system-fontconfig --without-system-freetype --without-system-zlib"
fi
@@ -5702,6 +5701,7 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_defaults \
--with-parallelism="'$with_parallelism'" \
--with-theme="'$with_theme'" \
+--with-vendor="'$with_vendor'" \
$sub_conf_opts \
$with_build_platform_configure_options \
--srcdir=$srcdir
@@ -5710,6 +5710,7 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_defaults \
--with-parallelism="$with_parallelism" \
--with-theme="$with_theme" \
+"--with-vendor=$with_vendor" \
$sub_conf_opts \
$with_build_platform_configure_options \
--srcdir=$srcdir \
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin
config_host.mk.in|1
configure.ac |4 +
instsetoo_native/CustomTarget_install.mk | 83 ---
solenv/bin/call_installer.sh | 58 +
4 files changed, 96 insertions(+), 50 deletions(-)
New commits:
commit d78aba37168399b92418b4f3b7571efa4e042211
Author: Thorsten Behrens
AuthorDate: Fri Apr 29 12:46:58 2022 +0200
Commit: Andras Timar
CommitDate: Thu Jun 9 20:45:56 2022 +0200
Get make_installer calls to run in parallel
If available, use GNU parallel to run N make_installer.pl scripts in
parallel, to scale packaging LibreOffice up with the rest of gbuild.
* fallback if no GNU parallel found - run make_installer sequentially
as before
* push most of the make_installer.pl input param tweaks from gbuild
down into a shared call_installer.sh script
* call gnu parallel with generated number of
"templ:lang:prodname:ext:pkgfmt:strip-flag" tuples, one for each
package to build (empty templ for non-windows, to save on cmd line
length)
* such that we can run all those in parallel (taking into account
the build's PARALLELISM parameter)
* there's still the main package build running epm sequentially for
umpteen sub-packages from within _one_ make_installer.pl instance, but
that's much harder to parallelize from inside Perl (so we punt on
that here)
Change-Id: Ie7d3084ed60d003d587c5e64dc9fb1809b23e409
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133957
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135343
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/config_host.mk.in b/config_host.mk.in
index d00f868e2757..96723061447c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -233,6 +233,7 @@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
+export GNUPARALLEL=@GNUPARALLEL@
export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@
export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@
export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 95585a8293c9..d23731af2f18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2824,6 +2824,10 @@ if test -z "$COMPRESSIONTOOL"; then
fi
AC_SUBST(COMPRESSIONTOOL)
+# use GNU parallel for packaging, if available
+AC_PATH_PROG(GNUPARALLEL, parallel)
+AC_SUBST(GNUPARALLEL)
+
AC_MSG_CHECKING([for GNU or BSD tar])
for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
$a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 0974240be1fb..2edb9ef365fa 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,41 +62,18 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
-PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME))
-
-ifeq (WNT,$(OS))
-define instsetoo_native_msitemplates
-
-TEMPLATE_DIR=$(dir $@)msi_templates \
-&& rm -rf $${TEMPLATE_DIR} \
-&& mkdir -p $${TEMPLATE_DIR}/Binary \
-&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do
$(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \
-&& $(GNUCOPY)
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.*
$${TEMPLATE_DIR}/Binary
-endef
-else
-instsetoo_native_msitemplates :=
-endif
-
define instsetoo_native_install_command
-$(call instsetoo_native_msitemplates,$(1))
-$(call gb_Helper_print_on_error, \
-cd $(dir $@) \
-$(foreach pkgformat,$(5),\
-&& $(PERL) -w $< \
- -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
- -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
- -p $(PRODUCTNAME_no_spaces)$(3) \
- -u $(instsetoo_OUT) \
- -packer $(COMPRESSIONTOOL) \
- -buildid $(if $(filter deb0
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
- $(if $(filter WNT,$(OS)), \
- -msitemplate $(dir $@)msi_templates \
- -msilanguage $(dir $@)win_ulffiles \
- ) \
- $(4) \
- -format $(pkgformat) \
- $(if $(verbose),-verbose,-quiet) \
-),$@.log)
+$(if $(GNUPARALLEL), \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) && \
+$(GNUPARALLEL) -j $(PARALLELISM) $(SRCDIR)/solenv/bin/call_installer.sh
$(if $(verbose),-verbose,-quiet) -- $(1) \
+,$@.log) \
+, \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) \
+$(foreach curpkg,$(1),\
+&& $(SRCDIR)/solenv/bin/call_inst
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin
config_host.mk.in|1
configure.ac |4 +
instsetoo_native/CustomTarget_install.mk | 77 ---
solenv/bin/call_installer.sh | 58 +++
4 files changed, 94 insertions(+), 46 deletions(-)
New commits:
commit ceb75969695d5132facbde8dafe08d21caada8ea
Author: Thorsten Behrens
AuthorDate: Fri Apr 29 12:46:58 2022 +0200
Commit: Andras Timar
CommitDate: Thu Jun 9 12:31:02 2022 +0200
Get make_installer calls to run in parallel
If available, use GNU parallel to run N make_installer.pl scripts in
parallel, to scale packaging LibreOffice up with the rest of gbuild.
* fallback if no GNU parallel found - run make_installer sequentially
as before
* push most of the make_installer.pl input param tweaks from gbuild
down into a shared call_installer.sh script
* call gnu parallel with generated number of
"templ:lang:prodname:ext:pkgfmt:strip-flag" tuples, one for each
package to build (empty templ for non-windows, to save on cmd line
length)
* such that we can run all those in parallel (taking into account
the build's PARALLELISM parameter)
* there's still the main package build running epm sequentially for
umpteen sub-packages from within _one_ make_installer.pl instance, but
that's much harder to parallelize from inside Perl (so we punt on
that here)
Change-Id: Ie7d3084ed60d003d587c5e64dc9fb1809b23e409
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133957
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135346
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/config_host.mk.in b/config_host.mk.in
index f4edd960ee09..73b367290f65 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -240,6 +240,7 @@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
+export GNUPARALLEL=@GNUPARALLEL@
export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@
export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@
export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 9a77f638157b..93319018fa4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2912,6 +2912,10 @@ if test -z "$COMPRESSIONTOOL"; then
fi
AC_SUBST(COMPRESSIONTOOL)
+# use GNU parallel for packaging, if available
+AC_PATH_PROG(GNUPARALLEL, parallel)
+AC_SUBST(GNUPARALLEL)
+
AC_MSG_CHECKING([for GNU or BSD tar])
for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
$a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 53c79e102bde..bb34a34450d7 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,39 +62,18 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
-ifeq (WNT,$(OS))
-define instsetoo_native_msitemplates
-
-TEMPLATE_DIR=$(dir $@)msi_templates \
-&& rm -rf $${TEMPLATE_DIR} \
-&& mkdir -p $${TEMPLATE_DIR}/Binary \
-&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do
$(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \
-&& $(GNUCOPY)
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.*
$${TEMPLATE_DIR}/Binary
-endef
-else
-instsetoo_native_msitemplates :=
-endif
-
define instsetoo_native_install_command
-$(call instsetoo_native_msitemplates,$(1))
-$(call gb_Helper_print_on_error, \
-cd $(dir $@) \
-$(foreach pkgformat,$(5),\
-&& $(PERL) -w $< \
- -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
- -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
- -p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \
- -u $(instsetoo_OUT) \
- -packer $(COMPRESSIONTOOL) \
- -buildid $(if $(filter deb0
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
- $(if $(filter WNT,$(OS)), \
- -msitemplate $(dir $@)msi_templates \
- -msilanguage $(dir $@)win_ulffiles \
- ) \
- $(4) \
- -format $(pkgformat) \
- $(if $(verbose),-verbose,-quiet) \
-),$@.log)
+$(if $(GNUPARALLEL), \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) && \
+$(GNUPARALLEL) -j $(PARALLELISM) $(SRCDIR)/solenv/bin/call_installer.sh
$(if $(verbose),-verbose,-quiet) -- $(1) \
+,$@.log) \
+, \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) \
+$(foreach curpkg,$(1),\
+&& $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet)
$
[Libreoffice-commits] core.git: oox/source
oox/source/export/presetTextWarpDefinitions.xml | 17 - 1 file changed, 17 deletions(-) New commits: commit 49f62ab95eeffd0ed4d19eca4c9abffa6e2cf84f Author: Thorsten Behrens AuthorDate: Tue May 31 09:38:15 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue May 31 09:39:56 2022 +0200 Revert 6eeb0942c35f07dfbadb13f35fc6aa3703dac945 Change-Id: I096f25d38f19fb728110e209a189f89a8e8d402f diff --git a/oox/source/export/presetTextWarpDefinitions.xml b/oox/source/export/presetTextWarpDefinitions.xml index e5f0c4f88c8a..c701c8f82b1c 100644 --- a/oox/source/export/presetTextWarpDefinitions.xml +++ b/oox/source/export/presetTextWarpDefinitions.xml @@ -1,21 +1,4 @@ - http://schemas.openxmlformats.org/drawingml/2006/main";>
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit c9d018df610b7bd7d5794231b2ccb0d8090573a6 Author: Thorsten Behrens AuthorDate: Fri May 27 00:45:18 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri May 27 09:33:45 2022 +0200 make_installer: convert Win to Unix path for cygwin Usual cygwin auto-conversion magic doesn't work for PATH variable, which requires proper /cygdrive/foo/bar entries. Change-Id: Ic07ffcdf7cb28c5e5702964c331f337ee811c063 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135032 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 37b177ab94c2..e4642c6ed6d2 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -71,7 +71,10 @@ $(if $(GNUPARALLEL), \ , \ $(call gb_Helper_print_on_error, \ cd $(dir $@) \ -&& PATH="$(SRCDIR)/solenv/bin:$$PATH" \ +$(if $(filter WNT,$(OS)), \ + && PATH="$(shell cygpath -u $(SRCDIR)/solenv/bin):$$PATH" \ +, \ + && PATH="$(SRCDIR)/solenv/bin:$$PATH") \ $(foreach curpkg,$(1),\ && call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ ),$@.log))
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aee953d7b66c02bbd7034cbf8991e3748dc3794a Author: Thorsten Behrens AuthorDate: Wed May 25 13:21:26 2022 +0200 Commit: Thorsten Behrens CommitDate: Thu May 26 01:09:55 2022 +0200 Reduce cmd line length for make_installer calls Seems on Windows, we're hitting the 8k character max cmd line length, on setups with slightly deeper src tree path locations. Shorten length of expanded call_installer calls by putting shell script into PATH locally. Change-Id: If1cddab9e4e07a7c5ebfae7a4e88e43b1bc8b907 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134938 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 47b2ffe1a262..37b177ab94c2 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -71,8 +71,9 @@ $(if $(GNUPARALLEL), \ , \ $(call gb_Helper_print_on_error, \ cd $(dir $@) \ +&& PATH="$(SRCDIR)/solenv/bin:$$PATH" \ $(foreach curpkg,$(1),\ -&& $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ +&& call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \ ),$@.log)) endef
[Libreoffice-commits] core.git: config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin
config_host.mk.in|1
configure.ac |4 +
instsetoo_native/CustomTarget_install.mk | 77 ---
solenv/bin/call_installer.sh | 58 +++
4 files changed, 94 insertions(+), 46 deletions(-)
New commits:
commit 6204336cc7242ff1b0fdc26ccb7f8dd4f362fb78
Author: Thorsten Behrens
AuthorDate: Fri Apr 29 12:46:58 2022 +0200
Commit: Thorsten Behrens
CommitDate: Sun May 22 21:35:42 2022 +0200
Get make_installer calls to run in parallel
If available, use GNU parallel to run N make_installer.pl scripts in
parallel, to scale packaging LibreOffice up with the rest of gbuild.
* fallback if no GNU parallel found - run make_installer sequentially
as before
* push most of the make_installer.pl input param tweaks from gbuild
down into a shared call_installer.sh script
* call gnu parallel with generated number of
"templ:lang:prodname:ext:pkgfmt:strip-flag" tuples, one for each
package to build (empty templ for non-windows, to save on cmd line
length)
* such that we can run all those in parallel (taking into account
the build's PARALLELISM parameter)
* there's still the main package build running epm sequentially for
umpteen sub-packages from within _one_ make_installer.pl instance, but
that's much harder to parallelize from inside Perl (so we punt on
that here)
Change-Id: Ie7d3084ed60d003d587c5e64dc9fb1809b23e409
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133957
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/config_host.mk.in b/config_host.mk.in
index 4d45a94e5a2c..9a2cd1343a18 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -259,6 +259,7 @@ export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_LINK_SRC=@GIT_LINK_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
+export GNUPARALLEL=@GNUPARALLEL@
export EPOXY_CFLAGS=$(gb_SPACE)@EPOXY_CFLAGS@
export EPOXY_LIBS=$(gb_SPACE)@EPOXY_LIBS@
export GLM_CFLAGS=$(gb_SPACE)@GLM_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 2e1e3c8b58d3..f75582843689 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2939,6 +2939,10 @@ if test -z "$COMPRESSIONTOOL"; then
fi
AC_SUBST(COMPRESSIONTOOL)
+# use GNU parallel for packaging, if available
+AC_PATH_PROG(GNUPARALLEL, parallel)
+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
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 0dab73ad904c..47b2ffe1a262 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,39 +62,18 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
-ifeq (WNT,$(OS))
-define instsetoo_native_msitemplates
-
-TEMPLATE_DIR=$(dir $@)msi_templates \
-&& rm -rf $${TEMPLATE_DIR} \
-&& mkdir -p $${TEMPLATE_DIR}/Binary \
-&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do
$(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \
-&& $(GNUCOPY)
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.*
$${TEMPLATE_DIR}/Binary
-endef
-else
-instsetoo_native_msitemplates :=
-endif
-
define instsetoo_native_install_command
-$(call instsetoo_native_msitemplates,$(1))
-$(call gb_Helper_print_on_error, \
-cd $(dir $@) \
-$(foreach pkgformat,$(5),\
-&& $(if $(filter-out archive,$(pkgformat)),ENABLE_STRIP=1) $(PERL) -w $< \
- -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
- -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
- -p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \
- -u $(instsetoo_OUT) \
- -packer $(COMPRESSIONTOOL) \
- -buildid $(if $(filter deb0
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
- $(if $(filter WNT,$(OS)), \
- -msitemplate $(dir $@)msi_templates \
- -msilanguage $(dir $@)win_ulffiles \
- ) \
- $(4) \
- -format $(pkgformat) \
- $(if $(verbose),-verbose,-quiet) \
-),$@.log)
+$(if $(GNUPARALLEL), \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) && \
+$(GNUPARALLEL) -j $(PARALLELISM) $(SRCDIR)/solenv/bin/call_installer.sh
$(if $(verbose),-verbose,-quiet) -- $(1) \
+,$@.log) \
+, \
+$(call gb_Helper_print_on_error, \
+cd $(dir $@) \
+$(foreach curpkg,$(1),\
+&& $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet)
$(curpkg) \
+),$@.log))
endef
$(call gb_CustomTarget_get_workdir,instsetoo_nat
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d284a9ef4556d6fc6b873e3614957993f478aac Author: Thorsten Behrens AuthorDate: Fri May 20 12:35:17 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri May 20 12:35:17 2022 +0200 Bump version to 6.1.7.34 Change-Id: Icb4894f0ba9f9e57cee46328eaebf214bc3d0d3d diff --git a/configure.ac b/configure.ac index 3c9760cdc16f..de4f83a6606c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.33],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.34],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3b46c8653c6a54b279893ea3b8b4b4394ac8ba3e Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Wed May 18 11:34:32 2022 +0200 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132061 Tested-by: Samuel Mehrbrodt Reviewed-by: Samuel Mehrbrodt Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134517 diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 899c21e4cec9..9237c35a5d31 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
Re: Compiling LO for lcov/gcov code coverage fails (gb_GCOV=YES)
Hi Maarten, Maarten Hoes wrote: > I personally do not know enough about the build system to figure out how to > correct this. Any and all help in trying to make this work again would be > appreciated. > Beyond what Lubos suggested, and assuming your error happens fairly quickly - you might want to give 'git bisect run' a try to find the commit that broke this (assuming you remember a time when it last worked). Here's a howto: https://lwn.net/Articles/317154/ HTH, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-33'
Tag 'cib-6.1-33' created by Thorsten Behrens at 2022-04-24 12:09 + Release LibreOffice powered by CIB 6.1-33 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmJlPgVfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/i+XxAAg3rgpgS7BAoSD1NMebRiUHy5qy3+/Dii2v8+qxhg6iaQhE4TPfctM0Um 1BfXW46/YgAn7SmVWVb49ccyQjvYqDo7iBZGJ0wRvNTuVP2SHOArdIiE8+khJrDM 3bVqeOvBMYLApkBSz3nxJ00sxEOy9939qd1zfFeVySqv6hhHJmuoLk8FYV0Oo1Y7 fPDVE3lqwzjAYWtIifeGMw7QNn2M224T+qQ2GLseLMlEbHiC7jOg2QIrVI4B00l1 c5KYcGqZ3nGkI6iiD0zWZ+u3FjPtkO9sxXzEVdKMpzYl3y/DtxjytzStxYid0e7p kqYBtQ1sltB8KUKQflUJVuKD0sQq8DmrQ3cXqGxXyttsE5mx++OiVApdjMXd6gVe brJsuuH85YFJYJCA47A0F8FB7hLQZlenn//PaTJga8GYBWqgEZB37ea//PwOnj18 jw9Wk/r4jW16fWXCXQFtmo71UPXn5QOGzjT9VE46a99zVrGnftC5BRXJjK54LCCM QclpaSzcb1d64e/ZbXZC3X7mPwhod2izxuPp7fzhsowU/q0Tdwkj1G7VB4YMexNB zPUpW9gZ7JEj3+VWYcx09THXqwad+2GaVxYdkev26uq4gR/rwWEq4obxl5zZgC0m xpKKEblmxeU9xwJuoSI+lG1VfQQWanvIlqcHkQ58NLRcZGRURh4= =ciVJ -END PGP SIGNATURE- Changes since cib-6.1-32-2: --- 0 files changed ---
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit b7a37d6fb9fc21afc77964de725d5143f5aad435 Author: Thorsten Behrens AuthorDate: Thu Apr 28 16:19:36 2022 + Commit: Thorsten Behrens CommitDate: Thu Apr 28 23:23:08 2022 +0200 Fix system-nss: add hasht.h header back Revert part of 02e1be8883a08ab17f3e890a834ab88f13c5867d which broke with-system-nss builds - the hasht.h header was actually needed. Change-Id: Ida36bc6cd91f0a9b26a2029f1cab835f90f40dde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133571 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index bf1da39b3fec..b75d73bb0a89 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -22,6 +22,7 @@ #include #include +#include #include #include
Re: [Libreoffice-qa] ESC meeting minutes: 2022-04-21
Hi *, Miklos Vajna wrote: > * ucb: webdav-curl: put user name from config into LOCK request (Michael S) > + https://gerrit.libreoffice.org/c/core/+/133143 > + benefit: if some other user edits a file on a webdav share, then publish > the name of the editing user > + but this sends user data, might disturb some > + idea: respect the setting that decides if user data is written to > documents > + currently controls ODF's meta.xml > + reuse this > Sorry, had quite a bad jitsi connection today, so as said comment via email - I agree with the rationale that putting the name into the lock file is good UX. There's a small corner case where there would be additional information disclosure, compared to document meta data: if the document is encrypted. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-3' - slideshow/source
slideshow/source/engine/activities/simplecontinuousactivitybase.cxx | 12 +++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 007e21825ca4093f39bcdca8f5c2a0e6df0c205e Author: Thorsten Behrens AuthorDate: Thu Apr 14 12:01:50 2022 +0200 Commit: Michael Stahl CommitDate: Wed Apr 20 12:07:34 2022 +0200 Resolves: tdf#143615 clamp relative times to 1.0 User input permits zero-length animations, so whenever we calculate relative position within the animation time frame, the case mnMinSimpleDuration == 0.0 means: we're already at the end of the animation, i.e. set relative time to 1.0 Change-Id: I0e8c1e29f47bd9fa16f04115cf52d3a176e13fb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133005 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit e1db8c27875eac73b1e619e4a23ecdb7a9924b61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133038 Reviewed-by: Xisco Fauli (cherry picked from commit 01c5006db900e3911e6bf8cb7abc2935e8215ded) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133044 Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 9e23fc2c76c8..01cb3b75007b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -63,9 +63,12 @@ namespace slideshow::internal // perform will be called at least mnMinNumberOfTurns // times. -// fraction of time elapsed +// fraction of time elapsed (clamp to 1.0 for zero-length +// animations) const double nFractionElapsedTime( -nCurrElapsedTime / mnMinSimpleDuration ); +mnMinSimpleDuration != 0.0 ? +nCurrElapsedTime / mnMinSimpleDuration : +1.0 ); // fraction of minimum calls performed const double nFractionRequiredCalls( @@ -115,7 +118,10 @@ namespace slideshow::internal // === const double nCurrElapsedTime( maTimer.getElapsedTime() ); -double nT( nCurrElapsedTime / mnMinSimpleDuration ); +// clamp to 1.0 for zero animation duration +double nT( mnMinSimpleDuration != 0.0 ? + nCurrElapsedTime / mnMinSimpleDuration : + 1.0 ); // one of the stop criteria reached?
Re: Distributing binary builds of vendor's LTS branches
Dear Ming, quick answer (and I'm just speaking for myself here) - Ming H. wrote: > I am writing on behalf of a group of Chinese LO users. > Thx a lot for reaching out! Would be great to hear more about the use of LibreOffice in China. I wonder if you or other people from the chinese community would be willing to talk a bit about your experiences, perhaps in one of the next TDF virtual townhalls (or latest at our annual conference)? > We are thinking of providing extended builds of old releases for > which TDF has stopped making security updates, since many Chinese > Windows users opt to stay at old releases for various reasons and > are mostly unaware of the security consequences. > With my developer hat on, I don't really understand how providing updates for old releases would help, if the users are unwilling to upgrade in the first place. Or are there specific problems in newer LibreOffice releases, that affect Chinese users in particular? That's in any case an issue I would be very interested in learning more about. > My question is, is such a plan acceptable by the LO community in > general, and the developers from those commercial vendors in > particular? > I cannot speak for the community, nor for commercial vendors in general (albeit running a company that does provide LTS products for LibreOffice). That said, there is I think broad consensus in the community, that LibreOffice needs paid developers to maintain the code, and providing LTS versions is one way of generating revenues. As such, publishing free binaries from those vendor branches would certainly raise eyebrows, at least from the vendor who pays the developers maintaining that branch. There might be other ways to address your problem; it's also possible that the vendor who's branch you consider building would be fine with providing free binaries for the Chinese market (hard to answer in the abstract) - so don't take the above as a 'no', but rather as the start of a conversation to solve the (apparent!) issue. :) > Comments and advice are appreciated. And if the developer mailing > list is not the proper place for such inquiry, please redirect me to > the correct channels. > I think for the moment, it's a good place to start. I've copied the friendly TDF membership people, who are planning the townhall meetings & are always happy to strengthen connections with the global community. Let's hear what others think! All the best, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - slideshow/source
slideshow/source/engine/activities/simplecontinuousactivitybase.cxx | 12 +++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 18ac22f8a24cb4b691d8c0269206355d0f484625 Author: Thorsten Behrens AuthorDate: Thu Apr 14 12:01:50 2022 +0200 Commit: Xisco Fauli CommitDate: Fri Apr 15 18:28:24 2022 +0200 Resolves: tdf#143615 clamp relative times to 1.0 User input permits zero-length animations, so whenever we calculate relative position within the animation time frame, the case mnMinSimpleDuration == 0.0 means: we're already at the end of the animation, i.e. set relative time to 1.0 Change-Id: I0e8c1e29f47bd9fa16f04115cf52d3a176e13fb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133005 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit e1db8c27875eac73b1e619e4a23ecdb7a9924b61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133039 Reviewed-by: Xisco Fauli diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 9e23fc2c76c8..01cb3b75007b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -63,9 +63,12 @@ namespace slideshow::internal // perform will be called at least mnMinNumberOfTurns // times. -// fraction of time elapsed +// fraction of time elapsed (clamp to 1.0 for zero-length +// animations) const double nFractionElapsedTime( -nCurrElapsedTime / mnMinSimpleDuration ); +mnMinSimpleDuration != 0.0 ? +nCurrElapsedTime / mnMinSimpleDuration : +1.0 ); // fraction of minimum calls performed const double nFractionRequiredCalls( @@ -115,7 +118,10 @@ namespace slideshow::internal // === const double nCurrElapsedTime( maTimer.getElapsedTime() ); -double nT( nCurrElapsedTime / mnMinSimpleDuration ); +// clamp to 1.0 for zero animation duration +double nT( mnMinSimpleDuration != 0.0 ? + nCurrElapsedTime / mnMinSimpleDuration : + 1.0 ); // one of the stop criteria reached?
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - slideshow/source
slideshow/source/engine/activities/simplecontinuousactivitybase.cxx | 12 +++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 01c5006db900e3911e6bf8cb7abc2935e8215ded Author: Thorsten Behrens AuthorDate: Thu Apr 14 12:01:50 2022 +0200 Commit: Xisco Fauli CommitDate: Fri Apr 15 18:05:46 2022 +0200 Resolves: tdf#143615 clamp relative times to 1.0 User input permits zero-length animations, so whenever we calculate relative position within the animation time frame, the case mnMinSimpleDuration == 0.0 means: we're already at the end of the animation, i.e. set relative time to 1.0 Change-Id: I0e8c1e29f47bd9fa16f04115cf52d3a176e13fb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133005 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit e1db8c27875eac73b1e619e4a23ecdb7a9924b61) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133038 Reviewed-by: Xisco Fauli diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 9e23fc2c76c8..01cb3b75007b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -63,9 +63,12 @@ namespace slideshow::internal // perform will be called at least mnMinNumberOfTurns // times. -// fraction of time elapsed +// fraction of time elapsed (clamp to 1.0 for zero-length +// animations) const double nFractionElapsedTime( -nCurrElapsedTime / mnMinSimpleDuration ); +mnMinSimpleDuration != 0.0 ? +nCurrElapsedTime / mnMinSimpleDuration : +1.0 ); // fraction of minimum calls performed const double nFractionRequiredCalls( @@ -115,7 +118,10 @@ namespace slideshow::internal // === const double nCurrElapsedTime( maTimer.getElapsedTime() ); -double nT( nCurrElapsedTime / mnMinSimpleDuration ); +// clamp to 1.0 for zero animation duration +double nT( mnMinSimpleDuration != 0.0 ? + nCurrElapsedTime / mnMinSimpleDuration : + 1.0 ); // one of the stop criteria reached?
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/activities/simplecontinuousactivitybase.cxx | 12 +++--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit e1db8c27875eac73b1e619e4a23ecdb7a9924b61 Author: Thorsten Behrens AuthorDate: Thu Apr 14 12:01:50 2022 +0200 Commit: Thorsten Behrens CommitDate: Thu Apr 14 19:29:03 2022 +0200 Resolves: tdf#143615 clamp relative times to 1.0 User input permits zero-length animations, so whenever we calculate relative position within the animation time frame, the case mnMinSimpleDuration == 0.0 means: we're already at the end of the animation, i.e. set relative time to 1.0 Change-Id: I0e8c1e29f47bd9fa16f04115cf52d3a176e13fb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133005 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx index 9e23fc2c76c8..01cb3b75007b 100644 --- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx +++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx @@ -63,9 +63,12 @@ namespace slideshow::internal // perform will be called at least mnMinNumberOfTurns // times. -// fraction of time elapsed +// fraction of time elapsed (clamp to 1.0 for zero-length +// animations) const double nFractionElapsedTime( -nCurrElapsedTime / mnMinSimpleDuration ); +mnMinSimpleDuration != 0.0 ? +nCurrElapsedTime / mnMinSimpleDuration : +1.0 ); // fraction of minimum calls performed const double nFractionRequiredCalls( @@ -115,7 +118,10 @@ namespace slideshow::internal // === const double nCurrElapsedTime( maTimer.getElapsedTime() ); -double nT( nCurrElapsedTime / mnMinSimpleDuration ); +// clamp to 1.0 for zero animation duration +double nT( mnMinSimpleDuration != 0.0 ? + nCurrElapsedTime / mnMinSimpleDuration : + 1.0 ); // one of the stop criteria reached?
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e54e77cb349ef9ad5ae1f38d217aec0be3ff0616 Author: Thorsten Behrens AuthorDate: Tue Apr 12 18:02:18 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 12 18:02:18 2022 +0200 Bump version to 6.1.7.33 Change-Id: I2072b771c273042665e1f9d79908fac38b6b479a diff --git a/configure.ac b/configure.ac index 7d056feaedbb..3c9760cdc16f 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.32],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.33],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 444d52aa0acaf1f9dd40bf8efb6f029b9b9d1131 Author: Thorsten Behrens AuthorDate: Tue Apr 12 17:08:04 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 12 17:08:04 2022 +0200 Bump version to 6.4.0.7 Change-Id: Ib2312b5b49571e0202c2edc5d14eb6a067f9eab6 diff --git a/configure.ac b/configure.ac index 4b05fb8f9a54..ee45f23f823c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.6],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.7],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - external/openldap
external/openldap/UnpackedTarball_openldap.mk |6
external/openldap/automake.patch | 3654 --
2 files changed, 5 insertions(+), 3655 deletions(-)
New commits:
commit 97648c6ccce80df96c438c0af37b924dd15edb32
Author: Thorsten Behrens
AuthorDate: Sat Apr 9 19:10:53 2022 +0200
Commit: Thorsten Behrens
CommitDate: Sat Apr 9 19:11:19 2022 +0200
use the new gbuild way to update config.*
(using the openldap part of the patch)
Change-Id: I43805ac8c3d5c1b65519da02c3cc50fdb9729ea6
Reviewed-on: https://gerrit.libreoffice.org/42941
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/external/openldap/UnpackedTarball_openldap.mk
b/external/openldap/UnpackedTarball_openldap.mk
index 74d6908b5623..61a083ddcd8a 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -13,9 +13,13 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openl
$(eval $(call gb_UnpackedTarball_set_patchlevel,openldap,0))
+$(eval $(call gb_UnpackedTarball_update_autoconf_configs,openldap,\
+ build \
+ contrib/ldapc++ \
+))
+
$(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
- external/openldap/automake.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/openldap/automake.patch b/external/openldap/automake.patch
deleted file mode 100644
index 6f2ebd6c0330..
--- a/external/openldap/automake.patch
+++ /dev/null
@@ -1,3654 +0,0 @@
build/config.guess
-+++ build/config.guess
-@@ -1,15 +1,12 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--# Free Software Foundation, Inc.
-+# Copyright 1992-2014 Free Software Foundation, Inc.
-
--timestamp='2010-09-24-OpenLDAP'
--# $OpenLDAP$
-+timestamp='2014-11-04'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
-@@ -18,26 +15,22 @@
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see <http://www.gnu.org/licenses/>.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--
--# Originally written by Per Bothner. Please send patches (context
--# diff format) to and include a ChangeLog
--# entry.
-+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
- #
--# This script attempts to guess a canonical system name similar to
--# config.sub. If it succeeds, it prints the system name on stdout, and
--# exits with 0. Otherwise, it exits with 1.
-+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
- #
- # You can get the latest version of this script from:
- #
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+#
-+# Please send patches to .
-+
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-
-@@ -57,9 +50,7 @@
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
--Software Foundation, Inc.
-+Copyright 1992-2014 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -93,7 +84,7 @@
- exit 1
- fi
-
--trap 'exit 1' HUP INT TERM
-+trap 'exit 1' 1 2 15
-
- # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
- # compiler to aid in system detection is discouraged as it requires
-@@ -107,7 +98,7 @@
-
- set_cc_for_build='
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null)
&& exit \$exitcode" 0 ;
--trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT
PIPE TERM ;
-+trap "
Re: Idea of a "strict" version of LO for publishers
Hi Yves, a global 'mode' for LibreOffice text editing is likely pretty invasive (i.e. lots of places need touching), so that's perhaps not the LibreOffice project's first choice. If downstream filtering of the document is sufficient for your use case, then perhaps the ODFToolkit [1] library packages can help you. They provide quite rich semantics on top of an in-memory DOM tree of an ODF document. Svante and Michael (in Cc) are the maintainers. HTH, Thorsten [1] https://odftoolkit.org/ Yves Picard wrote: > Hello, > On the advice of Sophie Gautier, I would like to tell you about one of our > "research and development" projects, for which I have a budget of about two > thousand euros. As a university publisher, we maintain electronic publishing > channels from word processing to several publishing formats (html, epub, > InDesign, PDF), passing through a pivot format in XML TEI. This pivot format > is itself derived from an XML export from Libre Office. > > A significant part of our work consists of tracking down and containing > artefacts from the word processor (Word or Libre Office), in particular style > nesting, automatic styles or language attributes, etc. > > I'm looking to test the idea of a "strict" version of LO that would ensure > that one style and one style only is applied to a paragraph, that one > enrichment and one enrichment only is applied to a word (no use of styles > like "accentuation" for example) or that a web link is always findable > despite the style applied. This would probably be an "amnesiac" version of LO > (without memory of the various manipulations) which would either be used by > authors (difficult to set up) or would be used by the editor by loading an > author file in this strict version. > > An alternative (and probably better) idea would be a "big cleaner" tool that > would flatten all style or attribute nesting to the author's work. > > I'm looking for an opinion from the Libre Office community on the feasibility > of such a development, while being well aware that it goes against the logic > of the word processor in some way. But such a version, I believe, would meet > the expectations of the publishing world. > > Thank you for your attention, > > Regards, > > Yves Picard, > Presses universitaires de Rennes, > France. signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-32'
Tag 'cib-6.1-32' created by Thorsten Behrens at 2022-04-05 12:16 + Release LibreOffice powered by CIB 6.1-32 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmJMMwJfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/ih0hAApSaFa5sr69oh+EAzxeBQSS+2bMnvl1lEc7/J1pbySrl5FnGHf3slioHK RDuVT5jQjstkFTC8cyptc/R86J0JMrjivYmqO5ameyA4xR5PuydHPKcOTdiZPWy0 817ObHrOKO6y/kjO77FrtSDU6ayvAp6LBpM93WajGf7Wpz8gtIeZPT/ak02tNXbp cY21OvFIqwSUQ881eO53GvYPyIl9oEzWHOPEXC3ClfrwWzc+ycMZseY5SZl243cg wMfbFPkq0IxQv6ey0kA4Lg6NCwylAqGtDmNcRFddu+7m7s0rH1Ot41i6HSk6m2i2 sKnR2fVphrWK7ov1/2IvhWs2uIwknS82hy6DIBTp3oci6wlkj4w514fbK3jWABl5 LJBFByIKxSKCUgyBwO3aS9z9Uexnm9DiCtrfC4y64uDRnntKx5MrUWJ2E1kMbPho ZZa4OJtH1Ya+vNsSFzsos9E8wUyOLm2zC3MFtbntewparbUBWwe6Zfb9so85vOM8 da4V/EBQwW0xCQpfeO+Zu7vzuUIa8wvIvexwTVo+6uR3OKouLY56oE4pnNzgyKdy 6deg2QjXvGgfRw2TpDlk+7+zhra6Va3mfbzjX//729f/a+vzSCFDGbRo3PXBDYxv hlDg0Ws2a1/NTAr4NSiofc6wgkPDvS5sk2R1y6N6f7nyLuf+pw8= =gmHU -END PGP SIGNATURE- Changes since cib-6.1-31-20: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 280f94caa6ce372de6c5278241622eef948db43a Author: Thorsten Behrens AuthorDate: Sat Apr 2 15:31:06 2022 +0200 Commit: Thorsten Behrens CommitDate: Sat Apr 2 15:31:06 2022 +0200 Release 6.2.9.12 Change-Id: I12721fe0b61e8e0210d50cd6d9e384192a227c01 diff --git a/configure.ac b/configure.ac index 10896ca8de9e..814a9bad75ca 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[6.2.9.11],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.2.9.12],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9db083a78d6885f02fd012d453d15d131d676636 Author: Thorsten Behrens AuthorDate: Sat Apr 2 14:11:14 2022 +0200 Commit: Thorsten Behrens CommitDate: Sat Apr 2 14:11:14 2022 +0200 Release 6.3.6.15 Change-Id: I3e207e3c15305febd13cb335da4081534cbc4103 diff --git a/configure.ac b/configure.ac index dcdd9c5f6fd2..784418b6027d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[6.3.6.14],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.3.6.15],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa4b035e325b82da4d35a1bc95f2750bda921987 Author: Thorsten Behrens AuthorDate: Fri Apr 1 11:23:55 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Apr 1 11:24:54 2022 +0200 Release 5.4.14 Change-Id: I0bbf999a30ad71b389f9b51bb005e66b98e23d97 diff --git a/configure.ac b/configure.ac index 2f60977ebdd3..e357d908745c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[5.4.13.0],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.4.14.0],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - postprocess/Rdb_services.mk shell/Library_jumplist.mk
postprocess/Rdb_services.mk |1 + shell/Library_jumplist.mk |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 302a97669a6c107d4c94add707458498860d4bed Author: Thorsten Behrens AuthorDate: Wed Mar 30 01:51:58 2022 +0200 Commit: Thorsten Behrens CommitDate: Wed Mar 30 01:51:58 2022 +0200 Register JumpList service in RDB database Change-Id: I3e9ac109b6dbdd4dd6a3b6281699e58563f4805c diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index d8975449173e..cd879d222c4f 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -148,6 +148,7 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/backends/wininetbe/wininetbe1 \ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ + shell/source/win32/jumplist/jumplist \ vcl/vcl.windows \ ) \ $(if $(DISABLE_GUI), \ diff --git a/shell/Library_jumplist.mk b/shell/Library_jumplist.mk index 943fabdd4080..27ba7c3133da 100755 --- a/shell/Library_jumplist.mk +++ b/shell/Library_jumplist.mk @@ -26,7 +26,7 @@ $(eval $(call gb_Library_use_system_win32_libs,jumplist,\ shell32 \ )) -$(eval $(call gb_Library_set_componentfile,jumplist,shell/source/win32/jumplist/jumplist,services)) +$(eval $(call gb_Library_set_componentfile,jumplist,shell/source/win32/jumplist/jumplist)) $(eval $(call gb_Library_add_exception_objects,jumplist,\ shell/source/win32/jumplist/JumpList \
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - sal/CppunitTest_sal_comtools.mk sal/qa
sal/CppunitTest_sal_comtools.mk |4 +++
sal/qa/systools/test_comtools.cxx | 44 ++
2 files changed, 30 insertions(+), 18 deletions(-)
New commits:
commit 2ae173b07228f9d508da391ae821ac05b6f93d28
Author: Thorsten Behrens
AuthorDate: Tue Mar 29 00:34:35 2022 +0200
Commit: Thorsten Behrens
CommitDate: Tue Mar 29 00:34:35 2022 +0200
Drop ComPtr and use sal::systools::COMReference
More partial application of commit
ed40d477b2412d4f23540052ca0748028c6103e6
Change-Id: If0bd069b6943486b0bd7b6a82304b082b98ad946
diff --git a/sal/CppunitTest_sal_comtools.mk b/sal/CppunitTest_sal_comtools.mk
index f26f4f8dffa1..1f9c24a0c812 100644
--- a/sal/CppunitTest_sal_comtools.mk
+++ b/sal/CppunitTest_sal_comtools.mk
@@ -17,4 +17,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_comtools,\
sal \
))
+$(eval $(call gb_CppunitTest_use_system_win32_libs,sal_comtools,\
+ole32 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sal/qa/systools/test_comtools.cxx
b/sal/qa/systools/test_comtools.cxx
index 096851c9e989..e0fc2d3e47e5 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -20,6 +20,7 @@
#include
#include
#include
+#include
class COMObject : public IUnknown
{
@@ -179,30 +180,36 @@ namespace test_comtools
void test_query_interface()
{
-try
-{
-sal::systools::COMReference r1 = comObjectSource();
-sal::systools::COMReference r2 =
r1.QueryInterface(IID_IUnknown);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong reference count, 2 is
expected", ULONG(2), reinterpret_cast(r2.get())->GetRefCount());
-}
-catch(const sal::systools::ComError&)
-{
-CPPUNIT_ASSERT_MESSAGE("Exception should not have been
thrown", false);
-}
+sal::systools::COMReference r1 = comObjectSource();
+sal::systools::COMReference r2;
+CPPUNIT_ASSERT_NO_THROW_MESSAGE(
+"Exception should not have been thrown",
+r2 =
r1.QueryInterface(sal::systools::COM_QUERY_THROW));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong reference count, 2 is
expected", ULONG(2),
+
reinterpret_cast(r2.get())->GetRefCount());
}
void test_query_interface_throw()
{
-try
-{
-sal::systools::COMReference r1 = comObjectSource();
-sal::systools::COMReference r2 =
r1.QueryInterface(IID_IPersistFile);
-}
-catch(const sal::systools::ComError&)
-{
+sal::systools::COMReference r1 = comObjectSource();
+CPPUNIT_ASSERT_THROW_MESSAGE("Exception should have been thrown",
+auto r2 =
r1.QueryInterface(sal::systools::COM_QUERY_THROW),
+sal::systools::ComError);
+}
+
+void test_CoCreateInstance()
+{
+if (FAILED(CoInitialize(nullptr)))
return;
+{
+// Use scope to destroy the reference before calling
CoUninitialize
+sal::systools::COMReference r;
+
CPPUNIT_ASSERT_NO_THROW(r.CoCreateInstance(__uuidof(FileOpenDialog)));
+// Immediately after CoCreateInstance, refcount must be 1;
increasing once gives 2
+CPPUNIT_ASSERT_EQUAL(ULONG(2), r->AddRef());
+r->Release();
}
-CPPUNIT_ASSERT_MESSAGE("Exception should have been thrown", false);
+CoUninitialize();
}
// Change the following lines only, if you add, remove or rename
@@ -223,6 +230,7 @@ namespace test_comtools
CPPUNIT_TEST(test_clear);
CPPUNIT_TEST(test_query_interface);
CPPUNIT_TEST(test_query_interface_throw);
+CPPUNIT_TEST(test_CoCreateInstance);
CPPUNIT_TEST_SUITE_END();
};
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b48f5710e0aa4ca23ad43ffd065f43396ad9d957 Author: Thorsten Behrens AuthorDate: Mon Mar 28 09:18:56 2022 +0200 Commit: Thorsten Behrens CommitDate: Mon Mar 28 09:18:56 2022 +0200 Bump version to 6.1.7.32 Change-Id: Ia231dfdd08583b406111adab46265fa7c45d41cc diff --git a/configure.ac b/configure.ac index 51fa1bd263df..c796a3985ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.31],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.32],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - Repository.mk
Repository.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 196e3400c6ea3246af89032ac6fef026ec4e45db Author: Thorsten Behrens AuthorDate: Sun Mar 27 12:48:46 2022 +0200 Commit: Thorsten Behrens CommitDate: Sun Mar 27 12:48:46 2022 +0200 Jumplist is windows-only Fix packaging breakage on Linux - Repository.mk also implicitely adds lib to packaging. Change-Id: I7912128afbcc177b4d66b4be975bc90331b6d67a diff --git a/Repository.mk b/Repository.mk index 49a46b454409..6a6b8bd12e06 100644 --- a/Repository.mk +++ b/Repository.mk @@ -391,7 +391,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ hyphen \ icg \ $(if $(ENABLE_JAVA),jdbc) \ - jumplist \ + $(if $(filter $(OS),WNT),jumplist) \ $(if $(ENABLE_LDAP),ldapbe2) \ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ localebe1 \
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 7d6508a8df22304d10701675c43c8b17625d8283 Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Thu Mar 24 11:37:51 2022 +0100 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132061 Tested-by: Samuel Mehrbrodt Reviewed-by: Samuel Mehrbrodt diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 899c21e4cec9..9237c35a5d31 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
Off-topic, please move to tdf-discuss or tdf-marketing (was: Hi (Formats supported by LibreOffice))
Dear Amit, dear Regis, lets please keep this list focused on technical developer discussions, so that means - discuss the code, not the market. Outreach, positioning of the product & success stories - that's on-topic on e.g. the marketing list (https://wiki.documentfoundation.org/Marketing/Mailing_List) Thanks, -- Thorsten signature.asc Description: PGP signature
Re: Hi (Formats supported by LibreOffice).
Hi Amit, your behaviour is way out of line. Please be considerate & polite. Any sort of abuse is not acceptable here. Thanks, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 62343ba171932de1e54a8a63c781b3242cfcc26c Author: Thorsten Behrens AuthorDate: Wed Mar 16 19:15:24 2022 +0100 Commit: Thorsten Behrens CommitDate: Wed Mar 16 19:15:24 2022 +0100 Bump version to 6.4.0.6 Change-Id: Ibeef3d390985232ea12bbbf6df5478323201a923 diff --git a/configure.ac b/configure.ac index 1a0305742346..32ee34f50ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.5],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.6],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
Re: Ideas for improving DevGuide
Regina Henschel wrote: > I think, that multiple languages are needed. Especially Java and Basic are > needed. > I concur. Python would be a nice addition though. For extension authors, we should definitely discourage c++ use. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-5'
Tag 'cib-6.4-5' created by Thorsten Behrens at 2022-02-28 11:06 + Release LibreOffice powered by CIB 6.4-5 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmIcrMlfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/h7WQ//WbaF8bz8cMVsDNjirT6CdOw+ZwPWpUwb/U6dj6qgx0pwAs9yZ0U9cVEv RoHMdxjGiPPkE0WzxhnEsYvIe+GGYFt7AGH3AP0oQJbHPG/LiRe3eZ5t9H/dFQ+L 1Ee9Br6KDuUxEJHimZNfF9G96cjOqAj9ydgry2KnS+OZkzbNY1y/TaXPHpBfia6V pag1i6Q07ouGyrcHsd1pPU2Jp1kQzpUMalyQavhROUzhqTpA21KLup3JAgzcNGvN S6K8Q/EScFEHjxFVvnZT1uwXOVBE4gztqlriMH88aDy4f1S4yMo7LhMbT0lYr3v0 HiSPA1fcTVmWkMN89t0Ji9s6PVam/z0k444c3riHtCWUOTuK9c6C7hajNHvN2sq2 /U9lCO8NaaVqf53xUmP3w+MZQNjFENfj9TaAJ1znTRbp4/GwZG4UtRZPeY4kPBoX 4IyweRLWd9CB20nf9MMpahn93lqB88Tj1P2ANFvzx37wT3fK0sUzlOZG0kI7EWr/ hhTJIsEOhLB99SbCnSEu7U+ue3wn6J7wCDQBQi8taIlLcSByPq8Qfpz8XCfINrv4 6mQ7WwbLNH9knRLD+6w2fl/8yWoJGFccDvCAI+PwAUNyVmqy7brxBfZ5b+aOlm6+ a8zp2wcdmxXVvjCQVFhr5kR31EeGxauugnBey4C6wX4fFewrmmc= =R2Ld -END PGP SIGNATURE- Changes since cib-6.4-4-17: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-31'
Tag 'cib-6.1-31' created by Thorsten Behrens at 2022-02-28 09:49 + Release LibreOffice powered by CIB 6.1-31 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmIcmpVfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/hkkg/5AbQAddS3mvuFSkswoWP1b2hSW8LNtjFAU1ETXtQjVKZMJFFolEmek/eR kDEwfVu7iNwBO9XSU1LlR/totAgspENAZgIZo1mceSpxmuFwgr/PUpmeo2Mc5ZIw QAbOCWGB5hqSUe1E5OYa+Nhq250KLJ1xqwLzQW+s5JNeWeL3U2fQbOCra0pRxVOM 11fGbhaU8A0DOlEqTesfZDGrEx5lXgULN7Ig8Ge+6Ot2vbbGzVj7/Yop0TV30GBv YbAH2YksIsR4tKlHssdgN1nlVyvDTL8pfjsUYQnLwAct795eEXMTcrFQRHrG5nZu 0/iSUSSy2BqsNNe71KFZlge/79XKdXi2iCHIZbxIw0jwekp+/ChBritTjMC3wWBI bqnWIa5sFsNL2c0k9kY0ps1bpKMSsFxl/amgVAK6NOq1LRHvmhI3PUwq6lXIDuGF +7czac/JmAe0Nckgd5Wtgx0VkONFWYm+S2JV7NdQewgz5l04b9Or0umKhz6fgZvH TxwvSMSqd4SpHmMG/59FqJo+D0RgYMGPOGcMRlQ+F0NhK+qcEg4ROITL9x8Yrqjn gSrNWn1HQafEVXOjUpdghdCEGI+IH8n1cyqqcBfR5jm1tE3nlTu7UPWM7xhgPX+B c5W1fSQYcKt5y7+/cDIHD6FjxV6OEq+aoTXOoMxqnRKmbZf0RT4= =4xYz -END PGP SIGNATURE- Changes since cib-6.1-30-19: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 38b0f36eef3a48a2b1ecbca91cb8fc396e2e4ad3 Author: Thorsten Behrens AuthorDate: Thu Feb 24 19:09:29 2022 +0100 Commit: Thorsten Behrens CommitDate: Thu Feb 24 19:09:29 2022 +0100 Bump version to 6.1.7.31 Change-Id: I90b21d25ee257d06eaa66ee3b4a75333145cd811 diff --git a/configure.ac b/configure.ac index 62579de3b8b7..51fa1bd263df 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.30],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.31],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55b70f54925603b044f2dd40b516f55fafdde735 Author: Thorsten Behrens AuthorDate: Thu Feb 24 19:08:23 2022 +0100 Commit: Thorsten Behrens CommitDate: Thu Feb 24 19:08:23 2022 +0100 Bump version to 6.4.0.5 Change-Id: Idc378f605aab6d8a65568c8553c411f574319f2a diff --git a/configure.ac b/configure.ac index 796a02f2e30a..338c8b881065 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.4.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.5.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-29'
Tag 'cib-6.1-29' created by Thorsten Behrens at 2022-02-21 09:38 + Release LibreOffice powered by CIB 6.1-29 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmITXY1fFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/jF1hAAq/YlK2HbytIihjKIlUn7lIoy6QrTWA+EjyIYGNlZLaP5ewIxvx3+h4ap W/FVD6bpCCHjlidXxI0GPYl/fp81MnjFHnjiDh4o0SfIMrS/esUebwWkzugY3IOu kUk6K1LNJNwflgqvm6SdKUbsR0uK3CC29XK1yW5a5jyrm04JtHwQaesNFtUKgVXW o8prj7oyR3W5uHiJqqj0ptiX1JCW8EMfQ2uVRnLD1ZK2oE7bQR8gtdac9d6IqZ6x DsWQTAnRrMDkpfLwRttB4YxKxRNN/RfYvof7+0lZ9MqL5HfBx4kF27+SikziZ/kv q33SDd672t38C6rbSypUXdMkaVuMhJlNhg8n8aluYzJ3EsBd1zKJNW3W/awHYx1S ryuHM69azhxApz20ZgLwrHTNFFwirvAR3wiHkJ7Xu33fxBv+kI3FdlqZRsqYkbg2 D0RJge//5pAJBMmmxfiUY2bZNdiDNc7PrKfLnfCCbmTGiWcQ0++0s6LbSM4ygsiJ EJgo8wxWNdyJkzUYNK73ffTyzKye3QFI7C+5ihA9LMKkKj6RAseNun+A7SZem64E h685MKwAYE/4eP/L+rFQdgB43G5KQum94MEB23H3lhrlSTjuIfLJ3BPmDnUXm/bV ZfkooNPPgZjO0lsM1I0nqhvVWZpDty6zMpZjFCZJOIFBXCZpnjo= =riKH -END PGP SIGNATURE- Changes since cib-6.1-28-4: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-30'
Tag 'cib-6.1-30' created by Thorsten Behrens at 2022-02-21 09:38 + Release LibreOffice powered by CIB 6.1-30 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmITXahfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/gYlA//ZSstNzPmtKJ7RfdGas2BbqSfM/M1lbOekr1jpuV/FIC1e7sW0bK/T/u/ 1FgeccjsT0G4KkgUPxkzqEe4IGqMa/5MQtvx2MIRSbTRa8Kf7pW9JxLgv0PwJlEb 57gwY9/9ugu8fx225mR/0q8Eq/xbvBe6m/2fny1YMYiogFYWqA6qE5p8TQmEwJtG HCI+17Bbj5od6I/v8kspminYsdQ0i4UTSx0x+IW/xneWFObZce1KAJ4DlgWrTy2L HPtCPpgrn1DgQ07c7yaFoheY9O7cUUQ9evc0haWQyhaxqu9PsYmXuSSSToBGCacZ mecFj+KmvyeBN6rYsvR3fg32UsgyYioHL1F+szNxwF2PDq6KsocFvGDOYdAC5/16 JLe9EKw4XJhsWqCoCVX5UeuHFwwc69WwRdfLOVSKU5f09Y3FvzQCdmpEEfUf0S8c kcHi1+1WV2dppZQkcX4zDY4wzaVFY2ZhDQk2XU7LHb/g/hIVVgyUQ6gMZqmwx3Jq OlsX1hORqWAig8crpAUQuagV0cespMG1QERmT0mN5IRFmooBdqEjwOVG4gR+/xMI ScF630xkC932u7Vw7SdIdU1lV0YRFOzASfSg6cVxbmdOm4Upt3PuaRGuz2JPDRWR x5TJNUX34cEt36YouAzXMReWNft9Udb7XE/8aU0ufekugy5E2Zw= =6At+ -END PGP SIGNATURE- Changes since cib-6.1-28-17: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-4'
Tag 'cib-6.4-4' created by Thorsten Behrens at 2022-02-21 10:13 + Release LibreOffice powered by CIB 6.4-4 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmITZbpfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/iTRA//Spzi5ypgspG5xn32J1ohJerEXDc7/FAzVA9SIYzvyDb+ZzBzIgow9WDx DwQsjn1G8Ni9t9MAIVhflf6VdFA2JCUgZLr1pu5L3oA3Vx+gWeea4roCxhnMgSqG uVl6sZ8h6PSJ5FFX7gbRXEAFxyQCprkhw2amZkO8pcFjV5zT3rcMBzDJ3OZEQYs2 RAbr1m5FUwth3U1IzPosRVZ3+TGyzuED3M/CX8HiCFHtmGSCsQLS7uCyKN3bSHCp xRqVC1AB0K8asYnraQo4RiddkBoxTTalNfXyKha1zzcQP/m1Y7uOvL9u/SnVLQt4 /FOkGCk9AmlctOZbpKptcMLNM09J6FAIT3gwlwdF7A+mrQSWSpc+Gp78p4z/ofjT duXj1TAH/PqYxFD0lIGB2rN5CvMbugtilgHuUW/dzEKsrIoEmLSZyULUgGmFD23a 8BztPwg2TH8VGYS/s1mtUEwM7fFFb8I9ccXDCbZQTGtvB2m/5/WQvcb9IdDuo7Ow Y80uFT1m6lpLOIUxSxqc5Yp26iiyqLmqQY49Bsmot3p/f4J+2KQh/GnFFmWR+N62 x/g7v2LN9T6XtG3R4+LcRTe0IyngROpj1IuKmhs7z9kQ4sW7ZsdGFBD9IEZP7tkS 4C95aVEeX5kuESx00DN3E/f43GPYB9OEZ75gSVU5/pLM4YudjtY= =Z4vT -END PGP SIGNATURE- Changes since cib-6.4-3-23: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'feature/coverrest-featuretests' - sw/CppunitTest_sw_odffeatures.mk sw/Module_sw.mk sw/qa
Rebased ref, commits from common ancestor:
commit c4d42e0a37b761c5d35bd14ff4c395f13dde8553
Author: Thorsten Behrens
AuthorDate: Sun Feb 20 15:41:01 2022 +0100
Commit: Thorsten Behrens
CommitDate: Sun Feb 20 17:06:28 2022 +0100
sw: add ODF-based feature test files
Start with a set of very basic text processing features, where each
test triggers one and only one high-level, user-visible feature
(like rendering bold text).
Change-Id: I08f66a67e8b5fe4af030415553c073242f965dfc
diff --git a/sw/CppunitTest_sw_odffeatures.mk b/sw/CppunitTest_sw_odffeatures.mk
new file mode 100644
index ..c1b6e562c4f9
--- /dev/null
+++ b/sw/CppunitTest_sw_odffeatures.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_odffeatures))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_odffeatures))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_odffeatures, \
+sw/qa/extras/odffeatures/basicodffeatures \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_odffeatures, \
+comphelper \
+editeng \
+cppu \
+cppuhelper \
+sal \
+ svt \
+ sfx \
+ svl \
+ sw \
+ swqahelper \
+test \
+unotest \
+vcl \
+tl \
+ utl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_odffeatures,\
+ boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_odffeatures,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+ -I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_odffeatures,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_odffeatures))
+$(eval $(call gb_CppunitTest_use_vcl,sw_odffeatures))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_odffeatures,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_odffeatures))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index baaafcbc5b76..701237c3348d 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_odfexport \
CppunitTest_sw_odfexport2 \
CppunitTest_sw_odfimport \
+CppunitTest_sw_odffeatures \
CppunitTest_sw_txtexport \
CppunitTest_sw_txtencexport \
CppunitTest_sw_txtimport \
diff --git a/sw/qa/extras/odffeatures/basicodffeatures.cxx
b/sw/qa/extras/odffeatures/basicodffeatures.cxx
new file mode 100644
index ..5fd26946ae43
--- /dev/null
+++ b/sw/qa/extras/odffeatures/basicodffeatures.cxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+
+class Test : public SwModelTestBase
+{
+public:
+Test() : SwModelTestBase("/sw/qa/extras/odffeatures/data/", "writer8")
{}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, loadPlainODT)
+{
+load(mpTestDocumentPath, "text_plain.odt");
+CPPUNIT_ASSERT_EQUAL( 1, getPages() );
+}
+
+CPPUNIT_TEST_FIXTURE(Test, loadBoldTextODT)
+{
+load(mpTestDocumentPath, "text_bold.odt");
+CPPUNIT_ASSERT_EQUAL( 1, getPages() );
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/odffeatures/data/text_bold.odt
b/sw/qa/extras/odffeatures/data/text_bold.odt
new file mode 100644
index ..d899017328b1
Binary files /dev/null and b/sw/qa/extras/odffeatures/data/text_bold.odt differ
diff --git a/sw/qa/extras/odffeatures/data/text_plain.odt
b/sw/qa/extras/odffeatures/data/text_plain.odt
new file mode 100644
index ..fa55c4c4522d
Binary files /dev/null and b/sw/qa/extras/odffeatures/data/text_plain.odt differ
[Libreoffice-commits] core.git: Changes to 'feature/coverrest-featuretests'
New branch 'feature/coverrest-featuretests' available with the following commits: commit 522679bff5f76fcfd918ca374c5701b73607274b Author: Thorsten Behrens Date: Sun Feb 20 15:41:01 2022 +0100 sw: add ODF-based feature test files Start with a set of very basic text processing features, where each test triggers one and only one high-level, user-visible feature (like rendering bold text). Change-Id: I08f66a67e8b5fe4af030415553c073242f965dfc
[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721c' - 145 commits - basic/source chart2/source comphelper/source compilerplugins/clang configure.ac connectivity/source cui/source dbacce
422e0ad9fe10
Author: Thorsten Behrens
AuthorDate: Sat Feb 12 12:17:20 2022 +0100
Commit: Thorsten Behrens
CommitDate: Sat Feb 12 12:17:20 2022 +0100
Merge remote-tracking branch 'origin/libreoffice-7-2' into
feature/cib_contract6721c
Update to upstream branch HEAD for 7.2.6 pre
commit 422e0ad9fe102ac44466acc6a1748f967d61246b
Author: Caolán McNamara
AuthorDate: Fri Feb 11 14:54:45 2022 +
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Feb 11 19:57:23 2022 +0100
Resolves: tdf#147325 "Edit in SQL View" should accept tab
Change-Id: I286281c317c30e5c189747f2d4844a0d5dd0828f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129830
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx
b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 600f18c20300..653d9c5f2952 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -40,6 +40,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow*
pParent, OQueryController&
m_xSQL->DisableInternalUndo();
m_xSQL->SetHelpId(HID_CTL_QRYSQLEDIT);
m_xSQL->SetModifyHdl(LINK(this, OQueryTextView, ModifyHdl));
+m_xSQL->SetAcceptsTab(true);
m_timerUndoActionCreation.SetTimeout(1000);
m_timerUndoActionCreation.SetInvokeHandler(LINK(this, OQueryTextView,
OnUndoActionTimer));
commit 63fcec3105b060cffde5e94fe688c8a59418e4c0
Author: Caolán McNamara
AuthorDate: Fri Jan 28 11:34:23 2022 +
Commit: Caolán McNamara
CommitDate: Fri Feb 11 17:53:34 2022 +0100
use our own tempfile mechanism
Change-Id: Ie7853ea8bd083d1056872cfad4323ff6cede235f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129071
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 45c15e1112e03b8b211ed0968ed1b16d5ed4ddfe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129758
diff --git a/hwpfilter/source/htags.cxx b/hwpfilter/source/htags.cxx
index d0a7d772ce15..7ff67b8b2016 100644
--- a/hwpfilter/source/htags.cxx
+++ b/hwpfilter/source/htags.cxx
@@ -19,6 +19,9 @@
#include "precompile.h"
+#include
+#include
+
#include
#include "hwplib.h"
@@ -106,27 +109,20 @@ void OlePicture::Read(HWPFile & hwpf)
delete [] data;
return;
}
-FILE *fp;
-char tname[200];
-wchar_t wtname[200];
-tmpnam(tname);
-if (nullptr == (fp = fopen(tname, "wb")))
-{
- delete [] data;
- return;
-}
-fwrite(data, size, 1, fp);
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+
+SvFileStream aOutputStream(aTempFile.GetURL(), StreamMode::WRITE);
+aOutputStream.WriteBytes(data, size);
delete [] data;
-fclose(fp);
-MultiByteToWideChar(CP_ACP, 0, tname, -1, wtname, 200);
-if( StgOpenStorage(wtname, nullptr,
+aOutputStream.Close();
+if( StgOpenStorage(o3tl::toW(aTempFile.GetFileName().getStr()), nullptr,
STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED,
nullptr, 0, &pis) != S_OK ) {
pis = nullptr;
- unlink(tname);
return;
}
-unlink(tname);
#else
hwpf.SkipBlock(size);
#endif
commit d0df2d899c602f165bfcc9239b3ba6504069671c
Author: Stephan Bergmann
AuthorDate: Tue Feb 8 20:57:10 2022 +0100
Commit: Stephan Bergmann
CommitDate: Fri Feb 11 15:13:55 2022 +0100
Remove COMPILER_PLUGINS_CXX from
distro-configs/Jenkins/linux_clang_dbgutil_64
It had originally been added with e754d0931ca75403647cc16100edd98e7e5ceadb
"Remove CXXFLAGS_CXX11 from Clang plugin compilation", so "if
COMPILER_PLUGINS_CXX is not set, simply default it to g++ instead of trying
to
construct an acceptable CLANGCXX value from CXX (which would be Clang).
(The
problem with using Clang without CXXFLAGS_CXX11 is that Clang, unlike GCC,
typically defaults to C++03, but building compilerplugins requires C++11 at
least. That would cause e.g. the Gerrit/Jenkins linux_clang_dbgutil_64
builds
to fail---but which also needs COMPILER_PLUGINS_CXX to be explicitly set to
'g++
-std=c++11' as GCC on those machines is still 4.8.5 defaulting to C++03."
But
that should no longer be an issue with contemporary Clang, which defaults
to >=
C++11 for quite a while now.
On the other hand, when trying to update the Clang used by
<https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/> from 5.0.2 to
12.0.1, and adding
> export COMPILER_PLUGINS_CXX="ccache
$LODE_HOME"/opt_private/gcc-7.3.0/bin/g++
to
<https://git.libreoffice.org/lode/+/refs/heads/master/bin/linux_clang_dbgutil_64.env>
(where this setting arguably belongs, rather than in
distro-co
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 184b871473cb88d25ffc59fb0d020ba80eaf5577 Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Michael Weghorn CommitDate: Thu Feb 10 09:30:08 2022 +0100 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129748 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn (cherry picked from commit cf4f54c72bd8f2c7314a1ff457bf8e4a65e1f379) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129749 diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 899c21e4cec9..9237c35a5d31 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/gpgmepp external/libassuan external/libgpg-error
external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |2 +- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 59f893883b70dad1a7b9052ecb2b569681f8004c Author: Thorsten Behrens AuthorDate: Tue Jun 15 18:03:27 2021 +0200 Commit: Michael Weghorn CommitDate: Thu Feb 10 09:29:48 2022 +0100 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens (cherry picked from commit 9fafa67c9bc85d9e5a13d18b7b7ecbc8de700c04) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129750 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 452f922750d6..dac2fad1361b 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 83d79a520988..899c21e4cec9 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ && $(MAKE) \ ) else
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit cf4f54c72bd8f2c7314a1ff457bf8e4a65e1f379 Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Michael Weghorn CommitDate: Wed Feb 9 15:49:42 2022 +0100 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129748 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 899c21e4cec9..9237c35a5d31 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d33ec2dcf20dfa938fde26db9cf42ebbd0ffe40b Author: Thorsten Behrens AuthorDate: Mon Feb 7 10:55:13 2022 +0100 Commit: Thorsten Behrens CommitDate: Mon Feb 7 10:55:13 2022 +0100 Bump version to 6.4.0.4 Change-Id: I0e9e68d6f0f30d522e16455a20f89cd31d7c5438 diff --git a/configure.ac b/configure.ac index d6f1b0b055ce..796a02f2e30a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.3.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.4.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a228c78edb1ba04ac25ed7a451c2ae676c35bc56 Author: Thorsten Behrens AuthorDate: Mon Feb 7 10:53:36 2022 +0100 Commit: Thorsten Behrens CommitDate: Mon Feb 7 10:53:36 2022 +0100 Bump version to 6.1.7.30 Change-Id: I514fb82b114016938fc5ed715a5513073336bfd1 diff --git a/configure.ac b/configure.ac index c50eabb784c0..62579de3b8b7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.1.7.29],[],[],[https://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.1.7.30],[],[],[https://libreoffice.cib.eu/]) AC_PREREQ([2.59])
[Libreoffice-commits] core.git: include/vcl
include/vcl/weld.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6156ea35f77cc38c197fb718f2ed4bd5015a8dfa
Author: Thorsten Behrens
AuthorDate: Sat Feb 5 00:20:56 2022 +0100
Commit: Thorsten Behrens
CommitDate: Sat Feb 5 15:29:19 2022 +0100
Fix [-Wignored-qualifiers]
Change-Id: Iba8b8536be38f99b7b7447d96abad61db7b7269f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129517
Tested-by: Jenkins
Tested-by: Justin Luth
Reviewed-by: Justin Luth
Reviewed-by: Thorsten Behrens
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index d02f5b43c086..1b2ebb5f819d 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -644,7 +644,7 @@ public:
inline OUString toId(const void* pValue)
{
-return OUString::number(reinterpret_cast(pValue));
+return OUString::number(reinterpret_cast(pValue));
}
template T fromId(const OUString& rValue)
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source
sc/source/core/tool/arraysumAVX.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3f96d70ce7f31d556b995733b44cb8715b64e329
Author: Thorsten Behrens
AuthorDate: Mon Jan 31 22:45:37 2022 +0100
Commit: Xisco Fauli
CommitDate: Thu Feb 3 17:54:35 2022 +0100
Avoid calling AVX code in library static initialization
Despite 26072b8db7ba53f00c83197cb064229a76001989 and
12c6b1ef6a824b09778163ec83fc44bb196e65db, Linux builds using
RH devtoolset-7 gcc7 still hit occasional unit test crashes
with illegal instructions.
Backtrace is always:
> #0 __static_initialization_and_destruction_0 (__initialize_p=1,
__priority=65535) at core/sc/source/core/tool/arraysumAVX.cxx:20
> #1 _GLOBAL__sub_I_arraysumAVX.cxx(void) () at
core/sc/source/core/tool/arraysumAVX.cxx:112
>
So lets make sure initializer is run only on function entry.
Change-Id: I69f5cb725e4d72fb346166b21870612473f974b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129246
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit d140817428cdbb519efa496f578bf6c054c94361)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129251
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/tool/arraysumAVX.cxx
b/sc/source/core/tool/arraysumAVX.cxx
index e256248047d0..4d9ee02285e7 100644
--- a/sc/source/core/tool/arraysumAVX.cxx
+++ b/sc/source/core/tool/arraysumAVX.cxx
@@ -30,7 +30,7 @@ using namespace AVX;
*/
static inline void sumAVX(__m256d& sum, __m256d& err, const __m256d& value)
{
-const __m256d ANNULATE_SIGN_BIT
+static const __m256d ANNULATE_SIGN_BIT
= _mm256_castsi256_pd(_mm256_set1_epi64x(0x7FFF'''));
// Temporal parameter
__m256d t = _mm256_add_pd(sum, value);
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/arraysumAVX.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d140817428cdbb519efa496f578bf6c054c94361
Author: Thorsten Behrens
AuthorDate: Mon Jan 31 22:45:37 2022 +0100
Commit: Thorsten Behrens
CommitDate: Tue Feb 1 00:16:20 2022 +0100
Avoid calling AVX code in library static initialization
Despite 26072b8db7ba53f00c83197cb064229a76001989 and
12c6b1ef6a824b09778163ec83fc44bb196e65db, Linux builds using
RH devtoolset-7 gcc7 still hit occasional unit test crashes
with illegal instructions.
Backtrace is always:
> #0 __static_initialization_and_destruction_0 (__initialize_p=1,
__priority=65535) at core/sc/source/core/tool/arraysumAVX.cxx:20
> #1 _GLOBAL__sub_I_arraysumAVX.cxx(void) () at
core/sc/source/core/tool/arraysumAVX.cxx:112
>
So lets make sure initializer is run only on function entry.
Change-Id: I69f5cb725e4d72fb346166b21870612473f974b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129246
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sc/source/core/tool/arraysumAVX.cxx
b/sc/source/core/tool/arraysumAVX.cxx
index e256248047d0..4d9ee02285e7 100644
--- a/sc/source/core/tool/arraysumAVX.cxx
+++ b/sc/source/core/tool/arraysumAVX.cxx
@@ -30,7 +30,7 @@ using namespace AVX;
*/
static inline void sumAVX(__m256d& sum, __m256d& err, const __m256d& value)
{
-const __m256d ANNULATE_SIGN_BIT
+static const __m256d ANNULATE_SIGN_BIT
= _mm256_castsi256_pd(_mm256_set1_epi64x(0x7FFF'''));
// Temporal parameter
__m256d t = _mm256_add_pd(sum, value);
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - config_host.mk.in configure.ac external/gpgmepp external/libassuan external/libgpg-error solenv/gbuild
config_host.mk.in |1 - configure.ac |1 - external/gpgmepp/ExternalProject_gpgmepp.mk |2 +- external/libassuan/ExternalProject_libassuan.mk |3 ++- external/libgpg-error/ExternalProject_libgpg-error.mk |2 +- solenv/gbuild/platform/com_MSC_class.mk |4 solenv/gbuild/platform/com_MSC_defs.mk| 16 7 files changed, 4 insertions(+), 25 deletions(-) New commits: commit c5891e585112b20a5132da25342a6bda119254e8 Author: Thorsten Behrens AuthorDate: Tue Jun 15 18:03:27 2021 +0200 Commit: Thorsten Behrens CommitDate: Thu Jan 27 22:39:53 2022 +0100 avoid windres preprocessor quoting-messups with current cygwin apparently fresh installs of cygwin behave differently with the windres command's quoting and treats --preprocessor='cpp foo bar' as a single file "cpp foo bar" to run instead of running "cpp" with the arguments "foo" and "bar". (-D and -I options are passed to the preprocessor automatically, so no need to prefix those with --preprocessor-arg) Conflicts: - solenv/gbuild/platform/com_MSC_defs.mk Change-Id: I711e968206f0769ff07152ebb9572e8b71c30cec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114965 Tested-by: Jenkins Reviewed-by: Georgy Litvinov Reviewed-by: Christian Lohmaier (cherry picked from commit 9b120ad2773676c5445d4664e9c7007c575249a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127097 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens (cherry picked from commit 9fafa67c9bc85d9e5a13d18b7b7ecbc8de700c04) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127058 diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 452f922750d6..dac2fad1361b 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \ $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \ --host=$(gb_ExternalProject_gpgmepp_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_gpgmepp_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index f137452ed35a..9237c35a5d31 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \ --host=$(gb_ExternalProject_libassuan_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libassuan_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)' \ MAKE=$(MAKE) \ && $(MAKE) \ ) diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..e5155aad94c1 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut --disable-doc \ --disable-tests \ --host=$(gb_ExternalProject_libgpg-error_host) \ - RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ + RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor=$(call gb_Executable_get_target,cpp) --preprocessor-arg=-+ -DRC
Re: About removing Beanshell/Javascript (Rhino) ?
Stephan Bergmann wrote: > You mean the BeanShell scripting, with an editor window (with a > "Run" button) via "Tools - Macros - Organize Macros - BeanShell... - > Edit"? Removal of which is what this thread is about. > Aye. > Someone would need to create such an extension, then. (Assuming > that it's actually possible to provide such scripting backends > through extensions, but I strongly assume it is.) > Right. I mean, removing the stuff is also work, that someone's gotta do. It's possible that its not worth it; what I would still suggest is to look at the area (developer/power user/automation stories) a bit more holistically. Beyond Basic, our dev story for integrating & scripting is not great, and it ain't getting better by removing options. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 18a0b619706ef84bb0a1b28f5488711817c2 Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Andras Timar CommitDate: Mon Jan 24 20:38:55 2022 +0100 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128876 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index e4e24aeac7fd..b55ffed5116d 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -31,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
Re: About removing Beanshell/Javascript (Rhino) ?
Stephan Bergmann wrote: > As always, hard to tell if anybody is actually using this. > FWIW, I find this Java REPL thingit very useful (is it called Groovy?) for rapid prototyping of Java code. There's a (very basic) editor for that buried in the macro dialog. Whether that's something that needs to remain in core, or can be just shunted into an extension, I've got no strong opinions on. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/wasm' - README.md
README.md |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8751d4e79a7056c5f7e53e7039d9b470567f8b28 Author: Thorsten Behrens AuthorDate: Sat Jan 15 12:58:16 2022 +0100 Commit: Thorsten Behrens CommitDate: Sun Jan 23 01:42:47 2022 +0100 Adjust ptr to WASM readme Change-Id: If0acc2791c07cdd0d3ab376e5a54f4e52105907e diff --git a/README.md b/README.md index 4052f0580c08..d460a4f6c68f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ run and compile LibreOffice, also used by the TDF builds: * Emscripten / WASM: * Runtime: a browser with SharedMemory support (threads + atomics) * Build: Qt 5.15 with Qt supported Emscripten 1.39.8 -* See README.wasm +* See static/README.wasm.md If you want to use Clang with the LibreOffice compiler plugins, the minimal version of Clang is 5.0.2. Since Xcode doesn't provide the compiler plugin
[Libreoffice-commits] core.git: config_host.mk.in configure.ac instsetoo_native/CustomTarget_install.mk solenv/bin
config_host.mk.in |1 +
configure.ac | 10 ++
instsetoo_native/CustomTarget_install.mk |1 +
solenv/bin/modules/installer/download.pm |2 +-
solenv/bin/modules/installer/epmfile.pm |4 ++--
solenv/bin/modules/installer/globals.pm |2 ++
solenv/bin/modules/installer/helppack.pm |2 +-
solenv/bin/modules/installer/languagepack.pm |2 +-
solenv/bin/modules/installer/parameter.pm |2 ++
solenv/bin/modules/installer/simplepackage.pm |2 +-
solenv/bin/modules/installer/worker.pm|2 +-
11 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit b8278d93bbf8c63e283024783da32f84f7e4f246
Author: Thorsten Behrens
AuthorDate: Sat Jan 15 16:24:33 2022 +0100
Commit: Thorsten Behrens
CommitDate: Sat Jan 22 10:14:23 2022 +0100
Make installer compression tool configurable
So we can use pigz or other parallelizable tools if available. Shaves
off noticeable build time when packaging install sets.
- figure out if pigz is available (fallback to gzip otherwise)
- pass compression tool down into make_installer
- and handle as one of many global options there
Change-Id: Ia9d1ea27a9f990874238b6f0be3e1fd30a662ec6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128469
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/config_host.mk.in b/config_host.mk.in
index 193406c8fbc9..f512e719ee6c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -85,6 +85,7 @@ export COMPILER_PLUGINS_CXXFLAGS=@COMPILER_PLUGINS_CXXFLAGS@
export COMPILER_PLUGINS_CXX_LINKFLAGS=@COMPILER_PLUGINS_CXX_LINKFLAGS@
export COMPILER_PLUGINS_DEBUG=@COMPILER_PLUGINS_DEBUG@
export COMPILER_PLUGINS_TOOLING_ARGS=@COMPILER_PLUGINS_TOOLING_ARGS@
+export COMPRESSIONTOOL=@COMPRESSIONTOOL@
export COM_IS_CLANG=@COM_IS_CLANG@
export CPPU_ENV=@CPPU_ENV@
export CPPU_ENV_FOR_BUILD=@CPPU_ENV_FOR_BUILD@
diff --git a/configure.ac b/configure.ac
index 53b2323a2c09..d657aed4a01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2916,6 +2916,16 @@ if test -z "$BASH"; then
fi
AC_SUBST(BASH)
+# prefer parallel comression tools, if available
+AC_PATH_PROG(COMPRESSIONTOOL, pigz)
+if test -z "$COMPRESSIONTOOL"; then
+AC_PATH_PROG(COMPRESSIONTOOL, gzip)
+if test -z "$COMPRESSIONTOOL"; then
+AC_MSG_ERROR([gzip not found in \$PATH])
+fi
+fi
+AC_SUBST(COMPRESSIONTOOL)
+
AC_MSG_CHECKING([for GNU or BSD tar])
for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
$a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 1dd705217c63..0dab73ad904c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -85,6 +85,7 @@ $(foreach pkgformat,$(5),\
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \
-u $(instsetoo_OUT) \
+ -packer $(COMPRESSIONTOOL) \
-buildid $(if $(filter deb0
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
-msitemplate $(dir $@)msi_templates \
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index b0e414abbd06..ca270fe563a9 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -520,7 +520,7 @@ sub create_tar_gz_file_from_directory
unlink("$installdir/install");
}
-my $systemcall = "cd $changedir; $fakerootstring tar -cf - $packdir | gzip
> $targzname";
+my $systemcall = "cd $changedir; $fakerootstring tar -cf - $packdir |
$installer::globals::packertool > $targzname";
my $returnvalue = system($systemcall);
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 7a1f5fd94c52..ecddeb395712 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1839,7 +1839,7 @@ sub create_packages_without_epm
# Solaris: pkgmk -o -f solaris-2.8-sparc/SUNWso8m34.prototype -d
solaris-2.8-sparc
# Solaris: pkgtrans solaris-2.8-sparc SUNWso8m34.pkg SUNWso8m34
-# Solaris: tar -cf - SUNWso8m34 | gzip > SUNWso8m34.tar.gz
+# Solaris: tar -cf - SUNWso8m34 | $installer::globals::packertool >
SUNWso8m34.tar.gz
if ( $installer::globals::issolarispkgbuild )
{
@@ -1983,7 +1983,7 @@ sub create_packages_without_epm
#
# my $targzname = $packagename . ".tar.gz";
-# $systemcall = "cd $destinationdir; tar -cf - $packagename | gzip >
$targzname";
+# $systemcall = "cd $desti
[Libreoffice-commits] core.git: bridges/Library_cpp_uno.mk bridges/Module_bridges.mk bridges/source cppuhelper/source cppu/source Repository.mk
Repository.mk|2
bridges/Library_cpp_uno.mk |3
bridges/Module_bridges.mk|2
bridges/source/cpp_uno/gcc3_wasm/cpp2uno.cxx | 47 +
bridges/source/cpp_uno/gcc3_wasm/except.cxx | 22 ++
bridges/source/cpp_uno/gcc3_wasm/uno2cpp.cxx | 93 +++
cppu/source/uno/lbmap.cxx|1
cppuhelper/source/exc_thrower.cxx| 17 +++-
cppuhelper/source/paths.cxx |4 -
9 files changed, 180 insertions(+), 11 deletions(-)
New commits:
commit c367a2781f99ed22d0f7d64184fb567aacc43f35
Author: Thorsten Behrens
AuthorDate: Sat Sep 25 18:03:31 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Jan 19 14:26:09 2022 +0100
WASM UNO: add a minimal dummy bridge
... and use the same fake exception rethrowing code then the
mobile platforms.
Change-Id: Ic90de1cfd1e0092d6064d041a613d60d9f5f76b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128596
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/Repository.mk b/Repository.mk
index 895d99fbadc2..fd83898e9426 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -572,13 +572,11 @@ $(eval $(call
gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
))
$(eval $(call gb_Helper_register_plugins_for_install,PLAINLIBS_URE,ure, \
- $(if $(filter EMSCRIPTEN,$(OS)),, \
$(if $(filter MSC,$(COM)), \
$(if $(filter INTEL,$(CPUNAME)),msci_uno) \
$(if $(filter X86_64,$(CPUNAME)),mscx_uno) \
$(if $(filter AARCH64,$(CPUNAME)),msca_uno) \
, gcc3_uno) \
- ) \
))
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 7c713f7ed1f4..e2de3c1678b4 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -85,6 +85,9 @@ else ifeq ($(COM),MSC)
bridges_SELECTED_BRIDGE := msvc_win32_intel
bridge_exception_objects := cpp2uno uno2cpp
bridge_noopt_objects := except
+else ifeq ($(OS),EMSCRIPTEN)
+bridges_SELECTED_BRIDGE := gcc3_wasm
+bridge_noopt_objects := cpp2uno except uno2cpp
endif
else ifeq ($(CPUNAME),M68K)
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 1c7fb1789b8e..3016bf2c404f 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -9,7 +9,6 @@
$(eval $(call gb_Module_Module,bridges))
-ifneq ($(OS),EMSCRIPTEN)
$(eval $(call gb_Module_add_targets,bridges,\
Library_cpp_uno \
$(if $(ENABLE_JAVA),\
@@ -30,6 +29,5 @@ else ifneq ($(words $(bridges_SELECTED_BRIDGE)),1)
$(call gb_Output_error,multiple bridges selected for build:
$(bridges_SELECTED_BRIDGE))
endif
endif
-endif
# vim: set noet sw=4 ts=4:
diff --git a/bridges/source/cpp_uno/gcc3_wasm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_wasm/cpp2uno.cxx
new file mode 100644
index ..fd7fa817588a
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_wasm/cpp2uno.cxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+using namespace ::com::sun::star::uno;
+
+using bridges::cpp_uno::shared::VtableFactory;
+
+struct VtableFactory::Slot
+{
+};
+
+VtableFactory::Slot* VtableFactory::mapBlockToVtable(void* block)
+{
+return static_cast(block) + 2;
+}
+
+std::size_t VtableFactory::getBlockSize(sal_Int32 slotCount)
+{
+return (slotCount + 2) * sizeof(Slot);
+}
+
+VtableFactory::Slot* VtableFactory::initializeBlock(void* block, sal_Int32
slotCount, sal_Int32,
+
typelib_InterfaceTypeDescription*)
+{
+Slot* slots = mapBlockToVtable(block);
+return slots + slotCount;
+}
+
+unsigned char* VtableFactory::addLocalFunctions(Slot**, unsigned char*,
+
typelib_InterfaceTypeDescription const*, sal_Int32,
+sal_Int32, sal_Int32)
+{
+std::abort();
+}
+
+void VtableFactory::flushCode(unsigned char const*, unsigned char const*) {}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_wasm/except.cxx
b/bridges/source/cpp_uno/gcc3_wasm/except.cxx
new file mode 100644
index ..36778c65a11a
--- /dev/null
+++ b/bridges/source/cpp_uno/gcc3_wasm/except.cxx
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the
Re: submit a revised patch to an abandoned gerrit change
Jan-Marek Glogowski wrote: > I have the same menu, but just next to the menu button (the vertical ...), > on the left side, there is also a RESTORE button. > Might only work for own patches. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-2'
Tag 'cib-6.4-2' created by Thorsten Behrens at 2022-01-12 00:55 + Release LibreOffice powered by CIB 6.4-2 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmHeJxRfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/iHPhAAgzjImTBXg9kZ0Odh8MovF50nXfC+3Y+OY3uRkubm9TJEJ7k+eVxFjdbT vomqI0ANz+JX4TFYscnzGrsqN+fHwmLG3tCT1pryRHhEhhRff8ZDKkeU9dBH7YKs nrS1gE+RGpg6WsTqR36v1pAWMkHloGTpkrCmP9CaXxR/DXvYAw8BT5f665Qett9n kbE2YPpHsLQk5FMZCioec65rt+un4O0BTuwDHzjz1kpUQavIbhKttmsFUpwzQMlg rtAQv9GwUYYKPOldotTzkl/LohSZ8i9yYRQZxHTT3Auo+PNBvmPcFvRFZzjm66bJ bU6YcSmA1oHCEvax/cMl/a+40ZL4dVrOub6zrSl8ojbMhiRQgRYkBw4/2rucrFpF TXu8OCoBe8nnUuh+GWKFeqafykBRZ+5X4EFtrkIyFaKEjQy74WrxJ1w0AcbbAk28 Z8mh90kFNPI9DkX5/NPy9yf9OnpF0vSGpaw5s6haTysE1Ya1rU22KgTJekdsbSOL sktXKgN9amLOWSowuxM+AHPeloYDaund5yy6aHG8HZsR04hSsB5/18gTf0Pd67yR wGsFn9SAvjlOgg/rsCpB76Ig28hK/qY2gmvTvxvRvHb9mm/ww9LcoxC6vxFWEW9/ eE4z4J3QAoZlbfWj/iSx6pjV3jhOsiBqW5CBrWo8tWGrIhxIs7s= =f99s -END PGP SIGNATURE- Changes since cib-6.4-0-45: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-1'
Tag 'cib-6.4-1' created by Thorsten Behrens at 2022-01-12 00:55 + Release LibreOffice powered by CIB 6.4-1 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmHeJwFfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/hTzA/9HwjhXUmUHAPIGxl/jazYVk9dt8/TCzY5e9+zE9Xq5kzyA2tZbGSaLOKK ShicdVjdo62y7JO+lIv1uEOLolZW7/ho8fAWTXCboSrhKBPHxrsalMxLLRQQ2Bh+ q06r6n+3FH9pehiQo+2SSb6VMXgr9Lzv4C4dGXRduipmtTpwmcexPoXMy8StkBGz zj6C7VQFJWzuOX9rjkhgXsRDzx8n7KSeOVydnHsz6ofF1i5PgKMBsrIxeskP91rp V8kwJaE4UEyZYnN/MJQWu53XwXi4VXfhNBft8Wx0RUZDqCFEHGstrWYqfeDVTo4u Em96JAEh+DKf8/sPxGdfH6E1cYWLOXwiVXQru6MvUQPWgpwK6P0txUOXHxUywMfp WhhkQ1i5y8CMDQRl67dPhJ0pTpc9zT4nNG8mIyGr9mb8btBrB803vFh98WRt0H7/ EK6ThAAR4WqF+VyN5BOeDFk71gT0a3dHZSm92ZHc8FNI9lTweocSbodPsEVYySZG ZTf+WE8LA6eDHP97BQNTTbY2lW8Q0TV608ap09dAnyhneVG8cnIDKLvzywVpomkw IFaYL50yuilEuEnvlYiOQlYP0jJlXNN9KynYV3wQEywNlqt8igWXhPAeC5zyxGfS Cw+WMA0qQRMLovOEBiQu+mn+CE6q+Y29UUQUGsSHcELRwesXYN4= =0/eu -END PGP SIGNATURE- Changes since cib-6.4-0-7: --- 0 files changed ---
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-3'
Tag 'cib-6.4-3' created by Thorsten Behrens at 2022-01-12 00:55 + Release LibreOffice powered by CIB 6.4-3 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEF13c36gxow74AXmeM3dpmHHuF/gFAmHeJx9fFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE3 NUREQ0RGQTgzMUEzMEVGODAxNzk5RTMzNzc2OTk4NzFFRTE3RjgACgkQM3dpmHHu F/iZuxAAqIcLrphvSWrI5ulB4uERoiF528jz0WBihoASuuq/UriQvwvxrJVA+dU/ 81F/3CYN3W0GCobVm5/G5Xc4dHNH9Ze69+9qikGrIm7ZSQ3pbw2+5ALrS1UbYrHm zH5X7Gz8HCDHWoxWp/dnI1WT9e7y3OyInPI8uCm5VOlyea7c3e6oapmYUCbFfiO4 Mt6jDdqJJt5ide8y2up+1ecIL3/ZHZQUziRcPPRz04QmI+rU1/XYNvETaMWwXB51 4ZoZ63gilR0dGs1F/R/cy0wQ0Ov35G+py8/inhC8id8XDEcONses+TapSHdHXWt6 4iba0gFHtQQP0hjDGloX6mtnwYnjJ7hibcDcqGYa5mEozzDpsD8al1zxoxbTnguk wULX/xUZJfLXswymnDtYYRZevAeCuEOx5EFXdvsx/D61OkLVwYE3blwMeE5BcHcI bz8gc8B3o29PqfOQkcmi2FXwweE6dRhGMfCfrualqfHIi7++C5LfXXlmTtP6zr9b cMtzk9DVCn4k6S6tn3SrVaXBGkrI95WJCjbXO/blYUURikm/sfm5N3tarKXQe6tB OMGy73bpqsh4bbRVv/rwPcm2qRkyzwaRJp16prF5d58UpCIiFTaNUILGpS9gMFZ6 6aEKUCSFki6p8fHR+rJB7/2k29SXojEhUFAeMfIkrYkR/MLorTA= =SEWZ -END PGP SIGNATURE- Changes since cib-6.4-0-55: --- 0 files changed ---
Re: tdf#140286 - CALC formula =INFO("OSVERSION") gives wrong output
Hi Chris, Chris Sherlock wrote: > 1. What should the Linux version of this function provide? > My 2 cents - if it ain't broken, don't fix it. People might (unreasonably) rely on what's returned there as of today, so why touch it? Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Question about cppuhelper/compbase and other compbase1/2/.../12
Julien Nabet wrote: > So it means we could at least use of compbase.hxx internally, then put > compbase.hxx in deprecated. > Yep. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - download.lst external/libassuan
download.lst|4 ++-- external/libassuan/ExternalPackage_libassuan.mk |2 +- external/libassuan/w32-build-fixes.patch.1 |5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 4f76a8329a8cc31fac1e4a9ee6f4658a6802b854 Author: Thorsten Behrens AuthorDate: Tue Dec 28 21:47:55 2021 +0100 Commit: Caolán McNamara CommitDate: Sat Jan 8 20:00:18 2022 +0100 Update libassuan to 2.5.5 Change-Id: Icd1034f4c6b43605f5d43fe28f7e0d191311daf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127664 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 568a5bba2a30ab588b52677106bf209d4c0df758) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128084 Reviewed-by: Caolán McNamara diff --git a/download.lst b/download.lst index e7aed759c8ee..854cd3d1a238 100644 --- a/download.lst +++ b/download.lst @@ -146,8 +146,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 export LCMS2_TARBALL := lcms2-2.12.tar.gz -export LIBASSUAN_SHA256SUM := 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 -export LIBASSUAN_TARBALL := libassuan-2.5.3.tar.bz2 +export LIBASSUAN_SHA256SUM := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +export LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2 export LIBATOMIC_OPS_SHA256SUM := 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk index 7a08028adbdd..0f24e5e2dec4 100644 --- a/external/libassuan/ExternalPackage_libassuan.mk +++ b/external/libassuan/ExternalPackage_libassuan.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.3)) +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.5)) else ifeq ($(OS),MACOSX) diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1 index cac6ea1045bc..ebf98c5f5093 100644 --- a/external/libassuan/w32-build-fixes.patch.1 +++ b/external/libassuan/w32-build-fixes.patch.1 @@ -33,13 +33,14 @@ diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -@@ -148,9 +148,9 @@ +@@ -148,10 +148,10 @@ $(DESTDIR)$(bindir)/gpgcedev.dll endif +mkheader$(EXEEXT): mkheader.c Makefile -mkheader: mkheader.c Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c +assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h) + ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - config_host/config_gpgme.h.in configure.ac download.lst external/gpgmepp xmlsecurity/source
config_host/config_gpgme.h.in |
3
configure.ac|
3
download.lst|
4
external/gpgmepp/ExternalPackage_gpgmepp.mk |
4
external/gpgmepp/UnpackedTarball_gpgmepp.mk |
2
external/gpgmepp/add-minimal-keyexport.patch|
68 --
external/gpgmepp/find-libgpg-error-libassuan.patch |
29
external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 |
30
external/gpgmepp/w32-build-fixes.patch.1|
9 +
external/gpgmepp/w32-fix-win32-macro.patch.1|
3
xmlsecurity/source/gpg/CertificateImpl.cxx |
7 -
11 files changed, 17 insertions(+), 145 deletions(-)
New commits:
commit e0721a655ca69d699024fd91da7071da0485b218
Author: Thorsten Behrens
AuthorDate: Tue Dec 28 22:15:51 2021 +0100
Commit: Caolán McNamara
CommitDate: Sat Jan 8 15:52:25 2022 +0100
Update gpgme to 1.16.0
* remove GPGME_CAN_EXPORT_MINIMAL_KEY, upstream now has support for
key export flags in c++ wrapper (gpgmepp >= 1.14)
* therefore, external/gpgmepp/add-minimal-keyexport.patch now fully
obsolete, tweaked xmlsecurity code to use upstream function
* bits of external/gpgmepp/find-libgpg-error-libassuan.patch are
upstream now (configure and makefile pieces, though we keep
configure.ac changes for the while - to not pick up system versions
too easily)
*
external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1
was from upstream anyway, removed
Change-Id: I991c20c0eeff0f9135e97c991afcb905be55a959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127665
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 78dae8b20b85686d1a642415195d2e10fbb2dc1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128085
Reviewed-by: Caolán McNamara
diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index 3c483d08f564..ead3ca7bc2b9 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -26,9 +26,6 @@
# include "config_lgpl.h"
#endif
-// Defined if gpgme supports exporting minimal key.
-#define GPGME_CAN_EXPORT_MINIMAL_KEY 0
-
#undef GPGME_GPGCONF
#endif
diff --git a/configure.ac b/configure.ac
index aca958768d0a..ce82177fa691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12443,7 +12443,7 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o
"$_os" = "WINNT" ; then
# 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
development package])], [])
+[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 ],
@@ -12453,7 +12453,6 @@ elif test "$_os" = "Linux" -o "$_os" = "Darwin" -o
"$_os" = "WINNT" ; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
-AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
diff --git a/download.lst b/download.lst
index d7e47f661dda..e7aed759c8ee 100644
--- a/download.lst
+++ b/download.lst
@@ -100,8 +100,8 @@ export FREETYPE_SHA256SUM :=
8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce
export FREETYPE_TARBALL := freetype-2.11.0.tar.xz
export GLM_SHA256SUM :=
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
export GLM_TARBALL := glm-0.9.9.8.zip
-export GPGME_SHA256SUM :=
c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
-export GPGME_TARBALL := gpgme-1.13.1.tar.bz2
+export GPGME_SHA256SUM :=
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
+export GPGME_TARBALL := gpgme-1.16.0.tar.bz2
export GRAPHITE_SHA256SUM :=
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
export HARFBUZZ_SHA256SUM :=
d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
diff --git a/external/gpgmep
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - download.lst external/libgpg-error
download.lst |4 -
external/libgpg-error/ExternalPackage_libgpg-error.mk |2
external/libgpg-error/w32-build-fixes-5.patch | 64 +-
3 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit fdfd132dc2f596472f0dfd99f7acd2a3d6509527
Author: Thorsten Behrens
AuthorDate: Tue Dec 28 21:45:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Sat Jan 8 15:51:44 2022 +0100
Update libgpg-error to 1.43
Change-Id: Iecd4a131f9c5b43bb03c5f9c4b6c7efe36e443aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127663
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 7d50d74d0a10b4811b82f66dc5ac5a696c2974c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128083
Reviewed-by: Caolán McNamara
diff --git a/download.lst b/download.lst
index 9c1a2b216b01..d7e47f661dda 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export LIBEXTTEXTCAT_SHA256SUM :=
6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25
export LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
export LIBFFI_SHA256SUM :=
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
export LIBFFI_TARBALL := libffi-3.3.tar.gz
-export LIBGPGERROR_SHA256SUM :=
b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
-export LIBGPGERROR_TARBALL := libgpg-error-1.37.tar.bz2
+export LIBGPGERROR_SHA256SUM :=
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
+export LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
export LIBLANGTAG_SHA256SUM :=
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
export LIBNUMBERTEXT_SHA256SUM :=
db9060d208501bd7bc06300a55d8489d29dd560ee0fbbd0f41b78af56816680c
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 1d9c016e09df..7ee849d2369c 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
-$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.28.0))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.32.1))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/w32-build-fixes-5.patch
b/external/libgpg-error/w32-build-fixes-5.patch
index 2633df9ee6c9..8a65cedea2da 100644
--- a/external/libgpg-error/w32-build-fixes-5.patch
+++ b/external/libgpg-error/w32-build-fixes-5.patch
@@ -1,3 +1,19 @@
+--- src/argparse.c 2021-11-03 13:44:56.0 +0100
src/argparse.c~2022-01-03 17:05:23.418077200 +0100
+@@ -33,8 +33,12 @@
+ #include
+ #include
+ #include
+-#include
+ #include
++#ifdef _WIN32
++# define R_OK 04
++# define strncasecmp _strnicmp
++# define strcasecmp _stricmp
++#endif
+
+ #include "gpgrt-int.h"
+
--- src/gpg-error.c2020-06-06 00:18:40.199791000 +0200
+++ src/gpg-error.c~ 2020-06-05 18:44:14.223182300 +0200
@@ -61,6 +61,11 @@
@@ -12,6 +28,19 @@
static void
i18n_init (void)
{
+
+--- src/spawn-w32.c~ 2022-01-03 16:33:24.0 +0100
src/spawn-w32.c 2022-01-03 16:46:57.173841200 +0100
+@@ -56,7 +56,7 @@
+ * Previous versions interpreted X_OK as F_OK anyway, so we'll just
+ * use F_OK directly. */
+ #undef X_OK
++#define X_OK 0
+-#define X_OK F_OK
+
+ /* For HANDLE and the internal file descriptor (fd) of this module:
+ * HANDLE can be represented by an intptr_t which should be true for
+
--- src/logging.c 2020-06-05 18:58:59.254413200 +0200
+++ src/logging.c~ 2019-12-12 15:23:37.0 +0100
@@ -44,7 +44,11 @@
@@ -65,20 +94,6 @@
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
src/spawn-w32.c2020-06-05 18:47:05.807099200 +0200
-+++ src/spawn-w32.c~ 2020-06-05 18:44:14.114035900 +0200
-@@ -834,7 +834,11 @@
- /* We don't use ENVP. */
- (void)envp;
-
-+#ifdef _WIN32
-+ if (_access (pgmname, 04))
-+#else
- if (access (pgmname, X_OK))
-+#endif
- return _gpg_err_code_from_syserror ();
-
- /* Prepare security attributes. */
--- src/sysutils.c 2020-06-06 00:23:52.457265500 +0200
+++ src/sysutils.c~2019-12-12 15:23:37.0 +0100
@@ -22,7 +22,11 @@
@@ -94,21 +109,6 @@
#include
#ifdef HAVE_W32_SYSTEM
# include
-@@ -274,11 +270,12 @@
- gpg_err_code_t
- _gpgrt_mkdir (const char *name, const char *modestr)
- {
-+#ifdef _WIN32
--#ifdef HAVE_W32CE_SYSTEM
- wchar_t *wname;
- (void)modestr;
-
-+ size_t size;
-+ wname = utf8_to_wchar (name, -1, &size);
-- wname = utf8_t
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e61367ca3b4a5440b91d2c4d29c773a6d2fe598d Author: Thorsten Behrens AuthorDate: Fri Jan 7 19:29:30 2022 +0100 Commit: Thorsten Behrens CommitDate: Fri Jan 7 19:29:30 2022 +0100 Bump version to 6.4.0.3 Change-Id: Id07a3d58b4aad4ea278db84e389ef408fba449c2 diff --git a/configure.ac b/configure.ac index 5a9db4590d70..970b5b7ab0f0 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.2.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.3.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - external/libassuan
external/libassuan/ExternalProject_libassuan.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 30582ba78dc6682a55f193905461b4abbec3e35e Author: Thorsten Behrens AuthorDate: Tue Dec 28 17:22:29 2021 +0100 Commit: Michael Stahl CommitDate: Fri Jan 7 14:02:59 2022 +0100 Fix autoconf>=2.70 gcc-wrapper breakage Re-generated configure file gets confused & claims not finding C89- compatible compiler for gcc-wrapper-building libassuan with msvc underneath. Work-around the problem by telling toolchain right off that this _is_ a std c compliant compiler. Change-Id: I4fa23673b790bc70a9294951df545c27f5236f81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127641 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 1bb0e177124d5d6661b72df6c7d848fb23639652) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127579 Reviewed-by: Michael Stahl diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 8ee96826cd69..a4c2510ba2dc 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -31,6 +31,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl --disable-shared \ --disable-doc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ + CFLAGS="$(CFLAGS) -D__STDC__=1" \ CXXFLAGS="$(CXXFLAGS)" \ GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \ GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
[Libreoffice-commits] core.git: config_host/config_gpgme.h.in configure.ac download.lst external/gpgmepp xmlsecurity/source
config_host/config_gpgme.h.in |
3
configure.ac|
3
download.lst|
4
external/gpgmepp/ExternalPackage_gpgmepp.mk |
4
external/gpgmepp/UnpackedTarball_gpgmepp.mk |
2
external/gpgmepp/add-minimal-keyexport.patch|
68 --
external/gpgmepp/find-libgpg-error-libassuan.patch |
29
external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1 |
30
external/gpgmepp/w32-build-fixes.patch.1|
9 +
external/gpgmepp/w32-fix-win32-macro.patch.1|
3
xmlsecurity/source/gpg/CertificateImpl.cxx |
7 -
11 files changed, 17 insertions(+), 145 deletions(-)
New commits:
commit 78dae8b20b85686d1a642415195d2e10fbb2dc1f
Author: Thorsten Behrens
AuthorDate: Tue Dec 28 22:15:51 2021 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 5 09:53:07 2022 +0100
Update gpgme to 1.16.0
* remove GPGME_CAN_EXPORT_MINIMAL_KEY, upstream now has support for
key export flags in c++ wrapper (gpgmepp >= 1.14)
* therefore, external/gpgmepp/add-minimal-keyexport.patch now fully
obsolete, tweaked xmlsecurity code to use upstream function
* bits of external/gpgmepp/find-libgpg-error-libassuan.patch are
upstream now (configure and makefile pieces, though we keep
configure.ac changes for the while - to not pick up system versions
too easily)
*
external/gpgmepp/gpgme.git-fe2892618c20cd40c342cce26ffb6ac4644fd3c3.patch.1
was from upstream anyway, removed
Change-Id: I991c20c0eeff0f9135e97c991afcb905be55a959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127665
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index 3c483d08f564..ead3ca7bc2b9 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -26,9 +26,6 @@
# include "config_lgpl.h"
#endif
-// Defined if gpgme supports exporting minimal key.
-#define GPGME_CAN_EXPORT_MINIMAL_KEY 0
-
#undef GPGME_GPGCONF
#endif
diff --git a/configure.ac b/configure.ac
index 30ff0ea4ea2f..9b5fbda9e868 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12358,7 +12358,7 @@ 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
development package])], [])
+[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 ],
@@ -12368,7 +12368,6 @@ elif test \( \( "$_os" = "Linux" -o "$_os" = "Darwin"
\) -a "$ENABLE_NSS" = TRUE
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
-AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
diff --git a/download.lst b/download.lst
index 0426a650da60..0a99bef76877 100644
--- a/download.lst
+++ b/download.lst
@@ -96,8 +96,8 @@ export FREETYPE_SHA256SUM :=
8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce
export FREETYPE_TARBALL := freetype-2.11.0.tar.xz
export GLM_SHA256SUM :=
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
export GLM_TARBALL := glm-0.9.9.8.zip
-export GPGME_SHA256SUM :=
c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
-export GPGME_TARBALL := gpgme-1.13.1.tar.bz2
+export GPGME_SHA256SUM :=
6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0
+export GPGME_TARBALL := gpgme-1.16.0.tar.bz2
export GRAPHITE_SHA256SUM :=
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
export HARFBUZZ_SHA256SUM :=
d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk
b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index 6bab3e5e293f..a2b207597cdd 100644
--- a/external/gpgmepp/ExternalPackage_g
[Libreoffice-commits] core.git: download.lst external/libassuan
download.lst|4 ++-- external/libassuan/ExternalPackage_libassuan.mk |2 +- external/libassuan/w32-build-fixes.patch.1 |5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit 568a5bba2a30ab588b52677106bf209d4c0df758 Author: Thorsten Behrens AuthorDate: Tue Dec 28 21:47:55 2021 +0100 Commit: Thorsten Behrens CommitDate: Wed Jan 5 09:52:51 2022 +0100 Update libassuan to 2.5.5 Change-Id: Icd1034f4c6b43605f5d43fe28f7e0d191311daf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127664 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/download.lst b/download.lst index 1ae0c34178ba..0426a650da60 100644 --- a/download.lst +++ b/download.lst @@ -142,8 +142,8 @@ export LANGUAGETOOL_SHA256SUM := 48c87e41636783bba438b65fd895821e369ed139e1465fa export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_SHA256SUM := 18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5 export LCMS2_TARBALL := lcms2-2.12.tar.gz -export LIBASSUAN_SHA256SUM := 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 -export LIBASSUAN_TARBALL := libassuan-2.5.3.tar.bz2 +export LIBASSUAN_SHA256SUM := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +export LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2 export LIBATOMIC_OPS_SHA256SUM := 1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk index 7a08028adbdd..0f24e5e2dec4 100644 --- a/external/libassuan/ExternalPackage_libassuan.mk +++ b/external/libassuan/ExternalPackage_libassuan.mk @@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),LINUX) -$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.3)) +$(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.5)) else ifeq ($(OS),MACOSX) diff --git a/external/libassuan/w32-build-fixes.patch.1 b/external/libassuan/w32-build-fixes.patch.1 index cac6ea1045bc..ebf98c5f5093 100644 --- a/external/libassuan/w32-build-fixes.patch.1 +++ b/external/libassuan/w32-build-fixes.patch.1 @@ -33,13 +33,14 @@ diff -ru libassuan.orig/src/Makefile.am libassuan/src/Makefile.am `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -@@ -148,9 +148,9 @@ +@@ -148,10 +148,10 @@ $(DESTDIR)$(bindir)/gpgcedev.dll endif +mkheader$(EXEEXT): mkheader.c Makefile -mkheader: mkheader.c Makefile - $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c +assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h) + ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
[Libreoffice-commits] core.git: download.lst external/libgpg-error
download.lst |4 -
external/libgpg-error/ExternalPackage_libgpg-error.mk |2
external/libgpg-error/w32-build-fixes-5.patch | 64 +-
3 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 7d50d74d0a10b4811b82f66dc5ac5a696c2974c7
Author: Thorsten Behrens
AuthorDate: Tue Dec 28 21:45:45 2021 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 5 09:52:35 2022 +0100
Update libgpg-error to 1.43
Change-Id: Iecd4a131f9c5b43bb03c5f9c4b6c7efe36e443aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127663
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/download.lst b/download.lst
index 92aa9dd07dc8..1ae0c34178ba 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ export LIBEXTTEXTCAT_SHA256SUM :=
6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25
export LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
export LIBFFI_SHA256SUM :=
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
export LIBFFI_TARBALL := libffi-3.3.tar.gz
-export LIBGPGERROR_SHA256SUM :=
b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
-export LIBGPGERROR_TARBALL := libgpg-error-1.37.tar.bz2
+export LIBGPGERROR_SHA256SUM :=
a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
+export LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
export LIBLANGTAG_SHA256SUM :=
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
export LIBNUMBERTEXT_SHA256SUM :=
db9060d208501bd7bc06300a55d8489d29dd560ee0fbbd0f41b78af56816680c
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index 1d9c016e09df..7ee849d2369c 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
-$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.28.0))
+$(eval $(call
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.32.1))
else ifeq ($(OS),MACOSX)
diff --git a/external/libgpg-error/w32-build-fixes-5.patch
b/external/libgpg-error/w32-build-fixes-5.patch
index 2633df9ee6c9..8a65cedea2da 100644
--- a/external/libgpg-error/w32-build-fixes-5.patch
+++ b/external/libgpg-error/w32-build-fixes-5.patch
@@ -1,3 +1,19 @@
+--- src/argparse.c 2021-11-03 13:44:56.0 +0100
src/argparse.c~2022-01-03 17:05:23.418077200 +0100
+@@ -33,8 +33,12 @@
+ #include
+ #include
+ #include
+-#include
+ #include
++#ifdef _WIN32
++# define R_OK 04
++# define strncasecmp _strnicmp
++# define strcasecmp _stricmp
++#endif
+
+ #include "gpgrt-int.h"
+
--- src/gpg-error.c2020-06-06 00:18:40.199791000 +0200
+++ src/gpg-error.c~ 2020-06-05 18:44:14.223182300 +0200
@@ -61,6 +61,11 @@
@@ -12,6 +28,19 @@
static void
i18n_init (void)
{
+
+--- src/spawn-w32.c~ 2022-01-03 16:33:24.0 +0100
src/spawn-w32.c 2022-01-03 16:46:57.173841200 +0100
+@@ -56,7 +56,7 @@
+ * Previous versions interpreted X_OK as F_OK anyway, so we'll just
+ * use F_OK directly. */
+ #undef X_OK
++#define X_OK 0
+-#define X_OK F_OK
+
+ /* For HANDLE and the internal file descriptor (fd) of this module:
+ * HANDLE can be represented by an intptr_t which should be true for
+
--- src/logging.c 2020-06-05 18:58:59.254413200 +0200
+++ src/logging.c~ 2019-12-12 15:23:37.0 +0100
@@ -44,7 +44,11 @@
@@ -65,20 +94,6 @@
gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
src/spawn-w32.c2020-06-05 18:47:05.807099200 +0200
-+++ src/spawn-w32.c~ 2020-06-05 18:44:14.114035900 +0200
-@@ -834,7 +834,11 @@
- /* We don't use ENVP. */
- (void)envp;
-
-+#ifdef _WIN32
-+ if (_access (pgmname, 04))
-+#else
- if (access (pgmname, X_OK))
-+#endif
- return _gpg_err_code_from_syserror ();
-
- /* Prepare security attributes. */
--- src/sysutils.c 2020-06-06 00:23:52.457265500 +0200
+++ src/sysutils.c~2019-12-12 15:23:37.0 +0100
@@ -22,7 +22,11 @@
@@ -94,21 +109,6 @@
#include
#ifdef HAVE_W32_SYSTEM
# include
-@@ -274,11 +270,12 @@
- gpg_err_code_t
- _gpgrt_mkdir (const char *name, const char *modestr)
- {
-+#ifdef _WIN32
--#ifdef HAVE_W32CE_SYSTEM
- wchar_t *wname;
- (void)modestr;
-
-+ size_t size;
-+ wname = utf8_to_wchar (name, -1, &size);
-- wname = utf8_to_wchar (name);
- if (!wname)
- return _gpg_err_code_from_syserror ();
- if (!CreateDirectoryW (wname, NULL))
--- src/visibility.c 2020-06-05 18:54:56.410442900 +0
