Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2018-07-04 23:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Wed Jul 4 23:52:58 2018 rev:158 rq:620219 version:6.1.0.0.beta2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2018-06-05 12:50:19.799311513 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2018-07-04 23:54:11.495954317 +0200 @@ -1,0 +2,118 @@ +Mon Jul 2 11:19:26 UTC 2018 - [email protected] + +- Fix ca_valencia myspell dictionary name + +------------------------------------------------------------------- +Fri Jun 22 08:54:24 UTC 2018 - [email protected] + +- Expand disk constraints to not fail on arm64 + +------------------------------------------------------------------- +Thu Jun 21 12:37:33 UTC 2018 - [email protected] + +- Enable display of commands in build logs +- Diable header-only Boost:System usage on older Leap +- old-boost.patch: Fix building with older Boost version +- Bumb disk space constraints. We need more than 32GB. + +------------------------------------------------------------------- +Sun Jun 17 07:56:09 UTC 2018 - [email protected] + +- Add more translations: + * Belarusian + * Bodo + * Dogri + * Frisian + * Gaelic + * Paraguayan_Guaraní + * Upper_Sorbian + * Konkani + * Kashmiri + * Luxembourgish + * Monglolian + * Manipuri + * Burnese + * Occitan + * Kinyarwanda + * Santali + * Sanskrit + * Sindhi + * Sidamo + * Tatar + * Uzbek + * Upper Sorbian + * Venetian + * Amharic + * Asturian + * Tibetian + * Bosnian + * English GB + * English ZA + * Indonesian + * Icelandic + * Georgian + * Khmer + * Lao + * Macedonian + * Nepali + * Oromo + * Albanian + * Tajik + * Uyghur + * Vietnamese + * Kurdish + +------------------------------------------------------------------- +Sat Jun 16 12:08:53 UTC 2018 - [email protected] + +- The kde integration now properly installed by upstream, no need + to do it in %install phase + +------------------------------------------------------------------- +Sat Jun 16 09:20:57 UTC 2018 - [email protected] + +- Try to build all languages see bsc#1096360 + +------------------------------------------------------------------- +Fri Jun 15 09:40:55 UTC 2018 - [email protected] + +- Update to 6.1.0.0.beta2: + * Various buildfixes as found by our testing +- Reenable KDE integration on 32bit +- Drop merged patch libreoffice-libxmlsec.patch + +------------------------------------------------------------------- +Tue Jun 12 13:04:49 UTC 2018 - [email protected] + +- Make sure to install the KDE5/Qt5 UI/filepicker + +------------------------------------------------------------------- +Fri Jun 8 09:32:50 UTC 2018 - [email protected] + +- Conflict with gnome subpackage on the gtk2 subpkg as it was split + of from there bsc#1096673 + +------------------------------------------------------------------- +Thu Jun 7 11:01:54 UTC 2018 - [email protected] + +- Update to 6.1.0.0.beta1: + * 6.1 series first beta, many fixes and features around + * Notably kde5_gtk3 integration, on by default now +- Remove merged patches: + * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch + * libreoffice-icu61.patch + * kde5-configure-checks.patch + * bnc1060128.patch + * bnc1039203.patch + * bnc1094359.patch +- Disable firebird everywhere for now as it causes issues +- Try to implement safeguarding to avoid bsc#1050305 +- Disable base-drivers-mysql as it needs mysqlcppcon that is only + for mysql and not mariadb, causes issues bsc#1094779 + * Users can still connect using jdbc/odbc +- Fix java detection on machines with too many cpus + * libreoffice-java-sched.patch +- Remove galaxy icon theme replaced by colibri +- Add karasa jaga icon theme + +------------------------------------------------------------------- Old: ---- 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar bnc1039203.patch bnc1060128.patch bnc1094359.patch kde5-configure-checks.patch libreoffice-6.0.4.2.tar.xz libreoffice-6.0.4.2.tar.xz.asc libreoffice-help-6.0.4.2.tar.xz libreoffice-help-6.0.4.2.tar.xz.asc libreoffice-icu61.patch libreoffice-translations-6.0.4.2.tar.xz libreoffice-translations-6.0.4.2.tar.xz.asc pdfium-3235.tar.bz2 New: ---- libreoffice-6.1.0.0.beta2.tar.xz libreoffice-6.1.0.0.beta2.tar.xz.asc libreoffice-help-6.1.0.0.beta2.tar.xz libreoffice-help-6.1.0.0.beta2.tar.xz.asc libreoffice-java-sched.patch libreoffice-translations-6.1.0.0.beta2.tar.xz libreoffice-translations-6.1.0.0.beta2.tar.xz.asc odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar old-boost.patch pdfium-3426.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.kqinI5/_old 2018-07-04 23:54:30.335933523 +0200 +++ /var/tmp/diff_new_pack.kqinI5/_new 2018-07-04 23:54:30.339933519 +0200 @@ -16,14 +16,12 @@ # -# List of supported langs, populated bellow in the lang macros -%global langpack_langs %{nil} # extensions %define numbertext_version 0.9.5 # Urls -%define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/6.0.4 -#%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ +%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://dev-builds.libreoffice.org/pre-releases/src/ # LTO needs newer toolchain stack only %if 0%{?suse_version} >= 1500 %bcond_without lto @@ -37,7 +35,7 @@ %bcond_with kdeintegration %endif %if 0%{?suse_version} > 1320 && 0%{?is_opensuse} -%bcond_without firebird +%bcond_with firebird %else %bcond_with firebird %endif @@ -54,12 +52,12 @@ %bcond_with gtk3 %endif Name: libreoffice -Version: 6.0.4.2 +Version: 6.1.0.0.beta2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ Group: Productivity/Office/Suite -URL: http://www.documentfoundation.org/ +URL: https://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-%{version}.tar.xz.asc Source2: %{tarball_url}/libreoffice-help-%{version}.tar.xz @@ -81,7 +79,7 @@ Source1002: %{external_url}/libassuan-2.4.3.tar.bz2 # Internal bundled stuff we can't remove # To build this we would pull cygwin; not worth it -Source2001: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source2001: https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll # hsqldb simply does not work with new system version, but luckily we migrate to firebird Source2002: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip # Heavily patched and not possible to use system one @@ -90,10 +88,10 @@ # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip # Needed for integration tests -Source2006: http://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar -Source2007: http://dev-www.libreoffice.org/extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar +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%2BODFTOOLKIT-460%2BODFTOOLKIT-475.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-3235.tar.bz2 +Source2008: %{external_url}/pdfium-3426.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 @@ -101,16 +99,10 @@ # 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: kde5-configure-checks.patch -Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch -# LO-L3: Wrong transition time -Patch7: bnc1039203.patch -# LO-L3: Slide with chart has some strange (too large?) elements (PPTX) -Patch8: bnc1060128.patch -# PATCH-FROM-UPSTREAM fix build with new icu -Patch9: libreoffice-icu61.patch -# LO-L3: LO Writer: Text in boxes not visible -Patch10: bnc1094359.patch +# Fix java detection on pcs with 99+ cpus, it prints too many warnings and then +# math does not work +Patch4: libreoffice-java-sched.patch +Patch5: old-boost.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -125,14 +117,16 @@ # Needed for tests BuildRequires: dejavu-fonts BuildRequires: doxygen >= 1.8.4 +# Dot is used by doxygen BuildRequires: fdupes BuildRequires: flex BuildRequires: flute BuildRequires: gcc-c++ BuildRequires: glm-devel +BuildRequires: graphviz # Needed for tests BuildRequires: google-carlito-fonts -BuildRequires: gperf +BuildRequires: gperf >= 3.0.0 BuildRequires: hyphen-devel # genbrk binary is required BuildRequires: icu @@ -147,8 +141,6 @@ BuildRequires: libjpeg-devel BuildRequires: liblayout BuildRequires: libloader -BuildRequires: libmysqlclient-devel -BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: librepository BuildRequires: libserializer BuildRequires: libtool @@ -160,6 +152,7 @@ BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine BuildRequires: pkgconfig +BuildRequires: python3-lxml BuildRequires: python3-xml BuildRequires: sac BuildRequires: ucpp @@ -195,12 +188,13 @@ BuildRequires: pkgconfig(libe-book-0.1) >= 0.1.1 BuildRequires: pkgconfig(libeot) >= 0.01 BuildRequires: pkgconfig(libepubgen-0.1) -BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.7 +BuildRequires: pkgconfig(libetonyek-0.1) >= 0.1.8 BuildRequires: pkgconfig(libexttextcat) >= 3.1.1 BuildRequires: pkgconfig(libfreehand-0.1) BuildRequires: pkgconfig(liblangtag) BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.13 +BuildRequires: pkgconfig(libnumbertext) >= 1.0.0 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 BuildRequires: pkgconfig(liborcus-0.13) BuildRequires: pkgconfig(libpagemaker-0.0) @@ -208,11 +202,11 @@ BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.4 +BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.6 BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) -BuildRequires: pkgconfig(libwps-0.4) >= 0.4.7 +BuildRequires: pkgconfig(libwps-0.4) >= 0.4.9 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(libzmf-0.0) @@ -261,7 +255,7 @@ %endif %if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 %else Provides: libreofficekit = %{version} Obsoletes: libreofficekit < %{version} @@ -288,7 +282,17 @@ BuildRequires: pkgconfig(fbclient) %endif %if %{with kdeintegration} -BuildRequires: libkde4-devel +BuildRequires: libqt5-qtbase-common-devel +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) %else Provides: %{name}-kde4 = %{version} Obsoletes: %{name}-kde4 < %{version} @@ -386,6 +390,7 @@ Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pentaho-reporting-flow-engine +Obsoletes: %{name}-base-drivers-mysql %if 0%{?suse_version} <= 1500 Supplements: %{name} %endif @@ -537,6 +542,7 @@ Summary: Gtk2 interface for LibreOffice Group: Productivity/Office/Suite Recommends: %{name}-gnome = %{version} +Conflicts: %{name}-gnome < %{version} # We are default if gtk3 is not present %if !%{with gtk3} Supplements: packageand(libreoffice:gnome-session) @@ -549,24 +555,16 @@ %description gtk2 This package contains Gtk2 interface rendering option for LibreOffice. -%package kde4 -Summary: KDE4 interface for LibreOffice -Group: Productivity/Office/Suite -Requires: %{name} = %{version} -# we need full kdelibs4 otherwise we will crash -Requires: kdelibs4 -Supplements: packageand(libreoffice:plasma5-workspace) - -%description kde4 -This package contains kde4 interface rendering options for LibreOffice. - %package qt5 -Summary: Qt5 interface for LibreOffice +Summary: Qt5/KDE Frameworks interface for LibreOffice Group: Productivity/Office/Suite Requires: %{name} = %{version} +Supplements: packageand(libreoffice:plasma5-workspace) +Provides: %{name}-kde4 = %{version} +Obsoletes: %{name}-kde4 < %{version} %description qt5 -This package contains Qt5 interface rendering options for LibreOffice. +This package contains Qt5/KDE Frameworks interface rendering options for LibreOffice. %package sdk Summary: LibreOffice SDK @@ -626,16 +624,6 @@ environment giving them full control over the embedded document, its appearance and behavior. -%package base-drivers-mysql -Summary: MySQL Database Driver for LibreOffice -Group: Productivity/Office/Suite -Requires: libreoffice-base = %{version} -Requires(pre): libreoffice = %{version} -Supplements: packageand(libreoffice-base:mysql-client) - -%description base-drivers-mysql -This package allows to access MySQL databases from LibreOffice Base. - %package calc-extensions Summary: LibreOffice Calc Extensions Group: Productivity/Office/Suite @@ -759,8 +747,9 @@ # L: internal (LibreOffice) language code, used in file names # l: language code, e.g., cs # g: glibc/java locale -# j: java locale for the additional language -# k: glibc locale for the additional language +# j: java locale +# k: glibc locale for the additional language -i +# o: java locale for the additional language -i # Mm: myspell dependency # n: language name, e.g., Czech # p: Provides: of libreoffice-l10n @@ -775,13 +764,12 @@ # Example: # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ: # %%langpack -l cs -n Czech -m cs_CZ -%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:TXx:) \ +%define langpack(c:Ei:g:j:k:L:l:Mm:n:o:p:q:r:S:s:TXx:) \ %define project LibreOffice \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ %define pkgname l10n-%{lang} \ %define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ -%global langpack_langs %{langpack_langs} %{_langpack_lang} %{-i:%{-i*}} \ \ %package %{pkgname} \ Summary: %{langname} Localization Files for LibreOffice \ @@ -821,34 +809,45 @@ %files %{pkgname} \ %{-T: \ %dir %{_datadir}/libreoffice/help/%{_langpack_lang} \ -%{_datadir}/libreoffice/help/%{_langpack_lang} \ -}\ +%{_datadir}/libreoffice/help/%{_langpack_lang}/* \ +} \ %{!-E: \ %define autotextdir %{_datadir}/%{name}/share/autotext \ %dir %{autotextdir} \ -%{expand:%%_langpack_common -l %{_langpack_lang} %{-g:-g %{-g*} -j %{-g*}}} \ +%{expand:%%_langpack_common -l %{_langpack_lang} %{-g:-g %{-g*}} %{-j:-j %{-j*}}} \ %{-x:%{autotextdir}/%{-x*}}%{!-x:%{-X:%{autotextdir}/%{_langpack_lang}}} \ %{-c:%{_datadir}/%{name}/share/registry/%{-c*}.xcd} \ %{-s:%{_datadir}/%{name}/share/registry/%{-s*}_%{_langpack_lang}.xcd} \ -%{-i:%{expand:%%_langpack_common -l %{-i*} %{-k:-g %{-k*}} %{-j:-j %{-j*}}}} \ +%{-i:%{expand:%%_langpack_common -l %{-i*} %{-k:-g %{-k*}} %{-o:-j %{-o*}}}} \ } \ \ %{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 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 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 cs -n Czech -X -m cs_CZ -T %langpack -l cy -n Welsh %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 dz -n Dzongkha -s ctl -T %langpack -l el -n Greek -m el_GR -T -%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M -g en_US -T +%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 es -n Spanish -M -X -T %langpack -l et -n Estonian -m et_EE -T @@ -856,28 +855,48 @@ %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 hr -n Croatian -m hr_HR -X -T +%langpack -l hsb -n Upper_Sorbian %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 is -n Icelandic -T -X -M %langpack -l ja -n Japanese -s cjk -X -T +%langpack -l ka -n Georgian -T %langpack -l kk -n Kazakh %langpack -l kn -n Kannada +%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 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 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 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 nl -n Dutch -X -m nl_NL -T -%langpack -l nn -n Nynorsk -m no -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 pl -n Polish -X -m pl_PL -T @@ -885,21 +904,34 @@ %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 sk -n Slovak -X -m sk_SK -T %langpack -l sl -n Slovenian -X -m sl_SI -T -%langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin +%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 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 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 tr -n Turkish -X -T %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 vi -n Vietnamese -T -X -M %langpack -l ve -n Venda +%langpack -l vec -n Venetian %langpack -l xh -n Xhosa %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 @@ -910,15 +942,12 @@ %if 0%{?suse_version} < 1330 # 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 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 %patch990 -p1 # Disable some of the failing tests (some are random) @@ -935,6 +964,11 @@ # The gpg files are not loaded properly sed -i -e /CPPUNIT_TEST\(testODFEncryptedGPG\)/d xmlsecurity/qa/unit/signing/signing.cxx +%if 0%{?suse_version} < 1500 +# Header-only libboost_system is not available +find -name \*.mk -exec sed -i s,-DBOOST_ERROR_CODE_HEADER_ONLY,, {} \; +%endif + # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile @@ -987,7 +1021,7 @@ --with-alloc=system \ --with-tls=nss \ --disable-openssl \ - --with-lang='%{langpack_langs}' \ + --with-lang=ALL \ --disable-fetch-external \ --with-external-tar="$RPM_SOURCE_DIR" \ --disable-epm \ @@ -997,6 +1031,11 @@ --enable-gstreamer-1-0 \ %if %{with gtk3} --enable-gtk3 \ +%if %{with kdeintegration} + --enable-gtk3-kde5 \ + --enable-kde5 \ + --disable-qt5 \ +%endif %else --disable-gtk3 \ %endif @@ -1020,13 +1059,9 @@ --with-help \ --without-export-validation \ --enable-odk \ -%if %{with kdeintegration} - --disable-qt5 \ - --enable-kde4 \ -%else --disable-qt5 \ + --disable-kde5 \ --disable-kde4 \ -%endif %if %{with system_gpgme} --with-system-gpgmepp \ %else @@ -1043,7 +1078,7 @@ --enable-ext-nlpsolver \ --enable-ext-numbertext \ --enable-ext-wiki-publisher \ - --enable-ext-mariadb-connector \ + --disable-ext-mariadb-connector \ --enable-scripting-beanshell \ --enable-scripting-javascript \ --disable-vlc \ @@ -1056,16 +1091,20 @@ # no coinormp packages for coinmp # just call make here as we added the jobs in configure -make build-nocheck +make verbose=t build-nocheck %check # Run tests only on 64b intel as they are resource hogs %ifarch x86_64 +# safeguard jarfires that can get magically overriden by the make +mkdir savejar +cp %{buildroot}%{_libdir}/%{name}/program/classes/*.jar savejar/ make +cp savejar/*.jar %{buildroot}%{_libdir}/%{name}/program/classes/ %endif %install -make DESTDIR=%{buildroot} distro-pack-install +make verbose=t DESTDIR=%{buildroot} distro-pack-install # Do not pollute build log set +x @@ -1129,7 +1168,7 @@ %{buildroot}%{_libdir}/%{name}/share/registry/Langpack-*.xcd \ %{buildroot}%{_libdir}/%{name}/share/config/images*.zip \ %{buildroot}%{_libdir}/%{name}/share/registry/{cjk,ctl}_*.xcd \ - %{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_th.xcd \ + %{buildroot}%{_libdir}/%{name}/share/registry/ctlseqcheck_*.xcd \ %{buildroot}%{_libdir}/%{name}/share/wizards/*.properties \ ; do trg="`dirname "$i" | sed 's|%{_libdir}|%{_datadir}|'`" @@ -1438,7 +1477,7 @@ %{_libdir}/libreoffice/program/libvclplug_gtklo.so %if %{with kdeintegration} -%files -f file-lists/kde4_list.txt kde4 +%files -f file-lists/kde4_list.txt qt5 %endif %files -f file-lists/officebean_list.txt officebean @@ -1448,9 +1487,6 @@ %files -f file-lists/sdk_doc_list.txt sdk-doc -%files base-drivers-mysql -%{_libdir}/%{name}/share/extensions/mysql-connector-ooo - %files calc-extensions %{_libdir}/%{name}/share/extensions/ConvertTextToNumber %{_libdir}/%{name}/share/extensions/nlpsolver @@ -1466,8 +1502,8 @@ %{_datadir}/%{name}/share/config/images_breeze.zip %{_datadir}/%{name}/share/config/images_breeze_dark.zip %{_datadir}/%{name}/share/config/images_elementary.zip -%{_datadir}/%{name}/share/config/images_galaxy.zip -%{_datadir}/%{name}/share/config/images_hicontrast.zip +%{_datadir}/%{name}/share/config/images_colibre.zip +%{_datadir}/%{name}/share/config/images_karasa_jaga.zip %{_datadir}/%{name}/share/config/images_sifr.zip %{_datadir}/%{name}/share/config/images_sifr_dark.zip %{_datadir}/%{name}/share/config/images_tango.zip ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.kqinI5/_old 2018-07-04 23:54:30.399933453 +0200 +++ /var/tmp/diff_new_pack.kqinI5/_new 2018-07-04 23:54:30.399933453 +0200 @@ -4,7 +4,7 @@ <size unit="M">4000</size> </physicalmemory> <disk> - <size unit="G">25</size> + <size unit="G">50</size> </disk> </hardware> </constraints> ++++++ libreoffice-java-sched.patch ++++++ diff --git a/configure.ac b/configure.ac index aa44107f8e79..8a40119e9bc6 100644 --- a/configure.ac +++ b/configure.ac @@ -6824,7 +6824,7 @@ you must use the "--with-jdk-home" configure option explicitly]) JDK=sun dnl Sun JDK specific tests - _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` + _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED '/^$/d' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10600; then ++++++ old-boost.patch ++++++ Index: libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx =================================================================== --- libreoffice-6.1.0.0.beta2.orig/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx +++ libreoffice-6.1.0.0.beta2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx @@ -58,7 +58,7 @@ OUString applicationDirPath() const auto utf8Path = applicationSystemPath.toUtf8(); auto ret = boost::filesystem::path(utf8Path.getStr(), utf8Path.getStr() + utf8Path.getLength()); ret.remove_filename(); - return OUString::fromUtf8(OString(ret.c_str(), ret.size())); + return OUString::fromUtf8(OString(ret.c_str(), strlen(ret.c_str()))); } OUString findPickerExecutable() ++++++ pdfium-3235.tar.bz2 -> pdfium-3426.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/libreoffice/pdfium-3235.tar.bz2 /work/SRC/openSUSE:Factory/.libreoffice.new/pdfium-3426.tar.bz2 differ: char 11, line 1
