[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/modules/installer/splitdbg.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8be82816380492adf7ecc818de6bcc2c843cebe9
Author: Andras Timar
AuthorDate: Fri Feb 4 12:20:52 2022 +0100
Commit: Andras Timar
CommitDate: Fri Feb 4 12:20:52 2022 +0100
[cp] better condition whether to split the debug info
On my PC (openSUSE 15.3) I've got the following:
file instdir/program/libmergedlo.so
instdir/program/libmergedlo.so: ELF 64-bit LSB shared object, x86-64,
version 1 (GNU/Linux), dynamically linked,
BuildID[sha1]=40be1a5cb04f9910d471094a574feecac4c1f82b, with debug_info, not
stripped
On the centos7 build host, the debug info packages were not generated,
because output of `file` command did not contain "with debug_info".
file instdir/program/libmergedlo.so
instdir/program/libmergedlo.so: ELF 64-bit LSB shared object, x86-64,
version 1 (GNU/Linux), dynamically linked,
BuildID[sha1]=f953b674501b28b3537269ab1b9312102ea5d6c1, not stripped
Change-Id: I799b85499450c19e098223ad8633ad2da61c4ff8
diff --git a/solenv/bin/modules/installer/splitdbg.pm
b/solenv/bin/modules/installer/splitdbg.pm
index cab93ee6386b..60c0c1bde024 100644
--- a/solenv/bin/modules/installer/splitdbg.pm
+++ b/solenv/bin/modules/installer/splitdbg.pm
@@ -33,7 +33,7 @@ sub _need_to_splitdbg
my $fileoutput = ;
close (FILE);
-if (( $fileoutput =~ /with debug_info/i ) && ( $fileoutput =~ /\bELF\b/ ))
{ $splitdbg = 1; }
+if (( $fileoutput =~ /not stripped/i ) && ( $fileoutput =~ /\bELF\b/ )) {
$splitdbg = 1; }
return $splitdbg;
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1042ffc16be570f42abc4d68dcb2f6deeb290f52
Author: Andras Timar
AuthorDate: Fri Oct 22 21:47:31 2021 +0200
Commit: Andras Timar
CommitDate: Fri Oct 22 21:47:31 2021 +0200
hdiutil flatten/unflatten was removed in macOS 11
Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 33ee1f29a04d..7b5b20bc93e2 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -461,7 +461,7 @@ sub create_package
my $megabytes = 1500;
$megabytes = 2000 if $ENV{'ENABLE_DEBUG'};
$systemcall = "cd $localtempdir && hdiutil create -megabytes
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\"
-format UDBZ";
-if (( $ref ne "" ) && ( $$ref ne "" )) {
+if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep
unflatten") == 0) {
$systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o
$archive && hdiutil flatten $archive";
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/native-code.py |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 9c4bb3c7d27a775f177c386db9d2c3bc7a33590e
Author: Tor Lillqvist
AuthorDate: Mon Oct 4 14:45:10 2021 +0300
Commit: Tor Lillqvist
CommitDate: Mon Oct 4 13:55:24 2021 +0200
We need com_sun_star_animations_AnimatePhysics_get_implementation
Fix crash in iOS app reported at
https://github.com/CollaboraOnline/online/issues/3321 .
Fix crash caused by missing
Change-Id: I1b5fedb0d5db84cc3f6a75b52c29a39ebe7a6ed9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123046
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ed9ed2e9ef9d..812b315aa7a0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -26,6 +26,8 @@ core_factory_list = [
]
core_constructor_list = [
+# animations/source/animcore/animcore.component
+"com_sun_star_animations_AnimatePhysics_get_implementation",
# basic/util/sb.component
("com_sun_star_comp_sfx2_DialogLibraryContainer_get_implementation","#if
HAVE_FEATURE_SCRIPTING"),
("com_sun_star_comp_sfx2_ScriptLibraryContainer_get_implementation", "#if
HAVE_FEATURE_SCRIPTING"),
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/native-code.py |1 - 1 file changed, 1 deletion(-) New commits: commit 8469533884c5a84f15205611bf327ae77bb0ecae Author: Caolán McNamara AuthorDate: Tue Sep 28 12:15:24 2021 +0100 Commit: Tor Lillqvist CommitDate: Tue Sep 28 14:53:20 2021 +0300 com_sun_star_comp_svx_CharacterSpacingToolBoxControl is duplicated com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation is already listed under svx/util/svx.component Change-Id: I55fd0e2aff051b62b33d5b257ced8e934c9053d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122770 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 75835b6a2d31..ed9ed2e9ef9d 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -382,7 +382,6 @@ core_constructor_list = [ # svx/util/svxcore.component "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation", "com_sun_star_comp_Draw_GraphicExporter_get_implementation", -"com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation", "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation", "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation", "com_sun_star_comp_svx_FrameToolBoxControl_get_implementation",
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/native-code.py |9 + 1 file changed, 9 insertions(+) New commits: commit 1a5616bb6b1337ffab0d3ac15c9f52292075c07c Author: Tor Lillqvist AuthorDate: Mon Sep 27 18:23:39 2021 +0300 Commit: Tor Lillqvist CommitDate: Tue Sep 28 08:57:58 2021 +0200 More constructors needed for the DISABLE_DYNLOADING case Fixes https://github.com/CollaboraOnline/online/issues/3293. Change-Id: I3c0eaedf47321f0e81be4ac52c66f8e55381ac32 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122720 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 924cd81d1a4e..75835b6a2d31 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -90,6 +90,7 @@ core_constructor_list = [ "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", "com_sun_star_comp_chart2_ChartFrameLoader_get_implementation", "com_sun_star_comp_chart2_WizardDialog_get_implementation", +"org_libreoffice_chart2_Chart2ToolboxController", "org_libreoffice_comp_chart2_sidebar_ChartPanelFactory", # comphelper/util/comphelp.component "com_sun_star_comp_MemoryStream", @@ -368,8 +369,12 @@ core_constructor_list = [ # svgio/svgio.component "svgio_XSvgParser_get_implementation", # svx/util/svx.component +"com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation", +"com_sun_star_comp_svx_CTLToolBoxControl_get_implementation", +"com_sun_star_comp_svx_LineSpacingToolBoxControl_get_implementation", "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation", "com_sun_star_comp_svx_SmartTagMenuController_get_implementation", +"com_sun_star_comp_svx_UnderlineToolBoxControl_get_implementation", "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation", "com_sun_star_drawing_SvxShapeCollection_get_implementation", "com_sun_star_svx_FontHeightToolBoxController_get_implementation", @@ -377,10 +382,14 @@ core_constructor_list = [ # svx/util/svxcore.component "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation", "com_sun_star_comp_Draw_GraphicExporter_get_implementation", +"com_sun_star_comp_svx_CharacterSpacingToolBoxControl_get_implementation", "com_sun_star_comp_svx_ColorToolBoxControl_get_implementation", "com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation", +"com_sun_star_comp_svx_FrameToolBoxControl_get_implementation", "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation", "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation", +"com_sun_star_comp_svx_LineEndToolBoxControl_get_implementation", +"com_sun_star_comp_svx_LineStyleToolBoxControl_get_implementation", "com_sun_star_comp_svx_StyleToolBoxControl_get_implementation", "com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation", # toolkit/util/tk.component
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit c7661f475b017d18123ff04af99530ffa06d26d3 Author: merttumer AuthorDate: Thu Apr 29 06:20:19 2021 + Commit: Mert Tumer CommitDate: Mon May 31 05:52:42 2021 +0200 Add missing FilterOptionsDialog constructor for android Change-Id: I8bdd44e1b2f45a6d62e6b7220762da62787e04fa Signed-off-by: merttumer Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114830 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116305 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 3574347bb204..924cd81d1a4e 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -565,6 +565,7 @@ edit_constructor_list = [ "Calc_XMLOasisMetaExporter_get_implementation", "Calc_XMLOasisSettingsExporter_get_implementation", "Calc_XMLOasisStylesExporter_get_implementation", +"Calc_FilterOptionsDialog_get_implementation", # starmath/util/sm.component "Math_XMLContentExporter_get_implementation", "Math_XMLOasisMetaExporter_get_implementation", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/native-code.py |6 ++ 1 file changed, 6 insertions(+) New commits: commit 38b46275e40c47913328a7984d05f28da9c9568c Author: Tor Lillqvist AuthorDate: Thu Mar 25 12:23:43 2021 +0200 Commit: Tor Lillqvist CommitDate: Mon Apr 5 16:33:14 2021 +0200 Include the pdfimport library constructor in the mobile apps if enabled This is part of implementing https://github.com/CollaboraOnline/online/issues/1824 . Change-Id: I68dacc2de0dc1f09da03fa213d5cff56a2343c77 Signed-off-by: Tor Lillqvist Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113079 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113095 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113605 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 13a7e720be08..207a0d4b66a0 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -664,6 +664,12 @@ draw_constructor_list = [ "css_comp_Impress_oox_PowerPointExport", # writerperfect/source/draw/wpftdraw.component "com_sun_star_comp_Draw_VisioImportFilter_get_implementation", +# sdext/source/pdfimport/pdfimport.component +"sdext_PDFIHybridAdaptor_get_implementation", +"sdext_PDFIRawAdaptor_Writer_get_implementation", +"sdext_PDFIRawAdaptor_Draw_get_implementation", +"sdext_PDFIRawAdaptor_Impress_get_implementation", +"sdext_PDFDetector_get_implementation", ] writer_factory_list = [ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - solenv/bin
solenv/bin/ooinstall |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit a90b7c9b61d74377bceacf4f47c87f9f4914babe
Author: Tor Lillqvist
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit: Andras Timar
CommitDate: Thu Apr 1 09:59:54 2021 +0200
Use the same solenv/bin/ooinstall as in the cp-5.3 branch
Specifically, pass the correct product name and not a hardcoded
"LibreOffice" for the make_installer.pl script's -p option.
As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
name as "CollaboraOffice" so we could as well do that also in
ooinstall.
(cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)
Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
Reviewed-on: https://gerrit.libreoffice.org/79128
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
(cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d
"$ENV{DESTDIR}") {
print "Running LibreOffice installer\n";
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
$PRODUCTNAME_no_spaces " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
