Hello community, here is the log from the commit of package libreoffice for openSUSE:Leap:15.2 checked in at 2020-04-08 12:48:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libreoffice (Old) and /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Wed Apr 8 12:48:06 2020 rev:98 rq:790247 version:6.4.2.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libreoffice/libreoffice.changes 2020-01-15 15:24:56.906560694 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248/libreoffice.changes 2020-04-08 12:48:26.118344024 +0200 @@ -1,0 +2,99 @@ +Sun Mar 15 07:08:09 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.2.2 jsc#SLE-11174 jsc#SLE-11175 jsc#SLE-11176 + bsc#1167223: + * 6.4.2 RC2 release + +------------------------------------------------------------------- +Mon Mar 9 15:56:40 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.2.1: + * 6.4.2 RC1 release +- Remove merged patch: + * soffice.sh_Avoid-exporting-empty-LC_ALL.patch + +------------------------------------------------------------------- +Wed Feb 19 11:46:11 UTC 2020 - Adam Majer <[email protected]> + +- fix_old_boost_spirit_namespace.patch: fixes build with older + boost versions by moving to modern Boost.Spirit namespace usage + +------------------------------------------------------------------- +Mon Feb 17 08:03:45 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.1.1: + * 6.4.1 RC1 release + * Add sfir and breeze dark svg iconsets +- Remove merged patch: + * lo-Fix-build-with-poppler-0.83.patch + +------------------------------------------------------------------- +Wed Feb 12 11:03:39 UTC 2020 - Marina Latini <[email protected]> + +- Fix autocorrect names for Italian + In Italian there are also other locales that should be included + in this list like fur_IT lld_IT sc_IT and vec_IT + +------------------------------------------------------------------- +Sun Feb 9 04:51:53 UTC 2020 - Thomas Williams <[email protected]> + +- Remove unneeded (and counterintuitive) mysql/mariadb dep from core + RPMs. Move it instead to the -base package, where it's really used. + +------------------------------------------------------------------- +Thu Feb 6 09:55:01 UTC 2020 - Wolfgang Bauer <[email protected]> + +- Add soffice.sh_Avoid-exporting-empty-LC_ALL.patch to fix broken + handling of non-ASCII characters in the KDE filedialog + (boo#1161816) + +------------------------------------------------------------------- +Thu Jan 30 10:24:05 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Move the animation library to core package bsc#1162152 + +------------------------------------------------------------------- +Thu Jan 23 10:21:31 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.0.3: + * RC 3 of 6.4 release +- Require java 1.8 or newer + +------------------------------------------------------------------- +Wed Jan 15 12:17:45 UTC 2020 - Bjørn Lie <[email protected]> + +- Add lo-Fix-build-with-poppler-0.83.patch: Fix build with + poppler-0.83. + +------------------------------------------------------------------- +Tue Jan 14 08:06:37 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.0.2: + * RC2 of 6.4 release +- Drop merged patch 0001-tdf-129879-Fix-wrong-order-of-buttons.patch + +------------------------------------------------------------------- +Wed Jan 8 12:29:11 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Add patch to fix button ordering in Qt interface: + * 0001-tdf-129879-Fix-wrong-order-of-buttons.patch + +------------------------------------------------------------------- +Sun Jan 5 03:59:38 UTC 2020 - Michael Gorse <[email protected]> + +- Set LANG during check; needed for a UTF8-related test to pass. + +------------------------------------------------------------------- +Thu Jan 2 10:05:16 UTC 2020 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.0.1: + * Various minor fixes for the RC1 of 6.4 branch + +------------------------------------------------------------------- +Tue Dec 3 08:58:06 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 6.4.0.0.beta1: + * Various features for 6.4 libreoffice series +- Remove upstreamed patch mdds-1-5.patch + +------------------------------------------------------------------- Old: ---- libreoffice-6.3.3.2.tar.xz libreoffice-6.3.3.2.tar.xz.asc libreoffice-help-6.3.3.2.tar.xz libreoffice-help-6.3.3.2.tar.xz.asc libreoffice-translations-6.3.3.2.tar.xz libreoffice-translations-6.3.3.2.tar.xz.asc mdds-1-5.patch pdfium-3794.tar.bz2 New: ---- fix_old_boost_spirit_namespace.patch libreoffice-6.4.2.2.tar.xz libreoffice-6.4.2.2.tar.xz.asc libreoffice-help-6.4.2.2.tar.xz libreoffice-help-6.4.2.2.tar.xz.asc libreoffice-translations-6.4.2.2.tar.xz libreoffice-translations-6.4.2.2.tar.xz.asc pdfium-3963.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.SSDaQe/_old 2020-04-08 12:48:30.658346313 +0200 +++ /var/tmp/diff_new_pack.SSDaQe/_new 2020-04-08 12:48:30.666346317 +0200 @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url https://dev-www.libreoffice.org/src/ -#%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.1.0 +#%%define tarball_url https://download.documentfoundation.org/libreoffice/src/6.4.0 %define tarball_url https://dev-builds.libreoffice.org/pre-releases/src/ # LTO needs newer toolchain stack only %if 0%{?suse_version} >= 1500 @@ -50,7 +50,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 6.3.3.2 +Version: 6.4.2.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -90,7 +90,7 @@ Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-3794.tar.bz2 +Source2008: %{external_url}/pdfium-3963.tar.bz2 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -98,7 +98,7 @@ # 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 -Patch5: mdds-1-5.patch +Patch6: fix_old_boost_spirit_namespace.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 @@ -128,7 +128,7 @@ BuildRequires: hyphen-devel # genbrk binary is required BuildRequires: icu -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: junit4 BuildRequires: libbase BuildRequires: libcppunit-devel >= 1.14.0 @@ -151,6 +151,7 @@ BuildRequires: pkgconfig BuildRequires: python3-lxml BuildRequires: python3-xml +BuildRequires: qrcodegen-devel BuildRequires: sac BuildRequires: ucpp BuildRequires: unixODBC-devel @@ -218,7 +219,7 @@ BuildRequires: pkgconfig(redland) BuildRequires: pkgconfig(sane-backends) BuildRequires: pkgconfig(serf-1) >= 1.1.0 -BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.24 +BuildRequires: pkgconfig(xmlsec1-nss) >= 1.2.28 BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xt) Requires: liberation-fonts @@ -573,7 +574,7 @@ Requires: make Requires: ucpp Requires: zip -Recommends: java-devel +Recommends: java-devel >= 1.8 Provides: libreoffice-ure-devel = %{version} Obsoletes: libreoffice-ure-devel < %{version} @@ -632,10 +633,10 @@ Requires(pre): libreoffice = %{version} # the watchWindow extension is written in java %ifarch %{ix86} -Requires: jre-32 >= 1.6 +Requires: jre-32 >= 1.8 %endif %ifarch x86_64 aarch64 ppc64le -Requires: jre-64 >= 1.6 +Requires: jre-64 >= 1.8 %endif %description calc-extensions @@ -652,10 +653,10 @@ Requires(pre): libreoffice = %{version} # the wiki extension is written in java %ifarch %{ix86} -Requires: jre-32 >= 1.6 +Requires: jre-32 >= 1.8 %endif %ifarch x86_64 aarch64 ppc64le -Requires: jre-64 >= 1.6 +Requires: jre-64 >= 1.8 %endif %description writer-extensions @@ -828,122 +829,122 @@ \ %{expand:%%_link_noarch_files %{pkgname}} \ %{nil} -%langpack -l af -n Afrikaans -m af_ZA -%langpack -l am -n Amharic -T -%langpack -l ar -n Arabic -s ctl -m ar -T -%langpack -l as -n Assamese -%langpack -l ast -n Asturian -T -%langpack -l be -n Belarusian -m be_BY +%langpack -l af -n Afrikaans -m af_ZA -X +%langpack -l am -n Amharic -T -X +%langpack -l ar -n Arabic -s ctl -m ar -T -X +%langpack -l as -n Assamese -X +%langpack -l ast -n Asturian -T -X +%langpack -l be -n Belarusian -m be_BY -X %langpack -l bg -n Bulgarian -X -m bg_BG -T -%langpack -l bn -n Bengali -m bn_BD -T -%langpack -l bn_IN -n Bengali_India -T -p bn-IN -m bn_IN -L bn-IN -g bn_IN -j bn_IN -%langpack -l bo -n Tibetian -T -s ctl -m bo -%langpack -l br -n Breton -m br_FR -%langpack -l brx -n Bodo -%langpack -l bs -n Bosnian -T +%langpack -l bn -n Bengali -m bn_BD -T -X +%langpack -l bn_IN -n Bengali_India -T -p bn-IN -m bn_IN -L bn-IN -g bn_IN -j bn_IN -X +%langpack -l bo -n Tibetian -T -s ctl -m bo -X +%langpack -l br -n Breton -m br_FR -X +%langpack -l brx -n Bodo -X +%langpack -l bs -n Bosnian -T -X %langpack -l ca -n Catalan -M -X -T -%langpack -l ca_valencia -n Valencian -m ca_ES_valencia -T -L ca-valencia -g ca@valencia -j ca_valencia +%langpack -l ca_valencia -n Valencian -m ca_ES_valencia -T -L ca-valencia -g ca@valencia -j ca_valencia -X %langpack -l cs -n Czech -X -m cs_CZ -T -%langpack -l cy -n Welsh +%langpack -l cy -n Welsh -X %langpack -l da -n Danish -X -m da_DK -T %langpack -l de -n German -X -M -T -%langpack -l dgo -n Dogri -%langpack -l dsb -n Lower_Sorbian -%langpack -l dz -n Dzongkha -s ctl -T -%langpack -l el -n Greek -m el_GR -T +%langpack -l dgo -n Dogri -X +%langpack -l dsb -n Lower_Sorbian -X +%langpack -l dz -n Dzongkha -s ctl -T -X +%langpack -l el -n Greek -m el_GR -T -X %langpack -l en -n English -L en-US -X -M -g en_US -T -j en_US %langpack -l en_GB -n English_GB -M -T -X -L en-GB -g en_GB -j en_GB %langpack -l en_ZA -n English_ZA -M -T -X -L en-ZA -g en_ZA -j en_ZA -%langpack -l eo -n Esperanto -T +%langpack -l eo -n Esperanto -T -X %langpack -l es -n Spanish -M -X -T -%langpack -l et -n Estonian -m et_EE -T -%langpack -l eu -n Basque -T +%langpack -l et -n Estonian -m et_EE -T -X +%langpack -l eu -n Basque -T -X %langpack -l fa -n Farsi -s ctl -X %langpack -l fi -n Finnish -r libreoffice-voikko -X -T %langpack -l fr -n French -X -m fr_FR -T -%langpack -l fy -n Frisian -%langpack -l ga -n Irish -%langpack -l gd -n Gaelic -m gd_GB -%langpack -l gl -n Galician -M -T -%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T -%langpack -l gug -n Paraguayan_Guaraní -M -%langpack -l he -n Hebrew -s ctl -m he_IL -T -%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T +%langpack -l fy -n Frisian -X +%langpack -l ga -n Irish -X +%langpack -l gd -n Gaelic -m gd_GB -X +%langpack -l gl -n Galician -M -T -X +%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T -X +%langpack -l gug -n Paraguayan_Guaraní -M -X +%langpack -l he -n Hebrew -s ctl -m he_IL -T -X +%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T -X %langpack -l hr -n Croatian -m hr_HR -X -T -%langpack -l hsb -n Upper_Sorbian +%langpack -l hsb -n Upper_Sorbian -X %langpack -l hu -n Hungarian -X -m hu_HU -T %langpack -l it -n Italian -X -m it_IT -T -%langpack -l id -n Indonesian -T -M +%langpack -l id -n Indonesian -T -M -X %langpack -l is -n Icelandic -T -X -M %langpack -l ja -n Japanese -s cjk -X -T -%langpack -l ka -n Georgian -T -%langpack -l kab -n Kabyle -%langpack -l kk -n Kazakh -%langpack -l kn -n Kannada +%langpack -l ka -n Georgian -T -X +%langpack -l kab -n Kabyle -X +%langpack -l kk -n Kazakh -X +%langpack -l kn -n Kannada -X %langpack -l km -n Khmer -T -X -s ctl -c ctlseqcheck_km -%langpack -l kmr_Latn -n Kurdish -M -g kmr@latin -L kmr-Latn -j kmr_Latn +%langpack -l kmr_Latn -n Kurdish -M -g kmr@latin -L kmr-Latn -j kmr_Latn -X %langpack -l ko -n Korean -s cjk -X -T -%langpack -l kok -n Konkani -%langpack -l ks -n Kashmiri -%langpack -l lb -n Luxembourgish -%langpack -l lo -n Lao -T -s ctl -m lo_LA -c ctlseqcheck_lo +%langpack -l kok -n Konkani -X +%langpack -l ks -n Kashmiri -X +%langpack -l lb -n Luxembourgish -X +%langpack -l lo -n Lao -T -s ctl -m lo_LA -c ctlseqcheck_lo -X %langpack -l lt -n Lithuanian -m lt_LT -X -T -%langpack -l lv -n Latvian -m lv_LV -T -%langpack -l mai -n Maithili -%langpack -l mk -n Macedonian -T -%langpack -l ml -n Malayalam +%langpack -l lv -n Latvian -m lv_LV -T -X +%langpack -l mai -n Maithili -X +%langpack -l mk -n Macedonian -T -X +%langpack -l ml -n Malayalam -X %langpack -l mn -n Monglolian -X -%langpack -l mni -n Manipuri -%langpack -l mr -n Marathi -%langpack -l my -n Burnese -s ctl -%langpack -l nb -n Bokmal -M -m no -T -%langpack -l ne -n Nepali -T -s ctl -m ne_NP +%langpack -l mni -n Manipuri -X +%langpack -l mr -n Marathi -X +%langpack -l my -n Burnese -s ctl -X +%langpack -l nb -n Bokmal -M -m no -T -X +%langpack -l ne -n Nepali -T -s ctl -m ne_NP -X %langpack -l nl -n Dutch -X -m nl_NL -T -%langpack -l nn -n Nynorsk -m nn_NO -T -%langpack -l nr -n Southern_Ndebele -%langpack -l nso -n Northern_Sotho -%langpack -l oc -n Occitan -m oc_FR -%langpack -l om -n Oromo -T -%langpack -l or -n Odia -s ctl -%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN +%langpack -l nn -n Nynorsk -m nn_NO -T -X +%langpack -l nr -n Southern_Ndebele -X +%langpack -l nso -n Northern_Sotho -X +%langpack -l oc -n Occitan -m oc_FR -X +%langpack -l om -n Oromo -T -X +%langpack -l or -n Odia -s ctl -X +%langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN -x pa-IN %langpack -l pl -n Polish -X -m pl_PL -T %langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X -g pt_BR -j pt_BR -T %langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -T %langpack -l ro -n Romanian -M -X -T %langpack -l ru -n Russian -X -m ru_RU -T -%langpack -l rw -n Kinyarwanda -%langpack -l sa_IN -n Sanskrit -L sa-IN -g sa_IN -j sa_IN -%langpack -l sat -n Santali -%langpack -l sd -n Sindhi -%langpack -l si -n Sinhalese -S ctl -m si_LK -T -%langpack -l sid -n Sidamo -T +%langpack -l rw -n Kinyarwanda -X +%langpack -l sa_IN -n Sanskrit -L sa-IN -g sa_IN -j sa_IN -x sa-IN +%langpack -l sat -n Santali -X +%langpack -l sd -n Sindhi -X +%langpack -l si -n Sinhalese -S ctl -m si_LK -T -X +%langpack -l sid -n Sidamo -T -X %langpack -l sk -n Slovak -X -m sk_SK -T %langpack -l sl -n Slovenian -X -m sl_SI -T -%langpack -l sq -n Albanian -T -m sq_AL -%langpack -l sr -n Serbian -i sr-Latn -M -j sr -g sr -k sr@latin -o sr_Latn -%langpack -l ss -n Swati -%langpack -l st -n Southern_Sotho +%langpack -l sq -n Albanian -T -m sq_AL -X +%langpack -l sr -n Serbian -i sr-Latn -M -j sr -g sr -k sr@latin -o sr_Latn -x sr-Latn +%langpack -l ss -n Swati -X +%langpack -l st -n Southern_Sotho -X %langpack -l sv -n Swedish -X -m sv_SE -T -%langpack -l sw_TZ -n Swahili -M -L sw-TZ -g sw_TZ -j sw_TZ -%langpack -l szl -n Silesian -%langpack -l ta -n Tamil -s ctl -T -%langpack -l te -n Telugu -m te_IN -%langpack -l tg -n Tajik -T -%langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH -%langpack -l tn -n Tswana +%langpack -l sw_TZ -n Swahili -M -L sw-TZ -g sw_TZ -j sw_TZ -x sw-TZ +%langpack -l szl -n Silesian -X +%langpack -l ta -n Tamil -s ctl -T -X +%langpack -l te -n Telugu -m te_IN -X +%langpack -l tg -n Tajik -T -X +%langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH -X +%langpack -l tn -n Tswana -X %langpack -l tr -n Turkish -X -T -m tr_TR -%langpack -l ts -n Tsonga -%langpack -l tt -n Tatar -%langpack -l ug -n Uyghur -T -%langpack -l uk -n Ukrainian -m uk_UA -T -%langpack -l uz -n Uzbek +%langpack -l ts -n Tsonga -X +%langpack -l tt -n Tatar -X +%langpack -l ug -n Uyghur -T -X +%langpack -l uk -n Ukrainian -m uk_UA -T -X +%langpack -l uz -n Uzbek -X %langpack -l vi -n Vietnamese -T -X -M -%langpack -l ve -n Venda -%langpack -l vec -n Venetian -%langpack -l xh -n Xhosa +%langpack -l ve -n Venda -X +%langpack -l vec -n Venetian -X +%langpack -l xh -n Xhosa -X %langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans -g zh_CN -j zh_CN -T %langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant -g zh_TW -j zh_TW -T -%langpack -l zu -n Zulu -m zu_ZA +%langpack -l zu -n Zulu -m zu_ZA -X %prep %setup -q -b2 -b4 @@ -953,7 +954,7 @@ %endif # Leap 42/SLE-12 %patch2 %patch3 -%patch5 -p1 +%patch6 -p1 %patch990 -p1 %patch991 -p1 @@ -1053,16 +1054,14 @@ --with-external-tar="$RPM_SOURCE_DIR" \ --disable-epm \ --disable-online-update \ - --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ --enable-gtk3 \ - --disable-gtk \ %if %{with kdeintegration} --disable-gtk3-kde5 \ - --enable-kde5 \ + --enable-kf5 \ --enable-qt5 \ %else - --disable-kde5 \ + --disable-kf5 \ --disable-qt5 \ %endif --enable-introspection \ @@ -1117,6 +1116,7 @@ make verbose=t build-nocheck %check +export LANG=C.UTF-8 # Run tests only on x86_64 and ppc64le as they are resource hogs %ifarch x86_64 ppc64le # safeguard jarfires that can get magically overriden by the make @@ -1142,6 +1142,11 @@ mv tmplist file-lists/common_list.txt %endif +# Remove the libanimcore from impress and put it to base (needed by draw too) +grep -v "%{_libdir}/libreoffice/program/libanimcorelo.so" file-lists/impress_list.txt > tmplist +mv tmplist file-lists/impress_list.txt +echo "%{_libdir}/libreoffice/program/libanimcorelo.so" >> file-lists/common_list.txt + ################ # update desktop files builddir=`pwd` @@ -1241,7 +1246,7 @@ %make_autocorr_aliases -l de de-DE de-AT de-BE de-CH de-LI de-LU %make_autocorr_aliases -l es es-ES es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-US es-UY es-VE %make_autocorr_aliases -l fr fr-FR fr-BE fr-CA fr-CH fr-LU fr-MC -%make_autocorr_aliases -l it it-IT it-CH +%make_autocorr_aliases -l it it-IT it-CH fur_IT lld_IT sc_IT vec_IT %make_autocorr_aliases -l nl-NL nl-AW %make_autocorr_aliases -l sv-SE sv-FI pushd %{buildroot}%{_libdir}/%{name}/share/autocorr @@ -1254,6 +1259,10 @@ echo "%{_libdir}/%{name}/share/autocorr/$file" >> file-lists/common_list.txt done +# we don't bother with serbian non-latin autocorr (as the lang logic allows us to dynamically allocate +# just one autotext filler and it does not make sense to have special case just for serbian +rm -r %{buildroot}%{_datadir}/libreoffice/share/autotext/sr/ + # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name @@ -1314,6 +1323,12 @@ mkdir -p %{buildroot}%{_includedir}/LibreOfficeKit/ install -m 0644 include/LibreOfficeKit/* %{buildroot}%{_includedir}/LibreOfficeKit/ +# typelib data +mkdir -p %{buildroot}%{_libdir}/girepository-1.0/ +install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib %{buildroot}%{_libdir}/girepository-1.0/ +mkdir -p %{buildroot}%{_datadir}/gir-1.0/ +install -m 0644 workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir %{buildroot}%{_datadir}/gir-1.0/ + # Symlink uno.py and unohelper.py so that python can find them # This is done after the cache files generating on purpose mkdir -p %{buildroot}%{python3_sitelib} @@ -1337,6 +1352,11 @@ export SRCDIR="./" ./solenv/bin/install-gdb-printers -a %{_datadir}/gdb/auto-load%{_libdir}/%{name} -c -i %{_libdir}/%{name} -p %{_datadir}/libreoffice/gdb +# Why would the mysql lib which is only USED by base not be IN THE BASE PACKAGE?!? +grep -v "%{_libdir}/libreoffice/program/libmysqlclo.so" file-lists/common_list.txt > tmplist +mv tmplist file-lists/common_list.txt +echo "%{_libdir}/libreoffice/program/libmysqlclo.so" >> file-lists/base_list.txt + # We have ton of duped files so run over it %fdupes %{buildroot}%{_prefix} @@ -1488,8 +1508,8 @@ %if %{with kdeintegration} %files -f file-lists/kde4_list.txt qt5 -%{_libdir}/libreoffice/program/libkde5be1lo.so -%{_libdir}/libreoffice/program/libvclplug_kde5lo.so +%{_libdir}/libreoffice/program/libkf5be1lo.so +%{_libdir}/libreoffice/program/libvclplug_kf5lo.so %{_libdir}/libreoffice/program/libvclplug_qt5lo.so %endif @@ -1514,12 +1534,14 @@ %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_breeze.zip %{_datadir}/%{name}/share/config/images_breeze_dark.zip +%{_datadir}/%{name}/share/config/images_breeze_dark_svg.zip %{_datadir}/%{name}/share/config/images_elementary.zip %{_datadir}/%{name}/share/config/images_colibre.zip %{_datadir}/%{name}/share/config/images_karasa_jaga.zip %{_datadir}/%{name}/share/config/images_karasa_jaga_svg.zip %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip +%{_datadir}/%{name}/share/config/images_sifr_dark_svg.zip %{_datadir}/%{name}/share/config/images_sifr_svg.zip %{_datadir}/%{name}/share/config/images_tango.zip %{_datadir}/%{name}/share/config/images_helpimg.zip ++++++ fix_old_boost_spirit_namespace.patch ++++++ commit 74ac4cd9c0cbc8bc5a9b3c049731dd28c4b0d981 (HEAD -> master) Author: Adam Majer <[email protected]> Date: Wed Feb 19 15:29:06 2020 +0100 Move Boost.Spirit usage away from legacy namespace Remove BOOST_SPIRIT_USE_OLD_NAMESPACE defines and move all usage of Boost.Spirit to boost::spirit::classic namespace. Change-Id: I7dc5bed4d1b51f4a0bd1a4ae40c2024222127ce3 PR: https://gerrit.libreoffice.org/c/core/+/89079 Index: libreoffice-6.4.1.1/connectivity/Library_dbtools.mk =================================================================== --- libreoffice-6.4.1.1.orig/connectivity/Library_dbtools.mk +++ libreoffice-6.4.1.1/connectivity/Library_dbtools.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,dbtools $(eval $(call gb_Library_add_defs,dbtools,\ -DOOO_DLLIMPLEMENTATION_DBTOOLS \ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools)) Index: libreoffice-6.4.1.1/sdext/Library_pdfimport.mk =================================================================== --- libreoffice-6.4.1.1.orig/sdext/Library_pdfimport.mk +++ libreoffice-6.4.1.1/sdext/Library_pdfimport.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_defs,pdfimp endif $(eval $(call gb_Library_add_defs,pdfimport, \ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ -DBOOST_ALL_NO_LIB \ )) Index: libreoffice-6.4.1.1/slideshow/Library_slideshow.mk =================================================================== --- libreoffice-6.4.1.1.orig/slideshow/Library_slideshow.mk +++ libreoffice-6.4.1.1/slideshow/Library_slideshow.mk @@ -14,10 +14,6 @@ $(eval $(call gb_Library_set_include,sli -I$(SRCDIR)/slideshow/source/inc \ )) -$(eval $(call gb_Library_add_defs,slideshow,\ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ -)) - ifneq ($(strip $(debug)$(DEBUG)),) $(eval $(call gb_Library_add_defs,slideshow,\ -DBOOST_SP_ENABLE_DEBUG_HOOKS \ Index: libreoffice-6.4.1.1/svx/Library_svx.mk =================================================================== --- libreoffice-6.4.1.1.orig/svx/Library_svx.mk +++ libreoffice-6.4.1.1/svx/Library_svx.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_custom_head $(eval $(call gb_Library_add_defs,svx,\ -DSVX_DLLIMPLEMENTATION \ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) $(eval $(call gb_Library_set_precompiled_header,svx,svx/inc/pch/precompiled_svx)) Index: libreoffice-6.4.1.1/svx/Library_svxcore.mk =================================================================== --- libreoffice-6.4.1.1.orig/svx/Library_svxcore.mk +++ libreoffice-6.4.1.1/svx/Library_svxcore.mk @@ -46,7 +46,6 @@ $(eval $(call gb_Library_set_precompiled $(eval $(call gb_Library_add_defs,svxcore,\ -DSVX_DLLIMPLEMENTATION \ - -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) $(eval $(call gb_Library_use_libraries,svxcore,\ Index: libreoffice-6.4.1.1/svx/Module_svx.mk =================================================================== --- libreoffice-6.4.1.1.orig/svx/Module_svx.mk +++ libreoffice-6.4.1.1/svx/Module_svx.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_subsequentch endif #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX -#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ? #todo: -DUNICODE and -D_UNICODE on WNT for source/dialog #todo: component file # vim: set noet sw=4 ts=4: Index: libreoffice-6.4.1.1/sdext/source/pdfimport/pdfparse/pdfparse.cxx =================================================================== --- libreoffice-6.4.1.1.orig/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ libreoffice-6.4.1.1/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -49,7 +49,7 @@ #endif -using namespace boost::spirit; +using namespace boost::spirit::classic; using namespace pdfparse; @@ -556,12 +556,12 @@ std::unique_ptr<PDFEntry> PDFReader::rea try { #if OSL_DEBUG_LEVEL > 0 - boost::spirit::parse_info<const char*> aInfo = + boost::spirit::classic::parse_info<const char*> aInfo = #endif - boost::spirit::parse( pBuffer, + boost::spirit::classic::parse( pBuffer, pBuffer+nLen, aGrammar, - boost::spirit::space_p ); + boost::spirit::classic::space_p ); #if OSL_DEBUG_LEVEL > 0 SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop = " << aInfo.stop << " (buff=" << pBuffer << ", offset = " << aInfo.stop - pBuffer << "), hit = " << (aInfo.hit ? OUString("true") : OUString("false")) << ", full = " << (aInfo.full ? OUString("true") : OUString("false")) << ", length = " << static_cast<int>(aInfo.length) ); #endif @@ -634,12 +634,12 @@ std::unique_ptr<PDFEntry> PDFReader::rea try { #if OSL_DEBUG_LEVEL > 0 - boost::spirit::parse_info< file_iterator<> > aInfo = + boost::spirit::classic::parse_info< file_iterator<> > aInfo = #endif - boost::spirit::parse( file_start, + boost::spirit::classic::parse( file_start, file_end, aGrammar, - boost::spirit::space_p ); + boost::spirit::classic::space_p ); #if OSL_DEBUG_LEVEL > 0 SAL_INFO("sdext.pdfimport.pdfparse", "parseinfo: stop at offset = " << aInfo.stop - file_start << ", hit = " << (aInfo.hit ? "true" : "false") << ", full = " << (aInfo.full ? "true" : "false") << ", length = " << aInfo.length); #endif Index: libreoffice-6.4.1.1/connectivity/source/commontools/RowFunctionParser.cxx =================================================================== --- libreoffice-6.4.1.1.orig/connectivity/source/commontools/RowFunctionParser.cxx +++ libreoffice-6.4.1.1/connectivity/source/commontools/RowFunctionParser.cxx @@ -284,7 +284,7 @@ public: ( '-' multiplicative_expression )* ) */ -class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > +class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar > { public: /** Create an arithmetic expression grammar @@ -303,14 +303,14 @@ public: // grammar definition explicit definition( const ExpressionGrammar& self ) { - using ::boost::spirit::space_p; - using ::boost::spirit::range_p; - using ::boost::spirit::lexeme_d; - using ::boost::spirit::ch_p; - using ::boost::spirit::int_p; - using ::boost::spirit::as_lower_d; - using ::boost::spirit::strlit; - using ::boost::spirit::inhibit_case; + using ::boost::spirit::classic::space_p; + using ::boost::spirit::classic::range_p; + using ::boost::spirit::classic::lexeme_d; + using ::boost::spirit::classic::ch_p; + using ::boost::spirit::classic::int_p; + using ::boost::spirit::classic::as_lower_d; + using ::boost::spirit::classic::strlit; + using ::boost::spirit::classic::inhibit_case; typedef inhibit_case<strlit<> > token_t; @@ -362,7 +362,7 @@ public: BOOST_SPIRIT_DEBUG_RULE(andExpression); } - const ::boost::spirit::rule< ScannerT >& start() const + const ::boost::spirit::classic::rule< ScannerT >& start() const { return basicExpression; } @@ -370,11 +370,11 @@ public: private: // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > assignment; - ::boost::spirit::rule< ScannerT > integer,argument; - ::boost::spirit::rule< ScannerT > orExpression,andExpression; + ::boost::spirit::classic::rule< ScannerT > basicExpression; + ::boost::spirit::classic::rule< ScannerT > unaryFunction; + ::boost::spirit::classic::rule< ScannerT > assignment; + ::boost::spirit::classic::rule< ScannerT > integer,argument; + ::boost::spirit::classic::rule< ScannerT > orExpression,andExpression; }; const ParserContextSharedPtr& getContext() const @@ -417,11 +417,11 @@ std::shared_ptr<ExpressionNode> const & ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( - ::boost::spirit::parse( aStart, + const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo( + ::boost::spirit::classic::parse( aStart, aEnd, aExpressionGrammer, - ::boost::spirit::space_p ) ); + ::boost::spirit::classic::space_p ) ); #if (OSL_DEBUG_LEVEL > 0) std::cout.flush(); // needed to keep stdout and cout in sync Index: libreoffice-6.4.1.1/slideshow/source/engine/smilfunctionparser.cxx =================================================================== --- libreoffice-6.4.1.1.orig/slideshow/source/engine/smilfunctionparser.cxx +++ libreoffice-6.4.1.1/slideshow/source/engine/smilfunctionparser.cxx @@ -363,14 +363,14 @@ namespace slideshow // notation, not the 1.0e10 one. // TODO(F1): Also handle the 1.0e10 case here. - template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T> + template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T> { template< typename ScannerT > - static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type + static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type parse_exp(ScannerT& scan) { // as_lower_d somehow breaks MSVC7 - return ::boost::spirit::ch_p('E').parse(scan); + return ::boost::spirit::classic::ch_p('E').parse(scan); } }; @@ -401,7 +401,7 @@ namespace slideshow ( '-' multiplicative_expression )* ) */ - class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > + class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar > { public: /** Create an arithmetic expression grammar @@ -420,8 +420,8 @@ namespace slideshow // grammar definition explicit definition( const ExpressionGrammar& self ) { - using ::boost::spirit::str_p; - using ::boost::spirit::real_parser; + using ::boost::spirit::classic::str_p; + using ::boost::spirit::classic::real_parser; identifier = str_p( "$" )[ ValueTFunctor( self.getContext()) ] @@ -487,7 +487,7 @@ namespace slideshow BOOST_SPIRIT_DEBUG_RULE(identifier); } - const ::boost::spirit::rule< ScannerT >& start() const + const ::boost::spirit::classic::rule< ScannerT >& start() const { return additiveExpression; } @@ -495,13 +495,13 @@ namespace slideshow private: // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > additiveExpression; - ::boost::spirit::rule< ScannerT > multiplicativeExpression; - ::boost::spirit::rule< ScannerT > unaryExpression; - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > binaryFunction; - ::boost::spirit::rule< ScannerT > identifier; + ::boost::spirit::classic::rule< ScannerT > additiveExpression; + ::boost::spirit::classic::rule< ScannerT > multiplicativeExpression; + ::boost::spirit::classic::rule< ScannerT > unaryExpression; + ::boost::spirit::classic::rule< ScannerT > basicExpression; + ::boost::spirit::classic::rule< ScannerT > unaryFunction; + ::boost::spirit::classic::rule< ScannerT > binaryFunction; + ::boost::spirit::classic::rule< ScannerT > identifier; }; const ParserContextSharedPtr& getContext() const @@ -547,11 +547,11 @@ namespace slideshow ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( - ::boost::spirit::parse( aStart, + const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo( + ::boost::spirit::classic::parse( aStart, aEnd, aExpressionGrammer, - ::boost::spirit::space_p ) ); + ::boost::spirit::classic::space_p ) ); #if OSL_DEBUG_LEVEL > 0 ::std::cout.flush(); // needed to keep stdout and cout in sync @@ -590,11 +590,11 @@ namespace slideshow ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( - ::boost::spirit::parse( aStart, + const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo( + ::boost::spirit::classic::parse( aStart, aEnd, - aExpressionGrammer >> ::boost::spirit::end_p, - ::boost::spirit::space_p ) ); + aExpressionGrammer >> ::boost::spirit::classic::end_p, + ::boost::spirit::classic::space_p ) ); #if OSL_DEBUG_LEVEL > 0 ::std::cout.flush(); // needed to keep stdout and cout in sync Index: libreoffice-6.4.1.1/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx =================================================================== --- libreoffice-6.4.1.1.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ libreoffice-6.4.1.1/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -922,14 +922,14 @@ public: // notation, not the 1.0e10 one. // TODO(F1): Also handle the 1.0e10 case here. -template< typename T > struct custom_real_parser_policies : public ::boost::spirit::ureal_parser_policies<T> +template< typename T > struct custom_real_parser_policies : public ::boost::spirit::classic::ureal_parser_policies<T> { template< typename ScannerT > - static typename ::boost::spirit::parser_result< ::boost::spirit::chlit<>, ScannerT >::type + static typename ::boost::spirit::classic::parser_result< ::boost::spirit::classic::chlit<>, ScannerT >::type parse_exp(ScannerT& scan) { // as_lower_d somehow breaks MSVC7 - return ::boost::spirit::ch_p('E').parse(scan); + return ::boost::spirit::classic::ch_p('E').parse(scan); } }; @@ -961,7 +961,7 @@ template< typename T > struct custom_rea */ -class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar > +class ExpressionGrammar : public ::boost::spirit::classic::grammar< ExpressionGrammar > { public: /** Create an arithmetic expression grammar @@ -980,10 +980,10 @@ public: // grammar definition explicit definition( const ExpressionGrammar& self ) { - using ::boost::spirit::str_p; - using ::boost::spirit::range_p; - using ::boost::spirit::lexeme_d; - using ::boost::spirit::real_parser; + using ::boost::spirit::classic::str_p; + using ::boost::spirit::classic::range_p; + using ::boost::spirit::classic::lexeme_d; + using ::boost::spirit::classic::real_parser; identifier = str_p( "pi" )[ EnumFunctor(ExpressionFunct::EnumPi, self.getContext() ) ] @@ -1072,7 +1072,7 @@ public: BOOST_SPIRIT_DEBUG_RULE(identifier); } - const ::boost::spirit::rule< ScannerT >& start() const + const ::boost::spirit::classic::rule< ScannerT >& start() const { return additiveExpression; } @@ -1080,18 +1080,18 @@ public: private: // the constituents of the Spirit arithmetic expression grammar. // For the sake of readability, without 'ma' prefix. - ::boost::spirit::rule< ScannerT > additiveExpression; - ::boost::spirit::rule< ScannerT > multiplicativeExpression; - ::boost::spirit::rule< ScannerT > unaryExpression; - ::boost::spirit::rule< ScannerT > basicExpression; - ::boost::spirit::rule< ScannerT > unaryFunction; - ::boost::spirit::rule< ScannerT > binaryFunction; - ::boost::spirit::rule< ScannerT > ternaryFunction; - ::boost::spirit::rule< ScannerT > funcRef_decl; - ::boost::spirit::rule< ScannerT > functionReference; - ::boost::spirit::rule< ScannerT > modRef_decl; - ::boost::spirit::rule< ScannerT > modifierReference; - ::boost::spirit::rule< ScannerT > identifier; + ::boost::spirit::classic::rule< ScannerT > additiveExpression; + ::boost::spirit::classic::rule< ScannerT > multiplicativeExpression; + ::boost::spirit::classic::rule< ScannerT > unaryExpression; + ::boost::spirit::classic::rule< ScannerT > basicExpression; + ::boost::spirit::classic::rule< ScannerT > unaryFunction; + ::boost::spirit::classic::rule< ScannerT > binaryFunction; + ::boost::spirit::classic::rule< ScannerT > ternaryFunction; + ::boost::spirit::classic::rule< ScannerT > funcRef_decl; + ::boost::spirit::classic::rule< ScannerT > functionReference; + ::boost::spirit::classic::rule< ScannerT > modRef_decl; + ::boost::spirit::classic::rule< ScannerT > modifierReference; + ::boost::spirit::classic::rule< ScannerT > identifier; }; const ParserContextSharedPtr& getContext() const @@ -1137,11 +1137,11 @@ std::shared_ptr<ExpressionNode> const & pContext->mpCustoShape = &rCustoShape; ExpressionGrammar aExpressionGrammer( pContext ); - const ::boost::spirit::parse_info<StringIteratorT> aParseInfo( - ::boost::spirit::parse( aStart, + const ::boost::spirit::classic::parse_info<StringIteratorT> aParseInfo( + ::boost::spirit::classic::parse( aStart, aEnd, - aExpressionGrammer >> ::boost::spirit::end_p, - ::boost::spirit::space_p ) ); + aExpressionGrammer >> ::boost::spirit::classic::end_p, + ::boost::spirit::classic::space_p ) ); // input fully congested by the parser? if( !aParseInfo.full ) ++++++ libreoffice-6.3.3.2.tar.xz -> libreoffice-6.4.2.2.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/libreoffice/libreoffice-6.3.3.2.tar.xz /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248/libreoffice-6.4.2.2.tar.xz differ: char 25, line 1 ++++++ libreoffice-help-6.3.3.2.tar.xz -> libreoffice-help-6.4.2.2.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/libreoffice/libreoffice-help-6.3.3.2.tar.xz /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248/libreoffice-help-6.4.2.2.tar.xz differ: char 26, line 1 ++++++ libreoffice-translations-6.3.3.2.tar.xz -> libreoffice-translations-6.4.2.2.tar.xz ++++++ /work/SRC/openSUSE:Leap:15.2/libreoffice/libreoffice-translations-6.3.3.2.tar.xz /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248/libreoffice-translations-6.4.2.2.tar.xz differ: char 25, line 1 ++++++ pdfium-3794.tar.bz2 -> pdfium-3963.tar.bz2 ++++++ /work/SRC/openSUSE:Leap:15.2/libreoffice/pdfium-3794.tar.bz2 /work/SRC/openSUSE:Leap:15.2/.libreoffice.new.3248/pdfium-3963.tar.bz2 differ: char 11, line 1
