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

Accepting request 242433 from LibreOffice:Factory

Browse Source 
- Try to finish out the py3 migration.
- Remove now not needed patch:
  * wizards-create-temlates-with-python-2.6.diff

OBS-URL: https://build.opensuse.org/request/show/242433
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=69
This commit is contained in:
Stephan Kulow 2014-07-27 16:47:10 +00:00 committed by Git OBS Bridge
commit f43ae727dc
11 changed files with 511 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
kde4-4.2.3.3-timer-mutex.patch
View File

@ -1,71 +0,0 @@
From 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Tue, 25 Mar 2014 11:20:16 +0000
Subject: prevent KDE/Qt from interfering with the session manager
I occassionally get lockups in IceProcessMessages() called from QtCore,
I'm actually not exactly sure why, as theoretically two connections
from one app shouldn't be a problem, but since LO does its own
session handling, there's no need to the KDE/Qt code to be involved,
so prevent it from connecting to the session manager altogether.
Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b
---
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 820d39a..e4900a7 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -166,8 +166,23 @@ void KDEXLib::Init()
KCmdLineArgs::init( m_nFakeCmdLineArgs, m_pAppCmdLineArgs, kAboutData );
+ // LO does its own session management, so prevent KDE/Qt from interfering
+ // (QApplication::disableSessionManagement(false) wouldn't quite do,
+ // since that still actually connects to the session manager, it just
+ // won't save the application data on session shutdown).
+ char* session_manager = NULL;
+ if( getenv( "SESSION_MANAGER" ) != NULL )
+ {
+ session_manager = strdup( getenv( "SESSION_MANAGER" ));
+ unsetenv( "SESSION_MANAGER" );
+ }
m_pApplication = new VCLKDEApplication();
- kapp->disableSessionManagement();
+ if( session_manager != NULL )
+ {
+ setenv( "SESSION_MANAGER", session_manager, 1 );
+ free( session_manager );
+ }
+
KApplication::setQuitOnLastWindowClosed(false);
#if KDE_HAVE_GLIB
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 412ee34..4ce0b2c 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -21,22 +21,14 @@
#define Region QtXRegion
-#include <QSessionManager>
-
#include <kapplication.h>
#undef Region
-/* #i59042# override KApplications method for session management
- * since it will interfere badly with our own.
- */
class VCLKDEApplication : public KApplication
{
public:
VCLKDEApplication();
-
- virtual void commitData(QSessionManager&) {};
-
virtual bool x11EventFilter(XEvent* event);
};
--
cgit v0.9.0.2-2-gbebe

3
libreoffice-4.2.4.2.tar.xz
View File

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

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

@ -0,0 +1,167 @@
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.0.3.tar.xz Normal file
View File

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

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

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

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

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

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

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

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

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

200
libreoffice.changes
View File

@ -1,3 +1,203 @@
-------------------------------------------------------------------
Thu Jul 24 08:33:07 UTC 2014 - tchvatal@suse.com
- 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 - tchvatal@suse.com
- Add patch to fix the themes/icons handling:
* libreoffice-4.3.0.3-themes-symlinks.patch
-------------------------------------------------------------------
Mon Jul 21 06:58:44 UTC 2014 - tchvatal@suse.com
- Version bump to 4.3.0.3:
* Various small bugfixes.
-------------------------------------------------------------------
Sun Jul 20 15:29:03 UTC 2014 - arnaud.versini@gmail.com
- Use Python3 instead of Python 2 for pyuno.
-------------------------------------------------------------------
Fri Jul 11 08:26:26 UTC 2014 - tchvatal@suse.com
- Add rpmlintrc to sources.
-------------------------------------------------------------------
Thu Jul 3 11:21:45 UTC 2014 - tchvatal@suse.com
- 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 - tchvatal@suse.com
- Install missing libsaxlo. Hacked for now, upstream notified.
-------------------------------------------------------------------
Tue Jun 24 10:47:32 UTC 2014 - tchvatal@suse.com
- Add patch to fix unfilelisted files:
* 0001-Package-filter-in-common-pack.patch
-------------------------------------------------------------------
Mon Jun 23 11:11:03 UTC 2014 - tchvatal@suse.com
- Version bump to 4.3.0.1:
* Buildfix with new glm
* Various fixes.
-------------------------------------------------------------------
Fri Jun 20 19:03:50 UTC 2014 - tchvatal@suse.com
- More languages got autotext. Reflect that.
-------------------------------------------------------------------
Fri Jun 20 07:25:57 UTC 2014 - tchvatal@suse.com
- Remove no longer provided files from list of artworky things.
-------------------------------------------------------------------
Tue Jun 17 09:17:10 UTC 2014 - tchvatal@suse.com
- Version the glew dependency.
-------------------------------------------------------------------
Mon Jun 16 10:39:01 UTC 2014 - tchvatal@suse.com
- 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 - tchvatal@suse.com
- Add patch from upstream fix-python-wizzards.patch to fix crashing
python wizzards ; bnc#881294
-------------------------------------------------------------------
Tue Jun 3 07:12:10 UTC 2014 - tchvatal@suse.com
- Typo in desc stating there is libreoffice-kde which is not anymore.
-------------------------------------------------------------------
Fri May 30 09:55:57 UTC 2014 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- bnc#875717 - LO-L3: DOCX import: font size of numbering is bigger
* direct-format-numbering.patch
-------------------------------------------------------------------
Fri May 30 09:21:31 UTC 2014 - andras.timar@collabora.com
- bnc#875718 - LO-L3: DOCX import: extra page numbers
* discard-more-header-footer-stuff.patch
-------------------------------------------------------------------
Fri May 30 07:33:54 UTC 2014 - andras.timar@collabora.com
- Security update CVE-2014-0247
* Use-varying-aElement-name.patch
-------------------------------------------------------------------
Fri May 23 18:49:38 UTC 2014 - andras.timar@collabora.com
- bnc#467278: let the previous fix work under KDE4, too
* VBA-macro-modification-warning.diff
-------------------------------------------------------------------
Thu May 22 15:53:29 UTC 2014 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- bnc#875712 - LO-L3: DOC import: picture brigtness/contrast not imported
* doc-brightness-contrast.diff
-------------------------------------------------------------------
Tue May 20 08:05:13 UTC 2014 - andras.timar@collabora.com
- bnc#870240 - LO-L3: pptx import file has text rotated on slide
* fix-text-rotation.diff
-------------------------------------------------------------------
Tue May 20 07:55:57 UTC 2014 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- bnc#870228 - LO-L3: Text inside the circle is not centered
* text-alignment-in-shape.diff
-------------------------------------------------------------------
Tue May 20 07:38:00 UTC 2014 - andras.timar@collabora.com
- 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 - andras.timar@collabora.com
- fix build on openSUSE 12.3:
* disable-firebird-unit-test.diff
-------------------------------------------------------------------
Fri May 16 10:20:00 UTC 2014 - andras.timar@collabora.com
- fix build on openSUSE 12.3:
* 0001-std-strlen-requires-cstring-include-to-build.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 6 19:58:50 UTC 2014 - tchvatal@suse.com Tue May 6 19:58:50 UTC 2014 - tchvatal@suse.com

83
libreoffice.spec
View File

@ -29,9 +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.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 Name: libreoffice
Version: 4.2.4.2 Version: 4.3.0.3
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
@ -40,6 +41,7 @@ Url: http://www.documentfoundation.org/
Source0: %{tarball_url}/libreoffice-%{version}.tar.xz Source0: %{tarball_url}/libreoffice-%{version}.tar.xz
Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz Source1: %{tarball_url}/libreoffice-help-%{version}.tar.xz
Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz Source2: %{tarball_url}/libreoffice-translations-%{version}.tar.xz
Source99: %{name}-rpmlintrc
# 256x256 desktop icons (bnc#722644) # 256x256 desktop icons (bnc#722644)
Source20: libreoffice-desktop-icons-256x256.tar.bz2 Source20: libreoffice-desktop-icons-256x256.tar.bz2
# Prebuilt sofficerc for the noarch upstream branding package # Prebuilt sofficerc for the noarch upstream branding package
@ -83,12 +85,9 @@ Patch10: system-pyuno.diff
# 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 Patch11: nlpsolver-no-broken-help.diff
Patch12: mediawiki-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 Patch13: jvmfwk-disable-gcj.diff
# Fix running wizzards in py2 as the utf is not htere Patch14: libreoffice-4.3.0.3-themes-symlinks.patch
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
# 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
@ -115,6 +114,8 @@ BuildRequires: flac-devel
BuildRequires: flex BuildRequires: flex
BuildRequires: flute BuildRequires: flute
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: glew-devel >= 1.10.0
BuildRequires: glm-devel
BuildRequires: glu-devel BuildRequires: glu-devel
BuildRequires: gnome-vfs2-devel BuildRequires: gnome-vfs2-devel
BuildRequires: gperf BuildRequires: gperf
@ -157,7 +158,7 @@ BuildRequires: libmwaw-devel
BuildRequires: libmysqlclient-devel 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.5.0 BuildRequires: liborcus-devel >= 0.7.0
BuildRequires: libpoppler-devel BuildRequires: libpoppler-devel
BuildRequires: libredland-devel BuildRequires: libredland-devel
BuildRequires: librepository BuildRequires: librepository
@ -187,9 +188,9 @@ BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib BuildRequires: perl-Compress-Zlib
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: procps BuildRequires: procps
BuildRequires: python-devel BuildRequires: python3-devel
BuildRequires: python-lxml BuildRequires: python3-lxml
BuildRequires: python-xml BuildRequires: python3-xml
BuildRequires: recode BuildRequires: recode
BuildRequires: rhino BuildRequires: rhino
BuildRequires: sac BuildRequires: sac
@ -204,11 +205,12 @@ BuildRequires: xorg-x11
BuildRequires: xorg-x11-fonts BuildRequires: xorg-x11-fonts
BuildRequires: xz BuildRequires: xz
BuildRequires: zip BuildRequires: zip
BuildRequires: pkgconfig(fbclient) BuildRequires: pkgconfig(fbembed)
Requires: libreoffice-branding >= 4.0 Requires: libreoffice-branding >= 4.0
Requires: libreoffice-icon-themes = %{version} Requires: libreoffice-icon-themes = %{version}
# We need at least english to launch ourselves. # We need at least english to launch ourselves.
Requires: libreoffice-l10n-en = %{version} Requires: libreoffice-l10n-en = %{version}
Requires: python3
Requires(post): coreutils Requires(post): coreutils
Requires(post): grep Requires(post): grep
Requires(post): gtk2 Requires(post): gtk2
@ -264,7 +266,7 @@ Some optional features are provided by extra packages, for example:
- libreoffice-mailmerge - libreoffice-mailmerge
- libreoffice-filters - libreoffice-filters
- libreoffice-kde - libreoffice-kde4
- libreoffice-gnome - libreoffice-gnome
Non-English localizations are provided by extra packages as well, for Non-English localizations are provided by extra packages as well, for
@ -768,7 +770,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l bg -n Bulgarian -T -X -m bg_BG %langpack -l bg -n Bulgarian -T -X -m bg_BG
%langpack -l bn -n Bengali -T -m bn_BD %langpack -l bn -n Bengali -T -m bn_BD
%langpack -l br -n Breton -m br_FR %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 cs -n Czech -T -X -m cs_CZ
%langpack -l cy -n Welsh %langpack -l cy -n Welsh
%langpack -l da -n Danish -T -X -m da_DK %langpack -l da -n Danish -T -X -m da_DK
@ -779,22 +781,22 @@ Provides additional %{langname} translations and resources for %{project}. \
%langpack -l es -n Spanish -M -T -X %langpack -l es -n Spanish -M -T -X
%langpack -l et -n Estonian -T -m et_EE %langpack -l et -n Estonian -T -m et_EE
%langpack -l eu -n Basque -T %langpack -l eu -n Basque -T
%langpack -l fa -n Farsi -s ctl %langpack -l fa -n Farsi -s ctl -X
%langpack -l fi -n Finnish -r libreoffice-voikko -T %langpack -l fi -n Finnish -r libreoffice-voikko -T -X
%langpack -l fr -n French -T -X -m fr_FR %langpack -l fr -n French -T -X -m fr_FR
%langpack -l ga -n Irish %langpack -l ga -n Irish
%langpack -l gl -n Galician -T -M %langpack -l gl -n Galician -T -M
%langpack -l gu -n Gujarati -s ctl -T -p gu-IN -m gu_IN %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 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 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 hu -n Hungarian -T -X -m hu_HU
%langpack -l it -n Italian -T -X -m it_IT %langpack -l it -n Italian -T -X -m it_IT
%langpack -l ja -n Japanese -s cjk -T -X %langpack -l ja -n Japanese -s cjk -T -X
%langpack -l kk -n Kazakh %langpack -l kk -n Kazakh
%langpack -l kn -n Kannada %langpack -l kn -n Kannada
%langpack -l ko -n Korean -s cjk -T -c korea -X %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 lv -n Latvian -m lv_LV
%langpack -l mai -n Maithili %langpack -l mai -n Maithili
%langpack -l ml -n Malayalam %langpack -l ml -n Malayalam
@ -812,7 +814,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%define langpack_lang Brazilian Portuguese %define langpack_lang Brazilian Portuguese
%langpack -l pt-BR -n %{langpack_lang} -m pt_BR -p pt_BR -T -X %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 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 ru -n Russian -T -X -m ru_RU
%langpack -l si -n Sinhalese -S ctl -T -m si_LK %langpack -l si -n Sinhalese -S ctl -T -m si_LK
%langpack -l sk -n Slovak -T -X -m sk_SK %langpack -l sk -n Slovak -T -X -m sk_SK
@ -839,7 +841,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%undefine langpack_lang %undefine langpack_lang
%prep %prep
%setup -q -b1 -b2 -n libreoffice-%{version} %setup -q -b1 -b2
%patch3 -p1 %patch3 -p1
%patch5 %patch5
%patch6 -p1 %patch6 -p1
@ -848,8 +850,7 @@ Provides additional %{langname} translations and resources for %{project}. \
%patch11 %patch11
%patch12 %patch12
%patch13 -p1 %patch13 -p1
%patch16 -p1 %patch14 -p1
%patch18 -p1
%patch990 -p1 %patch990 -p1
# 256x256 icons # 256x256 icons
tar -xjf %{SOURCE20} tar -xjf %{SOURCE20}
@ -907,11 +908,11 @@ CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS 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. # which is quite nightmare.
export PYTHON=%{_bindir}/python2 export PYTHON=%{_bindir}/python3
export PYTHON_CFLAGS=`pkg-config --cflags python2` export PYTHON_CFLAGS=`pkg-config --cflags python3`
export PYTHON_LIBS=`pkg-config --libs python2` export PYTHON_LIBS=`pkg-config --libs python3`
# do not run configure in autogen but use macro later # do not run configure in autogen but use macro later
export NOCONFIGURE=yes export NOCONFIGURE=yes
@ -947,7 +948,6 @@ export NOCONFIGURE=yes
--enable-python=system \ --enable-python=system \
--enable-randr \ --enable-randr \
--enable-randr-link \ --enable-randr-link \
--without-afms \
--without-fonts \ --without-fonts \
--without-myspell-dicts \ --without-myspell-dicts \
--with-jdk-home=$JAVA_HOME \ --with-jdk-home=$JAVA_HOME \
@ -980,7 +980,10 @@ export NOCONFIGURE=yes
%endif %endif
--enable-neon \ --enable-neon \
--with-system-ucpp \ --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) # 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 scripting/source/pyprov/officehelper.py
@ -995,6 +998,10 @@ make slowcheck
%install %install
make DESTDIR=%{buildroot} distro-pack-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 # update desktop files
builddir=`pwd` builddir=`pwd`
@ -1086,12 +1093,7 @@ echo "%{_datadir}/%{name}/program/shell" >> file-lists/branding_upstream.txt
for file in sofficerc \ for file in sofficerc \
intro.png \ intro.png \
flat_logo.svg \ flat_logo.svg \
shell/about.svg \ shell/about.svg ; do
shell/backing_left.png \
shell/backing_right.png \
shell/backing_rtl_left.png \
shell/backing_rtl_right.png \
shell/backing_space.png ; do
mv "%{buildroot}%{_libdir}/%{name}/program/$file" "%{buildroot}%{_datadir}/%{name}/program/$file" mv "%{buildroot}%{_libdir}/%{name}/program/$file" "%{buildroot}%{_datadir}/%{name}/program/$file"
ln -sf "%{_datadir}/%{name}/program/$file" "%{buildroot}/%{_libdir}/%{name}/program/$file" ln -sf "%{_datadir}/%{name}/program/$file" "%{buildroot}/%{_libdir}/%{name}/program/$file"
echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt
@ -1119,9 +1121,9 @@ for file in $files; do
done done
# Symlink uno.py and unohelper.py so that python can find them # Symlink uno.py and unohelper.py so that python can find them
mkdir -p %{buildroot}%{python_sitelib} mkdir -p %{buildroot}%{python3_sitelib}
ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python_sitelib}/uno.py ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py
ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python_sitelib}/unohelper.py ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py
# Remove translations source as we need more space # Remove translations source as we need more space
rm -rf translations/source/ rm -rf translations/source/
@ -1224,7 +1226,6 @@ fi
%exclude %{_datadir}/%{name}/program/sofficerc %exclude %{_datadir}/%{name}/program/sofficerc
%exclude %{_datadir}/%{name}/program/flat_logo.svg %exclude %{_datadir}/%{name}/program/flat_logo.svg
%exclude %{_datadir}/%{name}/program/*.png %exclude %{_datadir}/%{name}/program/*.png
%exclude %{_datadir}/%{name}/program/shell/*.png
%exclude %{_datadir}/%{name}/program/shell/*.svg %exclude %{_datadir}/%{name}/program/shell/*.svg
# such a big icons are not provided by other packages # such a big icons are not provided by other packages
# FIXME: last time checked on openSUSE-12.2 # FIXME: last time checked on openSUSE-12.2
@ -1261,8 +1262,8 @@ fi
%files -f file-lists/pyuno_list.txt pyuno %files -f file-lists/pyuno_list.txt pyuno
%defattr(-,root,root) %defattr(-,root,root)
%{python_sitelib}/uno.py %{python3_sitelib}/uno.py
%{python_sitelib}/unohelper.py %{python3_sitelib}/unohelper.py
%files -f file-lists/gnome_list.txt gnome %files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root) %defattr(-,root,root)
@ -1305,6 +1306,8 @@ fi
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share
%dir %{_datadir}/%{name}/share/config %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 %{_datadir}/%{name}/share/config/images.zip
%files icon-theme-hicontrast %files icon-theme-hicontrast

45
wizards-create-temlates-with-python-2.6.diff
View File

@ -1,45 +0,0 @@
diff -urN libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py
--- libreoffice-4.2.0.1.old/wizards/com/sun/star/wizards/common/SystemDialog.py 2013-12-30 11:24:14.200021127 +0100
+++ libreoffice-4.2.0.1/wizards/com/sun/star/wizards/common/SystemDialog.py 2014-01-01 14:34:21.173943513 +0100
@@ -15,6 +15,7 @@
# except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
+import locale
import traceback
from .Desktop import Desktop
@@ -140,6 +141,24 @@
traceback.print_exc()
'''
+ The original string is in the system encoding but str accepts only "ascii" in python 2.6
+ This hack is not needed with python-3.0
+ '''
+ def createStr(self, sString):
+ try:
+ strString = str(sString)
+
+ except:
+ try:
+ sCodeSet = locale.nl_langinfo(locale.CODESET)
+ except:
+ sCodeSet = "utf-8"
+
+ strString = str(sString.encode(sCodeSet))
+
+ return strString
+
+ '''
note the result should go through conversion of the product name.
@param filterName
@return the UI localized name of the given filter name.
@@ -153,7 +172,7 @@
xPropertyValue = list(oObject)
for i in xPropertyValue:
if i is not None and i.Name == "UIName":
- return str(i.Value).replace("%productname%", "LibreOffice")
+ return self.createStr(i.Value).replace("%productname%", "LibreOffice")
raise NullPointerException(
"UIName property not found for Filter " + filterName);