core.git: Branch 'libreoffice-24-2' - xmlsecurity/source
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 36bef70eaab0564cef7538dc492cf28d09507fa9
Author: Thorsten Behrens
AuthorDate: Fri Dec 22 22:44:15 2023 +0100
Commit: Michael Stahl
CommitDate: Wed Jan 10 11:41:00 2024 +0100
xmlsecurity: fix AES-GCM code differently
With PCH, the earlier workaround with NSS_PKCS11_2_0_COMPAT breaks -
so lets fix this with conditionals, its only two places.
Follow-up commit to 9276d5338ef04209b007bbc705e4c023cf181456
Change-Id: I7d3292304d83d784ee9dce5cdc62b4a028ff333a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161204
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161840
Reviewed-by: Michael Stahl
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index b053db901ccd..c3bbfdb0f2ef 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -24,12 +24,6 @@
#include
#include
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wunused-macros"
-#endif
-// see TODO below
-#define NSS_PKCS11_2_0_COMPAT 1
-
#include "ciphercontext.hxx"
#include // for NSS_VMINOR
#include
@@ -63,12 +57,14 @@ uno::Reference< xml::crypto::XCipherContext >
OCipherContext::Create( CK_MECHANI
if (nNSSCipherID == CKM_AES_GCM)
{
-// TODO: when runtime requirements are raised to NSS 3.52, replace this
-// according to https://fedoraproject.org/wiki/Changes/NssGCMParams
+// TODO: when runtime requirements are raised to NSS 3.52,
+// cleanup according to
+// https://fedoraproject.org/wiki/Changes/NssGCMParams
#if NSS_VMINOR >= 52
-static_assert(sizeof(CK_GCM_PARAMS) == sizeof(CK_NSS_GCM_PARAMS));
+xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(CK_NSS_GCM_PARAMS));
+#else
+xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(CK_GCM_PARAMS));
#endif
-xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(/*CK_NSS_GCM_PARAMS*/CK_GCM_PARAMS));
if (!xResult->m_pSecParam)
{
SAL_WARN("xmlsecurity.nss", "SECITEM_AllocItem failed");
@@ -76,7 +72,11 @@ uno::Reference< xml::crypto::XCipherContext >
OCipherContext::Create( CK_MECHANI
}
assert(aInitializationVector.getLength() == nAESGCMIVSize);
xResult->m_AESGCMIV = aInitializationVector;
-auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#if NSS_VMINOR >= 52
+auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#else
+auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#endif
pParams->pIv = const_cast(reinterpret_cast(xResult->m_AESGCMIV.getConstArray()));
pParams->ulIvLen =
sal::static_int_cast(xResult->m_AESGCMIV.getLength());
pParams->pAAD = nullptr;
Reminder: TDF board election ongoing, for another day - please consider voting!
Dear y'all, if you are a TDF trustee, and haven't voted yet - please do consider doing so by tomorrow midnight (CET timezone)! This time around, I'm glad to report that there's a lot of choice for electing board members - so do make your voice heard, and head over to the election interface here: https://elections.documentfoundation.org/vote.php?election_id=16 Thanks a lot & all the best, -- Thorsten signature.asc Description: PGP signature
Reminder: TDF board election ongoing, for another day - please consider voting!
Dear y'all, if you are a TDF trustee, and haven't voted yet - please do consider doing so by tomorrow midnight (CET timezone)! This time around, I'm glad to report that there's a lot of choice for electing board members - so do make your voice heard, and head over to the election interface here: https://elections.documentfoundation.org/vote.php?election_id=16 Thanks a lot & all the best, -- Thorsten signature.asc Description: PGP signature
core.git: Branch 'libreoffice-24-2' - configure.ac external/argon2
configure.ac |1 external/argon2/0002-Add-WinARM64-vcxproj-config.patch | 185 + external/argon2/UnpackedTarball_argon2.mk |1 3 files changed, 187 insertions(+) New commits: commit 2e8b59608471ab6c62a2e9c851dbe2b28fbd9804 Author: Thorsten Behrens AuthorDate: Sat Dec 23 01:08:09 2023 +0100 Commit: Xisco Fauli CommitDate: Tue Dec 26 09:35:23 2023 +0100 tdf#105844 argon2: add vcxproj files for WinARM64 builds Also add argon2 to crossbuild tools side. Change-Id: I8704b2d8362a051c2d634b9db7416cdc2cf9add4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161206 Tested-by: Jenkins Reviewed-by: Xisco Fauli Reviewed-by: Thorsten Behrens (cherry picked from commit ed1965b60840056da1eed9fd5ba5c21fdea95d56) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161220 diff --git a/configure.ac b/configure.ac index 62cd9343f82a..d841c7cc76fa 100644 --- a/configure.ac +++ b/configure.ac @@ -5880,6 +5880,7 @@ if test "$cross_compiling" = "yes"; then # filter permitted build targets PERMITTED_BUILD_TARGETS=" +ARGON2 AVMEDIA BOOST BZIP2 diff --git a/external/argon2/0002-Add-WinARM64-vcxproj-config.patch b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch new file mode 100644 index ..063296dd107c --- /dev/null +++ b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch @@ -0,0 +1,185 @@ +diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj +--- argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 01:00:49.231059537 +0100 argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 01:02:40.375527010 +0100 +@@ -13,6 +13,10 @@ + ReleaseStatic + x64 + ++ ++ Release ++ AMR64 ++ + + Release + Win32 +@@ -50,6 +54,12 @@ + true + MultiByte + ++ ++DynamicLibrary ++false ++true ++MultiByte ++ + + DynamicLibrary + false +@@ -84,6 +94,9 @@ + + + ++ ++ ++ + + + +@@ -107,6 +120,11 @@ + $(SolutionDir)vs2015uild\$(ProjectName)\ + $(SolutionDir)include;$(IncludePath) + ++ ++$(SolutionDir)vs2015uild\ ++$(SolutionDir)vs2015uild\$(ProjectName)\ ++$(SolutionDir)include;$(IncludePath) ++ + + $(SolutionDir)vs2015uild\ + $(SolutionDir)vs2015uild\$(ProjectName)\ +@@ -158,6 +176,21 @@ + true + + ++ ++ ++ Level3 ++ MaxSpeed ++ true ++ false ++ true ++ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ ++ ++ true ++ true ++ true ++ ++ + + + Level3 +@@ -209,7 +242,6 @@ + + + +- + + +@@ -221,7 +253,7 @@ + + +- ++ + + + +Only in argon2/vs2015/Argon2OptDll: Argon2OptDll.vcxproj~ +diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj +--- argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:00:49.231059537 +0100 argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:02:12.518576081 +0100 +@@ -17,6 +17,10 @@ + Release + Win32 + ++ ++ Release ++ ARM64 ++ + + Debug + x64 +@@ -51,6 +55,12 @@ + true + MultiByte + ++ ++Application ++false ++true ++MultiByte ++ + + Application + false +@@ -85,6 +95,9 @@ + + + ++ ++ ++ + + + +@@ -108,6 +121,11 @@ + $(SolutionDir)vs2015uild\ + $(SolutionDir)vs2015uild\$(ProjectName)\ + ++ ++$(SolutionDir)include;$(IncludePath) ++$(SolutionDir)vs2015uild\ ++$(SolutionDir)vs2015uild\$(ProjectName)\ ++ + + $(SolutionDir)include;$(IncludePath) + $(SolutionDir)vs2015uild\ +@@ -162,6 +180,21 @@ + true + + ++ ++ ++ Level3 ++ MaxSpeed ++ true ++ false ++ true ++ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ ++ ++ true ++ true ++ true ++ ++ + + + Level3 +@@ -214,7 +247,7 @@ + + +- ++ + + + +@@ -222,7 +255,6 @@ + + + +- + + +@@ -232,4 +264,4 @@ + + + +- +\ No newline at end of file ++ +Only in argon2/vs2015/Argon2OptTestCI: Argon2OptTestCI.vcxproj~ diff --git a/external/argon2/UnpackedTarball_argon2.mk b/external/argon2/UnpackedTarball_argon2.mk index 0b35c2f58caf..3addfad639d5 100644 --- a/external/argon2/UnpackedTarball_argon2.mk +++ b/external/argon2/UnpackedTarball_argon2.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1)) $(eval $(call gb_UnpackedTarball_add_patches,argon2,\ external/argon2/0001-Fix-possible-compil
core.git: external/zxcvbn-c
external/zxcvbn-c/ExternalProject_zxcvbn-c.mk |2 ++ external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk |2 ++ 2 files changed, 4 insertions(+) New commits: commit cfd333f13f85eaf6eaf564e791b55a2092841376 Author: Thorsten Behrens AuthorDate: Sat Dec 23 22:37:26 2023 +0100 Commit: Thorsten Behrens CommitDate: Sun Dec 24 00:29:50 2023 +0100 zxcvbn-c: disable warnings Change-Id: I348dc5f92f41fc3e8c1aee8743d5e1cf86fa3bbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161259 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/external/zxcvbn-c/ExternalProject_zxcvbn-c.mk b/external/zxcvbn-c/ExternalProject_zxcvbn-c.mk index 51b60a9c2ecb..bd652464ca15 100644 --- a/external/zxcvbn-c/ExternalProject_zxcvbn-c.mk +++ b/external/zxcvbn-c/ExternalProject_zxcvbn-c.mk @@ -9,6 +9,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,zxcvbn-c)) +$(eval $(call gb_Library_set_warnings_disabled,zxcvbn-c)) + $(eval $(call gb_ExternalProject_register_targets,zxcvbn-c,\ generate-dictionary-nodes \ )) diff --git a/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk b/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk index 9748ef850c55..ac670ad6ed5b 100644 --- a/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk +++ b/external/zxcvbn-c/StaticLibrary_zxcvbn-c.mk @@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,zxcvbn-c)) $(eval $(call gb_StaticLibrary_use_unpacked,zxcvbn-c,zxcvbn-c)) +$(eval $(call gb_StaticLibrary_set_warnings_disabled,zxcvbn-c)) + # zxcvbn-c static library depends on generation of dictionary nodes resulting in dict-src.h $(eval $(call gb_StaticLibrary_use_external_project,zxcvbn-c,zxcvbn-c,full))
core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 4a532e651b9fd4c9b24b017d2e1d099ee76ceed8
Author: Thorsten Behrens
AuthorDate: Fri Dec 22 22:44:15 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Dec 24 00:29:34 2023 +0100
xmlsecurity: fix AES-GCM code differently
With PCH, the earlier workaround with NSS_PKCS11_2_0_COMPAT breaks -
so lets fix this with conditionals, its only two places.
Follow-up commit to 9276d5338ef04209b007bbc705e4c023cf181456
Change-Id: I7d3292304d83d784ee9dce5cdc62b4a028ff333a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161204
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
index b053db901ccd..c3bbfdb0f2ef 100644
--- a/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
+++ b/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
@@ -24,12 +24,6 @@
#include
#include
-#if defined(__GNUC__)
-#pragma GCC diagnostic ignored "-Wunused-macros"
-#endif
-// see TODO below
-#define NSS_PKCS11_2_0_COMPAT 1
-
#include "ciphercontext.hxx"
#include // for NSS_VMINOR
#include
@@ -63,12 +57,14 @@ uno::Reference< xml::crypto::XCipherContext >
OCipherContext::Create( CK_MECHANI
if (nNSSCipherID == CKM_AES_GCM)
{
-// TODO: when runtime requirements are raised to NSS 3.52, replace this
-// according to https://fedoraproject.org/wiki/Changes/NssGCMParams
+// TODO: when runtime requirements are raised to NSS 3.52,
+// cleanup according to
+// https://fedoraproject.org/wiki/Changes/NssGCMParams
#if NSS_VMINOR >= 52
-static_assert(sizeof(CK_GCM_PARAMS) == sizeof(CK_NSS_GCM_PARAMS));
+xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(CK_NSS_GCM_PARAMS));
+#else
+xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(CK_GCM_PARAMS));
#endif
-xResult->m_pSecParam = SECITEM_AllocItem(nullptr, nullptr,
sizeof(/*CK_NSS_GCM_PARAMS*/CK_GCM_PARAMS));
if (!xResult->m_pSecParam)
{
SAL_WARN("xmlsecurity.nss", "SECITEM_AllocItem failed");
@@ -76,7 +72,11 @@ uno::Reference< xml::crypto::XCipherContext >
OCipherContext::Create( CK_MECHANI
}
assert(aInitializationVector.getLength() == nAESGCMIVSize);
xResult->m_AESGCMIV = aInitializationVector;
-auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#if NSS_VMINOR >= 52
+auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#else
+auto *const pParams =
reinterpret_cast(xResult->m_pSecParam->data);
+#endif
pParams->pIv = const_cast(reinterpret_cast(xResult->m_AESGCMIV.getConstArray()));
pParams->ulIvLen =
sal::static_int_cast(xResult->m_AESGCMIV.getLength());
pParams->pAAD = nullptr;
core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbe05a624ca53db83bedbc049791cc215ee6d46b Author: Thorsten Behrens AuthorDate: Sun Dec 24 00:04:10 2023 +0100 Commit: Thorsten Behrens CommitDate: Sun Dec 24 00:20:21 2023 +0100 get-bz-attachments: switch to python3 Nothing left to do, just switch the interpreter. Change-Id: I6a0ff0a019a66f6baf39794c853655f273676ea2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161261 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 924a522ebff7..c9942189be58 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # # This file is part of the LibreOffice project.
core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |8 1 file changed, 8 insertions(+) New commits: commit 750f53a73fe6b817edc76329488d4b508d57c19b Author: Thorsten Behrens AuthorDate: Tue Dec 19 19:54:55 2023 +0100 Commit: Thorsten Behrens CommitDate: Sun Dec 24 00:19:56 2023 +0100 get-bz-attachments: set speaking thread names for job queue Change-Id: I38d637b8dd0f19330329565bf2e63c3c8463536c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161004 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 9df55914360e..924a522ebff7 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -422,6 +422,14 @@ class manage_threads(threading.Thread): # Use job parameters to call our query # Then let the queue know we are done with this job (uri, mimetype, prefix, extension) = jobs.get(True, 6) +try: +# set thread name for easier debugging, if process +# ctl package is available +import prctl +prctl.set_name(prefix[:3] + ': ' + mimetype[-10:]) +except ImportError: +pass + try: get_through_rss_query(uri, mimetype, prefix, extension) finally:
core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype | 278 +--
1 file changed, 161 insertions(+), 117 deletions(-)
New commits:
commit 17f79d80484c5d5b492efd46e2e52481a17e0095
Author: Thorsten Behrens
AuthorDate: Tue Dec 19 19:42:00 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Dec 24 00:19:27 2023 +0100
get-bz-attachments: some flake8 cleanup
- fix the most obvious stylistic problems
- add some brief doc strings
- remove one instance of dead code, left over from this change:
commit bd2eee0bd4ae83ff453522b7cf09b69f1b8b5e1b
Date: Wed Jun 3 23:41:32 2015 +0200
get-bugzilla-attachments: avoid FDO-TDF duplicates...
Change-Id: I88672ae99bc42e9af09ea6033f87240463b2c038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161003
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 c9a0d41cf5cc..9df55914360e 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -23,53 +23,61 @@
# it is already downloaded by a previous run, and up-to-date.
from __future__ import print_function
-import feedparser
+
import base64
import datetime
import glob
+import os
+import os.path
import re
-import os, os.path
import stat
import sys
import threading
try:
import queue
-except:
+except Exception:
import Queue as queue
try:
from urllib.request import urlopen
-except:
+except Exception:
from urllib import urlopen
try:
import xmlrpc.client as xmlrpclib
-except:
+except Exception:
import xmlrpclib
from xml.dom import minidom
from xml.sax.saxutils import escape
+
from attachment_mimetypes import mimetypes
+import feedparser
+
+
def urlopen_retry(url):
+"""Open url, retry 3 times."""
maxretries = 3
for i in range(maxretries + 1):
try:
return urlopen(url)
except IOError as e:
-print("caught IOError: " + str(e))
+print('caught IOError: ' + str(e))
if maxretries == i:
raise
-print("retrying...")
+print('retrying...')
+
def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
-id = url.rsplit('=', 2)[1]
-print("id is " + prefix + id + " " + suffix)
-print("parsing " + id)
-sock = urlopen_retry(url+"=xml")
+"""Parse bug xml, download attachments with matching suffix."""
+bugid = url.rsplit('=', 2)[1]
+print('id is ' + prefix + bugid + ' ' + suffix)
+print('parsing ' + bugid)
+sock = urlopen_retry(url+'=xml')
dom = minidom.parse(sock)
sock.close()
-attachmentid=0
+attachmentid = 0
for attachment in dom.getElementsByTagName('attachment'):
attachmentid += 1
-print(" mimetype is", end=' ')
+print(' mimetype is', end=' ')
for node in attachment.childNodes:
if node.nodeName == 'type':
# check if attachment is deleted
@@ -87,53 +95,58 @@ def get_from_bug_url_via_xml(url, mimetype, prefix, suffix):
print('deleted attachment, skipping')
continue
-download = suffix + '/' +prefix + id + '-' + str(attachmentid)
+ '.' + suffix
+download = (suffix + '/' + prefix + bugid + '-' +
+str(attachmentid) + '.' + suffix)
if os.path.isfile(download):
-print("assuming " + download + " is up to date")
+print('assuming ' + download + ' is up to date')
continue
# prevent re-downloading FDO attachments from TDF
-if prefix == "tdf" and int(id) < 88776:
-fdodownload = download.replace("tdf", "fdo")
+if prefix == 'tdf' and int(bugid) < 88776:
+fdodownload = download.replace('tdf', 'fdo')
if os.path.isfile(fdodownload):
-print("assuming FDO " + fdodownload + " is up to date")
+print('assuming FDO ' + fdodownload + ' is up to date')
continue
print('downloading as ' + download)
-tmpfile = download + ".tmp"
+tmpfile = download + '.tmp'
f = open(tmpfile, 'wb')
f.write(base64.b64decode(node.firstChild.nodeValue))
f.close()
os.rename(tmpfile, download)
break
+
def get_novell_bug_via_xml(url, mimetype, prefix, suffix):
-id = url.rsplit('=', 2)[1]
-print("id is " + prefix + id + " &q
core.git: configure.ac external/argon2
configure.ac |1 external/argon2/0002-Add-WinARM64-vcxproj-config.patch | 185 + external/argon2/UnpackedTarball_argon2.mk |1 3 files changed, 187 insertions(+) New commits: commit 401e9408d14dc2b9d07183a04c223831a59f71a3 Author: Thorsten Behrens AuthorDate: Sat Dec 23 01:08:09 2023 +0100 Commit: Thorsten Behrens CommitDate: Sat Dec 23 20:10:57 2023 +0100 tdf#105844 argon2: add vcxproj files for WinARM64 builds Also add argon2 to crossbuild tools side. Change-Id: I8704b2d8362a051c2d634b9db7416cdc2cf9add4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161206 Tested-by: Jenkins Reviewed-by: Xisco Fauli Reviewed-by: Thorsten Behrens diff --git a/configure.ac b/configure.ac index 788342733d1c..1c2a9c86cf5e 100644 --- a/configure.ac +++ b/configure.ac @@ -5883,6 +5883,7 @@ if test "$cross_compiling" = "yes"; then # filter permitted build targets PERMITTED_BUILD_TARGETS=" +ARGON2 AVMEDIA BOOST BZIP2 diff --git a/external/argon2/0002-Add-WinARM64-vcxproj-config.patch b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch new file mode 100644 index ..063296dd107c --- /dev/null +++ b/external/argon2/0002-Add-WinARM64-vcxproj-config.patch @@ -0,0 +1,185 @@ +diff -ur argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj +--- argon2.org/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 01:00:49.231059537 +0100 argon2/vs2015/Argon2OptDll/Argon2OptDll.vcxproj2023-12-23 01:02:40.375527010 +0100 +@@ -13,6 +13,10 @@ + ReleaseStatic + x64 + ++ ++ Release ++ AMR64 ++ + + Release + Win32 +@@ -50,6 +54,12 @@ + true + MultiByte + ++ ++DynamicLibrary ++false ++true ++MultiByte ++ + + DynamicLibrary + false +@@ -84,6 +94,9 @@ + + + ++ ++ ++ + + + +@@ -107,6 +120,11 @@ + $(SolutionDir)vs2015uild\$(ProjectName)\ + $(SolutionDir)include;$(IncludePath) + ++ ++$(SolutionDir)vs2015uild\ ++$(SolutionDir)vs2015uild\$(ProjectName)\ ++$(SolutionDir)include;$(IncludePath) ++ + + $(SolutionDir)vs2015uild\ + $(SolutionDir)vs2015uild\$(ProjectName)\ +@@ -158,6 +176,21 @@ + true + + ++ ++ ++ Level3 ++ MaxSpeed ++ true ++ false ++ true ++ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ ++ ++ true ++ true ++ true ++ ++ + + + Level3 +@@ -209,7 +242,6 @@ + + + +- + + +@@ -221,7 +253,7 @@ + + +- ++ + + + +Only in argon2/vs2015/Argon2OptDll: Argon2OptDll.vcxproj~ +diff -ur argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj +--- argon2.org/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:00:49.231059537 +0100 argon2/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj 2023-12-23 01:02:12.518576081 +0100 +@@ -17,6 +17,10 @@ + Release + Win32 + ++ ++ Release ++ ARM64 ++ + + Debug + x64 +@@ -51,6 +55,12 @@ + true + MultiByte + ++ ++Application ++false ++true ++MultiByte ++ + + Application + false +@@ -85,6 +95,9 @@ + + + ++ ++ ++ + + + +@@ -108,6 +121,11 @@ + $(SolutionDir)vs2015uild\ + $(SolutionDir)vs2015uild\$(ProjectName)\ + ++ ++$(SolutionDir)include;$(IncludePath) ++$(SolutionDir)vs2015uild\ ++$(SolutionDir)vs2015uild\$(ProjectName)\ ++ + + $(SolutionDir)include;$(IncludePath) + $(SolutionDir)vs2015uild\ +@@ -162,6 +180,21 @@ + true + + ++ ++ ++ Level3 ++ MaxSpeed ++ true ++ false ++ true ++ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ++ ++ ++ true ++ true ++ true ++ ++ + + + Level3 +@@ -214,7 +247,7 @@ + + +- ++ + + + +@@ -222,7 +255,6 @@ + + + +- + + +@@ -232,4 +264,4 @@ + + + +- +\ No newline at end of file ++ +Only in argon2/vs2015/Argon2OptTestCI: Argon2OptTestCI.vcxproj~ diff --git a/external/argon2/UnpackedTarball_argon2.mk b/external/argon2/UnpackedTarball_argon2.mk index 0b35c2f58caf..3addfad639d5 100644 --- a/external/argon2/UnpackedTarball_argon2.mk +++ b/external/argon2/UnpackedTarball_argon2.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,argon2,1)) $(eval $(call gb_UnpackedTarball_add_patches,argon2,\ external/argon2/0001-Fix-possible-compiler-error-due-to-undefined-_MSC_VE.patch \ + external/argon2/0002-Add-WinARM64-vcxproj-config.patch \ )) # vim: set noet sw=4 ts=4:
core.git: cui/source
cui/source/dialogs/QrCodeGenDialog.cxx |9 - 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit 14c4c077182f0338a21ae7dedf8620e339d2 Author: Thorsten Behrens AuthorDate: Fri Dec 22 15:22:19 2023 +0100 Commit: Thorsten Behrens CommitDate: Sat Dec 23 09:52:54 2023 +0100 ZXing: no need for deprecated utf-8 conversions anymore With ZXing 2.0, the library directly supports utf8 std::string parameters: https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.0.0 Fixes the warning: cui/source/dialogs/QrCodeGenDialog.cxx:161:72: warning: 'FromUtf8' is deprecated [-Wdeprecated-declarations] 161 | ZXing::BitMatrix bitmatrix = writer.encode(ZXing::TextUtfEncoding::FromUtf8(QRText), 0, 0); | ^ /usr/include/ZXing/TextUtfEncoding.h:17:3: note: 'FromUtf8' has been explicitly marked deprecated here 17 | [[deprecated]] std::wstring FromUtf8(std::string_view utf8); | ^ Change-Id: Ic0a65d4455dabea1a7a4e23f558e4158a0c3f39f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161182 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index 8a25e3b364e7..c727f4cdbd02 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -19,6 +19,7 @@ #include #if ENABLE_ZXING +#include #include #ifdef __GNUC__ @@ -38,9 +39,7 @@ #include #endif -#if __has_include() -#include -#else +#if ZXING_VERSION_MAJOR < 2 #include #endif @@ -153,8 +152,8 @@ OString GenerateQRCode(std::u16string_view aQRText, tools::Long aQRECC, int aQRB ZXing::BarcodeFormat format = ZXing::BarcodeFormatFromString(GetBarCodeType(aQRType)); auto writer = ZXing::MultiFormatWriter(format).setMargin(aQRBorder).setEccLevel(bqrEcc); writer.setEncoding(ZXing::CharacterSet::UTF8); -#if __has_include() -ZXing::BitMatrix bitmatrix = writer.encode(ZXing::FromUtf8(QRText), 0, 0); +#if ZXING_VERSION_MAJOR >= 2 +ZXing::BitMatrix bitmatrix = writer.encode(QRText, 0, 0); #else ZXing::BitMatrix bitmatrix = writer.encode(ZXing::TextUtfEncoding::FromUtf8(QRText), 0, 0); #endif
core.git: bin/get-bugzilla-attachments-by-mimetype
bin/get-bugzilla-attachments-by-mimetype |1 - 1 file changed, 1 deletion(-) New commits: commit 3097d40ab6aa6f8fa59e82b22492e24634b7e7aa Author: Thorsten Behrens AuthorDate: Tue Dec 19 18:37:40 2023 +0100 Commit: Thorsten Behrens CommitDate: Tue Dec 19 19:45:55 2023 +0100 Drop commented-out code Change-Id: Ie433daf9f2d0117d798202219423e328631a8cb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161002 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 6b8e6cc1676c..c9a0d41cf5cc 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -374,7 +374,6 @@ novellattach = 'https://bugzilla.novell.com/attachment.cgi?id=' class manage_threads(threading.Thread): def run(self): -#print(threading.current_thread().get_ident()) while 1: # Try to receive a job from queue try:
core.git: Branch 'libreoffice-24-2' - external/clucene helpcompiler/source RepositoryExternal.mk
RepositoryExternal.mk |1
external/clucene/UnpackedTarball_clucene.mk |1
external/clucene/patches/clucene-reprobuild.patch.1 | 61
helpcompiler/source/HelpIndexer.cxx |5 +
4 files changed, 68 insertions(+)
New commits:
commit 018070500f7f001233f5622d656fc29494620d3f
Author: Thorsten Behrens
AuthorDate: Thu Nov 2 18:17:50 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 14 03:09:08 2023 +0100
reprobuild: don't write timestamps to clucene index files
Our embedded clucene by default write a random current-time
millisecond value into version fields, in an attempt to
randomise. Clearly this is not needed for our static help, and it also
prevents builds from being reproducible.
Change-Id: I011388b5bc72b5d86bc1900f5439036ede60c020
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158845
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160668
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9659ec7c163f..da11a7d153f2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2847,6 +2847,7 @@ ifneq ($(SYSTEM_CLUCENE),)
define gb_LinkTarget__use_clucene
$(call gb_LinkTarget_add_defs,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem
/,-isystem/,$(CLUCENE_CFLAGS))) \
+ -DSYSTEM_CLUCENE \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/external/clucene/UnpackedTarball_clucene.mk
b/external/clucene/UnpackedTarball_clucene.mk
index 7a1eed67d2f7..76fdfe6aca56 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
external/clucene/patches/nullstring.patch \
external/clucene/patches/binary_function.patch \
external/clucene/patches/clucene-pure-virtual.patch \
+ external/clucene/patches/clucene-reprobuild.patch.1 \
))
ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/clucene-reprobuild.patch.1
b/external/clucene/patches/clucene-reprobuild.patch.1
new file mode 100644
index ..2c5a0b95135f
--- /dev/null
+++ b/external/clucene/patches/clucene-reprobuild.patch.1
@@ -0,0 +1,61 @@
+diff -ur clucene.org/src/core/CLucene/index/IndexWriter.cpp
clucene/src/core/CLucene/index/IndexWriter.cpp
+--- clucene.org/src/core/CLucene/index/IndexWriter.cpp 2023-11-02
17:31:00.110168174 +0100
clucene/src/core/CLucene/index/IndexWriter.cpp 2023-11-02
17:33:22.507665912 +0100
+@@ -366,6 +366,10 @@
+ }
+ }
+
++void IndexWriter::setSegmentInfoStartVersion(int64_t startVersion) {
++ this->segmentInfos->setStartVersion(startVersion);
++}
++
+ int32_t IndexWriter::getMaxBufferedDocs() {
+ ensureOpen();
+ return docWriter->getMaxBufferedDocs();
+diff -ur clucene.org/src/core/CLucene/index/IndexWriter.h
clucene/src/core/CLucene/index/IndexWriter.h
+--- clucene.org/src/core/CLucene/index/IndexWriter.h 2023-11-02
17:31:00.113501525 +0100
clucene/src/core/CLucene/index/IndexWriter.h 2023-11-02
17:33:43.547787510 +0100
+@@ -336,6 +336,12 @@
+ int64_t getWriteLockTimeout();
+
+ /**
++ * Sets the 0th segmentinfo version. Default is current system time
++ * in milliseconds
++ */
++ void setSegmentInfoStartVersion(int64_t startVersion);
++
++ /**
+* Sets the maximum time to wait for a commit lock (in milliseconds).
+*/
+ void setCommitLockTimeout(int64_t commitLockTimeout);
+diff -ur clucene.org/src/core/CLucene/index/SegmentInfos.cpp
clucene/src/core/CLucene/index/SegmentInfos.cpp
+--- clucene.org/src/core/CLucene/index/SegmentInfos.cpp2023-11-02
17:31:00.110168174 +0100
clucene/src/core/CLucene/index/SegmentInfos.cpp2023-11-02
18:04:43.855243418 +0100
+@@ -662,6 +662,10 @@
+ return IndexFileNames::fileNameFromGeneration(
IndexFileNames::SEGMENTS, "", nextGeneration );
+ }
+
++ void SegmentInfos::setStartVersion(int64_t version) {
++ this->version = version;
++ }
++
+ void SegmentInfos::clearto(size_t from, size_t end){
+ size_t range = end - from;
+ if ( (infos.size() - from) >= range) { // Make sure we actually need to
remove
+diff -ur clucene.org/src/core/CLucene/index/_SegmentInfos.h
clucene/src/core/CLucene/index/_SegmentInfos.h
+--- clucene.org/src/core/CLucene/index/_SegmentInfos.h 2023-11-02
17:31:00.106834824 +0100
clucene/src/core/CLucene/index/_SegmentInfos.h 2023-11-02
18:04:51.178598463 +0100
+@@ -347,6 +347,13 @@
+ */
+ std::string getNextSegmentFileName();
+
++ /**
++ * Set version value to start from
++
++ Defaults to current time in milliseconds
++ */
++void setStartVersion(int64_t version);
++
+ /* public vector-like operations */
+ //
core.git: external/clucene helpcompiler/source RepositoryExternal.mk
RepositoryExternal.mk |1
external/clucene/UnpackedTarball_clucene.mk |1
external/clucene/patches/clucene-reprobuild.patch.1 | 61
helpcompiler/source/HelpIndexer.cxx |5 +
4 files changed, 68 insertions(+)
New commits:
commit ff071078ee5f13f0e9d430d6783444a631d232a0
Author: Thorsten Behrens
AuthorDate: Thu Nov 2 18:17:50 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 13 07:32:13 2023 +0100
reprobuild: don't write timestamps to clucene index files
Our embedded clucene by default write a random current-time
millisecond value into version fields, in an attempt to
randomise. Clearly this is not needed for our static help, and it also
prevents builds from being reproducible.
Change-Id: I011388b5bc72b5d86bc1900f5439036ede60c020
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158845
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9659ec7c163f..da11a7d153f2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2847,6 +2847,7 @@ ifneq ($(SYSTEM_CLUCENE),)
define gb_LinkTarget__use_clucene
$(call gb_LinkTarget_add_defs,$(1),\
$(filter-out -I% -isystem%,$(subst -isystem
/,-isystem/,$(CLUCENE_CFLAGS))) \
+ -DSYSTEM_CLUCENE \
)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/external/clucene/UnpackedTarball_clucene.mk
b/external/clucene/UnpackedTarball_clucene.mk
index 0d7b2a5c288e..3acdb35b5757 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
external/clucene/patches/binary_function.patch \
external/clucene/patches/clucene-pure-virtual.patch \
external/clucene/patches/enumarith.patch \
+ external/clucene/patches/clucene-reprobuild.patch.1 \
))
ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/clucene-reprobuild.patch.1
b/external/clucene/patches/clucene-reprobuild.patch.1
new file mode 100644
index ..2c5a0b95135f
--- /dev/null
+++ b/external/clucene/patches/clucene-reprobuild.patch.1
@@ -0,0 +1,61 @@
+diff -ur clucene.org/src/core/CLucene/index/IndexWriter.cpp
clucene/src/core/CLucene/index/IndexWriter.cpp
+--- clucene.org/src/core/CLucene/index/IndexWriter.cpp 2023-11-02
17:31:00.110168174 +0100
clucene/src/core/CLucene/index/IndexWriter.cpp 2023-11-02
17:33:22.507665912 +0100
+@@ -366,6 +366,10 @@
+ }
+ }
+
++void IndexWriter::setSegmentInfoStartVersion(int64_t startVersion) {
++ this->segmentInfos->setStartVersion(startVersion);
++}
++
+ int32_t IndexWriter::getMaxBufferedDocs() {
+ ensureOpen();
+ return docWriter->getMaxBufferedDocs();
+diff -ur clucene.org/src/core/CLucene/index/IndexWriter.h
clucene/src/core/CLucene/index/IndexWriter.h
+--- clucene.org/src/core/CLucene/index/IndexWriter.h 2023-11-02
17:31:00.113501525 +0100
clucene/src/core/CLucene/index/IndexWriter.h 2023-11-02
17:33:43.547787510 +0100
+@@ -336,6 +336,12 @@
+ int64_t getWriteLockTimeout();
+
+ /**
++ * Sets the 0th segmentinfo version. Default is current system time
++ * in milliseconds
++ */
++ void setSegmentInfoStartVersion(int64_t startVersion);
++
++ /**
+* Sets the maximum time to wait for a commit lock (in milliseconds).
+*/
+ void setCommitLockTimeout(int64_t commitLockTimeout);
+diff -ur clucene.org/src/core/CLucene/index/SegmentInfos.cpp
clucene/src/core/CLucene/index/SegmentInfos.cpp
+--- clucene.org/src/core/CLucene/index/SegmentInfos.cpp2023-11-02
17:31:00.110168174 +0100
clucene/src/core/CLucene/index/SegmentInfos.cpp2023-11-02
18:04:43.855243418 +0100
+@@ -662,6 +662,10 @@
+ return IndexFileNames::fileNameFromGeneration(
IndexFileNames::SEGMENTS, "", nextGeneration );
+ }
+
++ void SegmentInfos::setStartVersion(int64_t version) {
++ this->version = version;
++ }
++
+ void SegmentInfos::clearto(size_t from, size_t end){
+ size_t range = end - from;
+ if ( (infos.size() - from) >= range) { // Make sure we actually need to
remove
+diff -ur clucene.org/src/core/CLucene/index/_SegmentInfos.h
clucene/src/core/CLucene/index/_SegmentInfos.h
+--- clucene.org/src/core/CLucene/index/_SegmentInfos.h 2023-11-02
17:31:00.106834824 +0100
clucene/src/core/CLucene/index/_SegmentInfos.h 2023-11-02
18:04:51.178598463 +0100
+@@ -347,6 +347,13 @@
+ */
+ std::string getNextSegmentFileName();
+
++ /**
++ * Set version value to start from
++
++ Defaults to current time in milliseconds
++ */
++void setStartVersion(int64_t version);
++
+ /* public vector-like operations */
+ //delete and clears objects 'from' from to 'to'
+ void
core.git: android/source
android/source/build.gradle |3 +++
android/source/gradle.properties |1 -
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 638d25d141fdaf2ec54dfcc7d9d42207150761a3
Author: Thorsten Behrens
AuthorDate: Mon Dec 11 00:46:43 2023 +0100
Commit: Thorsten Behrens
CommitDate: Mon Dec 11 21:36:55 2023 +0100
Move Android buildfeature config to build.gradle
Old gradle.properties entry was deprecated in 8.0:
-
https://cs.android.com/android-studio/platform/tools/base/+/0bc1c23297760643b03e8cfd8acc52c007a99cd6
Change-Id: Ia34379e8112cc2c316be229e7719c2ce1b695576
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160602
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/android/source/build.gradle b/android/source/build.gradle
index 8843330b7ba5..eed27bef4e54 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -40,6 +40,9 @@ dependencies {
android {
namespace 'org.libreoffice'
compileSdk 34
+buildFeatures {
+buildConfig = true
+}
// uses non-conventional source layout, so need to reconfigure accordingly
// ToDo move to conventional layout, so stuff can be stripped down.
sourceSets {
diff --git a/android/source/gradle.properties b/android/source/gradle.properties
index 76578d6146a5..19f2d673e497 100644
--- a/android/source/gradle.properties
+++ b/android/source/gradle.properties
@@ -1,4 +1,3 @@
-android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.useAndroidX=true
core.git: external/libeot solenv/gbuild
external/libeot/ExternalProject_libeot.mk |1 - solenv/gbuild/platform/com_GCC_defs.mk|4 2 files changed, 5 deletions(-) New commits: commit 6fa6599963fb7d5ba411540b181c581bbbeb1e9d Author: Thorsten Behrens AuthorDate: Mon Dec 4 13:56:55 2023 +0100 Commit: Thorsten Behrens CommitDate: Sun Dec 10 00:37:58 2023 +0100 Remove hard limit to c89 for clang This seems no longer true: "Windows MSVC only supports C90 so force gnu89" With that said, also do a revert: "external/libeot internally uses --std=c99, do not overrule that" This reverts commit 61a66b612eaeeb38d5d9f9aa83326be6b08c1b6f. Change-Id: Id628131b4fa6b61e19da6d862d773ab36f201729 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160454 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index 98c7d2eb403d..6e5f465333cc 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -23,7 +23,6 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : --enable-static \ --disable-shared \ --disable-debug \ - CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ && $(MAKE) $(if $(verbose),V=1) \ ) $(call gb_Trace_EndRange,libeot,EXTERNAL) diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 7ea7a16461e3..3f50c4089b09 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -186,10 +186,6 @@ gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \ -Wno-variadic-macros -Wno-deprecated-declarations endif -# On Windows MSVC only supports C90 so force gnu89 (especially in clang) to -# to catch potential gnu89/C90 incompatibilities locally. -gb_CFLAGS_COMMON += -std=gnu89 - ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_IS_CLANG),TRUE) gb_LTOFLAGS := -flto=thin
core.git: distro-configs/LibreOfficeWin64.conf officecfg/registry
distro-configs/LibreOfficeWin64.conf |1 + officecfg/registry/schema/org/openoffice/Office/Update.xcs |6 -- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit caea33a11a212fc1c0426c90715c06376dbb9f06 Author: Thorsten Behrens AuthorDate: Thu Dec 7 16:39:32 2023 +0100 Commit: Thorsten Behrens CommitDate: Thu Dec 7 18:20:02 2023 +0100 Turn on MAR-based updater for Win64 But make it default-off for the while. Change-Id: I54e2fb8544ceb5ffe88053504294e2f3d5df50d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160436 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 71c386b36116..8ace248e80d4 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -7,6 +7,7 @@ --enable-ext-wiki-publisher --enable-ext-nlpsolver --enable-online-update +--enable-online-update-mar --enable-breakpad --with-help=html --with-myspell-dicts diff --git a/officecfg/registry/schema/org/openoffice/Office/Update.xcs b/officecfg/registry/schema/org/openoffice/Office/Update.xcs index 2260264b6b2a..1eed1a870206 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Update.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Update.xcs @@ -19,9 +19,11 @@ -Determines if the automatic Updater is enabled or disabled +Determines if the automatic Updater is enabled +or disabled. Defaults to false, as long as this is +regarded experimental. -true +false
core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 8 commits - desktop/qa embeddedobj/source include/svx reportdesign/source svx/source sw/source xmloff/source
desktop/qa/desktop_lib/test_desktop_lib.cxx|6 ++-
embeddedobj/source/commonembedding/persistence.cxx | 24 -
include/svx/unoshape.hxx |6 ++-
reportdesign/source/core/sdr/ReportDrawPage.cxx|2 -
svx/source/unodraw/shapeimpl.hxx |7 ++-
svx/source/unodraw/unomod.cxx |6 ++-
svx/source/unodraw/unopage.cxx | 14 +++
svx/source/unodraw/unoshap4.cxx| 38 +++--
sw/source/uibase/wrtsh/wrtsh2.cxx |8 ++--
xmloff/source/draw/ximpshap.cxx|4 ++
10 files changed, 69 insertions(+), 46 deletions(-)
New commits:
commit 5d1fa34717f9a21695b1f55e85ae54a723b94fc2
Author: Thorsten Behrens
AuthorDate: Wed Dec 6 12:15:44 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 7 13:04:28 2023 +0100
No FrameWeld yet on ViewFrame
This was only added via https://gerrit.libreoffice.org/c/core/+/113795
Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index afb468011feb..459abd7f8b33 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -497,7 +497,7 @@ static void LoadURL(SwView& rView, const OUString& rURL,
LoadUrlFlags nFilter,
OSL_ENSURE( pDShell, "No DocShell?!");
SfxViewFrame& rViewFrame = *rView.GetViewFrame();
-if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell,
rViewFrame.GetFrameWeld()))
+if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell,
rView.GetFrameWeld()))
return;
// We are doing tiledRendering, let the client handles the URL loading,
commit 9b2b9bd52db660bea45edc1da228a4a23add0c6d
Author: Miklos Vajna
AuthorDate: Mon Nov 27 11:21:57 2023 +0100
Commit: Thorsten Behrens
CommitDate: Thu Dec 7 10:36:39 2023 +0100
CppunitTest_desktop_lib: adjust asserts so this works again
Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990
Tested-by: Jenkins CollaboraOffice
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 1bb185dd5b9e..f32fb09d9270 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2396,7 +2396,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_ODT()
}
int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-CPPUNIT_ASSERT_EQUAL(int(1), nState);
+// OK or NOTVALIDATED (signature is OK, but certificate could not be
validated)
+CPPUNIT_ASSERT(nState == 1 || nState == 4);
}
void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
@@ -2454,7 +2455,8 @@ void DesktopLOKTest::testInsertCertificate_PEM_DOCX()
}
int nState = pDocument->m_pDocumentClass->getSignatureState(pDocument);
-CPPUNIT_ASSERT_EQUAL(int(5), nState);
+// PARTIAL_OK or NOTVALIDATED_PARTIAL_OK
+CPPUNIT_ASSERT(nState == 5 || nState == 6);
}
void DesktopLOKTest::testSignDocument_PEM_PDF()
commit 8dac6878119178a45d2ded9ddd584499b77cc26a
Author: Caolán McNamara
AuthorDate: Fri Nov 17 08:57:09 2023 +
Commit: Thorsten Behrens
CommitDate: Thu Dec 7 00:48:10 2023 +0100
we can have just one LoadURL for writer
Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index ec88a639a4e9..87375f30c8b7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,7 +23,6 @@
#include
class SwViewShell;
-class SwView;
enum class LoadUrlFlags {
NONE= 0x00,
@@ -36,10 +35,6 @@ namespace o3tl {
void LoadURL( SwViewShell& rSh, const OUString& rName,
LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-void LoadURL( SwView& rView, const OUString& rName,
- LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 820b131e60b6..0e3ba07c3973 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest )
const SvxFieldData* pField = pOLV->GetFieldAtCursor();
if (const SvxURLField* pURLField = dynamic_cast(pField))
{
-::LoadURL(GetView(), pURLFi
[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - onlineupdate/inc onlineupdate/source onlineupdate/StaticLibrary_updatehelper.mk
onlineupdate/StaticLibrary_updatehelper.mk |8 1 file changed, 8 insertions(+) New commits: commit a5e825cc69f9c29d450607d9033682ec3a68b57e Author: Thorsten Behrens AuthorDate: Thu Dec 7 02:18:49 2023 + Commit: Thorsten Behrens CommitDate: Thu Dec 7 03:20:26 2023 +0100 More fixup Windows buiuld Change-Id: Ic5ffedbf57fa0f686b9ede193f61e47e7efe90ac diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk index cbb0130759e9..cce26a8dcbac 100644 --- a/onlineupdate/StaticLibrary_updatehelper.mk +++ b/onlineupdate/StaticLibrary_updatehelper.mk @@ -19,8 +19,11 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\ $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\ -DNSS3 \ + -DUNICODE \ -DVERIFY_MAR_SIGNATURE \ -DXP_WIN=1 \ + -DNTDDI_VERSION=NTDDI_WIN8 \ + -DMOZ_MAINTENANCE_SERVICE \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\ @@ -28,6 +31,11 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\ onlineupdate/source/update/common/readstrings \ onlineupdate/source/update/common/uachelper \ onlineupdate/source/update/common/updatehelper \ + onlineupdate/source/update/common/updatecommon \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\ + onlineupdate/source/update/common/updateutils_win \ )) # vim:set shiftwidth=4 tabstop=4 noexpandtab: */ diff --git a/onlineupdate/source/service/nsAutoRef.h b/onlineupdate/inc/nsAutoRef.h similarity index 100% rename from onlineupdate/source/service/nsAutoRef.h rename to onlineupdate/inc/nsAutoRef.h diff --git a/onlineupdate/source/service/nsCharTraits.h b/onlineupdate/inc/nsCharTraits.h similarity index 100% rename from onlineupdate/source/service/nsCharTraits.h rename to onlineupdate/inc/nsCharTraits.h diff --git a/onlineupdate/source/service/nsUTF8Utils.h b/onlineupdate/inc/nsUTF8Utils.h similarity index 100% rename from onlineupdate/source/service/nsUTF8Utils.h rename to onlineupdate/inc/nsUTF8Utils.h diff --git a/onlineupdate/source/service/nsWindowsHelpers.h b/onlineupdate/inc/nsWindowsHelpers.h similarity index 100% rename from onlineupdate/source/service/nsWindowsHelpers.h rename to onlineupdate/inc/nsWindowsHelpers.h
[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - 2 commits - include/onlineupdate onlineupdate/Executable_update_service.mk onlineupdate/Module_onlineupdate.mk onlineupdate/source onl
include/onlineupdate/mozilla/ArrayUtils.h | 188 +
include/onlineupdate/mozilla/Casting.h | 229 +
include/onlineupdate/mozilla/DebugOnly.h| 102
include/onlineupdate/mozilla/DynamicallyLinkedFunctionPtr.h | 137
include/onlineupdate/mozilla/EndianUtils.h | 611
include/onlineupdate/mozilla/HashFunctions.h| 417 +++
include/onlineupdate/mozilla/MathAlgorithms.h | 492 +++
include/onlineupdate/mozilla/MemoryReporting.h | 30
include/onlineupdate/mozilla/ReentrancyGuard.h | 50
include/onlineupdate/mozilla/Result.h | 873 ++
include/onlineupdate/mozilla/ResultVariant.h| 61
include/onlineupdate/mozilla/Span.h | 973 +++
include/onlineupdate/mozilla/Variant.h | 928 ++
include/onlineupdate/mozilla/Vector.h | 1653
include/onlineupdate/mozilla/WinHeaderOnlyUtils.h | 826 +
include/onlineupdate/mozilla/WrappingOperations.h | 262 +
onlineupdate/Executable_update_service.mk |8
onlineupdate/Module_onlineupdate.mk |3
onlineupdate/StaticLibrary_libmarverify.mk |5
onlineupdate/source/service/nsAutoRef.h | 489 +++
onlineupdate/source/service/nsCharTraits.h | 486 +++
onlineupdate/source/service/nsUTF8Utils.h | 247 +
onlineupdate/source/service/nsWindowsHelpers.h | 339 ++
onlineupdate/source/service/nsWindowsRestart.cpp| 197 +
24 files changed, 9602 insertions(+), 4 deletions(-)
New commits:
commit 67b8ad26b868c6de69b0aa2d1f11ccf66cb1a2dd
Author: Thorsten Behrens
AuthorDate: Thu Dec 7 01:02:40 2023 +
Commit: Thorsten Behrens
CommitDate: Thu Dec 7 02:06:41 2023 +0100
Missing headers
Change-Id: I1a68e8f84df2c216c3507704d06131c4bfd20747
diff --git a/include/onlineupdate/mozilla/ArrayUtils.h
b/include/onlineupdate/mozilla/ArrayUtils.h
new file mode 100644
index ..0d55bb1f6546
--- /dev/null
+++ b/include/onlineupdate/mozilla/ArrayUtils.h
@@ -0,0 +1,188 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+/*
+ * Implements various helper functions related to arrays.
+ */
+
+#ifndef mozilla_ArrayUtils_h
+#define mozilla_ArrayUtils_h
+
+#include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
+
+#include
+#include
+
+#ifdef __cplusplus
+# include
+# include
+
+# include "mozilla/Alignment.h"
+
+namespace mozilla {
+
+template
+class Array;
+template
+class EnumeratedArray;
+
+/*
+ * Safely subtract two pointers when it is known that aEnd >= aBegin, yielding
a
+ * size_t result.
+ *
+ * Ordinary pointer subtraction yields a ptrdiff_t result, which, being signed,
+ * has insufficient range to express the distance between pointers at opposite
+ * ends of the address space. Furthermore, most compilers use ptrdiff_t to
+ * represent the intermediate byte address distance, before dividing by
+ * sizeof(T); if that intermediate result overflows, they'll produce results
+ * with the wrong sign even when the correct scaled distance would fit in a
+ * ptrdiff_t.
+ */
+template
+MOZ_ALWAYS_INLINE size_t PointerRangeSize(T* aBegin, T* aEnd) {
+ MOZ_ASSERT(aEnd >= aBegin);
+ return (size_t(aEnd) - size_t(aBegin)) / sizeof(T);
+}
+
+/*
+ * Compute the length of an array with constant length. (Use of this method
+ * with a non-array pointer will not compile.)
+ *
+ * Beware of the implicit trailing '\0' when using this with string constants.
+ */
+template
+constexpr size_t ArrayLength(T ()[N]) {
+ return N;
+}
+
+template
+constexpr size_t ArrayLength(const Array& aArr) {
+ return N;
+}
+
+template
+constexpr size_t ArrayLength(const EnumeratedArray& aArr) {
+ return size_t(N);
+}
+
+/*
+ * Compute the address one past the last element of a constant-length array.
+ *
+ * Beware of the implicit trailing '\0' when using this with string constants.
+ */
+template
+constexpr T* ArrayEnd(T ()[N]) {
+ return aArr + ArrayLength(aArr);
+}
+
+template
+constexpr T* ArrayEnd(Array& aArr) {
+ return [0] + ArrayLength(aArr);
+}
+
+template
+constexpr const T* ArrayEnd(const Array& aArr) {
+ return [0] + ArrayLength(aArr);
+}
+
+/**
+ * std::equal has subpar ergonomics.
+ */
+
+template
+bool ArrayEqual(const T ()[N], const U ()[N]) {
+ return std::equal(a, a + N, b);
+}
+
+template
+bool ArrayEqual(const T* const a, const U* const b, const size_t n) {
+ return std::equa
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 3 commits - external/liborcus i18npool/source svx/source sw/source unotools/source
external/liborcus/include.patch.0 | 21 + i18npool/source/calendar/calendar_gregorian.cxx |2 +- svx/source/dialog/fntctrl.cxx |2 +- sw/source/uibase/wrtsh/wrtsh2.cxx |2 +- unotools/source/i18n/resmgr.cxx |5 + 5 files changed, 29 insertions(+), 3 deletions(-) New commits: commit 95e1347cb2d4144ce97431a33b6d4ecda4d679aa Author: Thorsten Behrens AuthorDate: Wed Dec 6 12:15:44 2023 +0100 Commit: Thorsten Behrens CommitDate: Wed Dec 6 12:15:44 2023 +0100 No FrameWeld yet on ViewFrame This was only added via https://gerrit.libreoffice.org/c/core/+/113795 Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index 1cb9e1b46861..57769ab6e881 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -495,7 +495,7 @@ static void LoadURL(SwView& rView, const OUString& rURL, LoadUrlFlags nFilter, OSL_ENSURE( pDShell, "No DocShell?!"); SfxViewFrame& rViewFrame = *rView.GetViewFrame(); -if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell, rViewFrame.GetFrameWeld())) +if (!SfxObjectShell::AllowedLinkProtocolFromDocument(rURL, pDShell, rView.GetFrameWeld())) return; // We are doing tiledRendering, let the client handles the URL loading, commit 403bf61489eaded6982fe5700b4dbf58d869aa12 Author: Thorsten Behrens AuthorDate: Wed Dec 6 11:44:15 2023 +0100 Commit: Thorsten Behrens CommitDate: Wed Dec 6 12:15:15 2023 +0100 Fix build for gcc13 This was part of the following commit: Author: Stephan Bergmann Date: Mon May 23 10:21:54 2022 +0200 Missing #include in various external code ...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include rather than .) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann Plus the gist of this one: Author: Caolán McNamara Date: Tue Nov 3 14:10:31 2020 + presumably 'true' is sufficient in all cases Change-Id: I9366193085a4c46ef64f0a9660e51b8678ca35f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105252 Tested-by: Jenkins Reviewed-by: Caolán McNamara Change-Id: Iae063b6270dfe60cebe27833b1a22f7af1fc312c diff --git a/external/liborcus/include.patch.0 b/external/liborcus/include.patch.0 index 9555dd534b3e..3bed5aebf865 100644 --- a/external/liborcus/include.patch.0 +++ b/external/liborcus/include.patch.0 @@ -1,3 +1,24 @@ +--- include/orcus/base64.hpp include/orcus/base64.hpp +@@ -9,6 +9,7 @@ + #define __ORCUS_BASE64_HPP__ + + #include "env.hpp" ++#include + #include + #include + +--- include/orcus/types.hpp include/orcus/types.hpp +@@ -16,6 +16,7 @@ + #pragma GCC diagnostic ignored "-Wshadow" + #endif + ++#include + #include + #include + #include + --- src/liborcus/orcus_xlsx.cpp +++ src/liborcus/orcus_xlsx.cpp @@ -32,6 +32,7 @@ diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index f3dc6ede1f66..1dacd8868265 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); int32_t nZoneOffset, nDSTOffset; UErrorCode status = U_ZERO_ERROR; -body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); +body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); if ( !U_SUCCESS(status) ) throw ERROR; status = U_ZERO_ERROR; body->setTime( fR - (nZoneOffset + nDSTOffset), status ); diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index d312d7ad5f49..10c84ca95222 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet , bool bPreviewBack rCTLFont.SetFillColor( rColor ); } else -bTransparent = TRUE; +bTransparent = true; rFont.SetTransparent( bTransparent ); rCJKFont.SetTransparent( bTransparent ); commit 5badca42b45f23f35e6dcdb482
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 5 commits - configure.ac embeddedobj/source sw/source
Rebased ref, commits from common ancestor:
commit 64e3aacf59d345ed8f8ccdbdc20c4d5320831a79
Author: Thorsten Behrens
AuthorDate: Wed Dec 6 06:33:02 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 10:41:59 2023 +0100
Bump version to 6.4.0.22
Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf
diff --git a/configure.ac b/configure.ac
index 39cc33d13928..ac34e147b005 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.21],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.22],[],[],[https://www.cib.de/office/])
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
commit 847de5dfc3997886035a96b1755c07450ef6dfa9
Author: Caolán McNamara
AuthorDate: Fri Nov 17 08:57:09 2023 +
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 10:41:59 2023 +0100
we can have just one LoadURL for writer
Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index ec88a639a4e9..87375f30c8b7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,7 +23,6 @@
#include
class SwViewShell;
-class SwView;
enum class LoadUrlFlags {
NONE= 0x00,
@@ -36,10 +35,6 @@ namespace o3tl {
void LoadURL( SwViewShell& rSh, const OUString& rName,
LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-void LoadURL( SwView& rView, const OUString& rName,
- LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 820b131e60b6..0e3ba07c3973 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest )
const SvxFieldData* pField = pOLV->GetFieldAtCursor();
if (const SvxURLField* pURLField = dynamic_cast(pField))
{
-::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
pURLField->GetTargetFrame());
}
}
commit df87d705a49125c5438eba1f14972134acb55960
Author: Caolán McNamara
AuthorDate: Wed Nov 15 21:01:48 2023 +
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 10:41:59 2023 +0100
combine these hyperlink dispatchers into one call
Conflicts:
sw/source/uibase/shells/drwtxtex.cxx
sw/source/uibase/wrtsh/wrtsh2.cxx
Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 87375f30c8b7..ec88a639a4e9 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,6 +23,7 @@
#include
class SwViewShell;
+class SwView;
enum class LoadUrlFlags {
NONE= 0x00,
@@ -35,6 +36,10 @@ namespace o3tl {
void LoadURL( SwViewShell& rSh, const OUString& rName,
LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+void LoadURL( SwView& rView, const OUString& rName,
+ LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 0e3ba07c3973..820b131e60b6 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest )
const SvxFieldData* pField = pOLV->GetFieldAtCursor();
if (const SvxURLField* pURLField = dynamic_cast(pField))
{
-::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
pURLField->GetTargetFrame());
}
}
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 4b98417ac788..1cb9e1b46861 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -491,9 +491,
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 7 commits - configure.ac embeddedobj/source include/svx reportdesign/source svx/source sw/source xmloff/source
configure.ac |2 -
embeddedobj/source/commonembedding/persistence.cxx | 25 -
include/svx/unoshape.hxx |6 ++-
reportdesign/source/core/sdr/ReportDrawPage.cxx|2 -
svx/source/unodraw/shapeimpl.hxx |7 ++-
svx/source/unodraw/unomod.cxx |6 ++-
svx/source/unodraw/unopage.cxx | 14 +++
svx/source/unodraw/unoshap4.cxx| 38 +++--
sw/source/uibase/wrtsh/wrtsh2.cxx |8 ++--
xmloff/source/draw/ximpshap.cxx|4 ++
10 files changed, 67 insertions(+), 45 deletions(-)
New commits:
commit 9c4258eca006fd4524c11ab31a26d886dcad1ec7
Author: Thorsten Behrens
AuthorDate: Wed Dec 6 06:33:02 2023 +0100
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 06:33:02 2023 +0100
Bump version to 6.4.0.22
Change-Id: Ife20720d3cd9725a5bf40e4f1433261b790231cf
diff --git a/configure.ac b/configure.ac
index 39cc33d13928..ac34e147b005 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.21],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.22],[],[],[https://www.cib.de/office/])
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
commit 2bb9d59c9bd1c7893fccfce8e9b4034a8b4165e8
Author: Caolán McNamara
AuthorDate: Fri Nov 17 08:57:09 2023 +
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 06:22:54 2023 +0100
we can have just one LoadURL for writer
Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index ec88a639a4e9..87375f30c8b7 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,7 +23,6 @@
#include
class SwViewShell;
-class SwView;
enum class LoadUrlFlags {
NONE= 0x00,
@@ -36,10 +35,6 @@ namespace o3tl {
void LoadURL( SwViewShell& rSh, const OUString& rName,
LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-void LoadURL( SwView& rView, const OUString& rName,
- LoadUrlFlags nFilter, const OUString& rTargetFrameName );
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 820b131e60b6..0e3ba07c3973 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -545,7 +545,7 @@ void SwDrawTextShell::Execute( SfxRequest )
const SvxFieldData* pField = pOLV->GetFieldAtCursor();
if (const SvxURLField* pURLField = dynamic_cast(pField))
{
-::LoadURL(GetView(), pURLField->GetURL(), LoadUrlFlags::NONE,
+::LoadURL(GetShell(), pURLField->GetURL(), LoadUrlFlags::NONE,
pURLField->GetTargetFrame());
}
}
commit 2644737c313540dcd1e33e9c5c6802c6d228afa2
Author: Caolán McNamara
AuthorDate: Wed Nov 15 21:01:48 2023 +
Commit: Thorsten Behrens
CommitDate: Wed Dec 6 06:21:58 2023 +0100
combine these hyperlink dispatchers into one call
Conflicts:
sw/source/uibase/shells/drwtxtex.cxx
sw/source/uibase/wrtsh/wrtsh2.cxx
Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)
diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx
index 87375f30c8b7..ec88a639a4e9 100644
--- a/sw/inc/swurl.hxx
+++ b/sw/inc/swurl.hxx
@@ -23,6 +23,7 @@
#include
class SwViewShell;
+class SwView;
enum class LoadUrlFlags {
NONE= 0x00,
@@ -35,6 +36,10 @@ namespace o3tl {
void LoadURL( SwViewShell& rSh, const OUString& rName,
LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+void LoadURL( SwView& rView, const OUString& rName,
+ LoadUrlFlags nFilter, const OUString& rTargetFrameName );
+
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 0e3ba07c3973..820b131e60b6 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@
[Libreoffice-commits] core.git: Branch 'feature/windowsupdater' - 2 commits - include/onlineupdate onlineupdate/Executable_mbsdiff.mk onlineupdate/Executable_updater.mk onlineupdate/Executable_update_
include/onlineupdate/mozilla/Attributes.h | 16 onlineupdate/Executable_mbsdiff.mk |4 onlineupdate/Executable_update_service.mk |8 ++-- onlineupdate/Executable_updater.mk |3 +-- onlineupdate/StaticLibrary_libmar.mk |4 onlineupdate/StaticLibrary_libmarverify.mk |1 + onlineupdate/StaticLibrary_updatehelper.mk |1 + 7 files changed, 17 insertions(+), 20 deletions(-) New commits: commit ec46d6dc31f015298a049ff1f1d3e325e4dc7885 Author: Thorsten Behrens AuthorDate: Tue Dec 5 08:48:53 2023 + Commit: Thorsten Behrens CommitDate: Tue Dec 5 09:54:43 2023 +0100 Fix windows build some more Change-Id: Ib90844096565d164226c72a9dedaccf6f49a74f1 diff --git a/include/onlineupdate/mozilla/Attributes.h b/include/onlineupdate/mozilla/Attributes.h index 1f05ad3315b3..6b93ee1b2193 100644 --- a/include/onlineupdate/mozilla/Attributes.h +++ b/include/onlineupdate/mozilla/Attributes.h @@ -87,22 +87,6 @@ #endif #endif -/** - * Per clang's documentation: - * - * If a statement is marked nomerge and contains call expressions, those call - * expressions inside the statement will not be merged during optimization. This - * attribute can be used to prevent the optimizer from obscuring the source - * location of certain calls. - * - * This is useful to have clearer information on assertion failures. - */ -#if defined(__clang__) && __has_attribute(nomerge) -#define MOZ_NOMERGE __attribute__((nomerge)) -#else -#define MOZ_NOMERGE -#endif - /* * MOZ_NEVER_INLINE is a macro which expands to tell the compiler that the * method decorated with it must never be inlined, even if the compiler would diff --git a/onlineupdate/Executable_mbsdiff.mk b/onlineupdate/Executable_mbsdiff.mk index fded20228f10..562ad184a0ea 100644 --- a/onlineupdate/Executable_mbsdiff.mk +++ b/onlineupdate/Executable_mbsdiff.mk @@ -25,6 +25,10 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_libs,mbsdiff,\ ws2_32.lib \ )) + +$(eval $(call gb_Executable_add_defs,mbsdiff,\ + -DXP_WIN=1 \ +)) endif $(eval $(call gb_Executable_add_cxxobjects,mbsdiff,\ diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 1ac72e854293..5ad5667732d9 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -48,6 +48,10 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\ /ENTRY:wmainCRTStartup \ )) +$(eval $(call gb_Executable_add_defs,update_service,\ + -DXP_WIN=1 \ +)) + $(eval $(call gb_Executable_add_exception_objects,update_service,\ onlineupdate/source/update/common/certificatecheck \ onlineupdate/source/service/maintenanceservice \ diff --git a/onlineupdate/StaticLibrary_libmar.mk b/onlineupdate/StaticLibrary_libmar.mk index ab6b485e0ccb..7273ab397ec1 100644 --- a/onlineupdate/StaticLibrary_libmar.mk +++ b/onlineupdate/StaticLibrary_libmar.mk @@ -22,6 +22,10 @@ $(eval $(call gb_StaticLibrary_add_cobjects,libmar,\ onlineupdate/source/libmar/src/mar_read \ )) +$(eval $(call gb_StaticLibrary_add_defs,libmar,\ + -DXP_WIN=1 \ +)) + $(eval $(call gb_StaticLibrary_use_static_libraries,\ libmarverify \ )) diff --git a/onlineupdate/StaticLibrary_libmarverify.mk b/onlineupdate/StaticLibrary_libmarverify.mk index 1a9204a867c9..c4c4c8e2104e 100644 --- a/onlineupdate/StaticLibrary_libmarverify.mk +++ b/onlineupdate/StaticLibrary_libmarverify.mk @@ -19,6 +19,7 @@ $(eval $(call gb_StaticLibrary_set_include,libmarverify,\ ifneq ($(OS),WNT) $(eval $(call gb_StaticLibrary_add_defs,libmarverify,\ -DMAR_NSS \ + -DXP_WIN=1 \ )) $(eval $(call gb_StaticLibrary_use_externals,libmarverify,\ diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk index 96129fdba267..cbb0130759e9 100644 --- a/onlineupdate/StaticLibrary_updatehelper.mk +++ b/onlineupdate/StaticLibrary_updatehelper.mk @@ -20,6 +20,7 @@ $(eval $(call gb_StaticLibrary_set_include,updatehelper,\ $(eval $(call gb_StaticLibrary_add_defs,updatehelper,\ -DNSS3 \ -DVERIFY_MAR_SIGNATURE \ + -DXP_WIN=1 \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\ commit d143109b49908db2142cdd8435b4cf3164bb510f Author: Thorsten Behrens AuthorDate: Mon Dec 4 23:23:43 2023 + Commit: Thorsten Behrens CommitDate: Tue Dec 5 09:54:37 2023 +0100 Fixup windows Change-Id: Ic8426edfe6d5686791c14ddde31347f6139c7b3e diff --git a/onlineupdate/Executable_update_service.mk b/onlineupdate/Executable_update_service.mk index 6ff9afd1a6a8..1ac72e854293 100644 --- a/onlineupdate/Executable_update_service.mk +++ b/onlineupdate/Executable_update_service.mk @@ -49,9 +49,9 @@ $(eval $(call gb_Executable_add_ldflags,update_service,\ )) $(eval $(call gb_Executable_add_exception_objects,update_service,\ - onlineupdate/source
[Libreoffice-commits] core.git: Changes to 'feature/windowsupdater'
New branch 'feature/windowsupdater' available with the following commits: commit 93609732210532ab6bcdabf8fa12fa3dc6f06478 Author: Thorsten Behrens Date: Mon Dec 4 13:56:55 2023 +0100 Remove hard limit to c89 for clang Not sure this is still true? "Windows MSVC only supports C90 so force gnu89" Change-Id: Id628131b4fa6b61e19da6d862d773ab36f201729 commit 3ccce9c631e22faa57cc4e24200f54c040589410 Author: Thorsten Behrens Date: Mon Dec 4 13:56:12 2023 +0100 More buildfixes, also define XP_ commit a52a079d419c57a86f0ab2cced6e2b06d95f954b Author: Thorsten Behrens Date: Mon Dec 4 13:05:41 2023 +0100 Add more missing includes commit 1e4fc549a4d0741b2d34a8b8bd9498a63d475506 Author: Thorsten Behrens Date: Mon Dec 4 13:03:21 2023 +0100 Widen include path Change-Id: I3e371acb4adaf92999c830c5f94ca321df89b7d5 commit 07e11e5f5d3dbb075aeb3ed579bc1c7b8a35c6a6 Author: Thorsten Behrens Date: Mon Dec 4 09:20:32 2023 +0100 Add missing files, rename cpp->cxx, tweak makefiles commit a5799d7b7dfb937c17b1fcab77b0eaa36f5c32bf Author: Thorsten Behrens Date: Mon Dec 4 04:29:25 2023 +0100 Fixup after clang-format commit 0e79a73d1b3c76b766e3200396b123f10b71609c Author: Thorsten Behrens Date: Mon Dec 4 04:26:57 2023 +0100 Commit w/p clang-format commit 35b02a6818882b0d310b1098b636467d8cae45bc Author: Thorsten Behrens Date: Mon Dec 4 03:44:23 2023 +0100 clang-format all of onlineupdate In preparation of updating from upstream Change-Id: I8f2ce1079f000ed79af594ea1a89f85fc994de3b commit b0c47d7d873e40456079e2c99340a92da37239a4 Author: Thorsten Behrens Date: Mon Dec 4 03:38:44 2023 +0100 Format updater code with clang-format (instead of bespoke astyle rule) Change-Id: I623b453c7662383ba35d98ecae03b61c5a98b29b
Re: password encryption
Hi! t...@disroot.org wrote: > Hi, where do I find information regarding the encryption used with the "Save > with password" option? > In ODF files saved with password encryption, unzip it & look into /META-INF/manifest.xml for info on type & parameters of the encryption used. > Looking for current documentation. > The Open Document Format has this encryption feature standardized, the details are available here: * https://opendocumentformat.org/guidance/security/ * actual standard text: https://docs.oasis-open.org/office/OpenDocument/v1.3/cs01/part2-packages/OpenDocument-v1.3-cs01-part2-packages.html#__RefHeading__752811_826425813 Since this is the dev list - the code performing the actual stream encryption is here: https://opengrok.libreoffice.org/xref/core/package/source/zipapi/ZipOutputEntry.cxx?r=848f9b2c#116 Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/cib_contract49' - 16 commits - android/source chart2/qa configure.ac download.lst external/libcmis readlicense_oo/license sw/source
android/source/build.gradle |1
android/source/src/java/org/mozilla/gecko/gfx/GLController.java |3
chart2/qa/extras/xshape/data/ods/tdf90839-4.ods |binary
chart2/qa/extras/xshape/data/pptx/tdf149204.pptx|binary
chart2/qa/extras/xshape/data/reference/tdf149204.xml| 152
chart2/qa/extras/xshape/data/reference/tdf90839-1.xml | 142
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 148
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 148
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 96
chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx |binary
chart2/qa/extras/xshape/data/xlsx/tdf90839-2.xlsx |binary
chart2/qa/extras/xshape/data/xlsx/tdf90839-3.xlsx |binary
configure.ac|4
download.lst|4
external/libcmis/UnpackedTarball_libcmis.mk |3
readlicense_oo/license/CREDITS.fodt | 3589
+-
sw/source/core/access/accfrmobj.cxx |4
17 files changed, 2153 insertions(+), 2141 deletions(-)
New commits:
commit 48e334eb9e24b9a84fe00414efb4f24354604f89
Merge: da395adba2ae 29d686fea9f6
Author: Thorsten Behrens
AuthorDate: Mon Nov 27 00:03:09 2023 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 27 00:03:09 2023 +0100
Merge tag 'libreoffice-7.6.3.2' into feature/cib_contract49
Tag libreoffice-7.6.3.2
Change-Id: Id02318634e6cf14522a1a87a54ccf87d879d6030
commit da395adba2ae4e806c60a37b91582a6705e9
Author: Noel Grandin
AuthorDate: Thu Nov 23 17:47:24 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Nov 26 23:59:50 2023 +0100
tdf#158338 Opening file with image when JAWS is running causes endless loop
Revert "tdf#112865 assigning to mpDrawObj here is unnecessary"
This reverts commit 1c1647e6ee252fe68d7406d01043e88f1721590f.
Change-Id: I056123a90850989436dadf2d4504230550b9ae2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159768
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index d8e78836b2a1..f78dc2d155db 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -106,7 +106,9 @@ void SwAccessibleChild::Init( const SdrObject* pDrawObj )
void SwAccessibleChild::Init( const SwFrame* pFrame )
{
mpFrame = pFrame;
-mpDrawObj = nullptr;
+mpDrawObj = mpFrame && mpFrame->IsFlyFrame()
+? static_cast < const SwFlyFrame * >( mpFrame
)->GetVirtDrawObj()
+: nullptr;
mpWindow = nullptr;
}
commit 29d686fea9f6705b262d369fede658f824154cc0
Author: Christian Lohmaier
AuthorDate: Fri Nov 17 00:06:03 2023 +0100
Commit: Christian Lohmaier
CommitDate: Fri Nov 17 00:06:03 2023 +0100
Version 7.6.3.2, tag libreoffice-7.6.3.2
diff --git a/dictionaries b/dictionaries
index 7b19444059e3..3b7e1d20e556 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 7b19444059e3bc18cd373054b6fc79c41f901b97
+Subproject commit 3b7e1d20e5563f388c75450ce19db63b91892cca
diff --git a/helpcontent2 b/helpcontent2
index 007977e192a7..100b5b840688 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 007977e192a797baf207f429785b9dda21b0d17b
+Subproject commit 100b5b840688a2214d51ae941fad7a55f0f3ef15
diff --git a/translations b/translations
index 1a39c4c7afe8..b45da59fc2e8 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1a39c4c7afe81046f956d78878a7aad4ef95c6b9
+Subproject commit b45da59fc2e858609294bdf6353872475d8b48fd
commit 2bfa24641659af989a7ce234d59f6d9b2f50adb9
Author: Christian Lohmaier
AuthorDate: Fri Nov 17 00:05:51 2023 +0100
Commit: Christian Lohmaier
CommitDate: Fri Nov 17 00:05:51 2023 +0100
bump product version to 7.6.3.2
Change-Id: I2a04b586b4d5361e2edec26d1c6dca2dc394129e
diff --git a/configure.ac b/configure.ac
index 4adc8d52e0eb..6313193b6520 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[7.6.3.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.6.3.2],[],[],[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
commit e467adb1f8f2663e998086e97d609a52079d
Author: Christian Lohmaier
Author
Re: Writer colourspaces
Noel Grandin wrote: > But the code is not doing anything clever, there is no active color space > management in LO. > The macOS code is largely in vcl/osx/ and the color space constants we seem > to use are kCGColorSpaceSRGB and kCGColorSpaceGenericGrayGamma2_2 > Though presumably then we could make sure that an sRGB colour space also set for outputting all PDF colours (it is already apparently set for rendering text & solid colours inside LibreOffice, on OSX)? PDF export is here: vcl/source/gdi/pdfwriter*.cxx Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/wasm' - 7135 commits - accessibility/inc accessibility/source android/Bootstrap android/default-document android/Makefile android/source animations/sour
Rebased ref, commits from common ancestor:
commit 90990aae9e0424d1d0a9e708e1adffbfe7fecfc0
Author: Thorsten Behrens
AuthorDate: Mon Nov 20 00:51:56 2023 +0100
Commit: Thorsten Behrens
CommitDate: Mon Nov 20 01:07:18 2023 +0100
Revert "WASM: headless conversion without QT5 and with unique html"
Breaks due to double use of LD_FLAGS (and duplicated embind
symbols). Lets back this out for the moment, needs some gbuild
debonging.
This reverts commit a09b1b9e68c2285289fbf36c7f5fb6a1677e8c39.
Change-Id: Idb1348a0b4a55894bb12a2c101d9460bb5e40222
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index f27755eb3aa8..fd23ae4af437 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -45,13 +45,6 @@
#include
#include
-#ifdef EMSCRIPTEN
-#include
-#include
-#include
-#include
-#endif
-
namespace weld {class Button; }
namespace model {class ColorSet; }
struct NamedColor;
@@ -454,10 +447,6 @@ public:
virtual boolPrepareClose(bool bUI = true);
virtual HiddenInformation GetHiddenInformationState( HiddenInformation
nStates );
voidQueryHiddenInformation( HiddenWarningFact
eFact );
-#ifdef EMSCRIPTEN
-voidReadWASMFile(emscripten::val& contentArray,
sal_Int32 nRead, css::uno::Sequence& aContent);
-voidWriteWASMFile(emscripten::val& contentArray,
const OUString& rFileName);
-#endif
boolIsSecurityOptOpenReadOnly() const;
voidSetSecurityOptOpenReadOnly( bool bOpenReadOnly
);
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3a722f026678..b39b5d14ee38 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3006,37 +3006,6 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString&
rFileName, const OUString&
if( bOk )
{
-#ifdef EMSCRIPTEN
-if (aFilterName.endsWith("pdf_Export"))
-{
-try
-{
-sal_Int32 nRead;
-Reference aTempInput =
pNewFile->GetInputStream();
-sal_Int32 nBufferSize = 32767;
-Sequence aSequence(nBufferSize);
-emscripten::val contentArray = emscripten::val::array();
-do
-{
-nRead = aTempInput->readBytes(aSequence, nBufferSize);
-if (nRead < nBufferSize)
-{
-Sequence
aTempBuf(aSequence.getConstArray(), nRead);
-ReadWASMFile(contentArray, nRead, aTempBuf);
-}
-else
-{
-ReadWASMFile(contentArray, nRead, aSequence);
-}
-} while (nRead == nBufferSize);
-WriteWASMFile(contentArray, pNewFile->GetName());
-}
-catch (const Exception&)
-{
-}
-}
-#endif
-
if( !bCopyTo )
SetModified( false );
}
@@ -3082,40 +3051,6 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString&
rFileName, const OUString&
}
-#ifdef EMSCRIPTEN
-void SfxObjectShell::ReadWASMFile(emscripten::val& contentArray, sal_Int32
nRead, css::uno::Sequence& aContent)
-{
-emscripten::val fileContentView =
emscripten::val(emscripten::typed_memory_view(
-nRead,
-reinterpret_cast(aContent.getConstArray(;
-emscripten::val fileContentCopy =
emscripten::val::global("ArrayBuffer").new_(nRead);
-emscripten::val fileContentCopyView =
emscripten::val::global("Uint8Array").new_(fileContentCopy);
-fileContentCopyView.call("set", fileContentView);
-contentArray.call("push", fileContentCopyView);
-}
-void SfxObjectShell::WriteWASMFile(emscripten::val& contentArray, const
OUString& rFileName)
-{
-INetURLObject aURL(rFileName);
-OUString aNewname =
aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset);
-emscripten::val document = emscripten::val::global("document");
-emscripten::val window = emscripten::val::global("window");
-emscripten::val type = emscripten::val::object();
-type.set("type","application/octet-stream");
-emscripten::val contentBlob =
emscripten::val::global("Blob").new_(contentArray, type);
-emscripten::val contentUrl =
window["URL"].call("createObjectURL", contentBlob);
-emscripten::val contentLink =
document.call("createElement", std::string("a"));
-contentLink.set("href", contentUrl);
-contentLink.set("downloa
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-21'
Tag 'cib-6.4-21' created by Thorsten Behrens at 2023-11-16 00:35 + Release CIB Office cib-6.4-21 -BEGIN PGP SIGNATURE- iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCZVVj718UgAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR 5k3BAP9/kRkm0P0fAjLmtqtQ0rRhuANRBstVY1ovlngTygn25gD/aELeoT9ygfa7 58v5tCYZSthmiuIA3EbKahVJvOieBgQ= =zwPc -END PGP SIGNATURE- Changes since cib-6.4-20-12: --- 0 files changed ---
[Libreoffice-commits] core.git: config_host/config_buildconfig.h.in configure.ac desktop/source
config_host/config_buildconfig.h.in |8
configure.ac|5 -
desktop/source/lib/init.cxx |4 +---
3 files changed, 1 insertion(+), 16 deletions(-)
New commits:
commit 389def871853c885289627452f40b3ae0a8dabc8
Author: Thorsten Behrens
AuthorDate: Sun Nov 5 00:34:46 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Nov 5 21:25:18 2023 +0100
reprobuild: don't include build machine setup in binaries
The configure line can leak data from the building machine (path
names, level of parallelism etc), which leads to non-reproducible
build results.
Change-Id: I042afc3d7bad19e8e274147be2a9eb0abcf5436e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158871
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/config_host/config_buildconfig.h.in
b/config_host/config_buildconfig.h.in
deleted file mode 100644
index 0c93d6e02f84..
--- a/config_host/config_buildconfig.h.in
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Options passed to configure script */
-
-#ifndef CONFIG_BUILDCONFIG_H
-#define CONFIG_BUILDCONFIG_H
-
-#define BUILDCONFIG ""
-
-#endif
diff --git a/configure.ac b/configure.ac
index cb2f975bdd97..7b821c6343d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -523,10 +523,6 @@ git_date=`git log -1 --pretty=format:"%cd"
--date=format:'%Y' 2>&/dev/null`
LIBO_THIS_YEAR=${git_date:-2023}
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
-# replace backslashes, to get a valid c++ string
-config_args=$(echo $ac_configure_args | tr '\\' '/')
-AC_DEFINE_UNQUOTED([BUILDCONFIG],[["$config_args"]],[Options passed to
configure script])
-
dnl ===
dnl Product version
dnl ===
@@ -15045,7 +15041,6 @@ AC_CONFIG_FILES([config_host.mk
vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in])
AC_CONFIG_HEADERS([config_host/config_atspi.h])
-AC_CONFIG_HEADERS([config_host/config_buildconfig.h])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_box2d.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 71eeabcbc380..3283cf7731e5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -12,7 +12,6 @@
#include
#include
#include
-#include
#include
#include
@@ -7243,8 +7242,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER
LibreOfficeKit* /*pThis*/)
"\"ProductName\": \"%PRODUCTNAME\", "
"\"ProductVersion\": \"%PRODUCTVERSION\", "
"\"ProductExtension\": \"%PRODUCTEXTENSION\", "
-"\"BuildId\": \"%BUILDID\", "
-"\"BuildConfig\": \"" BUILDCONFIG "\" "
+"\"BuildId\": \"%BUILDID\" "
"}"_ustr));
}
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d2b0c48ca0f0ba8ef3049ebcd5f93ae420c22c46
Author: Thorsten Behrens
AuthorDate: Fri Nov 3 02:57:53 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Nov 5 21:24:11 2023 +0100
reprobuild: don't use any build-time dependent values
Even taking the current year from the build system makes a build
non-reproducible (if you run it again the next year).
Change-Id: I4a2ef0fe997c20d1c8ec954378f46adb5aad04df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158870
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/configure.ac b/configure.ac
index f6ea33f4cfc7..cb2f975bdd97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,8 @@ AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
-LIBO_THIS_YEAR=`date +%Y`
+git_date=`git log -1 --pretty=format:"%cd" --date=format:'%Y' 2>&/dev/null`
+LIBO_THIS_YEAR=${git_date:-2023}
AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
# replace backslashes, to get a valid c++ string
[Libreoffice-commits] core.git: svx/source
svx/source/gallery2/galleryfilestorage.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1d939b782235a62c965a4c8309869796b5838acf
Author: Thorsten Behrens
AuthorDate: Sun Nov 5 01:26:46 2023 +0100
Commit: Thorsten Behrens
CommitDate: Sun Nov 5 21:21:27 2023 +0100
reprobuild: don't write nondeterministic textencoding
No need to write this legacy int16, that we ignore on read anyway.
Change-Id: I5ee071aa0562b8e2718a1a83dffc543c9a104360
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158942
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/svx/source/gallery2/galleryfilestorage.cxx
b/svx/source/gallery2/galleryfilestorage.cxx
index 1838520ec60a..e9a8cd0aa8b6 100644
--- a/svx/source/gallery2/galleryfilestorage.cxx
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@@ -697,7 +697,8 @@ SvStream& GalleryFileStorage::writeGalleryTheme(SvStream&
rOStm, const GalleryTh
rOStm.WriteUInt16(0x0004);
write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, pThm->GetThemeName(),
RTL_TEXTENCODING_UTF8);
-rOStm.WriteUInt32(nCount).WriteUInt16(osl_getThreadTextEncoding());
+rOStm.WriteUInt32(nCount);
+rOStm.WriteUInt16(RTL_TEXTENCODING_UTF8); // unused on reading
for (sal_uInt32 i = 0; i < nCount; i++)
{
Re: Import of curved connectors from OOXML
Hi Regina, Regina Henschel wrote: > It is not an ODF problem. > Oh ok - then what I implied, was instead of trying to emulate the curvedConnector3 connector by mapping it to our existing ones, why not implement the missing drawingml ones natively? Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Import of curved connectors from OOXML
Hi Regina, Regina Henschel wrote: > I could try to approximate the OOXML curve by defining ersatz adjustment > values. What criteria should be used for such an approximation? Anyway, it > is mathematically complex, especially for cases with two or three handles. > Sounds like a good reason then to extend ODF's connector types? Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/source vcl/unx vcl/win
vcl/headless/svpprn.cxx | 14 +++---
vcl/inc/jobdata.hxx |2 +-
vcl/inc/jobset.h|9 -
vcl/osx/salprn.cxx |3 +--
vcl/source/gdi/jobset.cxx | 30 +-
vcl/source/gdi/print.cxx|4 +---
vcl/unx/generic/print/genprnpsp.cxx | 18 ++
vcl/unx/generic/printer/jobdata.cxx |6 +++---
vcl/win/gdi/salprn.cxx | 17 ++---
9 files changed, 38 insertions(+), 65 deletions(-)
New commits:
commit d97e0458914991214e3d396273862855aff66234
Author: Thorsten Behrens
AuthorDate: Mon Oct 1 03:09:35 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sun Oct 29 12:21:34 2023 +0100
vcl: no raw pointers
For ImplJobSetup. Also, check memcmp mem size more properly
Change-Id: Idcf20bf1b51bc2508f3d37e018efd18e591a6099
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/26648
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index b745ba692e65..6c40a0fd8d2f 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -146,21 +146,13 @@ static void copyJobDataToJobSetup( ImplJobSetup*
pJobSetup, JobData& rData )
}
// copy the whole context
-if( pJobSetup->GetDriverData() )
-std::free( const_cast(pJobSetup->GetDriverData()) );
sal_uInt32 nBytes;
-void* pBuffer = nullptr;
+std::unique_ptr pBuffer;
if( rData.getStreamBuffer( pBuffer, nBytes ) )
-{
-pJobSetup->SetDriverDataLen( nBytes );
-pJobSetup->SetDriverData( static_cast(pBuffer) );
-}
+pJobSetup->SetDriverData( std::move(pBuffer), nBytes );
else
-{
-pJobSetup->SetDriverDataLen( 0 );
-pJobSetup->SetDriverData( nullptr );
-}
+pJobSetup->SetDriverData( nullptr, 0 );
}
// SalInstance
diff --git a/vcl/inc/jobdata.hxx b/vcl/inc/jobdata.hxx
index ae9db11e69f6..46110057a888 100644
--- a/vcl/inc/jobdata.hxx
+++ b/vcl/inc/jobdata.hxx
@@ -69,7 +69,7 @@ struct VCL_DLLPUBLIC JobData
// creates a new buffer using new
// it is up to the user to delete it again
-bool getStreamBuffer( void*& pData, sal_uInt32& bytes );
+bool getStreamBuffer( std::unique_ptr& pData, sal_uInt32&
bytes );
static bool constructFromStreamBuffer( const void* pData, sal_uInt32
bytes, JobData& rJobData );
};
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index e3f154254e35..7c0d0b55a4c3 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
// see com.sun.star.portal.client.JobSetupSystem.idl:
#define JOBSETUP_SYSTEM_WINDOWS 1
@@ -44,7 +45,7 @@ private:
tools::LongmnPaperWidth; //< paper width (100th mm)
tools::LongmnPaperHeight; //< paper height (100th mm)
sal_uInt32 mnDriverDataLen;//< length of system specific data
-sal_uInt8* mpDriverData; //< system specific data (will be
streamed a byte block)
+std::unique_ptr mpDriverData; //< system specific data (will
be streamed a byte block)
boolmbPapersizeFromSetup;
// setup mode
PrinterSetupMode meSetupMode;
@@ -86,10 +87,8 @@ public:
void SetPaperHeight(tools::Long nHeight);
sal_uInt32 GetDriverDataLen() const { return mnDriverDataLen; }
-void SetDriverDataLen(sal_uInt32 nDriverDataLen);
-
-const sal_uInt8* GetDriverData() const { return mpDriverData; }
-void SetDriverData(sal_uInt8* pDriverData);
+const sal_uInt8* GetDriverData() const { return mpDriverData.get(); }
+void SetDriverData(std::unique_ptr pDriverData,
sal_uInt32 nDriverDataLen);
bool GetPapersizeFromSetup() const { return
mbPapersizeFromSetup; }
void SetPapersizeFromSetup(bool bPapersizeFromSetup);
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index e9101e390085..9f9c8c08f3db 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -190,8 +190,7 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup*
io_pSetupData )
io_pSetupData->SetOrientation( mePageOrientation );
io_pSetupData->SetPaperBin( 0 );
-io_pSetupData->SetDriverData( static_cast(std::malloc( 4
)) );
-io_pSetupData->SetDriverDataLen( 4 );
+io_pSetupData->SetDriverData( std::make_unique(4), 4 );
}
else
bSuccess = false;
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 9969a6165327..c9ed0d9626ec 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -65,7 +65,6 @@ ImplJobSetup::ImplJobSetup()
mnPaperWidth= 0;
mnPaperHeight = 0;
mnDriverDataLen = 0;
-mpDr
Re: About tdf#157884 Typo in UNO command ".uno:UnhainFrame"
Hi! Heiko Tietze wrote: > The typo is there for more than twenty years and macros may depend on it. > > Can we change the label but add an alias to the new "unchain" command, flag > this alias as deprecated, and remove it with the next release? > Adding an alias, and cleaning up our code sounds like a good idea. Removing the original, wrong UNO command in the next release - not so much. Those things end up in recorded macros, changing that will break an unknown number of macros for an unknown number of likely not very technical users. My 2 cents, -- Thorsten signature.asc Description: PGP signature
Re: Proposal: build service for LibreOffice extensions
Hi Hossein, all, Hossein Nourikhah wrote: > I suggest to create a build service for LibreOffice extensions, that works > this way: > > 1. The extension creator provides the source code, and the required > makefiles. It can be in BASIC, Java, Python, C++, or any other supported > language. It would be something like SUSE openbuildservice.org for OS > packages. > Hmm. So the OBS is a very peculiar beast, and significant effort is spent, to keep it secure (for its operators & users) and efficient. Another example of such a 'build service' for a particular platform is the F-Droid repo - which also needs significant work to keep running. Both are quite successful in supporting an ecosystem & a platform though. Before discussing the requirements & implementation details of such a service, therefore perhaps the more important question (before investing TDF resources) is - does it solve a real problem? And if it does, what other options would be available to solve it? > The benefits of such a build service is as follows: > > 1. Make the source code available to everyone, and probably visible in the >website similar to userstyles.org, etc > That seems easy to enforce (if we want to), w/o a build service. > 2. Make the build process easier for different architectures, at least for >the compiled languages. For the interpreted languages, it would be >reviewing, then creating a zip package > Yup, I agree. But wouldn't perhaps providing ready-made github/gitlab actions have a similar, but more universal & reusable effect? It would also be much cheaper to run & maintain. ;) > 3. Respond to the concerns about security of the binary extensions. > I'm not sure that building from source without _very_ thorough review of foreign code yields anything but a false sense of security. > 4. Possibility to clarify the license. > That also needs thorough review (we already ask for a license on the extension site). > 5. Checking the compatibility and possible problems with different versions >of LibreOffice. > That's a valid point, but it does not solve our need to commit to binary compatibility - the problem is not the extensions we don't have source code for (we can always inspect the binaries), but the extensions & basic macros nobody ever sees, because they're on individual users' computers, or internal to organisations. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - external/curl
external/curl/CVE-2023-38545_7.87.0.patch | 134 ++
external/curl/UnpackedTarball_curl.mk |1
2 files changed, 135 insertions(+)
New commits:
commit 50e42e822f69c400ee90daa3e22d326438ecfd7a
Author: Thorsten Behrens
AuthorDate: Wed Oct 11 10:41:42 2023 +0200
Commit: Thorsten Behrens
CommitDate: Thu Oct 12 02:05:14 2023 +0200
curl: fix socks return error if hostname too long for remote resolve
This fixes https://curl.se/docs/CVE-2023-38545.html
Change-Id: Id70486c8ec4e7754e7a07d81b22702e435ce6727
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157830
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/external/curl/CVE-2023-38545_7.87.0.patch
b/external/curl/CVE-2023-38545_7.87.0.patch
new file mode 100644
index ..c15c273ea41e
--- /dev/null
+++ b/external/curl/CVE-2023-38545_7.87.0.patch
@@ -0,0 +1,134 @@
+From 92fd36dd54de9ac845549944692eb33c5aee7343 Mon Sep 17 00:00:00 2001
+From: Jay Satiro
+Date: Mon, 9 Oct 2023 17:15:44 -0400
+Subject: [PATCH] socks: return error if hostname too long for remote resolve
+
+Prior to this change the state machine attempted to change the remote
+resolve to a local resolve if the hostname was longer than 255
+characters. Unfortunately that did not work as intended and caused a
+security issue.
+
+This patch applies to curl versions 7.87.0 - 8.1.2. Other versions
+that are affected take a different patch. Refer to the CVE advisory
+for more information.
+
+Bug: https://curl.se/docs/CVE-2023-38545.html
+---
+ lib/socks.c | 8 +++
+ tests/data/Makefile.inc | 2 +-
+ tests/data/test728 | 64 +
+ 3 files changed, 69 insertions(+), 5 deletions(-)
+ create mode 100644 tests/data/test728
+
+diff --git a/lib/socks.c b/lib/socks.c
+index d491e08..e7da5b4 100644
+--- a/lib/socks.c
b/lib/socks.c
+@@ -539,9 +539,9 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
+
+ /* RFC1928 chapter 5 specifies max 255 chars for domain name in packet */
+ if(!socks5_resolve_local && hostname_len > 255) {
+- infof(data, "SOCKS5: server resolving disabled for hostnames of "
+-"length > 255 [actual len=%zu]", hostname_len);
+- socks5_resolve_local = TRUE;
++ failf(data, "SOCKS5: the destination hostname is too long to be "
++"resolved remotely by the proxy.");
++ return CURLPX_LONG_HOSTNAME;
+ }
+
+ if(auth & ~(CURLAUTH_BASIC | CURLAUTH_GSSAPI))
+@@ -882,7 +882,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
+ }
+ else {
+ socksreq[len++] = 3;
+-socksreq[len++] = (char) hostname_len; /* one byte address length */
++socksreq[len++] = (unsigned char) hostname_len; /* one byte length */
+ memcpy([len], sx->hostname, hostname_len); /* w/o NULL */
+ len += hostname_len;
+ }
+diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
+index 3e0221a..64b11de 100644
+--- a/tests/data/Makefile.inc
b/tests/data/Makefile.inc
+@@ -99,7 +99,7 @@ test679 test680 test681 test682 test683 test684 test685 \
+ \
+ test700 test701 test702 test703 test704 test705 test706 test707 test708 \
+ test709 test710 test711 test712 test713 test714 test715 test716 test717 \
+-test718 test719 test720 test721 \
++test718 test719 test720 test721 test728 \
+ \
+ test800 test801 test802 test803 test804 test805 test806 test807 test808 \
+ test809 test810 test811 test812 test813 test814 test815 test816 test817 \
+diff --git a/tests/data/test728 b/tests/data/test728
+new file mode 100644
+index 000..05bcf28
+--- /dev/null
b/tests/data/test728
+@@ -0,0 +1,64 @@
++
++
++
++HTTP
++HTTP GET
++SOCKS5
++SOCKS5h
++followlocation
++
++
++
++#
++# Server-side
++
++# The hostname in this redirect is 256 characters and too long (> 255) for
++# SOCKS5 remote resolve. curl must return error CURLE_PROXY in this case.
++
++HTTP/1.1 301 Moved Permanently
++Location:
http:///
++Content-Length: 0
++Connection: close
++
++
++
++
++#
++# Client-side
++
++
++proxy
++
++
++http
++socks5
++
++
++SOCKS5h with HTTP redirect to hostname too long
++
++
++--no-progress-meter --location --proxy socks5h://%HOSTIP:%SOCKSPORT
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
++
++
++
++#
++# Verify data after the test has been "shot"
++
++
++GET /%TESTNUMBER HTTP/1.1
++Host: %HOSTIP:%HTTPPORT
++User-Agent: curl/%VERSION
++Accept: */*
++
++
++
++97
++
++# the error message is verified because error code CURLE_PROXY (97) may be
++# returned for any number of reasons and we need to make sure it is
++# specifi
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 77395e88e15bc468ea2986ec1c5b367d1a2105e9 Author: Thorsten Behrens AuthorDate: Wed Oct 11 10:00:26 2023 +0200 Commit: Christian Lohmaier CommitDate: Wed Oct 11 17:35:22 2023 +0200 curl: upgrade to release 8.4.0 Fixes CVE-2023-38546 and CVE-2023-38545 Minor amount of bugfixes, nothing that immediately affects us. New feature: IPFS protocols via HTTP gateway now supported, with the right URL. Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157786 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/download.lst b/download.lst index 683951549de2..d56f70e98411 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 -CURL_TARBALL := curl-8.3.0.tar.xz +CURL_SHA256SUM := 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d +CURL_TARBALL := curl-8.4.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - download.lst external/curl
download.lst |4 ++-- external/curl/ExternalProject_curl.mk| 26 +- external/curl/UnpackedTarball_curl.mk| 12 external/curl/asan-poison-nsspem.patch.0 | 11 --- external/curl/curl-nss.patch.1 | 17 - 5 files changed, 7 insertions(+), 63 deletions(-) New commits: commit d97184677471565f3987a5d0fe1ef96503c0b099 Author: Thorsten Behrens AuthorDate: Wed Oct 11 10:00:26 2023 +0200 Commit: Andras Timar CommitDate: Wed Oct 11 17:27:10 2023 +0200 curl: upgrade to release 8.4.0 Fixes CVE-2023-38546 and CVE-2023-38545 Minor amount of bugfixes, nothing that immediately affects us. New feature: IPFS protocols via HTTP gateway now supported, with the right URL. Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157829 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index b3ca4fd2e4a4..26012e8b014e 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 -CURL_TARBALL := curl-8.3.0.tar.xz +CURL_SHA256SUM := 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d +CURL_TARBALL := curl-8.4.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts commit 5a113f2376344062ff1a71debecf7a7b112c8e25 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Wed Sep 13 18:25:13 2023 +0900 Commit: Andras Timar CommitDate: Wed Oct 11 17:26:59 2023 +0200 curl: upgrade to release 8.3.0 Fixes CVE-2023-38039 * NSS support was removed in this release, so NSS related patches are not necessary now. * add configure options for curl. Change-Id: I71e09bac3c69ce4b13deee770a32225f39f79c46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156917 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> (cherry picked from commit c2930ebff82c4f7ffe8377ab82627131f8544226) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157311 Reviewed-by: Michael Stahl (cherry picked from commit 609d4a6b8d66d02a36c57de99efd36a4b1c2b789) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157313 Reviewed-by: Caolán McNamara (cherry picked from commit 5d9a942721ea683b3684e71c470d338599a80eb1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157828 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/download.lst b/download.lst index 5e87e03bfa12..b3ca4fd2e4a4 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 -CURL_TARBALL := curl-8.2.1.tar.xz +CURL_SHA256SUM := 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 +CURL_TARBALL := curl-8.3.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 087ea2c44b39..fdc93a46c3cb 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -10,21 +10,10 @@ $(eval $(call gb_ExternalProject_ExternalProject,curl)) $(eval $(call gb_ExternalProject_use_externals,curl,\ + $(if $(ENABLE_OPENSSL),openssl) \ zlib \ )) -ifeq ($(TLS),NSS) -$(eval $(call gb_ExternalProject_use_externals,curl,\ - nss3 \ -)) -else -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_ExternalProject_use_externals,curl,\ - openssl \ -)) -endif -endif - $(eval $(call gb_ExternalProject_register_targets,curl,\ build \ )) @@ -41,18 +30,14 @@ curl_LDFLAGS += -L$(SYSBASE)/usr/lib endif endif -# there are 2 include paths, the other one is passed to --with-nss below -ifeq ($(SYSTEM_NSS),) -curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -endif - # use --with-secure-transport on macOS >10.5 and iOS to get a native UI for SSL certs for CMIS usage -# use --with-nss/--with-openssl only on platforms other than macOS and iOS +# use --with-openssl only on platforms other than macOS and iOS $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_Trace_StartRange,curl,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(gb_RUN_CONFIGURE) ./configure \ - --without-nss --without-openssl --without-gnutls --without-mbedtls \ + --without-amissl --without-bearssl --without-gnutls \ + --without-mbedtls -
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-6+backports' - 138 commits - accessibility/inc accessibility/source comphelper/source configure.ac connectivity/source cui/source dbacc
/cnttab.cxx | 4 sw/source/uibase/dochdl/swdtflvr.cxx | 16 sw/source/uibase/fldui/fldmgr.cxx | 7 sw/source/uibase/utlui/content.cxx | 3 translations | 2 ucb/source/ucp/webdav-curl/CurlSession.cxx | 15 vcl/Library_vcl.mk | 1 vcl/headless/CairoCommon.cxx | 15 vcl/inc/quartz/cgutils.h | 4 vcl/osx/salinst.cxx| 8 vcl/qa/cppunit/pdfexport/data/nestedsection.fodt | 132 vcl/qa/cppunit/pdfexport/data/spanlist.fodt| 207 vcl/qa/cppunit/pdfexport/data/transparentshape.fodp| 439 + vcl/qa/cppunit/pdfexport/pdfexport.cxx | 612 + vcl/quartz/cgutils.mm | 43 vcl/skia/SkiaHelper.cxx| 23 vcl/skia/gdiimpl.cxx | 8 vcl/source/app/salvtables.cxx | 10 vcl/source/bitmap/bitmappaint.cxx | 75 vcl/source/filter/egif/egif.cxx| 6 vcl/source/gdi/pdfextoutdevdata.cxx| 17 vcl/source/gdi/pdfwriter_impl.cxx | 12 vcl/source/outdev/gradient.cxx | 36 vcl/source/treelist/transfer.cxx | 41 vcl/source/window/EnumContext.cxx | 5 vcl/source/window/mouse.cxx| 4 vcl/unx/generic/gdi/cairotextrender.cxx| 11 vcl/unx/gtk3/gtkframe.cxx | 3 vcl/unx/gtk3/gtkinst.cxx | 13 wizards/source/sfdocuments/SF_Base.xba | 2 writerfilter/CppunitTest_writerfilter_dmapper.mk | 1 writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx | 27 writerfilter/qa/cppunittests/dmapper/TableManager.cxx | 46 writerfilter/qa/cppunittests/dmapper/data/floattable-nested-cellstart.docx |binary writerfilter/qa/cppunittests/dmapper/data/floattable-nested.docx |binary writerfilter/qa/cppunittests/ooxml/data/floattable-leak.docx |binary writerfilter/qa/cppunittests/ooxml/ooxml.cxx | 21 writerfilter/source/dmapper/DomainMapper.cxx | 10 writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 15 writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 2 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 27 writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 writerfilter/source/dmapper/TableData.hxx | 29 writerfilter/source/dmapper/TableManager.cxx | 132 writerfilter/source/dmapper/TableManager.hxx | 5 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 xmloff/source/core/xmlimp.cxx | 9 xmloff/source/text/txtimp.cxx | 65 224 files changed, 6808 insertions(+), 2616 deletions(-) New commits: commit 2f05cbfeac4a7f2cd5ce7c3ec655cfed4ec7bdac Author: Thorsten Behrens AuthorDate: Wed Oct 11 10:00:26 2023 +0200 Commit: Michael Stahl CommitDate: Wed Oct 11 13:56:57 2023 +0200 curl: upgrade to release 8.4.0 Fixes CVE-2023-38546 and CVE-2023-38545 Minor amount of bugfixes, nothing that immediately affects us. New feature: IPFS protocols via HTTP gateway now supported, with the right URL. Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157811 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/download.lst b/download.lst index 823d5351c1c4..f381cdf98eaa 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2f05cbfeac4a7f2cd5ce7c3ec655cfed4ec7bdac Author: Thorsten Behrens AuthorDate: Wed Oct 11 10:00:26 2023 +0200 Commit: Michael Stahl CommitDate: Wed Oct 11 13:56:57 2023 +0200 curl: upgrade to release 8.4.0 Fixes CVE-2023-38546 and CVE-2023-38545 Minor amount of bugfixes, nothing that immediately affects us. New feature: IPFS protocols via HTTP gateway now supported, with the right URL. Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157811 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/download.lst b/download.lst index 823d5351c1c4..f381cdf98eaa 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 -CURL_TARBALL := curl-8.3.0.tar.xz +CURL_SHA256SUM := 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d +CURL_TARBALL := curl-8.4.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
[Libreoffice-commits] core.git: download.lst
download.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8252568859e8296c36c6e4dbb291f208e5f8766c Author: Thorsten Behrens AuthorDate: Wed Oct 11 10:00:26 2023 +0200 Commit: Caolán McNamara CommitDate: Wed Oct 11 12:46:09 2023 +0200 curl: upgrade to release 8.4.0 Fixes CVE-2023-38546 and CVE-2023-38545 Minor amount of bugfixes, nothing that immediately affects us. New feature: IPFS protocols via HTTP gateway now supported, with the right URL. Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157807 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/download.lst b/download.lst index 1325df09339e..26d9ab95c04a 100644 --- a/download.lst +++ b/download.lst @@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts -CURL_SHA256SUM := 376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63 -CURL_TARBALL := curl-8.3.0.tar.xz +CURL_SHA256SUM := 16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d +CURL_TARBALL := curl-8.4.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
Rebased ref, commits from common ancestor: commit 858c5633738c58022c03a2013bd84d0deaa67433 Author: Thorsten Behrens AuthorDate: Wed Oct 11 11:03:15 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Oct 11 11:33:01 2023 +0200 Bump version to 6.4.0.21 Change-Id: I271f0093fcaebec9ca9272c4a6aed46dfeba4010 diff --git a/configure.ac b/configure.ac index 5e8904798988..39cc33d13928 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.20],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/]) 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/allotropia/zeta-7-4' - 0 commits -
Rebased ref, commits from common ancestor:
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - 2 commits - external/curl
external/curl/CVE-2023-38545_7.87.0.patch | 134 ++
external/curl/CVE-2023-38546_8.0.1.patch | 124 +++
external/curl/UnpackedTarball_curl.mk |2
3 files changed, 260 insertions(+)
New commits:
commit 5e02033428712d676252cfe9bc04f93a9871ec29
Author: Thorsten Behrens
AuthorDate: Wed Oct 11 10:59:28 2023 +0200
Commit: Thorsten Behrens
CommitDate: Wed Oct 11 11:13:26 2023 +0200
curl: fix cookie: remove unnecessary struct fields
This fixes https://curl.se/docs/CVE-2023-38546.html
Change-Id: Ia43581ca66c4a96d5c0faa719ffcda3cd1ae923c
diff --git a/external/curl/CVE-2023-38546_8.0.1.patch
b/external/curl/CVE-2023-38546_8.0.1.patch
new file mode 100644
index ..b518c65cea21
--- /dev/null
+++ b/external/curl/CVE-2023-38546_8.0.1.patch
@@ -0,0 +1,124 @@
+From 4420e6d613f823639bbf814df29e8a25e27b4955 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Thu, 14 Sep 2023 23:28:32 +0200
+Subject: [PATCH] cookie: remove unnecessary struct fields
+
+Plus: reduce the hash table size from 256 to 63. It seems unlikely to
+make much of a speed difference for most use cases but saves 1.5KB of
+data per instance.
+
+Closes #11862
+---
+ lib/cookie.c | 13 +
+ lib/cookie.h | 7 +--
+ lib/easy.c | 4 +---
+ 3 files changed, 3 insertions(+), 21 deletions(-)
+
+diff --git a/lib/cookie.c b/lib/cookie.c
+index 0c6e0f7cd..d34620351 100644
+--- a/lib/cookie.c
b/lib/cookie.c
+@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co)
+ free(co->name);
+ free(co->value);
+ free(co->maxage);
+- free(co->version);
+ free(co);
+ }
+
+@@ -726,11 +725,7 @@ Curl_cookie_add(struct Curl_easy *data,
+ }
+ }
+ else if((nlen == 7) && strncasecompare("version", namep, 7)) {
+- strstore(>version, valuep, vlen);
+- if(!co->version) {
+-badcookie = TRUE;
+-break;
+- }
++ /* just ignore */
+ }
+ else if((nlen == 7) && strncasecompare("max-age", namep, 7)) {
+ /*
+@@ -1174,7 +1169,6 @@ Curl_cookie_add(struct Curl_easy *data,
+ free(clist->path);
+ free(clist->spath);
+ free(clist->expirestr);
+-free(clist->version);
+ free(clist->maxage);
+
+ *clist = *co; /* then store all the new data */
+@@ -1238,9 +1232,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy
*data,
+ c = calloc(1, sizeof(struct CookieInfo));
+ if(!c)
+ return NULL; /* failed to get memory */
+-c->filename = strdup(file?file:"none"); /* copy the name just in case */
+-if(!c->filename)
+- goto fail; /* failed to get memory */
+ /*
+ * Initialize the next_expiration time to signal that we don't have enough
+ * information yet.
+@@ -1394,7 +1385,6 @@ static struct Cookie *dup_cookie(struct Cookie *src)
+ CLONE(name);
+ CLONE(value);
+ CLONE(maxage);
+-CLONE(version);
+ d->expires = src->expires;
+ d->tailmatch = src->tailmatch;
+ d->secure = src->secure;
+@@ -1611,7 +1601,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c)
+ {
+ if(c) {
+ unsigned int i;
+-free(c->filename);
+ for(i = 0; i < COOKIE_HASH_SIZE; i++)
+ Curl_cookie_freelist(c->cookies[i]);
+ free(c); /* free the base struct as well */
+diff --git a/lib/cookie.h b/lib/cookie.h
+index 39bb08bc4..045696fe9 100644
+--- a/lib/cookie.h
b/lib/cookie.h
+@@ -36,11 +36,7 @@ struct Cookie {
+ char *domain; /* domain = */
+ curl_off_t expires; /* expires = */
+ char *expirestr; /* the plain text version */
+-
+- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */
+- char *version; /* Version = */
+ char *maxage; /* Max-Age = */
+-
+ bool tailmatch;/* whether we do tail-matching of the domain name */
+ bool secure; /* whether the 'secure' keyword was used */
+ bool livecookie; /* updated from a server, not a stored file */
+@@ -56,13 +52,12 @@ struct Cookie {
+ #define COOKIE_PREFIX__SECURE (1<<0)
+ #define COOKIE_PREFIX__HOST (1<<1)
+
+-#define COOKIE_HASH_SIZE 256
++#define COOKIE_HASH_SIZE 63
+
+ struct CookieInfo {
+ /* linked list of cookies we know of */
+ struct Cookie *cookies[COOKIE_HASH_SIZE];
+
+- char *filename; /* file we read from/write to */
+ long numcookies; /* number of cookies in the "jar" */
+ bool running;/* state info, for cookie adding information */
+ bool newsession; /* new session, discard session cookies on load */
+diff --git a/lib/easy.c b/lib/easy.c
+index 27124a72f..fddf047f2 100644
+--- a/lib/easy.c
b/lib/easy.c
+@@ -911,9 +911,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy
*data)
+ if(data->cookies) {
+ /* If cookies are enabled in the parent handle, we enable them
+i
[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 6c61a4ea4055786209e7e1981bda32a48ca805b2 Author: Thorsten Behrens AuthorDate: Wed Oct 11 11:03:15 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Oct 11 11:03:15 2023 +0200 Bump version to 6.4.0.21 Change-Id: I271f0093fcaebec9ca9272c4a6aed46dfeba4010 diff --git a/configure.ac b/configure.ac index 5e8904798988..39cc33d13928 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.20],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/]) 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-4' - 2 commits - external/curl
external/curl/CVE-2023-38545_7.87.0.patch | 134 ++
external/curl/CVE-2023-38546_8.0.1.patch | 124 +++
external/curl/UnpackedTarball_curl.mk |2
3 files changed, 260 insertions(+)
New commits:
commit 140463da874fdd4485b4b9556c98ef61aa113c4a
Author: Thorsten Behrens
AuthorDate: Wed Oct 11 10:59:28 2023 +0200
Commit: Thorsten Behrens
CommitDate: Wed Oct 11 10:59:28 2023 +0200
curl: fix cookie: remove unnecessary struct fields
This fixes https://curl.se/docs/CVE-2023-38546.html
Change-Id: Ia43581ca66c4a96d5c0faa719ffcda3cd1ae923c
diff --git a/external/curl/CVE-2023-38546_8.0.1.patch
b/external/curl/CVE-2023-38546_8.0.1.patch
new file mode 100644
index ..b518c65cea21
--- /dev/null
+++ b/external/curl/CVE-2023-38546_8.0.1.patch
@@ -0,0 +1,124 @@
+From 4420e6d613f823639bbf814df29e8a25e27b4955 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg
+Date: Thu, 14 Sep 2023 23:28:32 +0200
+Subject: [PATCH] cookie: remove unnecessary struct fields
+
+Plus: reduce the hash table size from 256 to 63. It seems unlikely to
+make much of a speed difference for most use cases but saves 1.5KB of
+data per instance.
+
+Closes #11862
+---
+ lib/cookie.c | 13 +
+ lib/cookie.h | 7 +--
+ lib/easy.c | 4 +---
+ 3 files changed, 3 insertions(+), 21 deletions(-)
+
+diff --git a/lib/cookie.c b/lib/cookie.c
+index 0c6e0f7cd..d34620351 100644
+--- a/lib/cookie.c
b/lib/cookie.c
+@@ -119,7 +119,6 @@ static void freecookie(struct Cookie *co)
+ free(co->name);
+ free(co->value);
+ free(co->maxage);
+- free(co->version);
+ free(co);
+ }
+
+@@ -726,11 +725,7 @@ Curl_cookie_add(struct Curl_easy *data,
+ }
+ }
+ else if((nlen == 7) && strncasecompare("version", namep, 7)) {
+- strstore(>version, valuep, vlen);
+- if(!co->version) {
+-badcookie = TRUE;
+-break;
+- }
++ /* just ignore */
+ }
+ else if((nlen == 7) && strncasecompare("max-age", namep, 7)) {
+ /*
+@@ -1174,7 +1169,6 @@ Curl_cookie_add(struct Curl_easy *data,
+ free(clist->path);
+ free(clist->spath);
+ free(clist->expirestr);
+-free(clist->version);
+ free(clist->maxage);
+
+ *clist = *co; /* then store all the new data */
+@@ -1238,9 +1232,6 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy
*data,
+ c = calloc(1, sizeof(struct CookieInfo));
+ if(!c)
+ return NULL; /* failed to get memory */
+-c->filename = strdup(file?file:"none"); /* copy the name just in case */
+-if(!c->filename)
+- goto fail; /* failed to get memory */
+ /*
+ * Initialize the next_expiration time to signal that we don't have enough
+ * information yet.
+@@ -1394,7 +1385,6 @@ static struct Cookie *dup_cookie(struct Cookie *src)
+ CLONE(name);
+ CLONE(value);
+ CLONE(maxage);
+-CLONE(version);
+ d->expires = src->expires;
+ d->tailmatch = src->tailmatch;
+ d->secure = src->secure;
+@@ -1611,7 +1601,6 @@ void Curl_cookie_cleanup(struct CookieInfo *c)
+ {
+ if(c) {
+ unsigned int i;
+-free(c->filename);
+ for(i = 0; i < COOKIE_HASH_SIZE; i++)
+ Curl_cookie_freelist(c->cookies[i]);
+ free(c); /* free the base struct as well */
+diff --git a/lib/cookie.h b/lib/cookie.h
+index 39bb08bc4..045696fe9 100644
+--- a/lib/cookie.h
b/lib/cookie.h
+@@ -36,11 +36,7 @@ struct Cookie {
+ char *domain; /* domain = */
+ curl_off_t expires; /* expires = */
+ char *expirestr; /* the plain text version */
+-
+- /* RFC 2109 keywords. Version=1 means 2109-compliant cookie sending */
+- char *version; /* Version = */
+ char *maxage; /* Max-Age = */
+-
+ bool tailmatch;/* whether we do tail-matching of the domain name */
+ bool secure; /* whether the 'secure' keyword was used */
+ bool livecookie; /* updated from a server, not a stored file */
+@@ -56,13 +52,12 @@ struct Cookie {
+ #define COOKIE_PREFIX__SECURE (1<<0)
+ #define COOKIE_PREFIX__HOST (1<<1)
+
+-#define COOKIE_HASH_SIZE 256
++#define COOKIE_HASH_SIZE 63
+
+ struct CookieInfo {
+ /* linked list of cookies we know of */
+ struct Cookie *cookies[COOKIE_HASH_SIZE];
+
+- char *filename; /* file we read from/write to */
+ long numcookies; /* number of cookies in the "jar" */
+ bool running;/* state info, for cookie adding information */
+ bool newsession; /* new session, discard session cookies on load */
+diff --git a/lib/easy.c b/lib/easy.c
+index 27124a72f..fddf047f2 100644
+--- a/lib/easy.c
b/lib/easy.c
+@@ -911,9 +911,7 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy
*data)
+ if(data->cookies) {
+ /* If cookies are enabled in the parent handle, we enable them
+i
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svx/qa
svx/qa/unit/core.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1c50e62d7682df5893d17884c24dceacbbe9c8c Author: Thorsten Behrens AuthorDate: Thu Oct 5 04:07:12 2023 +0200 Commit: Xisco Fauli CommitDate: Tue Oct 10 10:11:26 2023 +0200 related tdf#123983: don't open test file read/write from src tree Change-Id: I7f09a78076fa67447ead82ac7dc8556d840d5697 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157576 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens (cherry picked from commit ae533151bcc16de22fb90b42be1cf7432b0fddc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157715 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/svx/qa/unit/core.cxx b/svx/qa/unit/core.cxx index 4735c6664b4f..0625d7ad70fb 100644 --- a/svx/qa/unit/core.cxx +++ b/svx/qa/unit/core.cxx @@ -62,7 +62,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGraphicObjectResolver) OUString aURL = createFileURL(u"GraphicObjectResolverTest.zip"); uno::Reference xStorage = comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING, aURL, - embed::ElementModes::READWRITE); + embed::ElementModes::READ); CPPUNIT_ASSERT(xStorage.is()); rtl::Reference xGraphicHelper
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - svx/qa
svx/qa/unit/core.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96f72ec0a2f3cebc8afe4a1c20acb9e23544d83a Author: Thorsten Behrens AuthorDate: Thu Oct 5 04:07:12 2023 +0200 Commit: Thorsten Behrens CommitDate: Thu Oct 5 10:00:14 2023 +0200 related tdf#123983: don't open test file read/write from src tree Change-Id: I7f09a78076fa67447ead82ac7dc8556d840d5697 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157576 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens diff --git a/svx/qa/unit/core.cxx b/svx/qa/unit/core.cxx index 3966010012e6..e45f3dc0cda6 100644 --- a/svx/qa/unit/core.cxx +++ b/svx/qa/unit/core.cxx @@ -88,7 +88,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGraphicObjectResolver) OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "GraphicObjectResolverTest.zip"; uno::Reference xStorage = comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING, aURL, - embed::ElementModes::READWRITE); + embed::ElementModes::READ); CPPUNIT_ASSERT(xStorage.is()); rtl::Reference xGraphicHelper
[Libreoffice-commits] core.git: svx/qa
svx/qa/unit/core.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ae533151bcc16de22fb90b42be1cf7432b0fddc3 Author: Thorsten Behrens AuthorDate: Thu Oct 5 04:07:12 2023 +0200 Commit: Thorsten Behrens CommitDate: Thu Oct 5 09:59:28 2023 +0200 related tdf#123983: don't open test file read/write from src tree Change-Id: I7f09a78076fa67447ead82ac7dc8556d840d5697 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157576 Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens diff --git a/svx/qa/unit/core.cxx b/svx/qa/unit/core.cxx index 4735c6664b4f..0625d7ad70fb 100644 --- a/svx/qa/unit/core.cxx +++ b/svx/qa/unit/core.cxx @@ -62,7 +62,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGraphicObjectResolver) OUString aURL = createFileURL(u"GraphicObjectResolverTest.zip"); uno::Reference xStorage = comphelper::OStorageHelper::GetStorageOfFormatFromURL(ZIP_STORAGE_FORMAT_STRING, aURL, - embed::ElementModes::READWRITE); + embed::ElementModes::READ); CPPUNIT_ASSERT(xStorage.is()); rtl::Reference xGraphicHelper
[Libreoffice-qa] ESC in-person meeting: tomorrow 14-15 Bucharest time / 13-14 CEST
Hi, as discussed last week, we've found a slot for an in-person ESC meeting, here in Bucharest. You can find the pretalx link here: https://events.documentfoundation.org/libreoffice-conference-2023/talk/8DL7YN/ We'll not run the regular agenda, but leave space for more general, and/or long-term topics. If you are not in Bucharest, but would like to attend remotely, we'll try to make a jitsi stream working, via this room: https://jitsi.documentfoundation.org/conference1 Please add ideas, questions and topics to the usual ESC pad: https://pad.documentfoundation.org/p/esc Cheers, -- Thorsten
ESC in-person meeting: tomorrow 14-15 Bucharest time / 13-14 CEST
Hi, as discussed last week, we've found a slot for an in-person ESC meeting, here in Bucharest. You can find the pretalx link here: https://events.documentfoundation.org/libreoffice-conference-2023/talk/8DL7YN/ We'll not run the regular agenda, but leave space for more general, and/or long-term topics. If you are not in Bucharest, but would like to attend remotely, we'll try to make a jitsi stream working, via this room: https://jitsi.documentfoundation.org/conference1 Please add ideas, questions and topics to the usual ESC pad: https://pad.documentfoundation.org/p/esc Cheers, -- Thorsten
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig reportdesign/uiconfig sc/uiconfig sd/uico
basctl/uiconfig/basicide/menubar/menubar.xml |1 - chart2/uiconfig/menubar/menubar.xml|1 - dbaccess/uiconfig/dbapp/menubar/menubar.xml|1 - dbaccess/uiconfig/dbquery/menubar/menubar.xml |1 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml |1 - dbaccess/uiconfig/dbtable/menubar/menubar.xml |1 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml |1 - extensions/uiconfig/sbibliography/menubar/menubar.xml |1 - framework/uiconfig/startmodule/menubar/menubar.xml |1 - reportdesign/uiconfig/dbreport/menubar/menubar.xml |1 - sc/uiconfig/scalc/menubar/menubar.xml |1 - sc/uiconfig/scalc/ui/notebookbar.ui|7 --- sc/uiconfig/scalc/ui/notebookbar_compact.ui|7 --- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui|7 --- sd/uiconfig/sdraw/menubar/menubar.xml |1 - sd/uiconfig/sdraw/ui/notebookbar.ui|7 --- sd/uiconfig/sdraw/ui/notebookbar_compact.ui|7 --- sd/uiconfig/simpress/menubar/menubar.xml |1 - sd/uiconfig/simpress/ui/notebookbar.ui |7 --- sd/uiconfig/simpress/ui/notebookbar_compact.ui |7 --- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui |7 --- sfx2/sdi/appslots.sdi |4 sfx2/sdi/sfx.sdi | 15 --- sfx2/source/appl/appserv.cxx | 17 + starmath/uiconfig/smath/menubar/menubar.xml|1 - svx/source/dialog/SafeModeDialog.cxx |6 +++--- sw/uiconfig/sglobal/menubar/menubar.xml|1 - sw/uiconfig/sweb/menubar/menubar.xml |1 - sw/uiconfig/swform/menubar/menubar.xml |1 - sw/uiconfig/swreport/menubar/menubar.xml |1 - sw/uiconfig/swriter/menubar/menubar.xml|1 - sw/uiconfig/swriter/ui/notebookbar.ui |7 --- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |7 --- sw/uiconfig/swxform/menubar/menubar.xml|1 - 34 files changed, 4 insertions(+), 128 deletions(-) New commits: commit 4dabd26be520510b9614130d9e90157813543ced Author: Thorsten Behrens AuthorDate: Fri Apr 16 00:27:57 2021 +0200 Commit: Thorsten Behrens CommitDate: Sat Sep 9 23:44:13 2023 +0200 Remove .uno:QuestionAnswers, direct safeMode help to landing page Also point to Allotropia contact page. Change-Id: I41a456b838508a7904a81ff858de6dada0ed6824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156496 Reviewed-by: Gabor Kelemen Tested-by: Thorsten Behrens diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index 68f7cbab6742..85d8505718a3 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -161,7 +161,6 @@ - diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index dca2eaff7efe..a0e848f5cd92 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -162,7 +162,6 @@ - diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 34d8b8f5dc0e..214747123b2e 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -149,7 +149,6 @@ - diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index e896abfa00da..46c31e3f6613 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -104,7 +104,6 @@ - diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index fbeda4a1e9c2..8d13f0fc557e 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -88,7 +88,6 @@ - diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index 4ef7c80a26a2..bba876604886 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -88,7 +88,6 @@ - diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index c858d89878e4..4c5553aef0ed 100644
Re: Windows and 256 color displays
Ilmari Lauhakangas wrote: > On 9.9.2023 3.35, Chris Sherlock wrote: > > If not, we could remove a huge chunk of dithering code in > > ImplInitSalGDI() and vastly simplify multiplatform support. > > Win 7 popularity relative to other Win versions is crashing finally, being > 3.5% now, which *is* roughly the same that Win XP was in early 2018 when > LibreOffice removed support for it and Vista. > Sounds like a good plan then. Also since 24.2 will be considered a very visible major upgrade. But note that there's a chunk of dither & bitmap code to retain for paletted images, that we still want to load & save. Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - cui/source cui/uiconfig
cui/source/options/optgdlg.cxx| 17 -
cui/source/options/optgdlg.hxx|1
cui/uiconfig/ui/optgeneralpage.ui | 47 --
3 files changed, 65 deletions(-)
New commits:
commit 5294c472a67c1ab18b776d8fd107070b41220d84
Author: Thorsten Behrens
AuthorDate: Tue Apr 21 17:19:29 2020 +0200
Commit: Balazs Varga
CommitDate: Wed Sep 6 20:37:34 2023 +0200
Remove collect usage info from GUI
Change-Id: I1a7420c557187097b424d298c020bcb837a8261c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156484
Reviewed-by: Gabor Kelemen
Tested-by: Balazs Varga
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b9402dfb23be..6357ba529813 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -164,7 +164,6 @@ OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xYearFrame(m_xBuilder->weld_widget("yearframe"))
, m_xYearValueField(m_xBuilder->weld_spin_button("year"))
, m_xToYearFT(m_xBuilder->weld_label("toyear"))
-, m_xCrashReport(m_xBuilder->weld_check_button("crashreport"))
, m_xQuickStarterFrame(m_xBuilder->weld_widget("quickstarter"))
, m_xHelpImproveLabel(m_xBuilder->weld_label("label7")) //"Help Improve"
#if defined(UNX)
@@ -252,14 +251,6 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
-#if HAVE_FEATURE_BREAKPAD
-if (m_xCrashReport->get_state_changed_from_saved())
-{
-
officecfg::Office::Common::Misc::CrashReport::set(m_xCrashReport->get_active(),
batch);
-bModified = true;
-}
-#endif
-
#if defined(_WIN32)
if (m_xPerformFileExtCheck->get_state_changed_from_saved())
{
@@ -303,14 +294,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
else
m_xYearFrame->set_sensitive(false);
-#if HAVE_FEATURE_BREAKPAD
-
m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get()
&& CrashReporter::IsDumpEnable());
-
m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()
&& CrashReporter::IsDumpEnable());
-m_xCrashReport->save_state();
-#else
-m_xCrashReport->hide();
-#endif
-
const SfxPoolItem* pItem = nullptr;
SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false,
);
if ( SfxItemState::SET == eState )
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 75f29c6c5a34..da69ce2bf7c8 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -43,7 +43,6 @@ private:
std::unique_ptr m_xYearFrame;
std::unique_ptr m_xYearValueField;
std::unique_ptr m_xToYearFT;
-std::unique_ptr m_xCrashReport;
std::unique_ptr m_xQuickStarterFrame;
std::unique_ptr m_xHelpImproveLabel;
std::unique_ptr m_xQuickLaunchCB;
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index dfd8e7bd9cc2..9cfbc93452c7 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -266,53 +266,6 @@
4
-
-
-True
-False
-0
-none
-
-
-
-True
-False
-12
-6
-
-
-Sen_d crash reports to The Document
Foundation
-True
-True
-False
-start
-True
-True
-True
-
-
-0
-1
-
-
-
-
-
-
-True
-False
-Help Improve %PRODUCTNAME
-
-
-
-
-
-
-
-0
-5
-
-
True
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - desktop/source
desktop/source/app/app.cxx |3 ++-
desktop/source/app/crashreport.cxx | 12 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 3ea5024328dea554c24fac6de7f132c1d10d1222
Author: Thorsten Behrens
AuthorDate: Tue Apr 21 19:06:44 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Sep 5 19:15:28 2023 +0200
Some optimisations around crashreporter status queries
* make dump enable status query static
* only offer crash UI if dump is enabled
cherry-pick from commit: f67e4da406f8753fb041705cf197690e7fd9a0aa
Change-Id: I71aff4c6ca5a73e4d1db6163cdf8dec75b9e7538
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156490
Reviewed-by: Gabor Kelemen
Tested-by: Thorsten Behrens
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b205d5b189e1..a4c249b445a8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1987,7 +1987,8 @@ void Desktop::OpenClients()
#endif
#if HAVE_FEATURE_BREAKPAD
-if (officecfg::Office::Common::Misc::CrashReport::get() &&
CrashReporter::crashReportInfoExists())
+if (CrashReporter::IsDumpEnable() &&
+officecfg::Office::Common::Misc::CrashReport::get() &&
CrashReporter::crashReportInfoExists())
handleCrashReport();
#endif
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index 0458edf9793a..b8754c53f706 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -279,13 +279,21 @@ bool CrashReporter::IsDumpEnable()
if (env != nullptr && env[0] != '\0') {
return true;
}
+
+static bool bConfigRead = false;
+static bool bEnable = true; // default, always on
+
+if (bConfigRead)
+return bEnable;
+
// read configuration item 'CrashDumpEnable' -> bool on/off
OUString sToken;
if (rtl::Bootstrap::get("CrashDumpEnable", sToken))
{
-return sToken.toBoolean();
+bEnable = sToken.toBoolean();
}
-return true; // default, always on
+bConfigRead = true;
+return bEnable;
}
[Libreoffice-commits] core.git: Branch 'distro/allotropia/zeta-7-4' - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig reportdesign/uiconfig sc/uiconfig sd/uico
basctl/uiconfig/basicide/menubar/menubar.xml |1 - chart2/uiconfig/menubar/menubar.xml|1 - dbaccess/uiconfig/dbapp/menubar/menubar.xml|1 - dbaccess/uiconfig/dbquery/menubar/menubar.xml |1 - dbaccess/uiconfig/dbrelation/menubar/menubar.xml |1 - dbaccess/uiconfig/dbtable/menubar/menubar.xml |1 - dbaccess/uiconfig/dbtdata/menubar/menubar.xml |1 - extensions/uiconfig/sbibliography/menubar/menubar.xml |1 - framework/uiconfig/startmodule/menubar/menubar.xml |1 - reportdesign/uiconfig/dbreport/menubar/menubar.xml |1 - sc/uiconfig/scalc/menubar/menubar.xml |1 - sc/uiconfig/scalc/popupmenu/notebookbar.xml|1 - sc/uiconfig/scalc/ui/notebookbar.ui|7 --- sc/uiconfig/scalc/ui/notebookbar_compact.ui|7 --- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui|7 --- sd/uiconfig/sdraw/menubar/menubar.xml |1 - sd/uiconfig/sdraw/popupmenu/notebookbar.xml|1 - sd/uiconfig/sdraw/ui/notebookbar.ui|7 --- sd/uiconfig/sdraw/ui/notebookbar_compact.ui|7 --- sd/uiconfig/simpress/menubar/menubar.xml |1 - sd/uiconfig/simpress/popupmenu/notebookbar.xml |1 - sd/uiconfig/simpress/ui/notebookbar.ui |7 --- sd/uiconfig/simpress/ui/notebookbar_compact.ui |7 --- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui |7 --- starmath/uiconfig/smath/menubar/menubar.xml|1 - sw/uiconfig/sglobal/menubar/menubar.xml|1 - sw/uiconfig/sweb/menubar/menubar.xml |1 - sw/uiconfig/swform/menubar/menubar.xml |1 - sw/uiconfig/swreport/menubar/menubar.xml |1 - sw/uiconfig/swriter/menubar/menubar.xml|1 - sw/uiconfig/swriter/popupmenu/notebookbar.xml |1 - sw/uiconfig/swriter/ui/notebookbar.ui |7 --- sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |7 --- sw/uiconfig/swxform/menubar/menubar.xml|1 - 34 files changed, 94 deletions(-) New commits: commit 8ba33d73f70dd4c67fcef57c93a3652edfcc6dae Author: Thorsten Behrens AuthorDate: Mon Jun 17 02:41:36 2019 +0200 Commit: Thorsten Behrens CommitDate: Tue Sep 5 19:12:49 2023 +0200 Remove Help menu donate entry for LTS version Change-Id: I78db5b1989dee9ab10d670f26d08237335ffcc29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156493 Reviewed-by: Gabor Kelemen Tested-by: Thorsten Behrens diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml index ac59065c9daf..73a3612703e2 100644 --- a/basctl/uiconfig/basicide/menubar/menubar.xml +++ b/basctl/uiconfig/basicide/menubar/menubar.xml @@ -167,7 +167,6 @@ - diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index 354ebbc1903a..e588977b62be 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -168,7 +168,6 @@ - diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml index 7038a63608a7..a577e14fbc23 100644 --- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml @@ -155,7 +155,6 @@ - diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml index 8227446b4b89..ed335167a2e7 100644 --- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml @@ -110,7 +110,6 @@ - diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml index 6e3df781eca9..9b9a85aaceba 100644 --- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml @@ -94,7 +94,6 @@ - diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml index bbd4a7428f74..820dd9a0892c 100644 --- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml @@ -94,7 +94,6 @@ - diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml index bbf379953e85..7a80e2a432b7 100644 --- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml +++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml @@ -119,7 +119,6
Re: Machine learning is used in gerrit build
Hi Baole, Baole Fang wrote: > Hi Thorsten, > > After quickly checking the gerrit_master_ml and gerrit_master_seq > configuration, I didn't notice the change. Can you indicate the change for > me? > Sure - look into https://ci.libreoffice.org/view/Gerrit/job/gerrit_master_ml/configure , and search for GERRIT_TOPIC. There's a short-circuit check to divert into "normal" multijob, if that matches jenkins:all. Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Machine learning is used in gerrit build
Hi Noel, I wrote: > I can try & sit down tomorrow (with Baole, and perhaps you can join > too?), and tweak things a bit. > Added a tweak to short-circuit the ML builder, to unconditionally run the old 'normal' setup, if the patch has this gerrit topic set (minus the quotes): "jenkins:all". Pondering to make that an alias for "android:all", so with either of the two, one would get all Android platforms built, plus have all builds queued in parallel from the start. Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Machine learning is used in gerrit build
Hi Noel, Noel Grandin wrote: > Even in the good case, in the unlikely event of builds passing on the first > run, we have doubled the latency from submitting to getting a jenkins pass, > since we are running the two slowest build sub-paths in sequence. > The idea is to run a fast & reliable build first as a canary (but only if there's a high probability for failure, predicted by the ML). Granted, at the moment linux_clang_dbgutil is anything but. I can try & sit down tomorrow (with Baole, and perhaps you can join too?), and tweak things a bit. Cheers, -- Thorsten signature.asc Description: PGP signature
Re: Machine learning is used in gerrit build
Hi y'all, Xisco Fauli wrote: > On 18/8/23 18:48, Noel Grandin wrote: > > Just recently I have to resume my builds 5 or 6 times to get past the ML > > stage, only then to discover that I made a mistake that affected some > > other platform, and then having to change things again, and restart the > > process. > > Maybe having a way to force to build on all platforms as we do with android > could help. > Yup, that's how we should address this. Sorry, was (mostly) away from the keyboard the last few days, would have piped up earlier. Thx Xisco for pointing to that earlier modification. That said, the new ML-assisted build control is clearly there to make the overall Jenkins experience better, not worse for devs. The idea was, to catch likely-fail cases without causing load on the more expensive/more time-consuming builders (like Windows and Mac), and trying to keep the queue length for those builders close to zero (so for normal patches, people would get a build node ~immediately). Looking at the stats [1], we're still sometimes experiencing queue lengths north of 35 jobs. The time waiting in the build queue though dropped recently [2]. What's live now is a first cut, so let's try to fine-tune it. Most obvious knobs to tweak: threshold to divert build into canary-first mode, which 'features' to use from any given gerrit submission, and which build configuration to use for the canary run (might even be a new setup, with a different compiler/distro-config combination?). [1] https://ci.libreoffice.org/monitoring/nodes?part=graph=buildQueueLength [2] https://ci.libreoffice.org/monitoring/nodes?part=graph=buildQueueWaiting Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 687147ba9ff646c76347380ca13fd7c09acf618f Author: Thorsten Behrens AuthorDate: Tue Aug 15 20:14:49 2023 +0200 Commit: Thorsten Behrens CommitDate: Tue Aug 15 20:14:49 2023 +0200 Release 6.3.6.28 Change-Id: I6b3e703968a82c8d48f4d0cec8605177a246f3eb diff --git a/configure.ac b/configure.ac index 1b71847401b9..e7779a82ce49 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.27],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.3.6.28],[],[],[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
Re: Making it easier to start contributing to LibreOffice development
Hi Hossein, Hossein Nourikhah wrote: > How to automate (from command-line) the installation of a Visual Studio > Build Tools build environment, for C++, .NET, C#, etc > https://stackoverflow.com/q/62551793 > I think that's a _really_ great idea, adding that to lode - pulling in just the build tools, and putting them into a non-standard path via --installPath (so as to not interfere with any existing install). That should make for a much more standardized build env on Windows, with fewer opportunities to get it wrong. > 2-4 Dropping some of the huge dependencies > There was disagreements in this area, but it is actually possible to drop > some of the huge dependencies to simplify the build process. It is also a > big task. This is an example patch from me: > > Drop boost dependency for writerfilter > https://gerrit.libreoffice.org/c/core/+/139279 > For this one, I'm not convinced that is the right approach. You'll have a hard time replacing boost/spirit, the json parser and the various specialized containers with something equivalent. As Stephan said, the useful bits out of boost will eventually appear in std c++ - and that is the way, we'll eventually get rid of boost. If boost is a drag (is it really? we only build a tiny fraction of it, no?), perhaps cutting the tarball down to the absolute minimum is a better plan. Their git repo is already quite modular... Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - include/sfx2
include/sfx2/LokControlHandler.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a1687e1fe580561a8fbf0d2796b0c1f06ed2b405
Author: Thorsten Behrens
AuthorDate: Sat Aug 5 02:20:58 2023 +0200
Commit: Xisco Fauli
CommitDate: Mon Aug 7 10:40:38 2023 +0200
Fix crash in lokit form control mouse handler
Since 7adfecb0f5947ae258226c8d1652546f81577026
, clicking on form controls results in a crash like this one:
0x7f7c81092a7c in __pthread_kill_implementation () at /lib64/libc.so.6
0x7f7c81041226 in raise () at /lib64/libc.so.6
0x7f7c81029897 in abort () at /lib64/libc.so.6
0x7f7c812e4c60 in __gnu_debug::_Safe_sequence_base::_M_get_mutex() ()
at /lib64/libstdc++.so.6
0x7f7c2aaaf36f in std::_Optional_base_impl >::_M_get()
(this=0x7f7c2c673b50 )
at /usr/include/c++/13/optional:477
0x7f7c2aaa9b24 in std::optional::operator*() &
(this=0x7f7c2c673b50 )
at /usr/include/c++/13/optional:974
0x7f7c2aaa66bb in LokControlHandler::postMouseEvent(SdrPage const*,
SdrView const*, vcl::DocWindow&, int, Point, int, int, int)
(pPage=0x7f7c6ec35910, pDrawView=0x7f7c6f097a40, rMainWindow=...,
nType=0, aPointHmm=Point = {...}, nCount=1, nButtons=1, nModifier=0)
at core/include/sfx2/LokControlHandler.hxx:79
0x7f7c2aa9d784 in SwXTextDocument::postMouseEvent(int, int, int, int,
int, int) (this=0x7f7c6eae94f0, nType=0, nX=1756, nY=4106, nCount=1,
nButtons=1, nModifier=0)
at core/sw/source/uibase/uno/unotxdoc.cxx:3741
0x7f7c7c8fb074 in doc_postMouseEvent(LibreOfficeKitDocument*, int,
int, int, int, int, int) (pThis=0x7f7c6f37fe90, nType=0, nX=1756, nY=4106,
nCount=1, nButtons=1, nModifier=0)
at core/desktop/source/lib/init.cxx:5062
0x7f7c81642c9e in postMouseEventInThread(gpointer) (data=0x19aa340)
at core/libreofficekit/source/gtk/lokdocview.cxx:2335
0x7f7c816441fb in lokThreadFunc(gpointer, gpointer) (data=0x19aa340)
at core/libreofficekit/source/gtk/lokdocview.cxx:2567
Change-Id: I77e85df6a77adc033cc793488924ed676a9900be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155364
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 30fa03428e9fa9aecf753c14bc3c5156a471d49e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155307
Reviewed-by: Xisco Fauli
diff --git a/include/sfx2/LokControlHandler.hxx
b/include/sfx2/LokControlHandler.hxx
index dc69787456e5..a292f137471b 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -76,7 +76,7 @@ public:
// and set pointer style to arrow
if (!eDocPointerStyle)
{
-*eDocPointerStyle = rMainWindow.GetPointer();
+eDocPointerStyle = rMainWindow.GetPointer();
rMainWindow.SetPointer(pWindow->GetPointer());
}
[Libreoffice-commits] core.git: canvas/source vcl/source
canvas/source/vcl/spritehelper.cxx |6 -- vcl/source/bitmap/alpha.cxx|4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) New commits: commit ad1f69d28d31725a22e7e1cbb4d950aa9ad3bea7 Author: Thorsten Behrens AuthorDate: Sun Aug 6 01:19:17 2023 +0200 Commit: Noel Grandin CommitDate: Sun Aug 6 12:23:07 2023 +0200 tdf#156540 invert alpha mask when drawing sprites Due to the switch from transparency to alpha in commit 81994cb2b8b32453a92bcb011830fcb884f22ff3, a sprite's alpha mask needs to be inverted. Additionally, fixes an oversight in vcl's alpha.cxx, where manual blend math got mangled, also in 81994cb2b8b32453a92bcb011830fcb884f22ff3. Change-Id: I8ebbbc7fe624d8dfc8121d8814d30875c498870d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155378 Reviewed-by: Patrick Luby Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 3494a5fbda8f..f188526930a0 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -134,12 +134,14 @@ namespace vclcanvas // sprite content might contain alpha, create // BmpEx, then. BitmapEx aMask( mpBackBufferMask->getOutDev().GetBitmapEx( aEmptyPoint, - aOutputSize ) ); + aOutputSize ) ); +AlphaMask aAlpha( aMask.GetBitmap() ); +aAlpha.Invert(); // Note: since we retrieved aBmp and aMask // directly from an OutDev, it's already a // 'display bitmap' on windows. -maContent = BitmapEx( aBmp.GetBitmap(), AlphaMask( aMask.GetBitmap()) ); +maContent = BitmapEx( aBmp.GetBitmap(), aAlpha ); } } diff --git a/vcl/source/bitmap/alpha.cxx b/vcl/source/bitmap/alpha.cxx index 8e082c695137..ff0d035d52d1 100644 --- a/vcl/source/bitmap/alpha.cxx +++ b/vcl/source/bitmap/alpha.cxx @@ -118,8 +118,8 @@ void AlphaMask::BlendWith(const AlphaMask& rOther) // Awkward calculation because the original used transparency, and to replicate // the logic we need to translate into transparency, perform the original logic, // then translate back to alpha. -auto tmp = 255 - ((255 - nGrey1) + (255 - nGrey2) - (255 - nGrey1) * (255 - nGrey2)); -*scanline = static_cast(tmp / 255); +auto tmp = 255 - ((255 - nGrey1) + (255 - nGrey2) - (255 - nGrey1) * (255 - nGrey2) / 255); +*scanline = static_cast(tmp); ++scanline; ++otherScanline; }
Re: GSoC'23 -- Week 9
Hi Baole, Baole Fang wrote: > [testselect]( > https://github.com/baolef/libreoffice-ci/blob/main/models/testselect.py) is > now able to recognize 95% (94% previously) of all failures, while reducing > computation by 85% (84% previously). > Oh nice! So the goal is still, to run _one_ canary platform build (likely Linux), for all 'likely to fail' builds (threshold for 'likely to fail' TBD), right? @list: since with that setup, and sufficient prediction quality, we can reduce Jenkins job numbers by up to a factor of 6, for those builds that would usually fail CI anyway (but taking 6 builds, and quite some queue waiting time, to eventually get there). Cheers, -- Thorsten signature.asc Description: PGP signature
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/LokControlHandler.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e25e27c85ed970cdb97c468bdac86c80964f4231
Author: Thorsten Behrens
AuthorDate: Sat Aug 5 02:20:58 2023 +0200
Commit: Thorsten Behrens
CommitDate: Sat Aug 5 04:06:36 2023 +0200
Fix crash in lokit form control mouse handler
Since 7adfecb0f5947ae258226c8d1652546f81577026
, clicking on form controls results in a crash like this one:
0x7f7c81092a7c in __pthread_kill_implementation () at /lib64/libc.so.6
0x7f7c81041226 in raise () at /lib64/libc.so.6
0x7f7c81029897 in abort () at /lib64/libc.so.6
0x7f7c812e4c60 in __gnu_debug::_Safe_sequence_base::_M_get_mutex() ()
at /lib64/libstdc++.so.6
0x7f7c2aaaf36f in std::_Optional_base_impl >::_M_get()
(this=0x7f7c2c673b50 )
at /usr/include/c++/13/optional:477
0x7f7c2aaa9b24 in std::optional::operator*() &
(this=0x7f7c2c673b50 )
at /usr/include/c++/13/optional:974
0x7f7c2aaa66bb in LokControlHandler::postMouseEvent(SdrPage const*,
SdrView const*, vcl::DocWindow&, int, Point, int, int, int)
(pPage=0x7f7c6ec35910, pDrawView=0x7f7c6f097a40, rMainWindow=...,
nType=0, aPointHmm=Point = {...}, nCount=1, nButtons=1, nModifier=0)
at core/include/sfx2/LokControlHandler.hxx:79
0x7f7c2aa9d784 in SwXTextDocument::postMouseEvent(int, int, int, int,
int, int) (this=0x7f7c6eae94f0, nType=0, nX=1756, nY=4106, nCount=1,
nButtons=1, nModifier=0)
at core/sw/source/uibase/uno/unotxdoc.cxx:3741
0x7f7c7c8fb074 in doc_postMouseEvent(LibreOfficeKitDocument*, int,
int, int, int, int, int) (pThis=0x7f7c6f37fe90, nType=0, nX=1756, nY=4106,
nCount=1, nButtons=1, nModifier=0)
at core/desktop/source/lib/init.cxx:5062
0x7f7c81642c9e in postMouseEventInThread(gpointer) (data=0x19aa340)
at core/libreofficekit/source/gtk/lokdocview.cxx:2335
0x7f7c816441fb in lokThreadFunc(gpointer, gpointer) (data=0x19aa340)
at core/libreofficekit/source/gtk/lokdocview.cxx:2567
Change-Id: I77e85df6a77adc033cc793488924ed676a9900be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155364
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/sfx2/LokControlHandler.hxx
b/include/sfx2/LokControlHandler.hxx
index dc69787456e5..a292f137471b 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -76,7 +76,7 @@ public:
// and set pointer style to arrow
if (!eDocPointerStyle)
{
-*eDocPointerStyle = rMainWindow.GetPointer();
+eDocPointerStyle = rMainWindow.GetPointer();
rMainWindow.SetPointer(pWindow->GetPointer());
}
[Libreoffice-commits] core.git: scripting/source
scripting/source/pyprov/mailmerge.py |8
1 file changed, 8 insertions(+)
New commits:
commit d7b8dc9f3f866d65c2e1ae3727b3738ae954e325
Author: Thorsten Behrens
AuthorDate: Sat Jul 29 05:17:10 2023 +0200
Commit: Thorsten Behrens
CommitDate: Sun Jul 30 21:59:19 2023 +0200
Log SSL default verification path for mailmerge debug
related: follow python recommendation and pass SSL contexts
Change-Id: I992535a7fbe0bd21ff1de8241715babc0cb5cdc3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155050
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/scripting/source/pyprov/mailmerge.py
b/scripting/source/pyprov/mailmerge.py
index 6bd80430d147..40be53b9366a 100644
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -96,6 +96,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if dbg:
print("Timeout: " + str(tout), file=sys.stderr)
if port == 465:
+ if dbg:
+ print("SSL config: " +
str(ssl.get_default_verify_paths()), file=sys.stderr)
self.server = smtplib.SMTP_SSL(server, port,
timeout=tout, context=ssl.create_default_context())
else:
self.server = smtplib.SMTP(server, port,timeout=tout)
@@ -107,6 +109,8 @@ class PyMailSMTPService(unohelper.Base, XSmtpService):
if dbg:
print("ConnectionType: " + connectiontype,
file=sys.stderr)
if connectiontype.upper() == 'SSL' and port != 465:
+ if dbg:
+ print("SSL config: " +
str(ssl.get_default_verify_paths()), file=sys.stderr)
self.server.ehlo()
self.server.starttls(context=ssl.create_default_context())
self.server.ehlo()
@@ -299,6 +303,8 @@ class PyMailIMAPService(unohelper.Base, XMailService):
print(connectiontype, file=sys.stderr)
print("BEFORE", file=sys.stderr)
if connectiontype.upper() == 'SSL':
+ if dbg:
+ print("SSL config: " +
str(ssl.get_default_verify_paths()), file=sys.stderr)
self.server = imaplib.IMAP4_SSL(server, port,
ssl_context=ssl.create_default_context())
else:
self.server = imaplib.IMAP4(server, port)
@@ -368,6 +374,8 @@ class PyMailPOP3Service(unohelper.Base, XMailService):
print(connectiontype, file=sys.stderr)
print("BEFORE", file=sys.stderr)
if connectiontype.upper() == 'SSL':
+ if dbg:
+ print("SSL config: " +
str(ssl.get_default_verify_paths()), file=sys.stderr)
self.server = poplib.POP3_SSL(server, port,
context=ssl.create_default_context())
else:
tout = xConnectionContext.getValueByName("Timeout")
[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 dbb6992156773d0be0ea59b3832516f5f16c1f0c Author: Thorsten Behrens AuthorDate: Fri Jul 28 15:13:08 2023 +0200 Commit: Thorsten Behrens CommitDate: Fri Jul 28 15:13:08 2023 +0200 Bump version to 6.4.0.20 Change-Id: Id3648daeb6ac39b5995629a9ad4aee8ef0dd0857 diff --git a/configure.ac b/configure.ac index 23cfdfc91927..ec3bdb6e3a19 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.19],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.20],[],[],[https://www.cib.de/office/]) 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
ESC meeting minutes: 2023-07-27
in Gtk3 (Caolan) + unclear if they really move fwd with that - no sponsor for Gtk4... + let's wait and see * Crash Testing (Caolan) + 26(+0) import failure, 0(+0) export failures - was failing due to too many core dumps exhausting space - fixed the big crasher, restarted - sampled not finished run and submitted fixes for two other issues - next one higher than usual, expect then back to normal - nothing beyond that + 0 coverity issues + 3 ossfuzz issues - significant improvement - All timeouts. * Crash Reporting (Xisco) + 7.5.1.224951(+562) + 7.5.2.218175(+563) + 7.5.3.216985(+973) + 7.5.4.28858(+1509) + 7.5.5.2403(+0) * Mentoring (Hossein) committer... 1 week 1 month 3 months12 months open 93(3) 158(17) 206(2) 236(20) reviews 342(-18) 1216(86)3078(-28) 10956(18) merged 255(27)1144(-69) 3345(-17) 12660(51) abandoned 2(-7) 32(-7) 130(-9) 630(0) own commits 213(57) 738(30)2282(15)10356(40) review commits 74(24) 253(37) 734(11) 3054(3) contributor... 1 week 1 month 3 months 12 months open 13(-18) 44(-4) 223(-6) 238(0) reviews 742(54)2754(-122) 7958(-134) 32146(84) merged 20(-5) 92(11) 275(-50) 2723(-13) abandoned 1(0) 11(-3) 38(-6) 473(-9) own commits 19(-2) 84(11) 230(-7) 1047(12) review commits 0(0)0(0) 0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 1(1) cleanup_comments 332(332) total 405(405) assigned 22(22) open 355(355) + top 10 contributors: Dipam Turkar made 19 patches in 1 month, and 22 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 21 patches in 1 year Ahmed Eltokhy made 5 patches in 1 month, and 9 patches in 1 year Matt K made 4 patches in 1 month, and 6 patches in 1 year Stéphane Guillou made 4 patches in 1 month, and 19 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 73 patches in 1 year Czeber László made 3 patches in 1 month, and 17 patches in 1 year Luigi Iucci made 3 patches in 1 month, and 6 patches in 1 year Tzschichholz, Rico made 2 patches in 1 month, and 3 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year + top 10 reviewers: Caolán McNamara made 100 review comments in 1 month, and 232 in 1 year Michael Stahl made 100 review comments in 1 month, and 1108 in 1 year Nabet, Julien made 96 review comments in 1 month, and 962 in 1 year Vajngerl, Tomaž made 80 review comments in 1 month, and 410 in 1 year Kaganski, Mike made 78 review comments in 1 month, and 366 in 1 year Xisco Fauli made 56 review comments in 1 month, and 784 in 1 year Christian Lohmaier made 52 review comments in 1 month, and 396 in 1 year Thorsten Behrens made 50 review comments in 1 month, and 454 in 1 year Weghorn, Michael made 46 review comments in 1 month, and 182 in 1 year Grandin, Noel made 46 review comments in 1 month, and 594 in 1 year + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: Sahil Gautam gautamsahil1...@gmail.com * GSoC (Ilmari) + work is ongoing + next up: August 21st final week, submission of results by students * Commit Access + none this time * Developer Certification (Stephan/Miklos/Thorsten/László) + resting since: 15 weeks (limit: 20 weeks) * Jenkins / CI update (Cloph) gerrit_android_aarch64 jobs: 279 ok: 255 ko: 10 fail ratio: 3.58% mean_ok: 12 ( 24) median_ok: 8 ( 16) gerrit_android_arm jobs: 281 ok: 247 ko: 9 fail ratio: 3.20% mean_ok: 12 ( 24) median_ok: 8 ( 16) gerrit_android_x86 jobs: 280 ok: 251 ko: 13 fail ratio: 4.64% mean_ok: 12 ( 24) median_ok: 8 ( 17) gerrit_android_x86_64 jobs: 281 ok: 249 ko: 8 fail ratio: 2.85% mean_ok: 12 ( 25) median_ok: 8 ( 19) gerrit_linux_clang_dbgutil jobs: 586 ok: 415 ko: 112 fail ratio: 19.11% mean_ok: 50 ( 63) median_ok: 48 ( 55) gerrit_linux_gcc_release jobs: 562 ok: 449 ko: 75 fail ratio: 13.35% mean_ok: 25 ( 33) median_ok: 22 ( 26) gerrit_mac jobs: 572 ok: 439 ko: 84 fail ratio: 14.69% mean_ok: 45 ( 46) median_ok: 41 ( 41) gerrit_windows jobs: 588 ok: 400 ko: 123 fail ratio: 20.92% mean_ok: 75 (126) median_ok: 67 (108) gerrit_master jobs: 543 ok: 278 ko: 197 fail ratio: 36.28% mean
[Libreoffice-qa] ESC meeting minutes: 2023-07-27
in Gtk3 (Caolan) + unclear if they really move fwd with that - no sponsor for Gtk4... + let's wait and see * Crash Testing (Caolan) + 26(+0) import failure, 0(+0) export failures - was failing due to too many core dumps exhausting space - fixed the big crasher, restarted - sampled not finished run and submitted fixes for two other issues - next one higher than usual, expect then back to normal - nothing beyond that + 0 coverity issues + 3 ossfuzz issues - significant improvement - All timeouts. * Crash Reporting (Xisco) + 7.5.1.224951(+562) + 7.5.2.218175(+563) + 7.5.3.216985(+973) + 7.5.4.28858(+1509) + 7.5.5.2403(+0) * Mentoring (Hossein) committer... 1 week 1 month 3 months12 months open 93(3) 158(17) 206(2) 236(20) reviews 342(-18) 1216(86)3078(-28) 10956(18) merged 255(27)1144(-69) 3345(-17) 12660(51) abandoned 2(-7) 32(-7) 130(-9) 630(0) own commits 213(57) 738(30)2282(15)10356(40) review commits 74(24) 253(37) 734(11) 3054(3) contributor... 1 week 1 month 3 months 12 months open 13(-18) 44(-4) 223(-6) 238(0) reviews 742(54)2754(-122) 7958(-134) 32146(84) merged 20(-5) 92(11) 275(-50) 2723(-13) abandoned 1(0) 11(-3) 38(-6) 473(-9) own commits 19(-2) 84(11) 230(-7) 1047(12) review commits 0(0)0(0) 0(0) 0(0) + easyHack statistics: needsDevEval 8(8) needsUXEval 1(1) cleanup_comments 332(332) total 405(405) assigned 22(22) open 355(355) + top 10 contributors: Dipam Turkar made 19 patches in 1 month, and 22 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 21 patches in 1 year Ahmed Eltokhy made 5 patches in 1 month, and 9 patches in 1 year Matt K made 4 patches in 1 month, and 6 patches in 1 year Stéphane Guillou made 4 patches in 1 month, and 19 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 73 patches in 1 year Czeber László made 3 patches in 1 month, and 17 patches in 1 year Luigi Iucci made 3 patches in 1 month, and 6 patches in 1 year Tzschichholz, Rico made 2 patches in 1 month, and 3 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year + top 10 reviewers: Caolán McNamara made 100 review comments in 1 month, and 232 in 1 year Michael Stahl made 100 review comments in 1 month, and 1108 in 1 year Nabet, Julien made 96 review comments in 1 month, and 962 in 1 year Vajngerl, Tomaž made 80 review comments in 1 month, and 410 in 1 year Kaganski, Mike made 78 review comments in 1 month, and 366 in 1 year Xisco Fauli made 56 review comments in 1 month, and 784 in 1 year Christian Lohmaier made 52 review comments in 1 month, and 396 in 1 year Thorsten Behrens made 50 review comments in 1 month, and 454 in 1 year Weghorn, Michael made 46 review comments in 1 month, and 182 in 1 year Grandin, Noel made 46 review comments in 1 month, and 594 in 1 year + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: Sahil Gautam gautamsahil1...@gmail.com * GSoC (Ilmari) + work is ongoing + next up: August 21st final week, submission of results by students * Commit Access + none this time * Developer Certification (Stephan/Miklos/Thorsten/László) + resting since: 15 weeks (limit: 20 weeks) * Jenkins / CI update (Cloph) gerrit_android_aarch64 jobs: 279 ok: 255 ko: 10 fail ratio: 3.58% mean_ok: 12 ( 24) median_ok: 8 ( 16) gerrit_android_arm jobs: 281 ok: 247 ko: 9 fail ratio: 3.20% mean_ok: 12 ( 24) median_ok: 8 ( 16) gerrit_android_x86 jobs: 280 ok: 251 ko: 13 fail ratio: 4.64% mean_ok: 12 ( 24) median_ok: 8 ( 17) gerrit_android_x86_64 jobs: 281 ok: 249 ko: 8 fail ratio: 2.85% mean_ok: 12 ( 25) median_ok: 8 ( 19) gerrit_linux_clang_dbgutil jobs: 586 ok: 415 ko: 112 fail ratio: 19.11% mean_ok: 50 ( 63) median_ok: 48 ( 55) gerrit_linux_gcc_release jobs: 562 ok: 449 ko: 75 fail ratio: 13.35% mean_ok: 25 ( 33) median_ok: 22 ( 26) gerrit_mac jobs: 572 ok: 439 ko: 84 fail ratio: 14.69% mean_ok: 45 ( 46) median_ok: 41 ( 41) gerrit_windows jobs: 588 ok: 400 ko: 123 fail ratio: 20.92% mean_ok: 75 (126) median_ok: 67 (108) gerrit_master jobs: 543 ok: 278 ko: 197 fail ratio: 36.28% mean
Re: ESC meeting agenda: 2023-07-27 16:00 CEST
Hi Patrick, Patrick Luby wrote: > Not sure if the "1 review on libreoffice-7-6 is needed" is mine or not. But > if not, can you include the following Gerrit change in that agenda item?: > > https://gerrit.libreoffice.org/c/core/+/154701 > That's already merged? - the agenda line item was supposed to remind people, that since a few weeks, the -7-6 branch requires the usual +1 from another developer before merging. > The above change should fix most of the macOS language pack installation > failures described in tdf#144053. > Thx for the fix at any rate! :) Cheers, -- Thorsten signature.asc Description: PGP signature
Re: [Libreoffice-qa] ESC meeting agenda: 2023-07-27 16:00 CEST
Hi Patrick, Patrick Luby wrote: > Not sure if the "1 review on libreoffice-7-6 is needed" is mine or not. But > if not, can you include the following Gerrit change in that agenda item?: > > https://gerrit.libreoffice.org/c/core/+/154701 > That's already merged? - the agenda line item was supposed to remind people, that since a few weeks, the -7-6 branch requires the usual +1 from another developer before merging. > The above change should fix most of the macOS language pack installation > failures described in tdf#144053. > Thx for the fix at any rate! :) Cheers, -- Thorsten signature.asc Description: PGP signature
ESC meeting agenda: 2023-07-27 16:00 CEST
(405) assigned 22(22) open 355(355) + top 10 contributors: Dipam Turkar made 19 patches in 1 month, and 22 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 21 patches in 1 year Ahmed Eltokhy made 5 patches in 1 month, and 9 patches in 1 year Matt K made 4 patches in 1 month, and 6 patches in 1 year Stéphane Guillou made 4 patches in 1 month, and 19 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 73 patches in 1 year Czeber László made 3 patches in 1 month, and 17 patches in 1 year Luigi Iucci made 3 patches in 1 month, and 6 patches in 1 year Tzschichholz, Rico made 2 patches in 1 month, and 3 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year + top 10 reviewers: Caolán McNamara made 100 review comments in 1 month, and 232 in 1 year Michael Stahl made 100 review comments in 1 month, and 1108 in 1 year Nabet, Julien made 96 review comments in 1 month, and 962 in 1 year Vajngerl, Tomaž made 80 review comments in 1 month, and 410 in 1 year Kaganski, Mike made 78 review comments in 1 month, and 366 in 1 year Xisco Fauli made 56 review comments in 1 month, and 784 in 1 year Christian Lohmaier made 52 review comments in 1 month, and 396 in 1 year Thorsten Behrens made 50 review comments in 1 month, and 454 in 1 year Weghorn, Michael made 46 review comments in 1 month, and 182 in 1 year Grandin, Noel made 46 review comments in 1 month, and 594 in 1 year + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: Sahil Gautam gautamsahil1...@gmail.com * GSoC (Ilmari) + work is ongoing + next up: August 21st final week, submission of results * Commit Access * Developer Certification (Stephan/Miklos/Thorsten/László) + resting since: 15 weeks (limit: 20 weeks) * Jenkins / CI update (Cloph) * What’s cooking (Thorsten) + alpha/transparency change in vcl (Noel) * LibreOffice conference Bucharest 2023 (Gabriel) * QA update (Xisco) + UNCONFIRMED: 1186 (-2) + enhancements: 274 (+1) + needsUXEval: 5 (-2) + haveBackTrace: 11 (+0) + needsDevAdvice: 34 (+0) + documentation: 4 (+0) + android: 3 (+0) + iOS: 0 (+0) + Online: 12 (+0) + Most pressing bugs: New: Old: Fixed: + New high severity bugs of the week: + Always default to 'whole document' in Print and PDF export dialogs + https://bugs.documentfoundation.org/show_bug.cgi?id=139164 * QA stats (Stéphane) + https://bugs.documentfoundation.org/page.cgi?id=weekly-bug-summary.html +103 +20 (-146) overall) many thanks to the top bug squashers: Stéphane Guillou (stragu) 25 QA Administrators 21 خالد حسني 10 Balázs Varga (allotropia) 6 Heiko Tietze6 Rafael Lima 6 Gabor Kelemen (allotropia) 5 BogdanB 4 Buovjaga4 Michael Stahl (allotropia) 4 + top 10 bugs reporters: Stéphane Guillou (stragu) 5 Eyal Rozenberg 4 James 4 Mike Kaganski 3 Rafael Lima 3 vicxp0518 3 Elmar 2 Gerald Pfeifer 2 Jim Connell 2 Jonas H 2 + top 10 bugs fixers: خالد حسني 9 Balazs Varga6 Rafael Lima 6 Michael Stahl 4 Nagy Tibor 3 Patrick Luby3 Andreas Heinisch2 Czeber László 2 Heiko Tietze2 Justin Luth 2 + top 10 bugs confirmers: Stéphane Guillou21 m.a.riosv 10 Heiko Tietze9 Dieter 5 خالد حسني 5 *UNKNOWN* 4 Andreas Heinisch2 Nabet, Julien 2 Srebotnjak, Martin 2 Alex Thurgood 1 * Bisected bugs open: keyword 'bisected' + more accurate - down to a single commit. + http://bit.ly/2dyIfDy + done by: Stéphane Guillou 2 Justin Luth1 Kelemen, Gabor 1 خالد حسني 1 Raal 1 * Bibisected bugs open: keyword 'bibisected' + http://bit.ly/2cSCXlS + done by: Ilmari Lauhakangas 2 Stéphane Guillou 2 Justin Luth1 Kelemen, Gabor 1 Raal 1 * all bugs tagged with 'regression' + 1194(-2) bugs open of 12674(+10) total 13(+2) high
[Libreoffice-qa] ESC meeting agenda: 2023-07-27 16:00 CEST
(405) assigned 22(22) open 355(355) + top 10 contributors: Dipam Turkar made 19 patches in 1 month, and 22 patches in 1 year Dr. David Alan Gilbert made 6 patches in 1 month, and 21 patches in 1 year Ahmed Eltokhy made 5 patches in 1 month, and 9 patches in 1 year Matt K made 4 patches in 1 month, and 6 patches in 1 year Stéphane Guillou made 4 patches in 1 month, and 19 patches in 1 year Armin Le Grand (allotropia) made 4 patches in 1 month, and 73 patches in 1 year Czeber László made 3 patches in 1 month, and 17 patches in 1 year Luigi Iucci made 3 patches in 1 month, and 6 patches in 1 year Tzschichholz, Rico made 2 patches in 1 month, and 3 patches in 1 year Juan C. Sanz made 2 patches in 1 month, and 6 patches in 1 year + top 10 reviewers: Caolán McNamara made 100 review comments in 1 month, and 232 in 1 year Michael Stahl made 100 review comments in 1 month, and 1108 in 1 year Nabet, Julien made 96 review comments in 1 month, and 962 in 1 year Vajngerl, Tomaž made 80 review comments in 1 month, and 410 in 1 year Kaganski, Mike made 78 review comments in 1 month, and 366 in 1 year Xisco Fauli made 56 review comments in 1 month, and 784 in 1 year Christian Lohmaier made 52 review comments in 1 month, and 396 in 1 year Thorsten Behrens made 50 review comments in 1 month, and 454 in 1 year Weghorn, Michael made 46 review comments in 1 month, and 182 in 1 year Grandin, Noel made 46 review comments in 1 month, and 594 in 1 year + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: Sahil Gautam gautamsahil1...@gmail.com * GSoC (Ilmari) + work is ongoing + next up: August 21st final week, submission of results * Commit Access * Developer Certification (Stephan/Miklos/Thorsten/László) + resting since: 15 weeks (limit: 20 weeks) * Jenkins / CI update (Cloph) * What’s cooking (Thorsten) + alpha/transparency change in vcl (Noel) * LibreOffice conference Bucharest 2023 (Gabriel) * QA update (Xisco) + UNCONFIRMED: 1186 (-2) + enhancements: 274 (+1) + needsUXEval: 5 (-2) + haveBackTrace: 11 (+0) + needsDevAdvice: 34 (+0) + documentation: 4 (+0) + android: 3 (+0) + iOS: 0 (+0) + Online: 12 (+0) + Most pressing bugs: New: Old: Fixed: + New high severity bugs of the week: + Always default to 'whole document' in Print and PDF export dialogs + https://bugs.documentfoundation.org/show_bug.cgi?id=139164 * QA stats (Stéphane) + https://bugs.documentfoundation.org/page.cgi?id=weekly-bug-summary.html +103 +20 (-146) overall) many thanks to the top bug squashers: Stéphane Guillou (stragu) 25 QA Administrators 21 خالد حسني 10 Balázs Varga (allotropia) 6 Heiko Tietze6 Rafael Lima 6 Gabor Kelemen (allotropia) 5 BogdanB 4 Buovjaga4 Michael Stahl (allotropia) 4 + top 10 bugs reporters: Stéphane Guillou (stragu) 5 Eyal Rozenberg 4 James 4 Mike Kaganski 3 Rafael Lima 3 vicxp0518 3 Elmar 2 Gerald Pfeifer 2 Jim Connell 2 Jonas H 2 + top 10 bugs fixers: خالد حسني 9 Balazs Varga6 Rafael Lima 6 Michael Stahl 4 Nagy Tibor 3 Patrick Luby3 Andreas Heinisch2 Czeber László 2 Heiko Tietze2 Justin Luth 2 + top 10 bugs confirmers: Stéphane Guillou21 m.a.riosv 10 Heiko Tietze9 Dieter 5 خالد حسني 5 *UNKNOWN* 4 Andreas Heinisch2 Nabet, Julien 2 Srebotnjak, Martin 2 Alex Thurgood 1 * Bisected bugs open: keyword 'bisected' + more accurate - down to a single commit. + http://bit.ly/2dyIfDy + done by: Stéphane Guillou 2 Justin Luth1 Kelemen, Gabor 1 خالد حسني 1 Raal 1 * Bibisected bugs open: keyword 'bibisected' + http://bit.ly/2cSCXlS + done by: Ilmari Lauhakangas 2 Stéphane Guillou 2 Justin Luth1 Kelemen, Gabor 1 Raal 1 * all bugs tagged with 'regression' + 1194(-2) bugs open of 12674(+10) total 13(+2) high
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svx/uiconfig
svx/uiconfig/ui/accessibilitycheckentry.ui |1 - 1 file changed, 1 deletion(-) New commits: commit dbd05e732987304e7f69699aa1bf34f31ae18ac2 Author: Thorsten Behrens AuthorDate: Tue Jul 25 15:23:54 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Jul 26 01:23:44 2023 +0200 Revert "tdf#156137 - A11Y - Fix Long object names need to proper handling" This reverts commit d89dc4ac09d3c2bd55174f09485173057cc1403b. Reason for revert: GtkLinkButton.wrap is not available for native gtk widgets. Change-Id: Ie1634691996fb6d54b69013a585914d123d5e195 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154913 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit 0b415b64a09647f556bb24c7a09f9daec0b4ebc9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154916 diff --git a/svx/uiconfig/ui/accessibilitycheckentry.ui b/svx/uiconfig/ui/accessibilitycheckentry.ui index 3e364419fcdb..ea4b63c5fe88 100644 --- a/svx/uiconfig/ui/accessibilitycheckentry.ui +++ b/svx/uiconfig/ui/accessibilitycheckentry.ui @@ -37,7 +37,6 @@ True start True -True none
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/accessibilitycheckentry.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 98b04571e8787efa34bc3db2a93ee09f2241e262 Author: Thorsten Behrens AuthorDate: Tue Jul 25 15:23:54 2023 +0200 Commit: Thorsten Behrens CommitDate: Tue Jul 25 20:56:44 2023 +0200 Revert "tdf#156137 - A11Y - Fix Long object names need to proper handling" This reverts commit d89dc4ac09d3c2bd55174f09485173057cc1403b. Reason for revert: GtkLinkButton.wrap is not available for native gtk widgets. Change-Id: Ie1634691996fb6d54b69013a585914d123d5e195 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154913 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/svx/uiconfig/ui/accessibilitycheckentry.ui b/svx/uiconfig/ui/accessibilitycheckentry.ui index 3e364419fcdb..ea4b63c5fe88 100644 --- a/svx/uiconfig/ui/accessibilitycheckentry.ui +++ b/svx/uiconfig/ui/accessibilitycheckentry.ui @@ -37,7 +37,6 @@ True start True -True none
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a5da0f2da14bdceea69b0523bc05c55ddd75f52b Author: Thorsten Behrens AuthorDate: Wed Jul 19 01:40:05 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Jul 19 01:40:05 2023 +0200 Release 6.3.6.25 Change-Id: Idb792de65878576519d1e83a282f58624b2fb8f9 diff --git a/configure.ac b/configure.ac index e0a74779f35a..34d5df6ca83a 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.24],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.3.6.25],[],[],[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_contract138e' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 12eed8ee99a4f6c12a6da3ba63d5df4473581e79 Author: Thorsten Behrens AuthorDate: Sun Jul 16 11:59:36 2023 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 16 11:59:36 2023 +0200 Release version 7.3.7.5 for both Windows and Linux Change-Id: Id0b26fe054363ba3c039be3f61faa74dcfdea01e diff --git a/configure.ac b/configure.ac index 17f2ffc196e5..69dd44c3bf93 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.3.7.4],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.3.7.5],[],[],[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_contract57d' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6072ae89a4d5475f89204add726eb4edf074921c Author: Thorsten Behrens AuthorDate: Tue Jul 4 13:24:03 2023 +0200 Commit: Thorsten Behrens CommitDate: Tue Jul 4 13:24:03 2023 +0200 Release 6.3.6.24 Change-Id: I0d68c2c019eb1a402a941b03369d32a186aaa645 diff --git a/configure.ac b/configure.ac index bd58dd3d40e1..e0a74779f35a 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.23],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.3.6.24],[],[],[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
Re: Stepping down from ESC & Developer certification committee
Hi Kendy, Jan Holesovsky wrote: > Today is my last day at Collabora Productivity, and I have no intention > to continue LibreOffice development as a volunteer (unless the > environment around TDF becomes less toxic), so effective immediately, > I'm stepping down from ESC and from the Developer certification > committee. Please also change my affiliation to "Unaffiliated" in the > list of Certified developers. > It is with great sadness to read your message. I would like to join in with all the others, to thank you profoundly, for everything you've contributed to LibreOffice and this community, in those nearly 20 years. People have covered your technical contributions, so let me try and complete the picture on what you did for TDF & the community. This project really needs to sit down & figure out how to stop frustrating core, long-term members like that... - I very much remember your crucial support in the early days of the fork, setting up TDF (infra, organisation, community), organizing events, mentoring, swag buying and shipping on your own dime & back - how we discussed release plans, and how you were instrumental in patiently guiding that to a compromise - how you got update notifications & infra to work, including helping with the various extension/template repos re-implemented and turned live, so we would have feature-parity with OOo there - how you championed & shepherded personas, and many other UX topics, to completion - when you (after initiatives from Italo and others) got the developer certification rolled into a working process, including tools & internal guidelines - were instrumental in hiring UX and dev mentors - championed the html help rework & shepherded that to completion - ..plus all the many more things you did, over the time of now almost 13 years on this project.. I look forward to meet you again, perhaps here in a while, or in another context. At any rate, should you be around Hamburg, drop me a note & we will have a beer or two. Same from Bubli, who sends warm greetings, from another another project alumna! All the best, -- Thorsten signature.asc Description: PGP signature
Re: [Libreoffice-qa] ESC budget ranking final approval: 2023-06-29 16:00 CEST
Hi y'all, Ilmari Lauhakangas wrote: > some tweaks were still needed to the ranking, apologies for the hassle. > Let's decide on the final ranking in the ESC meeting tomorrow: > > https://pad.documentfoundation.org/p/esc > Quick heads-up: I've added a link to the latest draft of the ESC tendering process document to the pad (under preparations). Cheers, -- Thorsten signature.asc Description: PGP signature
Re: [Libreoffice-qa] ESC budget ranking final approval: 2023-06-29 16:00 CEST
Hi y'all, Ilmari Lauhakangas wrote: > some tweaks were still needed to the ranking, apologies for the hassle. > Let's decide on the final ranking in the ESC meeting tomorrow: > > https://pad.documentfoundation.org/p/esc > Quick heads-up: I've added a link to the latest draft of the ESC tendering process document to the pad (under preparations). Cheers, -- Thorsten signature.asc Description: PGP signature
Re: [Libreoffice-qa] ESC budget item review meeting minutes: 2023-06-22
Hi Eyal, [adding dev & qa list back - f'up to there, I'd say, project@ is more for general announcements] my personal take would be - we should indeed outline a bit better, what formal requirements the ESC has, to be able to evaluate such tender proposals. Hossein already mentioned some minimum verbosity, such that someone independent, but skilled in the art, can judge a submission. I would hesitate to prescribe any particular 'kind' of work. Whatever the project members deem important should go there - if, what & when to do it, is then up to the ESC to decide. What is useful to mention though, is that successful proposals almost always are from, or are supported by, someone with technical background. Finding an ESC member to refine & lobby for one's proposal also tends to be a good idea. Best, Thorsten Eyal Rozenberg wrote: > So, even though the ranking is not in yet, I want to use the opportunity > and ask the members and officers who attended this year's meeting, and > rankings in previous years, to consider trying to author some guidelines > regarding what constitutes a "good" tender proposal, e.g.: > > * Larger or smaller amount of work? > * Features or bug/misdesign fixes? > * Proposals which can be broken down easily into smaller pieces of work, > or rather work that is somewhat atomic and unlikely to be done > incrementally? > * Improvements to more commonly-used apps and parts of the code, or > rather improvements to the less popular ones which are unlikely to > result in sufficient pressure from the user base to make happen? > * Work that is only apriori relevant to some category of users (e.g. > people with disabilities, specific language groups etc.), or work that > is more universally relevant? > > Now, I realize that different people have different ideas regarding what > the tendering priorities should be, and of course this may also tie in > to the ongoing arguments regarding TDF-ecosystem-company relations, but > - it's all fine as long as you separate what you-personally believe is > better from what has, in recent years, gotten more support and ranked up. > > Eyal > > > > On 22/06/2023 19:43, Ilmari Lauhakangas wrote: > > * Present: > > + Affiliated with TDF: Ilmari Lauhakangas, Xisco Faulí, Heiko > > Tietze, Florian Effenberger, Italo Vignoli, Khaled Hosny, Sophie > > Gautier, Olivier Hallot, Christian Lohmaier, Stéphane Guillou, Hossein > > Nourikhah > > + Affiliated with Collabora: Tomaž Vajngerl, Justin Luth > > + Affiliated with allotropia: Thorsten Behrens > > + Affiliated with Omnis Cloud Sarl (or TDF Board?): Paolo Vecchi > > + Affiliated with Red Hat: Stephan Bergmann > > + Unaffiliated: V Stuart Foote, Regina Henschel, Simon Phipps, > > Gerald Pfeifer > > > > * current version of the proposal was sent to board at 15.06.23, 11:24 > > * starts with section "Preamble" and ends with "Database Rights On > > The Transparency Section" > > * 2.823 words, 16.737 characters > > * tdf_budget_2023-06-12_comments_CP-clean.odt > > * SHA256: > > 4890a4f9c5bec212ea56997c4056af0389d99e618ebeac66e1abf25c6f67e14e > > * shared with the ESC end of April (27/04/2023) was this: > > > > https://nextcloud.documentfoundation.org/s/YprpsFP45z7a7p3 > > > > * ESC version is ~4-5 weeks, w/o preamble and w/o board decision bits > > > > Registration of Affiliation > > > > "Means a person: > > • acting as a representative of; > > • OR is a legal representative of; > > • OR is an employee of; > > • OR is a current consultant to; > > • OR is a former employee of OR former consultant (unless a > > sufficient amount of time has elapsed since the relevant relationship > > has ended) to > > a relevant entity OR of an entity which is > > • controlled by; > > • OR controls; > > • OR is under a common control with; > > • OR shares substantial business interest, including by way of > > ◦ long term economic relationship; > > ◦ OR commercial partnership, distributorship or similar; > > ◦ OR business coordination agreements, including consortia; > > ◦ OR any kind of agreement that limit the competition against > > each other – especially in the same fields as where the TDF operates – > > with; > > • OR operates in a joint venture with > > a relevant entity. For the sake of clarification, being a member of a > > general business association (such as a guild) OR of a Free Software > > association (such as the FSFE, OSI and OSI Affilia
Re: ESC budget item review meeting minutes: 2023-06-22
Hi Eyal, [adding dev & qa list back - f'up to there, I'd say, project@ is more for general announcements] my personal take would be - we should indeed outline a bit better, what formal requirements the ESC has, to be able to evaluate such tender proposals. Hossein already mentioned some minimum verbosity, such that someone independent, but skilled in the art, can judge a submission. I would hesitate to prescribe any particular 'kind' of work. Whatever the project members deem important should go there - if, what & when to do it, is then up to the ESC to decide. What is useful to mention though, is that successful proposals almost always are from, or are supported by, someone with technical background. Finding an ESC member to refine & lobby for one's proposal also tends to be a good idea. Best, Thorsten Eyal Rozenberg wrote: > So, even though the ranking is not in yet, I want to use the opportunity > and ask the members and officers who attended this year's meeting, and > rankings in previous years, to consider trying to author some guidelines > regarding what constitutes a "good" tender proposal, e.g.: > > * Larger or smaller amount of work? > * Features or bug/misdesign fixes? > * Proposals which can be broken down easily into smaller pieces of work, > or rather work that is somewhat atomic and unlikely to be done > incrementally? > * Improvements to more commonly-used apps and parts of the code, or > rather improvements to the less popular ones which are unlikely to > result in sufficient pressure from the user base to make happen? > * Work that is only apriori relevant to some category of users (e.g. > people with disabilities, specific language groups etc.), or work that > is more universally relevant? > > Now, I realize that different people have different ideas regarding what > the tendering priorities should be, and of course this may also tie in > to the ongoing arguments regarding TDF-ecosystem-company relations, but > - it's all fine as long as you separate what you-personally believe is > better from what has, in recent years, gotten more support and ranked up. > > Eyal > > > > On 22/06/2023 19:43, Ilmari Lauhakangas wrote: > > * Present: > > + Affiliated with TDF: Ilmari Lauhakangas, Xisco Faulí, Heiko > > Tietze, Florian Effenberger, Italo Vignoli, Khaled Hosny, Sophie > > Gautier, Olivier Hallot, Christian Lohmaier, Stéphane Guillou, Hossein > > Nourikhah > > + Affiliated with Collabora: Tomaž Vajngerl, Justin Luth > > + Affiliated with allotropia: Thorsten Behrens > > + Affiliated with Omnis Cloud Sarl (or TDF Board?): Paolo Vecchi > > + Affiliated with Red Hat: Stephan Bergmann > > + Unaffiliated: V Stuart Foote, Regina Henschel, Simon Phipps, > > Gerald Pfeifer > > > > * current version of the proposal was sent to board at 15.06.23, 11:24 > > * starts with section "Preamble" and ends with "Database Rights On > > The Transparency Section" > > * 2.823 words, 16.737 characters > > * tdf_budget_2023-06-12_comments_CP-clean.odt > > * SHA256: > > 4890a4f9c5bec212ea56997c4056af0389d99e618ebeac66e1abf25c6f67e14e > > * shared with the ESC end of April (27/04/2023) was this: > > > > https://nextcloud.documentfoundation.org/s/YprpsFP45z7a7p3 > > > > * ESC version is ~4-5 weeks, w/o preamble and w/o board decision bits > > > > Registration of Affiliation > > > > "Means a person: > > • acting as a representative of; > > • OR is a legal representative of; > > • OR is an employee of; > > • OR is a current consultant to; > > • OR is a former employee of OR former consultant (unless a > > sufficient amount of time has elapsed since the relevant relationship > > has ended) to > > a relevant entity OR of an entity which is > > • controlled by; > > • OR controls; > > • OR is under a common control with; > > • OR shares substantial business interest, including by way of > > ◦ long term economic relationship; > > ◦ OR commercial partnership, distributorship or similar; > > ◦ OR business coordination agreements, including consortia; > > ◦ OR any kind of agreement that limit the competition against > > each other – especially in the same fields as where the TDF operates – > > with; > > • OR operates in a joint venture with > > a relevant entity. For the sake of clarification, being a member of a > > general business association (such as a guild) OR of a Free Software > > association (such as the FSFE, OSI and OSI Affilia
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.4-19'
Tag 'cib-6.4-19' created by Thorsten Behrens at 2023-06-15 01:04 + Release CIB Office cib-6.4-19 -BEGIN PGP SIGNATURE- iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCZIpjnl8UgAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF RkM0OEVEQkFGM0Y3NjE5MzBENDgyMUUwNzk2QTY4MTdDOTFFNgAKCRAeB5amgXyR 5rYtAQDfWp0ef57kjBCTR0Pu49CHviGuC5J/QQPUcrrKhVNYtAD/V6MVend90tCt NK70sx4+HE/y3nGwbliPzWdIQF6sHgQ= =p7Tj -END PGP SIGNATURE- Changes since cib-6.4-18-5: --- 0 files changed ---
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 10 commits - download.lst external/curl external/libtommath external/libxml2 external/libxmlsec external/libxslt external/openssl ex
Rebased ref, commits from common ancestor: commit 4fbe08e56bdbb60289dd18c718b80168b640110f Author: Thorsten Behrens AuthorDate: Wed Jun 14 16:42:21 2023 +0200 Commit: Thorsten Behrens CommitDate: Thu Jun 15 01:32:19 2023 +0200 Build python3 against own openssl This is a bit from https://gerrit.libreoffice.org/c/core/+/98435 which we were missing, due to sticking to Python 3.5.x Change-Id: I3b18d1f540d56cf06fccc4abcb6e45eda8a4ba4b diff --git a/external/python3/python-3.5.4-ssl.patch.1 b/external/python3/python-3.5.4-ssl.patch.1 index beb6fe38882f..837d0053cf5a 100644 --- a/external/python3/python-3.5.4-ssl.patch.1 +++ b/external/python3/python-3.5.4-ssl.patch.1 @@ -34,7 +34,7 @@ diff -ru python3.orig/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj - ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) -+ ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies) ++ ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\libssl.lib;$(WORKDIR)\UnpackedTarball\openssl\libcrypto.lib;%(AdditionalDependencies) commit a30e264accbec3f6269e89887e4acd2a0538e515 Author: Thorsten Behrens AuthorDate: Wed Jun 14 13:34:52 2023 +0200 Commit: Thorsten Behrens CommitDate: Thu Jun 15 01:32:19 2023 +0200 openssl: upgrade to release 1.1.1t Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e) (cherry picked from commit ba359c09226756865d3813fee08514384257ae58) Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50 diff --git a/download.lst b/download.lst index 2e8f5b2aea0a..89860176ad77 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz +export OPENSSL_SHA256SUM := 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b +export OPENSSL_TARBALL := openssl-1.1.1t.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 61017fc6146a6162678e7d9218ee0fe4de6527a5 Author: Xisco Fauli AuthorDate: Wed Nov 2 20:29:51 2022 +0100 Commit: Thorsten Behrens CommitDate: Thu Jun 15 01:32:19 2023 +0200 upgrade to openssl-1.1.1s Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142184 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 23e6227ab347a00b235fb00892b379ef4e3a0d35) (cherry picked from commit 2c06d55c8e43368920780e55c62e1e65fdefba04) Change-Id: Ic0f1fca7ef73b3a443c24d2bcc7f234be331a05b diff --git a/download.lst b/download.lst index 2c413cd593f8..2e8f5b2aea0a 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca -export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz +export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa +export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 858d475f9bc07ad648b4a0d91b5fdedeac6cf307 Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Tue Sep 6 14:42:20 2022 +0900 Commit: Thorsten Behrens CommitDate: Thu Jun 15 01:32:19 2023 +0200 upgrade openssl-1.1.1q Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139463 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 96db5e3d610ede2ed82f1ab7673ac6d1c69fd588) (cherry picked from commit 9da5e4107e74d7590fbf44f5f4f24ed620852f91) Cha
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 9 commits - download.lst external/curl external/libtommath external/libxml2 external/libxmlsec external/libxslt external/openssl ext
download.lst |4 ++-- external/curl/ExternalProject_curl.mk |5 +++-- external/libtommath/ExternalProject_libtommath.mk |4 +--- external/libxml2/ExternalProject_xml2.mk |6 +++--- external/libxmlsec/ExternalProject_xmlsec.mk |5 +++-- external/libxslt/ExternalProject_xslt.mk |5 +++-- external/openssl/ExternalProject_openssl.mk |2 ++ external/postgresql/ExternalProject_postgresql.mk |8 solenv/gbuild/ExternalProject.mk |2 +- solenv/gbuild/platform/com_MSC_class.mk | 11 +-- 10 files changed, 31 insertions(+), 21 deletions(-) New commits: commit 5dec00f8fd25b176fa25f088c54cb15b166617eb Author: Thorsten Behrens AuthorDate: Wed Jun 14 13:34:52 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Jun 14 13:34:52 2023 +0200 openssl: upgrade to release 1.1.1t Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653 Tested-by: Jenkins Reviewed-by: Thorsten Behrens (cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e) (cherry picked from commit ba359c09226756865d3813fee08514384257ae58) Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50 diff --git a/download.lst b/download.lst index 2e8f5b2aea0a..89860176ad77 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa -export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz +export OPENSSL_SHA256SUM := 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b +export OPENSSL_TARBALL := openssl-1.1.1t.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit 0134b9d3f447cf43d0f537323d7dafc355dabd51 Author: Xisco Fauli AuthorDate: Wed Nov 2 20:29:51 2022 +0100 Commit: Thorsten Behrens CommitDate: Wed Jun 14 13:33:22 2023 +0200 upgrade to openssl-1.1.1s Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142184 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 23e6227ab347a00b235fb00892b379ef4e3a0d35) (cherry picked from commit 2c06d55c8e43368920780e55c62e1e65fdefba04) Change-Id: Ic0f1fca7ef73b3a443c24d2bcc7f234be331a05b diff --git a/download.lst b/download.lst index 2c413cd593f8..2e8f5b2aea0a 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca -export OPENSSL_TARBALL := openssl-1.1.1q.tar.gz +export OPENSSL_SHA256SUM := c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa +export OPENSSL_TARBALL := openssl-1.1.1s.tar.gz export ORCUS_SHA256SUM := 676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908 export ORCUS_TARBALL := liborcus-0.12.1.tar.gz export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb commit d0b0ee8f459f2d99a2ed88094c1528ce9e5b1bee Author: Taichi Haradaguchi <20001...@ymail.ne.jp> AuthorDate: Tue Sep 6 14:42:20 2022 +0900 Commit: Thorsten Behrens CommitDate: Wed Jun 14 13:32:48 2023 +0200 upgrade openssl-1.1.1q Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139463 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 96db5e3d610ede2ed82f1ab7673ac6d1c69fd588) (cherry picked from commit 9da5e4107e74d7590fbf44f5f4f24ed620852f91) Change-Id: I2317e734f074cf7301a6081cf3d2221beeaf5ad1 diff --git a/download.lst b/download.lst index 7281ab02a696..2c413cd593f8 100644 --- a/download.lst +++ b/download.lst @@ -177,8 +177,8 @@ export OPENCOLLADA_SHA256SUM := 8f25d429237cde289a448c82a0a830791354ccce5ee40d77 export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2 export OPENLDAP_SHA256SUM := 99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34 export OPENLDAP_TARBALL := openldap-2.4.59.tgz -export OPENSSL_SHA256SUM := f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 -export OPENSSL_T
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - 2 commits - configure.ac external/nss
Rebased ref, commits from common ancestor:
commit 019743acfc717518cfca49f4fc326adea9661789
Author: Thorsten Behrens
AuthorDate: Wed Jun 14 08:44:09 2023 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jun 14 08:45:14 2023 +0200
Release 5.4.18
Change-Id: I151cefaadc35a14c308d095bda6b044db369556a
diff --git a/configure.ac b/configure.ac
index ced1de25fcf1..425e1cb7c1a3 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.17.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.18.0],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 29cdc81fd9d0d4dd2a26d780cfbb8a2e1a3ec810
Author: Thorsten Behrens
AuthorDate: Wed Jun 14 01:00:36 2023 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jun 14 08:45:06 2023 +0200
Fix nss build for devtoolset-7 string erase
Error was: nss_bogo_shim.cc:43:66: error: no matching function for
call to ‘std::basic_string..'
Change-Id: I357d61fcb6299ac87edac2229a1a134199e7d37a
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index e77f92341d91..04d098cadc19 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-win32-make.patch.1 \
external/nss/ubsan.patch.0 \
external/nss/clang-cl.patch.0 \
+external/nss/nss-std-string.patch.1 \
external/nss/nss.vs2015.patch \
external/nss/nss.vs2015.pdb.patch \
$(if $(filter iOS,$(OS)), \
diff --git a/external/nss/nss-std-string.patch.1
b/external/nss/nss-std-string.patch.1
new file mode 100644
index ..2669cfb51a4a
--- /dev/null
+++ b/external/nss/nss-std-string.patch.1
@@ -0,0 +1,15 @@
+diff -ur nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc
nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc
+--- nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13
22:06:35.757518272 +0200
nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13
22:06:50.521508892 +0200
+@@ -40,8 +40,8 @@
+ }
+
+ static void StringRemoveNewlines(std::string& str) {
+- str.erase(std::remove(str.begin(), str.end(), '\n'), str.cend());
+- str.erase(std::remove(str.begin(), str.end(), '\r'), str.cend());
++ str.erase(std::remove(str.begin(), str.end(), '\n'), str.end());
++ str.erase(std::remove(str.begin(), str.end(), '\r'), str.end());
+ }
+
+ class TestAgent {
+Only in nss/nss/gtests/nss_bogo_shim: nss_bogo_shim.cc~
[Libreoffice-commits] core.git: Branch 'feature/cib_contract891c' - external/nss
external/nss/UnpackedTarball_nss.mk |1 +
external/nss/nss-std-string.patch.1 | 15 +++
2 files changed, 16 insertions(+)
New commits:
commit ab7719c026386a352d1bb62e98cdbb881c46ed4f
Author: Thorsten Behrens
AuthorDate: Wed Jun 14 01:00:36 2023 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jun 14 01:00:36 2023 +0200
Fix nss build for devtoolset-7 string erase
Error was: nss_bogo_shim.cc:43:66: error: no matching function for
call to ‘std::basic_string
Change-Id: I357d61fcb6299ac87edac2229a1a134199e7d37a
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index e77f92341d91..04d098cadc19 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-win32-make.patch.1 \
external/nss/ubsan.patch.0 \
external/nss/clang-cl.patch.0 \
+external/nss/nss-std-string.patch.1 \
external/nss/nss.vs2015.patch \
external/nss/nss.vs2015.pdb.patch \
$(if $(filter iOS,$(OS)), \
diff --git a/external/nss/nss-std-string.patch.1
b/external/nss/nss-std-string.patch.1
new file mode 100644
index ..2669cfb51a4a
--- /dev/null
+++ b/external/nss/nss-std-string.patch.1
@@ -0,0 +1,15 @@
+diff -ur nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc
nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc
+--- nss.org/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13
22:06:35.757518272 +0200
nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2023-06-13
22:06:50.521508892 +0200
+@@ -40,8 +40,8 @@
+ }
+
+ static void StringRemoveNewlines(std::string& str) {
+- str.erase(std::remove(str.begin(), str.end(), '\n'), str.cend());
+- str.erase(std::remove(str.begin(), str.end(), '\r'), str.cend());
++ str.erase(std::remove(str.begin(), str.end(), '\n'), str.end());
++ str.erase(std::remove(str.begin(), str.end(), '\r'), str.end());
+ }
+
+ class TestAgent {
+Only in nss/nss/gtests/nss_bogo_shim: nss_bogo_shim.cc~
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 2 commits - configure.ac sfx2/source starmath/qa
configure.ac|2 +-
sfx2/source/doc/objmisc.cxx |3 +--
starmath/qa/cppunit/test_cursor.cxx |1 -
starmath/qa/cppunit/test_node.cxx |1 -
starmath/qa/cppunit/test_nodetotextvisitors.cxx |1 -
5 files changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 9a9424a65d2f04bd3de0f9b1c3f453da50d3dd06
Author: Thorsten Behrens
AuthorDate: Mon Jun 12 16:47:11 2023 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jun 12 16:47:43 2023 +0200
Bump version to 6.4.0.19
Change-Id: Id0635d370bcb2296f65ae28c1f3daba5a015a265
diff --git a/configure.ac b/configure.ac
index 4867f4ef1629..23cfdfc91927 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.18],[],[],[https://www.cib.de/office/])
+AC_INIT([CIB Office],[6.4.0.19],[],[],[https://www.cib.de/office/])
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
commit cf2d0807642b443bb320abed7464dae10f7c5ee0
Author: Thorsten Behrens
AuthorDate: Mon Jun 12 16:43:49 2023 +0200
Commit: Thorsten Behrens
CommitDate: Mon Jun 12 16:43:49 2023 +0200
Revert "tdf#146547 Mark read-only docs as modified"
This reverts commit cb46fe877fd000ad74eb167a3a6127e89c8990f9.
Causes tdf#155638: "Forms: Form couldn't be closed after it has been
opened"
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 50f92ee65ac6..ff31ce956bbc 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -262,8 +262,7 @@ void SfxObjectShell::EnableSetModified( bool bEnable )
bool SfxObjectShell::IsEnableSetModified() const
{
-// Don't allow when user explicitly requested read only (IsLoadReadonly()
or IsOriginallyLoadedReadOnlyMedium())
-return pImpl->m_bEnableSetModified && ! (IsLoadReadonly() ||
IsOriginallyLoadedReadOnlyMedium());
+return pImpl->m_bEnableSetModified && !IsReadOnly();
}
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
index b85b5ceef37a..080e7a274c4d 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -57,7 +57,6 @@ void Test::setUp()
SmGlobals::ensure();
xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
-xDocShRef->DoInitNew();
}
void Test::tearDown()
diff --git a/starmath/qa/cppunit/test_node.cxx
b/starmath/qa/cppunit/test_node.cxx
index 570cab00d062..dba0b9ff3c40 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -53,7 +53,6 @@ void NodeTest::setUp()
mxDocShell = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT |
SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS |
SfxModelFlags::DISABLE_DOCUMENT_RECOVERY);
-mxDocShell->DoInitNew();
}
void NodeTest::tearDown()
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index e738351a8d23..c3172ab60126 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -90,7 +90,6 @@ void Test::setUp()
SmGlobals::ensure();
xDocShRef = new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT);
-xDocShRef->DoInitNew();
}
void Test::tearDown()
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6f5bea4839797cdff8fcd79b85276660623f1042 Author: Thorsten Behrens AuthorDate: Mon Jun 5 14:23:58 2023 +0200 Commit: Thorsten Behrens CommitDate: Mon Jun 5 14:23:58 2023 +0200 Release 6.3.6.23 Change-Id: I24895a77a8ba7b404fc3894b0e12f5c5907ce65e diff --git a/configure.ac b/configure.ac index e60a275d9c27..bd58dd3d40e1 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.22],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.3.6.23],[],[],[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 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a471c41ac57f9eee8ea97c4b9e5989b86eec67f Author: Thorsten Behrens AuthorDate: Mon Jun 5 14:16:11 2023 +0200 Commit: Thorsten Behrens CommitDate: Mon Jun 5 14:16:11 2023 +0200 Bump version to 6.4.0.18 Change-Id: Id22c6cc988b547e1f88a2aa82542047d27bd9fe7 diff --git a/configure.ac b/configure.ac index d02695f3c53e..6986a174de09 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.17],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.18],[],[],[https://www.cib.de/office/]) 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_contract138e' - 2 commits - configure.ac vcl/unx
configure.ac |2 +- vcl/unx/kf5/KF5SalInstance.cxx |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 60f9897228affd127bdfdddc04024c743e5c6fbe Author: Thorsten Behrens AuthorDate: Wed May 24 03:00:07 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed May 24 03:00:07 2023 +0200 Release version 7.3.7.4 for both Windows and Linux Change-Id: Ie27002d0390aecf1fbe8ec88d4edfd411a569196 diff --git a/configure.ac b/configure.ac index 5bb52272cdac..17f2ffc196e5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.3.7.3],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.3.7.4],[],[],[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 commit 76e2d1f70143bbd65785ad325f1f0cd93ab0196a Author: Thorsten Behrens AuthorDate: Wed May 24 02:52:16 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed May 24 02:58:40 2023 +0200 Disable global menubar for Unity There seems to be a number of problems, on older Qt5.5: * https://bugreports.qt.io/browse/QTBUG-58723 * https://bugs.launchpad.net/ubuntu/+source/bamf/+bug/1532226 So instead of workarounds, let's just avoid the feature here. Change-Id: Icec0b399ecb5a65ca3350acd4f4a59f3fe3bf089 diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx index 1bf479a4e73e..1fb5e1efc229 100644 --- a/vcl/unx/kf5/KF5SalInstance.cxx +++ b/vcl/unx/kf5/KF5SalInstance.cxx @@ -77,6 +77,9 @@ VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance() std::vector aFakeArgvFreeable; QtInstance::AllocFakeCmdlineArgs(pFakeArgv, pFakeArgc, aFakeArgvFreeable); +// disable global menubar, which is affected by QTBUG-58723 +QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar); + std::unique_ptr pQApp = QtInstance::CreateQApplication(*pFakeArgc, pFakeArgv.get());
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/AccessibilityCheckStrings.hrc |2 +-
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx |7 +++
sw/source/core/access/AccessibilityCheck.cxx |3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 5351b8789805154219fe57b92b41b17c0e0cd765
Author: Thorsten Behrens
AuthorDate: Fri May 12 10:42:56 2023 +0200
Commit: Thorsten Behrens
CommitDate: Sat May 13 13:25:08 2023 +0200
related tdf#57423: make a11y checker accept image description too
For LibreOffice, alt text and image description text are treated
mostly the same during PDF export (and merged, if both are set), so
having at least one of them set should make the checker happy enough.
Change-Id: I9e54bcf52dee323fdbdd4a3015797a59efb7b42f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151695
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/inc/AccessibilityCheckStrings.hrc
b/sw/inc/AccessibilityCheckStrings.hrc
index 805f525b37e2..cb461b1013f8 100644
--- a/sw/inc/AccessibilityCheckStrings.hrc
+++ b/sw/inc/AccessibilityCheckStrings.hrc
@@ -13,7 +13,7 @@
#define NC_(Context, String) TranslateId(Context, reinterpret_cast(u8##String))
-#define STR_NO_ALT NC_("STR_NO_ALT", "No alt text for
graphic “%OBJECT_NAME%”.")
+#define STR_NO_ALT NC_("STR_NO_ALT", "No alt or
description text for graphic “%OBJECT_NAME%”.")
#define STR_TABLE_MERGE_SPLIT NC_("STR_TABLE_MERGE_SPLIT", "Table
“%OBJECT_NAME%” contains merges or splits.")
#define STR_FAKE_NUMBERING NC_("STR_FAKE_NUMBERING", "Simulated
numbering “%NUMBERING%”.")
#define STR_HYPERLINK_TEXT_IS_LINK NC_("STR_HYPERLINK_TEXT_IS_LINK",
"Hyperlink text is the same as the link address “%LINK%”.")
diff --git a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
index d24a0922b73e..2b99f49b0cb2 100644
--- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
+++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx
@@ -48,15 +48,14 @@ CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest,
testTableSplitMergeAndAltText)
sw::AccessibilityCheck aCheck(pDoc);
aCheck.check();
auto& aIssues = aCheck.getIssueCollection().getIssues();
-CPPUNIT_ASSERT_EQUAL(size_t(7), aIssues.size());
+CPPUNIT_ASSERT_EQUAL(size_t(6), aIssues.size());
CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_GRAPHIC,
aIssues[0]->m_eIssueID);
-CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_OLE,
aIssues[1]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT,
aIssues[1]->m_eIssueID);
CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT,
aIssues[2]->m_eIssueID);
CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT,
aIssues[3]->m_eIssueID);
CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT,
aIssues[4]->m_eIssueID);
-CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT,
aIssues[5]->m_eIssueID);
-CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_SHAPE,
aIssues[6]->m_eIssueID);
+CPPUNIT_ASSERT_EQUAL(sfx::AccessibilityIssueID::NO_ALT_SHAPE,
aIssues[5]->m_eIssueID);
}
CPPUNIT_TEST_FIXTURE(AccessibilityCheckTest, testCheckParagraphIssues)
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index bae9b9d0c586..3a2bf556d112 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -97,8 +97,7 @@ class NoTextNodeAltTextCheck : public NodeCheck
if (!pNoTextNode)
return;
-OUString sAlternative = pNoTextNode->GetTitle();
-if (!sAlternative.isEmpty())
+if (!pNoTextNode->GetTitle().isEmpty() ||
!pNoTextNode->GetDescription().isEmpty())
return;
OUString sName = pNoTextNode->GetFlyFormat()->GetName();
[Libreoffice-commits] core.git: msicreator/createmsi.py
msicreator/createmsi.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca45f6efc2e9250daee8e94f8408fe4abba4a7ba Author: Thorsten Behrens AuthorDate: Sun Apr 23 16:34:32 2023 +0200 Commit: Thorsten Behrens CommitDate: Fri Apr 28 11:22:44 2023 +0200 msicreator: fix hardcoded wix toolset path On a Windows Server, the following installation procedure has the toolset end up below the x86 program dir: * % powershell Install-WindowsFeature Net-Framework-Core * % choco install -y wixtoolset Change-Id: I5e416cd24f51ae84cb0e6ef99b8a962355fb2b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150828 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/msicreator/createmsi.py b/msicreator/createmsi.py index 3a25c56c266e..23ae885906ff 100644 --- a/msicreator/createmsi.py +++ b/msicreator/createmsi.py @@ -571,7 +571,7 @@ class PackageGenerator: }) def build_package(self): -wixdir = 'c:\\Program Files\\Wix Toolset v3.11\\bin' +wixdir = 'c:\\Program Files (x86)\\Wix Toolset v3.11\\bin' if platform.system() != "Windows": wixdir = '/usr/bin' if not os.path.isdir(wixdir):
[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk
instsetoo_native/CustomTarget_install.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 904dfc73d08ba51ed29f4009ba2290e6232c0489 Author: Thorsten Behrens AuthorDate: Sun Apr 23 12:48:38 2023 +0200 Commit: Christian Lohmaier CommitDate: Wed Apr 26 18:50:06 2023 +0200 Disable WiX-based MSI generation for the moment Right now, CI builders have no WiX toolset installed, breaking all daily builds (since commit 9aee0383c3ebc3f267c99e19764728ba09c12d3a) Change-Id: I92ba2590c5afa711d3079edc070fd904b01de6f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150823 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index e4c0f7fcb9e7..ee69d07ebd8f 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -115,7 +115,6 @@ $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(instsetoo_installer_targets) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) - $(if $(LODE_HOME),$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) $(PRODUCTNAME_WITHOUT_SPACES)) ifeq (TRUE,$(LIBO_TEST_INSTALL)) unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 68912948e376ce0b080a0d2a76dd9d951f8bcdf6
Author: Thorsten Behrens
AuthorDate: Thu Apr 20 01:18:06 2023 +0200
Commit: Thorsten Behrens
CommitDate: Thu Apr 20 13:15:07 2023 +0200
WASM: don't run gfx tests on startup
Change-Id: Ibc04b5c1bb3972544fa605447c635b4af84f7584
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150668
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 169330dab9f7..4e3daca9893b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1557,12 +1557,14 @@ int Desktop::Main()
CheckOpenCLCompute(xDesktop);
#endif
+#if !defined(EMSCRIPTEN)
//Running the VCL graphics rendering tests
const char * pDisplay = std::getenv("DISPLAY");
if (!pDisplay || pDisplay[0] == ':')
{
runGraphicsRenderTests();
}
+#endif
// Post user event to startup first application component window
// We have to send this OpenClients message short before execute() to
