pool/libreoffice
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Version bump to 4.4.0rc1:

Browse Source 
* New 4.4 branch release with additional features
- Enable collada:
  * New bundled collada2gltf tarball:
    4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
- Obsoleted patches:
  * jvmfwk-disable-gcj.diff
  * libreoffice-4.3-plasma5-ui-decisions.patch
  * libreoffice-4.3.0.3-themes-symlinks.patch
  * office-cfg-linux-common-template-dir.diff
  * libreoffice-boost-1.56.patch
- Refreshed patches:
  * officecfg-help-in-usr-share.diff
  * system-pyuno.diff

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=212
This commit is contained in:
Tomáš Chvátal 2015-01-04 15:54:18 +00:00 committed by Git OBS Bridge
parent 618f0083f9
commit 1bf642c601
16 changed files with 73 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb
size 555291

21
jvmfwk-disable-gcj.diff
View File

@ -1,21 +0,0 @@
diff -urN libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
--- libreoffice-4.1.2.3.old/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:50:15.977432391 +0200
+++ libreoffice-4.1.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2013-10-08 16:51:47.260432381 +0200
@@ -35,9 +35,6 @@
<vendor name="Blackdown Java-Linux Team">
<minVersion>1.5.0</minVersion>
</vendor>
- <vendor name="Free Software Foundation, Inc.">
- <minVersion>1.5.0</minVersion>
- </vendor>
<vendor name="BEA Systems, Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
@@ -48,7 +45,6 @@
<library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
- <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
<library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so</library>
</plugins>
</javaSelection>

59
libreoffice-4.3-plasma5-ui-decisions.patch
View File

@ -1,59 +0,0 @@
From e04b8afe7aef5db535311630834bc25316433dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 3 Nov 2014 10:01:52 +0100
Subject: Detect KDE5 and fallback to KDE4UI there
Change-Id: I8da53d7b81d28b0051be96c0c4ee0a29d8ed8360
Reviewed-on: https://gerrit.libreoffice.org/12209
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 163d48e..e1f253d 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -272,6 +272,23 @@ static bool is_kde4_desktop( Display* pDisplay )
return false;
}
+static bool is_kde5_desktop( Display* pDisplay )
+{
+ if ( NULL != getenv( "KDE_FULL_SESSION" ) )
+ {
+ OUString aVer( "5" );
+
+ const char *pVer = getenv( "KDE_SESSION_VERSION" );
+ if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
+ return true;
+ }
+
+ if ( KDEVersion( pDisplay ) == 5 )
+ return true;
+
+ return false;
+}
+
extern "C"
{
@@ -285,6 +302,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
if ( aOver.equalsIgnoreAsciiCase( "tde" ) )
return DESKTOP_TDE;
+ if ( aOver.equalsIgnoreAsciiCase( "kde5" ) )
+ return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( "kde4" ) )
return DESKTOP_KDE4;
if ( aOver.equalsIgnoreAsciiCase( "gnome" ) )
@@ -371,6 +390,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment()
// these guys can be slower, with X property fetches,
// round-trips etc. and so are done later.
+ else if ( is_kde5_desktop( pDisplay ) )
+ ret = DESKTOP_KDE4;
else if ( is_kde4_desktop( pDisplay ) )
ret = DESKTOP_KDE4;
else if ( is_gnome_desktop( pDisplay ) )
--
cgit v0.10.2

167
libreoffice-4.3.0.3-themes-symlinks.patch
View File

@ -1,167 +0,0 @@
From c796db004d463cb60a5b4489a868ae8dd377d0df Mon Sep 17 00:00:00 2001
From: Tobias Lippert <drtl@fastmail.fm>
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

3
libreoffice-4.3.5.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78e6821a69f37b6c0c2c8d436aef24810d0a76b5d087ef95f6107a6bdbef2637
size 152786724

3
libreoffice-4.4.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea74ae13f48ca8b6ad81239f7488f2c27dc712abfd7338b79f855d2d02b84c87
size 162127896

216
libreoffice-boost-1.56.patch
View File

@ -1,216 +0,0 @@
From 45dfbdca6a9afba1a6aef21623ec025ded635a4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sonnenberger?= <joerg@NetBSD.org>
Date: Thu, 28 Aug 2014 12:18:43 +0200
Subject: Fix build with boost-1.56.0.
Change-Id: I61686bf61ff1e0561c385492c563e4495456ca47
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index eb33f8f..741dbb3 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -402,11 +402,12 @@ namespace cairocanvas
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
+ SurfaceSharedPtr surface(mpOwningSpriteCanvas->getBufferSurface());
::std::for_each( aUncoveredAreas.begin(),
aUncoveredAreas.end(),
::boost::bind( &repaintBackground,
boost::cref(pCompositingCairo),
- boost::cref(mpOwningSpriteCanvas->getBufferSurface()),
+ boost::cref(surface),
_1 ) );
cairo_rectangle( pWindowCairo.get(), 0, 0, rSize.getX(), rSize.getY() );
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 13ae629..e2ded77 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -573,12 +573,12 @@ namespace vclcanvas
// repaint all affected sprites on top of background into
// VDev.
+ ::basegfx::B2DPoint outPos( ::vcl::unotools::b2DPointFromPoint(aOutputPosition) );
::std::for_each( rSortedUpdateSprites.begin(),
rSortedUpdateSprites.end(),
::boost::bind( &spriteRedrawStub2,
::boost::ref( maVDev.get() ),
- ::boost::cref(
- ::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
+ ::boost::cref( outPos ),
_1 ) );
// flush to screen
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index d51d1bc..14f24e6 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1396,7 +1396,8 @@ void OTableController::assignTable()
setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) );
if(!isEditable())
{
- ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( sal_True )));
+ sal_Bool t( sal_True );
+ ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t )));
}
m_bNew = false;
// be notified when the table is in disposing
diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index e91f5b8..033434a 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -117,9 +117,9 @@ void applyTableStylePart( oox::drawingml::FillProperties& rFillProperties,
if (rTableStylePart.getTextColor().isUsed())
aTextCharProps.maCharColor = rTableStylePart.getTextColor();
if( rTableStylePart.getTextBoldStyle().is_initialized() )
- aTextCharProps.moBold = rTableStylePart.getTextBoldStyle();
+ aTextCharProps.moBold = *rTableStylePart.getTextBoldStyle();
if( rTableStylePart.getTextItalicStyle().is_initialized() )
- aTextCharProps.moItalic = rTableStylePart.getTextItalicStyle();
+ aTextCharProps.moItalic = *rTableStylePart.getTextItalicStyle();
}
void applyTableCellProperties( const Reference < ::com::sun::star::table::XCell >& rxCell, const TableCell& rTableCell )
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index db5eb0b..571095a 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1622,8 +1622,9 @@ void SAL_CALL OReportDefinition::switchToStorage( const uno::Reference< embed::X
m_pImpl->m_pObjectContainer->SwitchPersistence(m_pImpl->m_xStorage);
}
// notify our container listeners
+ OWeakObject *weakObjectThis = static_cast<OWeakObject*>(this);
m_pImpl->m_aStorageChangeListeners.forEach<document::XStorageChangeListener>(
- ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(static_cast<OWeakObject*>(this)),boost::cref(_xStorage)));
+ ::boost::bind(&document::XStorageChangeListener::notifyStorageChange,_1,boost::cref(weakObjectThis),boost::cref(_xStorage)));
}
uno::Reference< embed::XStorage > SAL_CALL OReportDefinition::getDocumentStorage( ) throw (io::IOException, uno::Exception, uno::RuntimeException, std::exception)
diff --git a/slideshow/source/engine/activities/activitybase.hxx b/slideshow/source/engine/activities/activitybase.hxx
index ec0d72b..52ac966 100644
--- a/slideshow/source/engine/activities/activitybase.hxx
+++ b/slideshow/source/engine/activities/activitybase.hxx
@@ -111,7 +111,7 @@ protected:
ShapeAttributeLayerSharedPtr getShapeAttributeLayer() const
{ return mpAttributeLayer; }
- bool isRepeatCountValid() const { return maRepeats; }
+ bool isRepeatCountValid() const { return bool(maRepeats); }
double getRepeatCount() const { return *maRepeats; }
bool isAutoReverse() const { return mbAutoReverse; }
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index c1513eb..3add12f 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -400,11 +400,12 @@ void RehearseTimingsActivity::viewsChanged()
{
// new sprite pos, transformation might have changed:
maSpriteRectangle = calcSpriteRectangle( maViews.front().first );
+ ::basegfx::B2DPoint rectMin( maSpriteRectangle.getMinimum() );
// reposition sprites
for_each_sprite( boost::bind( &cppcanvas::Sprite::move,
_1,
- boost::cref(maSpriteRectangle.getMinimum())) );
+ boost::cref( rectMin )) );
// sprites changed, need screen update
mrScreenUpdater.notifyUpdate();
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index f5de6d8..3d784d0 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -148,12 +148,13 @@ namespace slideshow
void AppletShape::implViewsChanged()
{
// resize all ViewShapes
+ ::basegfx::B2DRectangle bounds( AppletShape::getBounds() );
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::bind(
&ViewAppletShape::resize,
_1,
- ::boost::cref( AppletShape::getBounds())) );
+ ::boost::cref( bounds )) );
}
@@ -252,11 +253,12 @@ namespace slideshow
bool AppletShape::implStartIntrinsicAnimation()
{
+ ::basegfx::B2DRectangle bounds( getBounds() );
::std::for_each( maViewAppletShapes.begin(),
maViewAppletShapes.end(),
::boost::bind( &ViewAppletShape::startApplet,
_1,
- ::boost::cref( getBounds() )));
+ ::boost::cref( bounds )));
mbIsPlaying = true;
return true;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index b0f12fd..a3b89b7 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -168,6 +168,7 @@ namespace slideshow
}
// redraw all view shapes, by calling their update() method
+ ViewShape::RenderArgs renderArgs( getViewRenderArgs() );
if( ::std::count_if( maViewShapes.begin(),
maViewShapes.end(),
::boost::bind<bool>(
@@ -178,8 +179,7 @@ namespace slideshow
// the extra mem_fn. WTF.
_1,
::boost::cref( mpCurrMtf ),
- ::boost::cref(
- getViewRenderArgs() ),
+ ::boost::cref( renderArgs ),
nUpdateFlags,
isVisible() ) )
!= static_cast<ViewShapeVector::difference_type>(maViewShapes.size()) )
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index f50e84b..071fe60 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -125,12 +125,13 @@ namespace slideshow
void MediaShape::implViewsChanged()
{
// resize all ViewShapes
+ ::basegfx::B2DRectangle bounds( getBounds() );
::std::for_each( maViewMediaShapes.begin(),
maViewMediaShapes.end(),
::boost::bind(
&ViewMediaShape::resize,
_1,
- ::boost::cref( getBounds())) );
+ ::boost::cref( bounds )) );
}
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index a547997..0f27c8f 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -45,11 +45,12 @@ namespace slideshow
const UnoViewVector::iterator aEnd( maViews.end() );
// already added?
+ uno::Reference<presentation::XSlideShowView> xView (rView->getUnoView());
if( ::std::find_if( maViews.begin(),
aEnd,
::boost::bind(
::std::equal_to< uno::Reference< presentation::XSlideShowView > >(),
- ::boost::cref( rView->getUnoView() ),
+ ::boost::cref( xView ),
::boost::bind(
&UnoView::getUnoView,
_1 ) ) ) != aEnd )
--
cgit v0.10.2

3
libreoffice-help-4.3.5.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92
size 1852412

3
libreoffice-help-4.4.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a2cd9d3edc64f0c2971f15935102e902be43a041f5ad54e508df1a6b107a4b3d
size 1875508

3
libreoffice-translations-4.3.5.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc248f1f0f530427178df075443f15208ab1973f1a9a83191c1882a55c751b77
size 127017108

3
libreoffice-translations-4.4.0.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85ba40a14d30db885be8542f14fd31576cb8ef8d3f8f742a03a3e591b2451cdf
size 127303116

18
libreoffice.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sun Jan 4 15:51:42 UTC 2015 - tchvatal@suse.com
- Version bump to 4.4.0rc1:
* New 4.4 branch release with additional features
- Enable collada:
* New bundled collada2gltf tarball:
4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
- Obsoleted patches:
* jvmfwk-disable-gcj.diff
* libreoffice-4.3-plasma5-ui-decisions.patch
* libreoffice-4.3.0.3-themes-symlinks.patch
* office-cfg-linux-common-template-dir.diff
* libreoffice-boost-1.56.patch
- Refreshed patches:
* officecfg-help-in-usr-share.diff
* system-pyuno.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 18 18:39:02 UTC 2014 - tchvatal@suse.com Thu Dec 18 18:39:02 UTC 2014 - tchvatal@suse.com

60
libreoffice.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice # spec file for package libreoffice
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,10 +29,10 @@
%define numbertext_version 0.9.5 %define numbertext_version 0.9.5
# Urls # Urls
%define external_url http://dev-www.libreoffice.org/src/ %define external_url http://dev-www.libreoffice.org/src/
%define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.5 %define tarball_url http://download.documentfoundation.org/libreoffice/src/4.4.0
# This is used due to the need for beta releases # This is used due to the need for beta releases
Name: libreoffice Name: libreoffice
Version: 4.3.5.2 Version: 4.4.0.1
Release: 0 Release: 0
Summary: A Free Office Suite (Framework) 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 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
@ -66,33 +66,23 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
# Needed for wiki-published and always taken as bundled # Needed for wiki-published and always taken as bundled
Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
# Currently not possible to unbundle, sucks
Source2006: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
# search help icons in %{_prefix}/share # search help icons in %{_prefix}/share
# FIXME: make it configurable in integrate into git # FIXME: make it configurable in integrate into git
Patch3: officecfg-help-in-usr-share.diff Patch0: officecfg-help-in-usr-share.diff
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream # FIXME: make it configurable and push upstream
Patch5: scp2-user-config-suse.diff Patch1: scp2-user-config-suse.diff
# pack new desktop files # pack new desktop files
Patch6: pack-desktop-files-for-optional-filters.diff Patch2: pack-desktop-files-for-optional-filters.diff
# As the patch2 and usr share search is broken we can't do this anymore
# search libreoffice/share/template/common for language independent templates
# FIXME: make it configurable to push upstream
Patch9: office-cfg-linux-common-template-dir.diff
# correctly bootstrap python stuff with system python (deb#501028, i#90701) # correctly bootstrap python stuff with system python (deb#501028, i#90701)
Patch10: system-pyuno.diff Patch3: system-pyuno.diff
# do not use the broken help; unopkg complained about it when registering extensions # do not use the broken help; unopkg complained about it when registering extensions
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch11: nlpsolver-no-broken-help.diff Patch4: nlpsolver-no-broken-help.diff
Patch12: mediawiki-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff
# LO never worked well with it
Patch13: jvmfwk-disable-gcj.diff
Patch14: libreoffice-4.3.0.3-themes-symlinks.patch
# PATCH-FIX-UPSTREAM: detect properly kde5 and allow kde4 ui there; will be in 4.4 series
Patch16: libreoffice-4.3-plasma5-ui-decisions.patch
# PATCH-FIX-UPSTREAM libreoffice-boost-1.56.patch
# http://cgit.freedesktop.org/libreoffice/core/commit/?id=45dfbdca6a9afba1a6aef21623ec025ded635a4d
Patch17: libreoffice-boost-1.56.patch
# try to save space by using hardlinks # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
BuildRequires: ImageMagick BuildRequires: ImageMagick
@ -165,6 +155,7 @@ BuildRequires: libmysqlclient-devel
BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libmysqlcppconn-devel >= 1.0.6
BuildRequires: libodfgen-devel BuildRequires: libodfgen-devel
BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: liborcus-devel >= 0.7.0
BuildRequires: libpagemaker-devel
BuildRequires: libpoppler-devel BuildRequires: libpoppler-devel
BuildRequires: libredland-devel BuildRequires: libredland-devel
BuildRequires: librepository BuildRequires: librepository
@ -185,6 +176,7 @@ BuildRequires: mozilla-nss-devel
BuildRequires: mythes-devel BuildRequires: mythes-devel
BuildRequires: neon-devel BuildRequires: neon-devel
BuildRequires: npapi-sdk BuildRequires: npapi-sdk
BuildRequires: openCOLLADA-devel
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: patch BuildRequires: patch
@ -859,17 +851,12 @@ Provides additional %{langname} translations and resources for %{project}. \
%prep %prep
%setup -q -b1 -b2 %setup -q -b1 -b2
%patch0 -p1
%patch1
%patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4
%patch5 %patch5
%patch6 -p1
%patch9 -p1
%patch10 -p1
%patch11
%patch12
%patch13 -p1
%patch14 -p1
%patch16 -p1
%patch17 -p1
%patch990 -p1 %patch990 -p1
# 256x256 icons # 256x256 icons
tar -xjf %{SOURCE20} tar -xjf %{SOURCE20}
@ -931,6 +918,10 @@ CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS
# 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'
# Whack in our python3 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. # which is quite nightmare.
export PYTHON=%{_bindir}/python3 export PYTHON=%{_bindir}/python3
@ -942,6 +933,7 @@ export NOCONFIGURE=yes
./autogen.sh ./autogen.sh
%configure \ %configure \
$PARALLEL_BUILD \ $PARALLEL_BUILD \
--enable-mergelibs \
--docdir=%{_docdir}/%{name} \ --docdir=%{_docdir}/%{name} \
--with-compat-oowrappers \ --with-compat-oowrappers \
--with-system-headers \ --with-system-headers \
@ -983,7 +975,7 @@ export NOCONFIGURE=yes
--with-doxygen \ --with-doxygen \
--enable-gtk3 \ --enable-gtk3 \
--enable-kde4 \ --enable-kde4 \
--enable-gstreamer \ --enable-gstreamer-1-0 \
--enable-evolution2 \ --enable-evolution2 \
--enable-lockdown \ --enable-lockdown \
--enable-dbus \ --enable-dbus \
@ -996,7 +988,6 @@ export NOCONFIGURE=yes
--enable-scripting-beanshell \ --enable-scripting-beanshell \
--enable-scripting-javascript \ --enable-scripting-javascript \
--enable-telepathy \ --enable-telepathy \
--enable-opengl \
%if %{with vlc} %if %{with vlc}
--enable-vlc \ --enable-vlc \
%endif %endif
@ -1005,12 +996,11 @@ export NOCONFIGURE=yes
--disable-ccache \ --disable-ccache \
--enable-gltf --with-system-libgltf \ --enable-gltf --with-system-libgltf \
--disable-coinmp \ --disable-coinmp \
--disable-collada --enable-collada --with-system-opencollada
# disable collada as we can't use system libs yet
# no coinormp packages for coinmp # no coinormp packages for coinmp
# hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) # 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 sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py
# just call make here as we added the jobs in configure # just call make here as we added the jobs in configure
make build-nocheck make build-nocheck

28
office-cfg-linux-common-template-dir.diff
View File

@ -1,28 +0,0 @@
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu
--- libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Common.xcu 2013-12-30 11:24:13.235021217 +0100
+++ libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Common.xcu 2014-01-01 14:21:15.331016368 +0100
@@ -703,4 +703,6 @@
<value oor:external="com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
</prop>
</node>
+ <!-- FIXME: This comment is needed to change a checksum or so.
+ Then the updated list of templates paths is read from Common.xcs-->
</oor:component-data>
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
--- libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-12-30 11:24:13.232021217 +0100
+++ libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2014-01-01 14:22:32.801009186 +0100
@@ -1667,6 +1667,14 @@
<value>
<it>$(insturl)/@LIBO_SHARE_FOLDER@/template/$(vlang)</it>
<it>$(insturl)/@LIBO_SHARE_FOLDER@/template/common</it>
+ <it>file:///usr/share/templates/libreoffice/common</it>
+ <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
+ <it>file:///usr/share/templates/ooo/common</it>
+ <it>file:///usr/share/templates/ooo/$(vlang)</it>
+ <it>file:///usr/share/templates/libreoffice/common</it>
+ <it>file:///usr/share/templates/libreoffice/$(vlang)</it>
+ <it>file:///usr/share/templates/ooo/common</it>
+ <it>file:///usr/share/templates/ooo/$(vlang)</it>
<it>$(userurl)/template</it>
</value>
</prop>

28
officecfg-help-in-usr-share.diff
View File

@ -1,33 +1,35 @@
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu Index: libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
--- libreoffice-4.2.0.1.old/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2013-12-30 11:24:13.235021217 +0100 ===================================================================
+++ libreoffice-4.2.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu 2014-01-01 14:16:37.708042106 +0100 --- libreoffice-4.4.0.1.orig/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
</node> </node>
<node oor:name="Help" oor:op="fuse" oor:mandatory="true"> <node oor:name="Help" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths"> <node oor:name="InternalPaths">
- <node oor:name="$(instpath)/help" oor:op="fuse"/> - <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/>
+ <node oor:name="/usr/share/help" oor:op="fuse"/> + <node oor:name="/usr/share/help" oor:op="fuse"/>
</node> </node>
</node> </node>
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
diff -urN libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs Index: libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
--- libreoffice-4.2.0.1.old/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2013-12-30 11:24:13.232021217 +0100 ===================================================================
+++ libreoffice-4.2.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2014-01-01 14:16:37.710042106 +0100 --- libreoffice-4.4.0.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1613,7 +1613,7 @@ +++ libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1615,7 +1615,7 @@
<info> <info>
<desc>Specifies the path to the Office help files.</desc> <desc>Specifies the path to the Office help files.</desc>
</info> </info>
- <value>$(instpath)/help</value> - <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
+ <value>/usr/share/libreoffice/help</value> + <value>/usr/share/help</value>
</prop> </prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info> <info>
@@ -1808,7 +1808,7 @@ @@ -1810,7 +1810,7 @@
<desc>Specifies the default directory where Office help files are <desc>Specifies the default directory where Office help files are
located.</desc> located.</desc>
</info> </info>
- <value>$(instpath)/help</value> - <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
+ <value>/usr/share/libreoffice/help</value> + <value>/usr/share/help</value>
</prop> </prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false"> <prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info> <info>

6
system-pyuno.diff
View File

@ -27,9 +27,9 @@ diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/module/uno.py libreoffice-4
import pyuno import pyuno
try: try:
diff -urN libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py diff -urN libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py
--- libreoffice-4.0.0.0.beta2.old/scripting/source/pyprov/officehelper.py 2012-12-19 19:09:46.868989508 +0100 --- libreoffice-4.0.0.0.beta2.old/pyuno/source/officehelper.py 2012-12-19 19:09:46.868989508 +0100
+++ libreoffice-4.0.0.0.beta2/scripting/source/pyprov/officehelper.py 2012-12-19 19:10:21.810986269 +0100 +++ libreoffice-4.0.0.0.beta2/pyuno/source/officehelper.py 2012-12-19 19:10:21.810986269 +0100
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
if "UNO_PATH" in os.environ: if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"] sOffice = os.environ["UNO_PATH"]