diff --git a/0001-Speed-up-languagepack-installation.patch b/0001-Speed-up-languagepack-installation.patch new file mode 100644 index 0000000..df91ac8 --- /dev/null +++ b/0001-Speed-up-languagepack-installation.patch @@ -0,0 +1,147 @@ +From d2763829435b7a30baebab939e1e04a94cce722b Mon Sep 17 00:00:00 2001 +From: Michael Schroeder +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 + diff --git a/java112.patch b/java112.patch deleted file mode 100644 index 2defd64..0000000 --- a/java112.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk -=================================================================== ---- libreoffice-6.2.0.3.orig/odk/CustomTarget_javadoc.mk -+++ libreoffice-6.2.0.3/odk/CustomTarget_javadoc.mk -@@ -32,7 +32,7 @@ $(call gb_CustomTarget_get_workdir,odk/d - $(call gb_Jar_get_target,ridl) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) - $(call gb_Helper_abbreviate_dirs,\ -- $(JAVADOC) -J-Xmx120m -use -splitindex \ -+ $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use -splitindex \ - -windowtitle "Java UNO Runtime Reference" \ - -header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\ - -tag attention:a:"Attention:" \ diff --git a/kde5-32bit-build-fix.patch b/kde5-32bit-build-fix.patch new file mode 100644 index 0000000..d35ee47 --- /dev/null +++ b/kde5-32bit-build-fix.patch @@ -0,0 +1,13 @@ +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(nCurrent); + } + break; + default: diff --git a/libreoffice-6.2.0.3.tar.xz b/libreoffice-6.2.0.3.tar.xz deleted file mode 100644 index 6edc53d..0000000 --- a/libreoffice-6.2.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87d0581afbc582fdccf5e95a749a38572c62979a4b1c7f144b4854b93d6b1ade -size 213476336 diff --git a/libreoffice-6.2.0.3.tar.xz.asc b/libreoffice-6.2.0.3.tar.xz.asc deleted file mode 100644 index 86e0caa..0000000 --- a/libreoffice-6.2.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy9wACgkQ9DSh76/u -rqPv2w/+IEi29Bot0EruxzCpc6CkVeZuPixl3ue9iQtwDy25CN6uilgoxWLw7f7/ -/MY3Z6wWJ3RzC+r8TEI+jZ2vbnlAvlhUrYpTMudTBdTWkBmNtsoqHCdCspd/qdD0 -j5awVunnLjuCn8VQCCtdQsnsycqoSH7w5rjBaGARbfOTw69EaFIqlbO3criKFA4Z -Nh/D7g4HlGLVxOuAtVAS3FOKhdmGfuICmBx+7q37vGQY23cEzbE1SjfAwS5LMYev -x9FSZgTn/kouTKWErTtY7uJES2SYVQTGcBdDFho2y0Hm0L3u2H+uIqZGGbacVXoZ -/wkkPWdxpnxeTdGNxHHkgtu8vtaXt6lHM1EkPLx9FtchllsCSYNOzDitKqIIpsyK -/7r9gRw1Y2w+K2ggj5pe0Cq6/mS0XGC9IStsSa8LmZvyD7yuKjOOLsMXbS3vbWd8 -dUtLvXuk2Mgt9H1LP14VOW0qfF+NPE/5WMtoK1lc4lAuvdbXZSZDHg0+fs6o7FYi -N4CJZQ+4r7UuDY+ciwx/thRVnJ3KGc0smoETPYGewIT7Gog1FTw42IqPIAv3uoW1 -tLyrekW+yiR0d9RLx+/DCq1scMsHoCUEsirIwDyerkPL6NTFxi9K58Jb9fojeHBd -DoGwq/HPh2lOmrfQA4X2dVR6WujR7i8JX+UGfKme2miaQTPYHvM= -=SNmR ------END PGP SIGNATURE----- diff --git a/libreoffice-6.2.1.2.tar.xz b/libreoffice-6.2.1.2.tar.xz new file mode 100644 index 0000000..6af8f37 --- /dev/null +++ b/libreoffice-6.2.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1d4fc442e21a163cd4a4e356b94ac99865d1d02b2d36e472b1ec232c22595c +size 213885668 diff --git a/libreoffice-6.2.1.2.tar.xz.asc b/libreoffice-6.2.1.2.tar.xz.asc new file mode 100644 index 0000000..e590c39 --- /dev/null +++ b/libreoffice-6.2.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZjwACgkQ9DSh76/u +rqNm1hAAg1Wz+ugWajhP6Hm+mcpsitjavbNIHt0i2zZ6iGgC+yYmEFI3fqpC7Xbe +ifa0rORIgLyyO6uVmPtYX9k43Nf3QCG9lTgovbQB5fDkUyoUVsiiyU+1zOSXhR5B +GJT3D1Uc1XUB4Vf/p1OjLjd6atHW1k7hT1VkgQl7OZm7wZemtvKuDFuS/Icet+ye +cnDQORxsIfk9iLduh7W4stWrxrtw0KSsRq9X7pNw73auN12bDLmqosd3a8s9A9oO +3drvC3sJpgBdkMT7+FBH+Lho1LSnkTwFpC6zrnDHIAkg+46R+dETjhJ3pFVv8rSg +4dSS3COmulpogFj+Un/jJgAzE1/OSoW1rpSY7wUivTitgcwU11QBHyQzj9b8SugC +6Li2w0oJi4XBGZvLqjjJJNerd5iccIFDQEJG+Mj2rHfeHVE24rThRBTtD6lyjSVM +Hb7+b/DVkDRPSOlnZu3XDKrdpQ6DimiRGJFsQK3o8phNpizl78xbZy/EVKhXoepu +VvtyRGoJImNqtWq2MVt5w0Hb5hq/qADZcu/rbeZfjHcxwMw2R74a+dwmo7cRbA5p +nEVM208N0AhFRhGX9tQ7Dnfqxtk3B/mhNO7bK5wkHdHaZj8fcZ04COLl0Y5XFj1U +09xnzD9R5cp4NcXbceGnmVj0WyDHMav31Xt/TA+Y4BCG9JR0w0c= +=mUmP +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-6.2.0.3.tar.xz b/libreoffice-help-6.2.0.3.tar.xz deleted file mode 100644 index 20ae043..0000000 --- a/libreoffice-help-6.2.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6e7c7cf927182572405af1be100363abc9ca9fbbdd9999b4418f97e54d481cc -size 16186548 diff --git a/libreoffice-help-6.2.0.3.tar.xz.asc b/libreoffice-help-6.2.0.3.tar.xz.asc deleted file mode 100644 index 6913431..0000000 --- a/libreoffice-help-6.2.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy+EACgkQ9DSh76/u -rqO6iBAAxNLNCZ9pPk/MHGzxWhqDvmsLEqAW8syntcV/VDYjKbKiFBeqLpL42jnn -M5/S13X9JAJQWOpiCgDaz+j22ueYr7xju3sXyRI/xwXbnvo1NJzsS177P3lD0q8H -4MBsnrCwTwy+9cY94Y17IDrTFzOIFtNPK77YNlKJKEL4nFXOt/mODUmXmS+TgBqL -5X5Xa1DXvujDhLnr507NGL3gKjzIDF0q3z1WLDC/+LeWDzRWcvryMzxAtktb9V6p -Drgs+Xa9Ppz1XRrhezAzUHcBx13fNY4kAKxg8olIhxotgRXLIKuB+LV2bhAu/u8x -jX15PL5saz8a+G8bpKS9JExiaiiiW6zdH+uDW2VZorD/55lldxGttbjp5EnzRgFN -+vHfXrpzKSbcVVFG7ugOqOz2pojfYmZFkTxw57OFyG7vDneitwNnIzkgh3KJMQuZ -O5tbOcKTo/P0jeq5lgjLTPLUQnEmv/WosZpy4ga5IkA1vMhEcTmLe6laf7UzMaj5 -EivwsdtAsasAQqad0CsGUdLyAxYRf7eLXEwBoOyZ94mOLnqd234rzp1mZXaNMFhv -6RH8qDE3O0uJf2baRYUkEmjBf1hLh22QcxQ34iYdO28hmwEeveJaTKIR+GpcNZ5v -1TKFL5pRc86a327Cpu9B2GWS9MlnsUG3R2sgikd2NU/EbxPq23w= -=LUqW ------END PGP SIGNATURE----- diff --git a/libreoffice-help-6.2.1.2.tar.xz b/libreoffice-help-6.2.1.2.tar.xz new file mode 100644 index 0000000..4803747 --- /dev/null +++ b/libreoffice-help-6.2.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3444086cf346a20c76b68564a4890152674656d595fb20fdd47b613c6569cf19 +size 16187168 diff --git a/libreoffice-help-6.2.1.2.tar.xz.asc b/libreoffice-help-6.2.1.2.tar.xz.asc new file mode 100644 index 0000000..0acd95d --- /dev/null +++ b/libreoffice-help-6.2.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZkAACgkQ9DSh76/u +rqPJ/hAA0HIhhWx6wW9oPn1V+d2wmBnI9ZryPlUZ8InusyE8jt3rja7228iyhCP4 +zEv4nMApRmyQoSnqGjoxASZ96qfvllWwdhliOod0Yg0C8UwIyyHRz6O9i3VlnFsR +lsiY7MmlOKHZmsx0pVeYAbZboSRf1b31twcyWSez9MrExcAHkVha+aSMzgCTcaq6 +1oDb5jDTT3P61lhyG5WGDmulpOFUAt7KjOyaRaGuyoskG6SdJK8XOPBjjkJv8ERZ +FPwI3jKQrw6oOhonyiAmgqdshvWLTVvOTqVEP77fjPmW4USbjPj7dgOoGVKTxeRf +kDM+CtT5bewwZxPckxFhnhTdKmTBRYHxpJ0s8J1yMJnbvITR8zWZfFr30t8hKfVy +HBZntYAooEv+NwyY/GqZmgB9Rb9uvikOzpucggh0v/XQu0Ykqsf56PhEU6MM8kvr +I8MZo7MtfnFFzu/6osH/z+T7tzkZ9vkrL2vgnM37B5azqBggkmpMUxhK4ItGyDrs +PAwSF4k16vRd8dMMJyIIvEG0k8+AYS/0bn/kH0bxxXS/Et1+Oe00TuMFxi6wFzlh +ecL2dLF5zeqhbqtEcZ+yMdYsLnjtWaihdNu3l7EJHU7+24EVcbqHHlV3vb+ftd1h +F10HZM4SeBojfRK/CQIXkkhkjbngXfqv7lKN/z24C+AOsj1xb7I= +=snSe +-----END PGP SIGNATURE----- diff --git a/libreoffice-no-destdircheck.patch b/libreoffice-no-destdircheck.patch new file mode 100644 index 0000000..9596aa4 --- /dev/null +++ b/libreoffice-no-destdircheck.patch @@ -0,0 +1,27 @@ +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 diff --git a/libreoffice-postgresql.patch b/libreoffice-postgresql.patch new file mode 100644 index 0000000..742193e --- /dev/null +++ b/libreoffice-postgresql.patch @@ -0,0 +1,24 @@ +--- 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 diff --git a/libreoffice-translations-6.2.0.3.tar.xz b/libreoffice-translations-6.2.0.3.tar.xz deleted file mode 100644 index a6a2b6a..0000000 --- a/libreoffice-translations-6.2.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9165c136e366a75a3a9403c2d1f0b1d48d708e72877f9180cbae25c0e33d7e03 -size 141589344 diff --git a/libreoffice-translations-6.2.0.3.tar.xz.asc b/libreoffice-translations-6.2.0.3.tar.xz.asc deleted file mode 100644 index 29370f0..0000000 --- a/libreoffice-translations-6.2.0.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlxIy+IACgkQ9DSh76/u -rqOS6xAAoNRTkT173SYlIoDII2NT/CNcGnFi1lSHDQVKskQLlNzvqm0qiV3x8jdy -0kRqWaROi7WWbutFegCQQGOEtD0eEDDf1nLSIEw5SQMyMYpz8IjuGJl/DhPqZi/V -majsPakik2G9xVk4d2+Yo76myYkkwp3/oXpA4dOygEeryDrjVVLYS+QL93yZ1MzW -V8T/cLleAu/AhxcAENTYHtcZMGDx2rJ6xct6+1iJqMXl0KUCO/qAO8ObFmqy4NJr -TGV4u+nTug6uZOr9oTzGAvJz8fLn7djfbFj8TKxtwrykfLs5q1GhrLCwCkJBrFtK -f8OMTxKf86dGjrkQkKnoXa96QYV1BqQTIypvUQyfv8Tp8Vl5JN2hhDE2JuJG9ltK -S/sfLsQh29YFhVyTbvaJhsN3W7ddyURVg5NzuI1Z+JEV/J7uT8OMhhI0Fy6+Voea -B1I4WUnzBt3HAKXkP0ykwCWag3GETo1/RQcF/n9ulM25LRc+ngr4biTaFMegIstf -H1/1WlheaNr+Vip1fVTKuPrEjNCT1d3EMciHnrITV3365jdqbMdrFL5t4+4l4VOd -Vi2R34TNL/snh1pr+VNZsR/lEtfinMQMUEMuF8hILLdMq+MpC5Mme3slmTuUieGl -WsQ2/ir0F9sUfF6Jf3x3bjGBU/9b/p+Kkj0pHfysn9N9sVS+AI8= -=x8DA ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-6.2.1.2.tar.xz b/libreoffice-translations-6.2.1.2.tar.xz new file mode 100644 index 0000000..7f51b4a --- /dev/null +++ b/libreoffice-translations-6.2.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2e48e40ce14d68649e118846c993d34186ac13a1f4c3c53b988ef573260da0 +size 141790536 diff --git a/libreoffice-translations-6.2.1.2.tar.xz.asc b/libreoffice-translations-6.2.1.2.tar.xz.asc new file mode 100644 index 0000000..82f76de --- /dev/null +++ b/libreoffice-translations-6.2.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAlx1ZkEACgkQ9DSh76/u +rqM9ng/+LF7MgBKdLHgdUmJ31OjsKk4FfrcvQGP2scivA0tYmLm7tAgzlAm2t4fj +n3VsFKuIGg6LMHOKvmYw+pKrwBj7gg8jBlzCWgoamYbu03fB//bQJsywsju5f9rB +amLKiOyTZIDGToDgH+ekgSjZBMGyQq/M3oLvj71e1bJx6hRtx+E9Cu9D/ff9644w +HmiNUtuv4ibiC7xy+f8gjHV2VqyQZJjgzyDj8tigrzLTeLxK0eKkK0TfaFNhlOg1 +DPR1pFNk9KkuuFEwGfkzLURkjF7R/55ljNfqA2gghFi9qwObGHEAipuemOOtwqR+ +gpbIFWZNgHD/V8qV3YfmH0s4TOt+mKd/nFrpI+v5ThQi7MJB9XvX9MzP+lcbYaMy +OFm4dhI1frGHwARpGZo/kQ/v2gKF3VUKWaF65bEv36rKD9hgn9jBZM+K+iDbYZ9Q +kudTvpvdbqE7x8U7MEd3ao6dMf5h3VFDqv0ihtKjkkKlWjAg3U6G+moWtGOSUtlh +1CQHjZhihyt/WiGH37Fa8SdAh8X1sNSdgGTS83FYqH6Hr3XtqJNFpzRvIcOdZYd2 +VVN8Eob+aqYudzQYXrnn4ziHTlA/2h3ZOPASREk45qiN9K0S+UVVSlGGW2ZTIzUD +pHS+hEGw2Cc3QpOWl+2FRjav7MfOkVmYvfgMUKpX/kcOXX7B4QY= +=QrBL +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index ca2898a..90fb6d5 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Mon Mar 4 12:37:41 UTC 2019 - Reinhard Max + +- 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 + +- Switch to gcc7 on SLE12 + +------------------------------------------------------------------- +Wed Feb 27 10:20:14 UTC 2019 - Tomáš Chvátal + +- 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 + +- Add patch to fix 32bit build: + * kde5-32bit-build-fix.patch + +------------------------------------------------------------------- +Mon Feb 25 12:55:35 UTC 2019 - Tomáš Chvátal + +- 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 + +- 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 + +- 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 + ------------------------------------------------------------------- Thu Jan 24 13:19:29 UTC 2019 - Tomáš Chvátal @@ -131,6 +185,7 @@ Tue Oct 30 08:36:24 UTC 2018 - Tomáš Chvátal * 6.1.3 Final * In this release we have fixes for bsc#1079744 bsc#1088266 bsc#1095755 bsc#1110345 bsc#1107012 + * bsc#1124062 CVE-2018-16858 ------------------------------------------------------------------- Thu Oct 25 14:17:16 UTC 2018 - Tomáš Chvátal diff --git a/libreoffice.spec b/libreoffice.spec index 9888907..d6b4784 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -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 @@ Patch1: scp2-user-config-suse.diff # 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: fdupes BuildRequires: flex BuildRequires: flute BuildRequires: fontforge -BuildRequires: gcc-c++ BuildRequires: glm-devel BuildRequires: graphviz # Needed for tests @@ -257,6 +260,13 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} 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 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %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 @@ CFLAGS="$ARCH_FLAGS" 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 @@ export NOCONFIGURE=yes %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 @@ export NOCONFIGURE=yes --with-help=html \ --without-export-validation \ --enable-odk \ - --disable-qt5 \ - --disable-kde5 \ --disable-kde4 \ %if %{with system_gpgme} --with-system-gpgmepp \