Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2019-03-07 10:49:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Thu Mar 7 10:49:17 2019 rev:172 rq:682372 version:6.2.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2019-01-26 22:20:42.286938773 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new.28833/libreoffice.changes 2019-03-07 10:49:47.953863732 +0100 @@ -1,0 +2,54 @@ +Mon Mar 4 12:37:41 UTC 2019 - Reinhard Max <[email protected]> + +- libreoffice-postgresql.patch: pg_config is meant for linking + server extensions, clients should use pkg-config instead to build + against libpq. This fixes build with PostgreSQL 11. + +------------------------------------------------------------------- +Mon Mar 4 10:00:18 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Switch to gcc7 on SLE12 + +------------------------------------------------------------------- +Wed Feb 27 10:20:14 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 6.2.1.2: + * mostly just bundles update that we are not using + +------------------------------------------------------------------- +Tue Feb 26 09:17:17 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patch to fix 32bit build: + * kde5-32bit-build-fix.patch + +------------------------------------------------------------------- +Mon Feb 25 12:55:35 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Add patches speeding up install: + * 0001-Speed-up-languagepack-installation.patch + * libreoffice-no-destdircheck.patch + +------------------------------------------------------------------- +Fri Feb 22 09:53:08 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 6.2.1.1: + * Fixes focus issue wrt bsc#1123455 + * More stability fixes + * Additional fixes for the KDE wrapper +- Remove merged patches: + * java112.patch + * kde5-detection.patch + * kde5-font-width.patch + +------------------------------------------------------------------- +Fri Jan 25 09:12:12 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Switch to full KDE stack for KDE Frameworks integration instead + of gtk3 KDE wrapper bsc#1123131 +- Add patch to fix detection of KDE session on wayland: + * kde5-detection.patch +- Add patch to fix selection of condensed fonts instead of regular + ones: + * kde5-font-width.patch + +------------------------------------------------------------------- @@ -133,0 +188 @@ + * bsc#1124062 CVE-2018-16858 Old: ---- java112.patch libreoffice-6.2.0.3.tar.xz libreoffice-6.2.0.3.tar.xz.asc libreoffice-help-6.2.0.3.tar.xz libreoffice-help-6.2.0.3.tar.xz.asc libreoffice-translations-6.2.0.3.tar.xz libreoffice-translations-6.2.0.3.tar.xz.asc New: ---- 0001-Speed-up-languagepack-installation.patch kde5-32bit-build-fix.patch libreoffice-6.2.1.2.tar.xz libreoffice-6.2.1.2.tar.xz.asc libreoffice-help-6.2.1.2.tar.xz libreoffice-help-6.2.1.2.tar.xz.asc libreoffice-no-destdircheck.patch libreoffice-postgresql.patch libreoffice-translations-6.2.1.2.tar.xz libreoffice-translations-6.2.1.2.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.turPFB/_old 2019-03-07 10:49:57.537861183 +0100 +++ /var/tmp/diff_new_pack.turPFB/_new 2019-03-07 10:49:57.569861175 +0100 @@ -52,7 +52,7 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.2.0.3 +Version: 6.2.1.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -99,10 +99,14 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff -Patch4: java112.patch +Patch4: 0001-Speed-up-languagepack-installation.patch Patch5: old-boost.patch +Patch6: kde5-32bit-build-fix.patch +Patch7: libreoffice-postgresql.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff +# save time by relying on rpm check rather than doing stupid find+grep +Patch991: libreoffice-no-destdircheck.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -121,7 +125,6 @@ BuildRequires: flex BuildRequires: flute BuildRequires: fontforge -BuildRequires: gcc-c++ BuildRequires: glm-devel BuildRequires: graphviz # Needed for tests @@ -257,6 +260,13 @@ Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if %{?suse_version} >= 1500 +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 +%else +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%endif %if 0%{?suse_version} < 1500 Requires(post): update-desktop-files Requires(postun): update-desktop-files @@ -953,16 +963,18 @@ %prep %setup -q -b2 -b4 -%if 0%{?suse_version} < 1330 +%if 0%{?suse_version} < 1500 # The rename of the configdir is needed only on older than factory for compat %patch1 -# patch to build with old boost -%patch5 -p1 %endif # Leap 42/SLE-12 %patch2 %patch3 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 %patch990 -p1 +%patch991 -p1 # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 @@ -1003,6 +1015,11 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS +%if 0%{?suse_version} < 1500 +export CC=gcc-7 +export CXX=g++-7 +%endif + # Colada does not have .pc file and configure creator was really lazy export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' @@ -1045,8 +1062,11 @@ %if %{with gtk3} --enable-gtk3 \ %if %{with kdeintegration} - --enable-gtk3-kde5 \ + --disable-gtk3-kde5 \ --enable-kde5 \ + --enable-qt5 \ +%else + --disable-kde5 \ --disable-qt5 \ %endif %else @@ -1073,8 +1093,6 @@ --with-help=html \ --without-export-validation \ --enable-odk \ - --disable-qt5 \ - --disable-kde5 \ --disable-kde4 \ %if %{with system_gpgme} --with-system-gpgmepp \ ++++++ 0001-Speed-up-languagepack-installation.patch ++++++ >From d2763829435b7a30baebab939e1e04a94cce722b Mon Sep 17 00:00:00 2001 From: Michael Schroeder <[email protected]> Date: Mon, 25 Feb 2019 13:28:14 +0100 Subject: [PATCH] Speed up languagepack installation Reorder the order the filelists are initialized per package. Optimize speed of find_files_for_package: We can simply check if the modules entry is the same as last time. The code uses iterators instead of that C-ish for loops. Create a hash from the packagemodules to speed up the check if a module is included in the hash. Change-Id: I1e8ae394634a527880e08ef8ff333d94d04f49fd Before: 12s per language/package After: <1s per language/package --- solenv/bin/modules/installer.pm | 26 +++++------ solenv/bin/modules/installer/packagelist.pm | 52 ++++++++++----------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 88ec4e9394f9..f7983673f2e8 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -998,14 +998,23 @@ sub run { $packagerootpath = $installer::globals::rootpath; } + ################################# + # collecting items for package + ################################# + + my $filesinpackage = installer::packagelist::find_files_for_package($filesinproductlanguageresolvedarrayref, $onepackage); + my $unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinproductlanguageresolvedarrayref, $onepackage); + my $linksinpackage = installer::packagelist::find_links_for_package($linksinproductlanguageresolvedarrayref, $onepackage); + my $dirsinpackage = installer::packagelist::find_dirs_for_package($directoriesforepmarrayref, $onepackage); + ############################################# # copying the collectors for each package ############################################# - my $filesinpackage = installer::converter::copy_collector($filesinproductlanguageresolvedarrayref); - my $linksinpackage = installer::converter::copy_collector($linksinproductlanguageresolvedarrayref); - my $unixlinksinpackage = installer::converter::copy_collector($unixlinksinproductlanguageresolvedarrayref); - my $dirsinpackage = installer::converter::copy_collector($directoriesforepmarrayref); + $filesinpackage = installer::converter::copy_collector($filesinpackage); + $linksinpackage = installer::converter::copy_collector($linksinpackage); + $unixlinksinpackage = installer::converter::copy_collector($unixlinksinpackage); + $dirsinpackage = installer::converter::copy_collector($dirsinpackage); ########################################### # setting the root path for the packages @@ -1016,15 +1025,6 @@ sub run { installer::scriptitems::add_rootpath_to_links($linksinpackage, $packagerootpath); installer::scriptitems::add_rootpath_to_files($unixlinksinpackage, $packagerootpath); - ################################# - # collecting items for package - ################################# - - $filesinpackage = installer::packagelist::find_files_for_package($filesinpackage, $onepackage); - $unixlinksinpackage = installer::packagelist::find_files_for_package($unixlinksinpackage, $onepackage); - $linksinpackage = installer::packagelist::find_links_for_package($linksinpackage, $filesinpackage); - $dirsinpackage = installer::packagelist::find_dirs_for_package($dirsinpackage, $onepackage); - ############################################### # nothing to do, if $filesinpackage is empty ############################################### diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm index 14daf9907507..a0e1da760b44 100644 --- a/solenv/bin/modules/installer/packagelist.pm +++ b/solenv/bin/modules/installer/packagelist.pm @@ -239,47 +239,43 @@ sub find_files_for_package { my ($filelist, $onepackage) = @_; - my @newfilelist = (); + my @newfilelist; + my $lastmodules = ''; + my $lastincludefile = 0; - for ( my $i = 0; $i <= $#{$filelist}; $i++ ) + my %packagemodules = map {$_ => 1} @{$onepackage->{'allmodules'}}; + + for my $onefile (@$filelist) { - my $onefile = ${$filelist}[$i]; my $modulesstring = $onefile->{'modules'}; # comma separated modules list + + # check if the modules string is the same as in the last file + if ($modulesstring eq $lastmodules) + { + push(@newfilelist, $onefile) if $lastincludefile; + next; + } + my $moduleslist = installer::converter::convert_stringlist_into_array(\$modulesstring, ","); my $includefile = 0; # iterating over all modules of this file - - for ( my $j = 0; $j <= $#{$moduleslist}; $j++ ) - { - if ( $includefile ) { next; } - my $filemodule = ${$moduleslist}[$j]; + for my $filemodule (@$moduleslist) { installer::remover::remove_leading_and_ending_whitespaces(\$filemodule); - - # iterating over all modules of the package - - my $packagemodules = $onepackage->{'allmodules'}; - - for ( my $k = 0; $k <= $#{$packagemodules}; $k++ ) - { - if ( $includefile ) { next; } - my $packagemodule = ${$packagemodules}[$k]; - - if ( $filemodule eq $packagemodule ) - { - $includefile = 1; - last; - } + if ($packagemodules{$filemodule}) { + $includefile = 1; + last; } } - if ( $includefile ) - { - push(@newfilelist, $onefile); - } - } + push(@newfilelist, $onefile) if $includefile; + + # cache last result for this modules list + $lastmodules = $modulesstring; + $lastincludefile = $includefile; + } return \@newfilelist; } -- 2.20.1 ++++++ kde5-32bit-build-fix.patch ++++++ diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx index 5d40a7de39ab..d8d35b2f90b5 100644 --- a/vcl/unx/kde5/KDE5FilePicker2.cxx +++ b/vcl/unx/kde5/KDE5FilePicker2.cxx @@ -661,7 +661,7 @@ uno::Any KDE5FilePicker::handleGetListValue(QComboBox* pQComboBox, sal_Int16 nAc case ControlActions::GET_SELECTED_ITEM_INDEX: { int nCurrent = pQComboBox->currentIndex(); - aAny <<= nCurrent; + aAny <<= static_cast<sal_Int32>(nCurrent); } break; default: ++++++ libreoffice-6.2.0.3.tar.xz -> libreoffice-6.2.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-6.2.0.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.28833/libreoffice-6.2.1.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-6.2.0.3.tar.xz -> libreoffice-help-6.2.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-help-6.2.0.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.28833/libreoffice-help-6.2.1.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-no-destdircheck.patch ++++++ diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up index 701c9ffa0972..0d0fc27246ff 100755 --- a/bin/distro-install-clean-up +++ b/bin/distro-install-clean-up @@ -71,22 +71,3 @@ for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/sdk/examples ; do -name "manifest.mf" \) -exec chmod 644 {} \; fi done - -if test "z$DESTDIR" != "z" ; then - echo "Checking for DESTDIR inside installed files..." - found_destdir= - for file in `find $DESTDIR -type f` ; do - grep -q "$DESTDIR" $file && echo "$file: includes the string \"$DESTDIR\"" && found_destdir=1 - done - if test "z$found_destdir" != "z" ; then - echo "!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!" - echo "The path DESTDIR:$DESTDIR was found inside some" - echo "installed files. It is probably a bug." - echo - echo "Especially, if the DESTDIR is set to \$RPM_BUILD_ROOT" - echo "when creating RPM packages. Even it could be a security hole" - echo "if the application searches /var/tmp for binaries or" - echo "config files because the directory is world-writable." - echo "!!!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!" - fi -fi ++++++ libreoffice-postgresql.patch ++++++ --- configure.ac.orig +++ configure.ac @@ -8669,11 +8669,17 @@ if test "x$enable_postgresql_sdbc" != "x done fi AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path) - if test -z "$PGCONFIG"; then - AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH]) + if test -n "$PGCONFIG"; then + POSTGRESQL_INC=-I$(${PGCONFIG} --includedir) + POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)" + else + PKG_CHECK_MODULES(POSTGRESQL, libpq, [ + POSTGRESQL_INC=$POSTGRESQL_CFLAGS + POSTGRESQL_LIB=$POSTGRESQL_LIBS + ],[ + AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH]) + ]) fi - POSTGRESQL_INC=-I$(${PGCONFIG} --includedir) - POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)" FilterLibs "${POSTGRESQL_LIB}" POSTGRESQL_LIB="${filteredlibs}" else ++++++ libreoffice-translations-6.2.0.3.tar.xz -> libreoffice-translations-6.2.1.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-6.2.0.3.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new.28833/libreoffice-translations-6.2.1.2.tar.xz differ: char 26, line 1
