diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 31 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 2 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 7 |
4 files changed, 10 insertions, 31 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index d210cefa17..045d9d6afd 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -185,7 +185,6 @@ BEGIN $installer::globals::is_copy_only_project = 0; $installer::globals::is_simple_packager_project = 0; $installer::globals::patch_user_dir = 0; - $installer::globals::record_archive_metadata = 0; $installer::globals::languagepack = 0; $installer::globals::helppack = 0; $installer::globals::refresh_includepaths = 0; diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 3a876c4a36..a8b98a222e 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -47,12 +47,8 @@ sub check_simple_packager_project $installer::globals::is_simple_packager_project = 1; $installer::globals::patch_user_dir = 1; } - elsif( $installer::globals::packageformat eq "archive" ) - { - $installer::globals::is_simple_packager_project = 1; - $installer::globals::record_archive_metadata = 1; - } - elsif( $installer::globals::packageformat eq "dmg" ) + elsif(( $installer::globals::packageformat eq "archive" ) || + ( $installer::globals::packageformat eq "dmg" ) ) { $installer::globals::is_simple_packager_project = 1; } @@ -612,9 +608,6 @@ sub create_simple_package # stripping files ?! if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { strip_libraries($filesref, $languagestringref); } - my @archive_metadata_skip; - my @archive_metadata_cond; - # copy Files installer::logger::print_message( "... copying files ...\n" ); installer::logger::include_header_into_logfile("Copying files:"); @@ -665,18 +658,6 @@ sub create_simple_package } } } - - if ($installer::globals::record_archive_metadata) - { - if ($onefile->{'Styles'} =~ /\b(ASSEMBLY|ASSIGNCOMPONENT|FONT)\b/) - { - push(@archive_metadata_skip, $onefile->{'destination'}); - } - elsif ($onefile->{'modules'} =~ /^gid_Module_(Langpack|Optional)_/) - { - push(@archive_metadata_cond, $onefile->{'destination'}); - } - } } # creating Links @@ -745,14 +726,6 @@ sub create_simple_package create_package($installdir, $installdir, $packagename, $allvariables, $includepatharrayref, $languagestringref, ".dmg"); } - if ($installer::globals::record_archive_metadata) - { - open(HANDLE, '>', "$installer::globals::csp_installdir/../metadata") or die $!; - print HANDLE "skip $_\n" foreach (sort(@archive_metadata_skip)); - print HANDLE "cond $_\n" foreach (sort(@archive_metadata_cond)); - close HANDLE; - } - # Analyzing the log file installer::worker::clean_output_tree(); # removing directories created in the output tree diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 981877ea11..672ac41529 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -2424,6 +2424,7 @@ cui/source/inc/pastedlg.hxx cui/source/inc/postdlg.hxx cui/source/inc/scriptdlg.hxx cui/source/inc/sdrcelldlg.hxx +cui/source/inc/securityoptions.hxx cui/source/inc/splitcelldlg.hxx cui/source/inc/srchxtra.hxx cui/source/inc/swpossizetabpage.hxx @@ -2489,7 +2490,6 @@ cui/source/options/optupdt.hxx cui/source/options/sdbcdriverenum.cxx cui/source/options/sdbcdriverenum.hxx cui/source/options/securityoptions.cxx -cui/source/options/securityoptions.hxx cui/source/options/treeopt.cxx cui/source/options/webconninfo.cxx cui/source/options/webconninfo.hxx diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index a8d8b88394..74beb39f21 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -794,6 +794,13 @@ "dest-filename": "@ARGON2_TARBALL@" }, { + "url": "https://dev-www.libreoffice.org/src/@LIBPNG_TARBALL@", + "sha256": "@LIBPNG_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@LIBPNG_TARBALL@" + }, + { "url": "https://dev-www.libreoffice.org/extern/@OPENSYMBOL_TTF@", "sha256": "@OPENSYMBOL_SHA256SUM@", "type": "file", |