Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-07-27 18:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-05-09 06:57:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-07-27 18:47:24.000000000 +0200 @@ -1,0 +2,200 @@ +Thu Jul 24 08:33:07 UTC 2014 - [email protected] + +- Try to finish out the py3 migration. +- Remove now not needed patch: + * wizards-create-temlates-with-python-2.6.diff + +------------------------------------------------------------------- +Mon Jul 21 07:09:41 UTC 2014 - [email protected] + +- Add patch to fix the themes/icons handling: + * libreoffice-4.3.0.3-themes-symlinks.patch + +------------------------------------------------------------------- +Mon Jul 21 06:58:44 UTC 2014 - [email protected] + +- Version bump to 4.3.0.3: + * Various small bugfixes. + +------------------------------------------------------------------- +Sun Jul 20 15:29:03 UTC 2014 - [email protected] + +- Use Python3 instead of Python 2 for pyuno. + +------------------------------------------------------------------- +Fri Jul 11 08:26:26 UTC 2014 - [email protected] + +- Add rpmlintrc to sources. + +------------------------------------------------------------------- +Thu Jul 3 11:21:45 UTC 2014 - [email protected] + +- Version bump to 4.3.0.2: + * Various small bugfixes +- Drop upstreamed patches: + * 0001-Package-filter-in-common-pack.patch + +------------------------------------------------------------------- +Wed Jun 25 11:04:41 UTC 2014 - [email protected] + +- Install missing libsaxlo. Hacked for now, upstream notified. + +------------------------------------------------------------------- +Tue Jun 24 10:47:32 UTC 2014 - [email protected] + +- Add patch to fix unfilelisted files: + * 0001-Package-filter-in-common-pack.patch + +------------------------------------------------------------------- +Mon Jun 23 11:11:03 UTC 2014 - [email protected] + +- Version bump to 4.3.0.1: + * Buildfix with new glm + * Various fixes. + +------------------------------------------------------------------- +Fri Jun 20 19:03:50 UTC 2014 - [email protected] + +- More languages got autotext. Reflect that. + +------------------------------------------------------------------- +Fri Jun 20 07:25:57 UTC 2014 - [email protected] + +- Remove no longer provided files from list of artworky things. + +------------------------------------------------------------------- +Tue Jun 17 09:17:10 UTC 2014 - [email protected] + +- Version the glew dependency. + +------------------------------------------------------------------- +Mon Jun 16 10:39:01 UTC 2014 - [email protected] + +- Version bump to 4.3.0beta2: + * major version bump with fixes all around everywhere +- Added dependencies over glew and glm +- Removed patches that were upstreamed: + * set-language-in-impress.diff + * text-alignment-in-shape.diff + * kde4-4.2.3.3-timer-mutex.patch + * impress-table-performance.patch + * import-gradfill-for-text-colors.diff + * fix-text-rotation.diff + * fix-python-wizzards.patch + * docx-brightness-contrast-2.diff + * docx-brightness-contrast-1.diff + * doc-brightness-contrast.diff + * discard-more-header-footer-stuff.patch + * disable-firebird-unit-test.diff + * direct-format-numbering.patch + * WW8-import-fix-upper-margin-of-multi-page.patch + * VBA-macro-modification-warning.diff + * Use-varying-aElement-name.patch + * 0001-std-strlen-requires-cstring-include-to-build.patch +Temporary switches until upstream allows system version: + * --disable-gltf + * --disable-coinmp + +------------------------------------------------------------------- +Thu Jun 5 14:07:31 UTC 2014 - [email protected] + +- Add patch from upstream fix-python-wizzards.patch to fix crashing + python wizzards ; bnc#881294 + +------------------------------------------------------------------- +Tue Jun 3 07:12:10 UTC 2014 - [email protected] + +- Typo in desc stating there is libreoffice-kde which is not anymore. + +------------------------------------------------------------------- +Fri May 30 09:55:57 UTC 2014 - [email protected] + +- bnc#822625 - LO-L3: Table editing is a pain in Impress (performace issues) + * impress-table-performance.patch + +------------------------------------------------------------------- +Fri May 30 09:30:28 UTC 2014 - [email protected] + +- bnc#863018 - LO-L3: Missing text in imported .doc file + * WW8-import-fix-upper-margin-of-multi-page.patch + +------------------------------------------------------------------- +Fri May 30 09:25:45 UTC 2014 - [email protected] + +- bnc#875717 - LO-L3: DOCX import: font size of numbering is bigger + * direct-format-numbering.patch + +------------------------------------------------------------------- +Fri May 30 09:21:31 UTC 2014 - [email protected] + +- bnc#875718 - LO-L3: DOCX import: extra page numbers + * discard-more-header-footer-stuff.patch + +------------------------------------------------------------------- +Fri May 30 07:33:54 UTC 2014 - [email protected] + +- Security update CVE-2014-0247 + * Use-varying-aElement-name.patch + +------------------------------------------------------------------- +Fri May 23 18:49:38 UTC 2014 - [email protected] + +- bnc#467278: let the previous fix work under KDE4, too + * VBA-macro-modification-warning.diff + +------------------------------------------------------------------- +Thu May 22 15:53:29 UTC 2014 - [email protected] + +- bnc#467278: Introduce a warning that changes to VBA macros cannot be saved. + * VBA-macro-modification-warning.diff + +------------------------------------------------------------------- +Tue May 20 08:17:29 UTC 2014 - [email protected] + +- bnc#875713 - LO-L3: DOCX import: picture brigtness/contrast not imported + * docx-brightness-contrast-1.diff + * docx-brightness-contrast-2.diff + +------------------------------------------------------------------- +Tue May 20 08:11:28 UTC 2014 - [email protected] + +- bnc#875712 - LO-L3: DOC import: picture brigtness/contrast not imported + * doc-brightness-contrast.diff + +------------------------------------------------------------------- +Tue May 20 08:05:13 UTC 2014 - [email protected] + +- bnc#870240 - LO-L3: pptx import file has text rotated on slide + * fix-text-rotation.diff + +------------------------------------------------------------------- +Tue May 20 07:55:57 UTC 2014 - [email protected] + +- bnc#870234 - LO-L3: pptx file has text imported as black instead of white + * import-gradfill-for-text-colors.diff + +------------------------------------------------------------------- +Tue May 20 07:51:16 UTC 2014 - [email protected] + +- bnc#870228 - LO-L3: Text inside the circle is not centered + * text-alignment-in-shape.diff + +------------------------------------------------------------------- +Tue May 20 07:38:00 UTC 2014 - [email protected] + +- bnc#863021 - LO-L3: Allow setting language for slide or presentation entirely + * set-language-in-impress.diff + +------------------------------------------------------------------- +Tue May 20 07:27:24 UTC 2014 - [email protected] + +- fix build on openSUSE 12.3: + * disable-firebird-unit-test.diff + +------------------------------------------------------------------- +Fri May 16 10:20:00 UTC 2014 - [email protected] + +- fix build on openSUSE 12.3: ++++ 3 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes ++++ and /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes Old: ---- kde4-4.2.3.3-timer-mutex.patch libreoffice-4.2.4.2.tar.xz libreoffice-help-4.2.4.2.tar.xz libreoffice-translations-4.2.4.2.tar.xz wizards-create-temlates-with-python-2.6.diff New: ---- libreoffice-4.3.0.3-themes-symlinks.patch libreoffice-4.3.0.3.tar.xz libreoffice-help-4.3.0.3.tar.xz libreoffice-translations-4.3.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.PPU8jq/_old 2014-07-27 18:47:28.000000000 +0200 +++ /var/tmp/diff_new_pack.PPU8jq/_new 2014-07-27 18:47:28.000000000 +0200 @@ -29,9 +29,10 @@ %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/4.2.4/ +%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.0/ +# This is used due to the need for beta releases Name: libreoffice -Version: 4.2.4.2 +Version: 4.3.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C @@ -40,6 +41,7 @@ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz +Source99: %{name}-rpmlintrc # 256x256 desktop icons (bnc#722644) Source20: libreoffice-desktop-icons-256x256.tar.bz2 # Prebuilt sofficerc for the noarch upstream branding package @@ -83,12 +85,9 @@ # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch11: nlpsolver-no-broken-help.diff Patch12: mediawiki-no-broken-help.diff -# LO newer worked well with it +# LO never worked well with it Patch13: jvmfwk-disable-gcj.diff -# Fix running wizzards in py2 as the utf is not htere -Patch16: wizards-create-temlates-with-python-2.6.diff -# PATCH-FIX-UPSTREAM: fix kde hanging in 4.2.3.3 -Patch18: kde4-4.2.3.3-timer-mutex.patch +Patch14: libreoffice-4.3.0.3-themes-symlinks.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -115,6 +114,8 @@ BuildRequires: flex BuildRequires: flute BuildRequires: gcc-c++ +BuildRequires: glew-devel >= 1.10.0 +BuildRequires: glm-devel BuildRequires: glu-devel BuildRequires: gnome-vfs2-devel BuildRequires: gperf @@ -157,7 +158,7 @@ BuildRequires: libmysqlclient-devel BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel -BuildRequires: liborcus-devel >= 0.5.0 +BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: libpoppler-devel BuildRequires: libredland-devel BuildRequires: librepository @@ -187,9 +188,9 @@ BuildRequires: perl-Compress-Zlib BuildRequires: postgresql-devel BuildRequires: procps -BuildRequires: python-devel -BuildRequires: python-lxml -BuildRequires: python-xml +BuildRequires: python3-devel +BuildRequires: python3-lxml +BuildRequires: python3-xml BuildRequires: recode BuildRequires: rhino BuildRequires: sac @@ -204,11 +205,12 @@ BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip -BuildRequires: pkgconfig(fbclient) +BuildRequires: pkgconfig(fbembed) Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} # We need at least english to launch ourselves. Requires: libreoffice-l10n-en = %{version} +Requires: python3 Requires(post): coreutils Requires(post): grep Requires(post): gtk2 @@ -264,7 +266,7 @@ - libreoffice-mailmerge - libreoffice-filters -- libreoffice-kde +- libreoffice-kde4 - libreoffice-gnome Non-English localizations are provided by extra packages as well, for @@ -768,7 +770,7 @@ %langpack -l bg -n Bulgarian -T -X -m bg_BG %langpack -l bn -n Bengali -T -m bn_BD %langpack -l br -n Breton -m br_FR -%langpack -l ca -n Catalan -T -M +%langpack -l ca -n Catalan -T -M -X %langpack -l cs -n Czech -T -X -m cs_CZ %langpack -l cy -n Welsh %langpack -l da -n Danish -T -X -m da_DK @@ -779,22 +781,22 @@ %langpack -l es -n Spanish -M -T -X %langpack -l et -n Estonian -T -m et_EE %langpack -l eu -n Basque -T -%langpack -l fa -n Farsi -s ctl -%langpack -l fi -n Finnish -r libreoffice-voikko -T +%langpack -l fa -n Farsi -s ctl -X +%langpack -l fi -n Finnish -r libreoffice-voikko -T -X %langpack -l fr -n French -T -X -m fr_FR %langpack -l ga -n Irish %langpack -l gl -n Galician -T -M %langpack -l gu -n Gujarati -s ctl -T -p gu-IN -m gu_IN %langpack -l he -n Hebrew -s ctl -T -m he_IL %langpack -l hi -n Hindi -s ctl -T -p hi-IN -m hi_IN -%langpack -l hr -n Croatian -T -m hr_HR +%langpack -l hr -n Croatian -T -m hr_HR -X %langpack -l hu -n Hungarian -T -X -m hu_HU %langpack -l it -n Italian -T -X -m it_IT %langpack -l ja -n Japanese -s cjk -T -X %langpack -l kk -n Kazakh %langpack -l kn -n Kannada %langpack -l ko -n Korean -s cjk -T -c korea -X -%langpack -l lt -n Lithuanian -m lt_LT +%langpack -l lt -n Lithuanian -m lt_LT -X %langpack -l lv -n Latvian -m lv_LV %langpack -l mai -n Maithili %langpack -l ml -n Malayalam @@ -812,7 +814,7 @@ %define langpack_lang Brazilian Portuguese %langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -T -X %langpack -l pt-PT -n Portuguese -m pt_PT -T -L pt -x pt -%langpack -l ro -n Romanian -M +%langpack -l ro -n Romanian -M -X %langpack -l ru -n Russian -T -X -m ru_RU %langpack -l si -n Sinhalese -S ctl -T -m si_LK %langpack -l sk -n Slovak -T -X -m sk_SK @@ -839,7 +841,7 @@ %undefine langpack_lang %prep -%setup -q -b1 -b2 -n libreoffice-%{version} +%setup -q -b1 -b2 %patch3 -p1 %patch5 %patch6 -p1 @@ -848,8 +850,7 @@ %patch11 %patch12 %patch13 -p1 -%patch16 -p1 -%patch18 -p1 +%patch14 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} @@ -907,11 +908,11 @@ CXXFLAGS="$ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -# Whack in our python2 so we don't have to use internal one +# Whack in our python3 so we don't have to use internal one # which is quite nightmare. -export PYTHON=%{_bindir}/python2 -export PYTHON_CFLAGS=`pkg-config --cflags python2` -export PYTHON_LIBS=`pkg-config --libs python2` +export PYTHON=%{_bindir}/python3 +export PYTHON_CFLAGS=`pkg-config --cflags python3` +export PYTHON_LIBS=`pkg-config --libs python3` # do not run configure in autogen but use macro later export NOCONFIGURE=yes @@ -947,7 +948,6 @@ --enable-python=system \ --enable-randr \ --enable-randr-link \ - --without-afms \ --without-fonts \ --without-myspell-dicts \ --with-jdk-home=$JAVA_HOME \ @@ -980,7 +980,10 @@ %endif --enable-neon \ --with-system-ucpp \ - --disable-ccache + --disable-ccache \ + --disable-gltf \ + --disable-coinmp +# gltf and coinmp disabled until possible to use external pkgs # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py scripting/source/pyprov/officehelper.py @@ -995,6 +998,10 @@ %install make DESTDIR=%{buildroot} distro-pack-install +# FIXME: Hack add missing file +install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so +echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt + ################ # update desktop files builddir=`pwd` @@ -1086,12 +1093,7 @@ for file in sofficerc \ intro.png \ flat_logo.svg \ - shell/about.svg \ - shell/backing_left.png \ - shell/backing_right.png \ - shell/backing_rtl_left.png \ - shell/backing_rtl_right.png \ - shell/backing_space.png ; do + shell/about.svg ; do mv "%{buildroot}%{_libdir}/%{name}/program/$file" "%{buildroot}%{_datadir}/%{name}/program/$file" ln -sf "%{_datadir}/%{name}/program/$file" "%{buildroot}/%{_libdir}/%{name}/program/$file" echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt @@ -1119,9 +1121,9 @@ done # Symlink uno.py and unohelper.py so that python can find them -mkdir -p %{buildroot}%{python_sitelib} -ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python_sitelib}/uno.py -ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python_sitelib}/unohelper.py +mkdir -p %{buildroot}%{python3_sitelib} +ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py +ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py # Remove translations source as we need more space rm -rf translations/source/ @@ -1224,7 +1226,6 @@ %exclude %{_datadir}/%{name}/program/sofficerc %exclude %{_datadir}/%{name}/program/flat_logo.svg %exclude %{_datadir}/%{name}/program/*.png -%exclude %{_datadir}/%{name}/program/shell/*.png %exclude %{_datadir}/%{name}/program/shell/*.svg # such a big icons are not provided by other packages # FIXME: last time checked on openSUSE-12.2 @@ -1261,8 +1262,8 @@ %files -f file-lists/pyuno_list.txt pyuno %defattr(-,root,root) -%{python_sitelib}/uno.py -%{python_sitelib}/unohelper.py +%{python3_sitelib}/uno.py +%{python3_sitelib}/unohelper.py %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) @@ -1305,6 +1306,8 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config +%{_datadir}/%{name}/share/config/images_galaxy.zip +# other is just images.zip which seems to be almost identical %{_datadir}/%{name}/share/config/images.zip %files icon-theme-hicontrast ++++++ libreoffice-4.3.0.3-themes-symlinks.patch ++++++ >From c796db004d463cb60a5b4489a868ae8dd377d0df Mon Sep 17 00:00:00 2001 From: Tobias Lippert <[email protected]> Date: Sat, 19 Jul 2014 13:39:21 +0200 Subject: [PATCH] fdo#81532 Handle symlinks to icon themes correctly - added logging for icon theme scanning. Change-Id: I799c5fc09879411020142f7808da0d9f2f63dc17 --- vcl/source/app/IconThemeScanner.cxx | 68 ++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 25 deletions(-) diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx index 9684bb6..29d3cd7 100644 --- a/vcl/source/app/IconThemeScanner.cxx +++ b/vcl/source/app/IconThemeScanner.cxx @@ -12,6 +12,7 @@ #include <config_folders.h> #include <osl/file.hxx> #include <rtl/bootstrap.hxx> +#include <salhelper/linkhelper.hxx> #include <vcl/svapp.hxx> #include <vcl/IconThemeInfo.hxx> @@ -20,24 +21,34 @@ namespace vcl { namespace { -bool -search_path_is_valid(const OUString& dir) +const char *LOG_AREA = "vcl.app"; + +// set the status of a file. Returns false if the status could not be determined. +bool set_file_status(osl::FileStatus& status, const OUString& file) { osl::DirectoryItem dirItem; - osl::FileBase::RC retvalGet = osl::DirectoryItem::get(dir, dirItem); + osl::FileBase::RC retvalGet = osl::DirectoryItem::get(file, dirItem); if (retvalGet != osl::FileBase::E_None) { + SAL_WARN(LOG_AREA, "Could not determine status for file '" << file << "'."); return false; } - osl::FileStatus fileStatus(osl_FileStatus_Mask_Type); - osl::FileBase::RC retvalStatus = dirItem.getFileStatus(fileStatus); + osl::FileBase::RC retvalStatus = dirItem.getFileStatus(status); if (retvalStatus != osl::FileBase::E_None) { + SAL_WARN(LOG_AREA, "Could not determine status for file '" << file << "'."); return false; } + return true; +} - if (!fileStatus.isDirectory()) { - return false; +OUString convert_to_absolute_path(const OUString& path) +{ + salhelper::LinkResolver resolver(0); + osl::FileBase::RC rc = resolver.fetchFileStatus(path); + if (rc != osl::FileBase::E_None) { + SAL_WARN(LOG_AREA, "Could not resolve path '" << path << "' to search for icon themes."); + throw std::runtime_error("Provided a recursive symlink to a icon theme directory that could not be resolved."); } - return true; + return resolver.m_aStatus.getFileURL(); } } @@ -48,12 +59,20 @@ IconThemeScanner::IconThemeScanner() bool IconThemeScanner::ScanDirectoryForIconThemes(const OUString& path) { - bool pathIsValid = search_path_is_valid(path); - if (!pathIsValid) { + osl::FileStatus fileStatus(osl_FileStatus_Mask_Type); + bool couldSetFileStatus = set_file_status(fileStatus, path); + if (!couldSetFileStatus) { + return false; + } + + if (!fileStatus.isDirectory()) { + SAL_INFO(LOG_AREA, "Cannot search for icon themes in '"<< path << "'. It is not a directory."); return false; } + std::vector<OUString> iconThemePaths = ReadIconThemesFromPath(path); if (iconThemePaths.empty()) { + SAL_WARN(LOG_AREA, "Could not find any icon themes in the provided directory ('" <<path<<"'."); return false; } mFoundIconThemes.clear(); @@ -70,8 +89,11 @@ IconThemeScanner::AddIconThemeByPath(const OUString &url) if (!IconThemeInfo::UrlCanBeParsed(url)) { return false; } + SAL_INFO(LOG_AREA, "Found a file that seems to be an icon theme: '" << url << "'" ); IconThemeInfo newTheme(url); mFoundIconThemes.push_back(newTheme); + SAL_INFO(LOG_AREA, "Adding the file as '" << newTheme.GetDisplayName() << + "' with id '" << newTheme.GetThemeId() << "'."); return true; } @@ -79,6 +101,7 @@ IconThemeScanner::AddIconThemeByPath(const OUString &url) IconThemeScanner::ReadIconThemesFromPath(const OUString& dir) { std::vector<OUString> found; + SAL_INFO(LOG_AREA, "Scanning directory '" << dir << " for icon themes."); osl::Directory dirToScan(dir); osl::FileBase::RC retvalOpen = dirToScan.open(); @@ -93,15 +116,12 @@ IconThemeScanner::ReadIconThemesFromPath(const OUString& dir) if (retvalStatus != osl::FileBase::E_None) { continue; } - if (!status.isRegular()) { - continue; - } - if (!FileIsValidIconTheme(status.getFileURL())) { + + OUString filename = convert_to_absolute_path(status.getFileURL()); + if (!FileIsValidIconTheme(filename)) { continue; } - OUString entry; - entry = status.getFileURL(); - found.push_back(entry); + found.push_back(filename); } return found; } @@ -111,20 +131,16 @@ IconThemeScanner::FileIsValidIconTheme(const OUString& filename) { // check whether we can construct a IconThemeInfo from it if (!IconThemeInfo::UrlCanBeParsed(filename)) { + SAL_INFO(LOG_AREA, "File '" << filename << "' does not seem to be an icon theme."); return false; } - // check whether the file is a regular file - osl::DirectoryItem dirItem; - osl::FileBase::RC retvalGet = osl::DirectoryItem::get(filename, dirItem); - if (retvalGet != osl::FileBase::E_None) { - return false; - } osl::FileStatus fileStatus(osl_FileStatus_Mask_Type); - osl::FileBase::RC retvalStatus = dirItem.getFileStatus(fileStatus); - if (retvalStatus != osl::FileBase::E_None) { + bool couldSetFileStatus = set_file_status(fileStatus, filename); + if (!couldSetFileStatus) { return false; } + if (!fileStatus.isRegular()) { return false; } @@ -178,6 +194,8 @@ IconThemeScanner::GetIconThemeInfo(const OUString& themeId) std::vector<IconThemeInfo>::iterator info = std::find_if(mFoundIconThemes.begin(), mFoundIconThemes.end(), SameTheme(themeId)); if (info == mFoundIconThemes.end()) { + SAL_WARN(LOG_AREA, "Requested information for icon theme with id '" << themeId + << "' which does not exist."); throw std::runtime_error("Requested information on not-installed icon theme"); } return *info; -- 1.7.9.5 ++++++ libreoffice-4.2.4.2.tar.xz -> libreoffice-4.3.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.2.4.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.3.0.3.tar.xz differ: char 26, line 1 ++++++ libreoffice-help-4.2.4.2.tar.xz -> libreoffice-help-4.3.0.3.tar.xz ++++++ ++++ 12080 lines of diff (skipped) ++++++ libreoffice-translations-4.2.4.2.tar.xz -> libreoffice-translations-4.3.0.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.2.4.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.3.0.3.tar.xz differ: char 26, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
