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

Accepting request 175584 from LibreOffice:Unstable

Browse Source 
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)

OBS-URL: https://build.opensuse.org/request/show/175584
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=33
This commit is contained in:
Petr Mladek 2013-05-14 15:51:01 +00:00 committed by Git OBS Bridge
parent 11a530a46c
commit c5b436d6b3
39 changed files with 289 additions and 1433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcdr-0.0.11.tar.bz2
View File

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

3
libcdr-0.0.13.tar.bz2 Normal file
View File

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

3
libreoffice-4.0.2.2.1.tar.xz
View File

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

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

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

5
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-branding-upstream.spec
View File

@ -18,7 +18,7 @@
Name: libreoffice-branding-upstream
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define lo_home libreoffice
Summary: Original Branding for LibreOffice

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

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

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

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

5
libreoffice-help-en-US.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-en-US.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-en-US
## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

2
libreoffice-help-en-US.spec.in
View File

@ -18,7 +18,7 @@
Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-help-group1.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-group1.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group1
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-help-group2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-group2.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group2
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-help-group3.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-group3.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group3
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-help-group4.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-group4.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group4
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-help-group5.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-help-group5.spec
View File

@ -22,7 +22,7 @@ Name: libreoffice-help-group5
## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
###################################################################
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

2
libreoffice-help-groupX.spec.in
View File

@ -18,7 +18,7 @@
Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define gnu_make_version 3.82
%define gnu_make_snapshot 20120301

5
libreoffice-icon-themes.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-icon-themes.spec
View File

@ -18,7 +18,7 @@
Name: libreoffice-icon-themes
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define ooo_home libreoffice
BuildRequires: libreoffice-icon-themes-prebuilt = %version

5
libreoffice-l10n.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
-------------------------------------------------------------------
Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com

2
libreoffice-l10n.spec
View File

@ -22,7 +22,7 @@
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
###################################################################
Name: libreoffice-l10n
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define piece l10n
%define ooo_home libreoffice

2
libreoffice-l10n.spec.in
View File

@ -18,7 +18,7 @@
@DO_NOT_EDIT_COMMENT@
Name: libreoffice-l10n
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
%define piece l10n
%define ooo_home libreoffice

1341
libreoffice-poppler-0.17.0-reject-fix.diff
View File

File diff suppressed because it is too large Load Diff

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

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

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

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

81
libreoffice.changes
View File

@ -1,3 +1,84 @@
-------------------------------------------------------------------
Tue May 14 09:41:34 UTC 2013 - pmladek@suse.com
- wizards-create-temlates-with-python-2.6.diff: Letter and Fax templates
can't be created by python-2.6 if ODF file type description uses
non-ASCII characters
- office-cfg-linux-common-template-dir.diff: keep the default system
paths first; the Agenda wizard is not found, otherwise
-------------------------------------------------------------------
Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com
- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3)
* lots crasher fixes
* add mono support again
* lots other import/export fixes
* added and fixed various VBA API
* FileDateTime function (fdo#63306)
* broken word completion (fdo#62643)
* broken YEARFRAC function (fdo#40100)
* legacy diagram PPTX import (bnc#699334)
* animations inside SmartArt (bnc#705982)
* cut/copy icons in Basic IDE (fdo#30545)
* table layout in DOCX import (bnc#780645)
* VBA macro fails in PageSetUp (bnc#813528)
* Firefox plugin not recognized (fdo#54087)
* decimal and group separators were swapped
* no sound with statement "beep" (fdo#58807)
* shapes location in DOCX import (bnc#816583)
* search is always case sensitive (fdo#63779)
* unable to save on Samba via GVFS (fdo#54275)
* slide show mode inverts outputs (rhbz#906137)
* reorder toolbars in formula editor (fdo#63350)
* wrong bullet color in PPTX import (bnc#719988)
* splitting a table options are mixed (fdo#62670)
* pull-down selections in DOCX import (bnc#779630)
* shape with background in XLSX import (bnc#798309)
* autocorrect options can not be closed (fdo#57905)
* import of scattered and bubble charts (bnc#810508)
* transparent background in EMF+ import (bnc#812793)
* wrong background color in PPTX import (bnc#734733)
* allow to use more than 3 sort criteria (fdo#51828)
* 'Personas' are called 'Themes' and changed location
* frame's background color in DOCX import (bnc#592908)
* bullet points are not indented correctly (bnc#793414)
* axis labels with percentage in PPTX import (bnc#813291)
* do not freeze in picture dialog without JRE (fdo#57553)
* better fix for default PDF export directory (bnc#777788)
* implement easy access to the recent documents (bnc#816516)
* really use the setting how to follow hyperlinks (fdo#51296)
* keep migrating user extensions after one failed (deb#703486)
* support MS Office and Flat ODF file types in Mozilla plug-in
* impossible to assign a macro to a drawing or picture (fdo#62797)
* VBA macro fails with error "Incorrect Property Value" (bnc#809017)
* broken surrounding text support (STS) for Input Methods (fdo#63802)
* VBA macro fails with "objCmd.ActiveConnection = Nothing" (bnc#805071)
* several template manager fixes (fdo#60581, fdo#60844, fdo#61389,
fdo#61390)
* several Base Report Builder fixes (fdo#33091, fdo#36858, fdo#48056,
fdo#61564, i#112652, i#108092)
* several RTL support fixes (fdo#33302, fdo#38951, fdo#59117, fdo#60533,
fdo#60554, fdo#60855, fdo#62050, fdo#62143, fdo#62399, fdo#63878,
fdo#37464, fdo#59892)
- update libvisio to version 0.0.26:
* extend the encoding support
* several other fixes and improvements
- update libcdr to version 0.0.13:
* text color, CDR, txsm, and other fixes
- removed obsolete patches:
* touch-no-dereference.diff
* libreoffice-poppler-0.17.0-reject-fix.diff
- system-poppler-0.12.3.diff: easier approach to build with system
poppler, version 0.12.3
- enable mono build again
-------------------------------------------------------------------
Thu May 9 15:08:37 UTC 2013 - pmladek@suse.com
- use --enable-gstreamer-0-10 configure option to make sure that
we use the stable implementation
-------------------------------------------------------------------
Fri Apr 19 11:32:28 UTC 2013 - pmladek@suse.com

24
libreoffice.spec
View File

@ -156,7 +156,7 @@ BuildRequires: python-lxml
%define test_build_sdk 1
# build_mono: 1 = yes
# 0 = no (pack just a README file)
%define build_mono 0
%define build_mono 1
# save_space: 0 = no
# 1 = yes (do some hacks to safe space in the installation phase)
%define save_space 1
@ -203,7 +203,7 @@ BuildRequires: python-lxml
%define ct2n_version 1.3.2
%define gdocs_version 3.0.1
%define numbertext_version 0.9.5
Version: 4.0.2.2.1
Version: 4.0.3.3.2
Release: 0
Requires: libreoffice-branding >= 4.0
Requires: libreoffice-icon-themes = %version
@ -556,12 +556,12 @@ Source1038: d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
Source1041: b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
Source1042: libvisio-0.0.25.tar.bz2
Source1042: libvisio-0.0.26.tar.bz2
Source1043: 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
# FIXME: the system clucene does not include stuff from contribs-lib (CJKAnalyzer.h)
Source1044: 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
# newly developed library for LO feature
Source1045: libcdr-0.0.11.tar.bz2
Source1045: libcdr-0.0.13.tar.bz2
# this library is not available on older distributions
Source1046: 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
# internal boost headers are needed on openSUSE <= 11.3; the system one has broken dst_adjustment_offsets definition (bnc#767949)
@ -609,12 +609,12 @@ Patch15: bridges-missing-cxxflags.diff
# dmake does not work with more than 64 jobs
# FIXME: this patch won't be necessary in LO-4.1 where dmake has finally been removed
Patch16: build-max-64-jobs.diff
# avoid race condition when delivering symlinks and target files into solver
Patch17: touch-no-dereference.diff
# Letter and Fax tamplates can't be created by python-2.6 if ODF file type description uses non-Ascii characters
Patch17: wizards-create-temlates-with-python-2.6.diff
#
# revert problematic build fix for poppler 0.17.0 on older distributions
# cpp/poppler-version.h is not included in older poppler packages
# FIXME: make it configurable to push upstream
Patch910: libreoffice-poppler-0.17.0-reject-fix.diff
Patch910: system-poppler-0.12.3.diff
# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262)
Patch920: redland-rpath-hack.diff
# try to save space by using hardlinks
@ -1304,9 +1304,10 @@ the LibreOffice localizations separately.
%patch15
%patch16
%patch17 -p1
%if %suse_version <= 1130
#
%if %suse_version >= 1110 && %suse_version < 1120
# cpp/poppler-version.h is not included in older poppler packages
%patch910 -p1
%patch910
%endif
#
%if %suse_version > 1140 && %suse_version < 1230
@ -1388,11 +1389,12 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c
--enable-kde \
--enable-kde4 \
%endif
--enable-gstreamer-0-10 \
--enable-evolution2 \
--enable-lockdown \
--enable-dbus \
%if 0%{?suse_version} <= 01130
%if %build_mono == 1
%if %build_mono != 0
--enable-mono \
--with-mono-gac-root=%{_prefix}/lib \
%endif

3
libvisio-0.0.25.tar.bz2
View File

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

3
libvisio-0.0.26.tar.bz2 Normal file
View File

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

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

@ -1,33 +1,37 @@
--- officecfg/registry/data/org/openoffice/Office/Common.xcu
Index: officecfg/registry/data/org/openoffice/Office/Common.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/Office/Common.xcu.orig
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -705,4 +705,6 @@
@@ -727,4 +727,6 @@
"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>
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.old 2012-03-01 15:34:22.000000000 +0100
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs 2012-03-01 15:54:05.000000000 +0100
@@ -1897,6 +1897,10 @@
sub-folders.</desc>
</info>
Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
===================================================================
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs.orig
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1965,6 +1965,10 @@
<value>
<it>$(insturl)/share/template/$(vlang)</it>
<it>$(insturl)/share/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>$(userurl)/template</it>
</value>
</prop>
@@ -2165,6 +2169,10 @@
<value>
<it>$(insturl)/share/template/$(vlang)</it>
<it>$(insturl)/share/template/common</it>
<it>$(userurl)/template</it>
@@ -2090,6 +2094,10 @@
are located in folders and sub-folders.</desc>
</info>
<value>
+ <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>$(insturl)/share/template/$(vlang)</it>
<it>$(insturl)/share/template/common</it>
<it>$(userurl)/template</it>
</value>
</prop>

8
solenv-touch-no-dereference.diff
View File

@ -1,10 +1,12 @@
--- solenv/gbuild/Deliver.mk.old 2013-03-28 19:01:42.000000000 +0100
+++ solenv/gbuild/Deliver.mk 2013-04-18 12:24:05.000000000 +0200
Index: solenv/gbuild/Deliver.mk
===================================================================
--- solenv/gbuild/Deliver.mk.orig
+++ solenv/gbuild/Deliver.mk
@@ -60,7 +60,7 @@ endif
endef
define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
endef

35
system-poppler-0.12.3.diff Normal file
View File

@ -0,0 +1,35 @@
Index: libreoffice-4.0.3.2a/configure.ac
===================================================================
--- configure.ac
+++ configure.ac
@@ -9723,16 +9723,6 @@ if test "$_os" != Android -a "$_os" != i
AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
- AC_LANG_PUSH([C++])
- save_CXXFLAGS=$CXXFLAGS
- save_CPPFLAGS=$CPPFLAGS
- CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
- CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
- AC_CHECK_HEADER([cpp/poppler-version.h], [],
- [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
- CXXFLAGS=$save_CXXFLAGS
- CPPFLAGS=$save_CPPFLAGS
- AC_LANG_POP([C++])
libo_MINGW_CHECK_DLL([POPPLER], [libpoppler])
else
AC_MSG_RESULT([internal])
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-05-01 16:10:03.000000000 +0200
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-05-01 16:11:22.000000000 +0200
@@ -62,7 +62,10 @@ class PDFDoc;
#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
typedef GString GooString;
#else
-#include <cpp/poppler-version.h>
+#define POPPLER_VERSION "0.12.3"
+#define POPPLER_VERSION_MAJOR 0
+#define POPPLER_VERSION_MINOR 12
+#define POPPLER_VERSION_MICRO 3
#define POPPLER_CHECK_VERSION(major,minor,micro) \
(POPPLER_VERSION_MAJOR > (major) || \
(POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \

37
touch-no-dereference.diff
View File

@ -1,37 +0,0 @@
From b03773728e53a83715d338b021f60375aed06bb9 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 19 Mar 2013 14:38:58 +0100
Subject: [PATCH] fix race condition when using hardlinks to deliver into
solver
We need to use "touch --no-dereference" on the delivered files.
Otherwise, it creates empty target file when you touch symlinks and
delivering the real target file might fail.
This caused many build failures when delivering:
liblcms2.so -> liblcms2.so.2.0.4
liblcms2.so.2 -> liblcms2.so.2.0.4
liblcms2.so.2.0.4
Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935
---
solenv/gbuild/Deliver.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 0f257e5..ab56dab 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -60,7 +60,7 @@ endif
endef
define gb_Deliver__deliver
-$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch -r $(1) $(2)
+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch --no-dereference -r $(1) $(2)
endef
ifneq ($(strip $(gb_Deliver_GNUCOPY)),)
--
1.8.1.3

65
wizards-create-temlates-with-python-2.6.diff Normal file
View File

@ -0,0 +1,65 @@
From 8a6be8341d0a962d1ec384440ece523607c8b1d5 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 14 May 2013 11:25:49 +0200
Subject: [PATCH] allow to create Letter and Fax templates with python 2.6
The localized file type desciptions have non-ascii characters.
The "str" type acceppts only "ascii" characters in python-2.6,
The string has to be encoded according to the system locale,
otherwise it is broken in non-UTF-* locales.
Change-Id: I0a138f10ec7c2665c0700918f671fbd5eb674bf6
---
wizards/com/sun/star/wizards/common/SystemDialog.py | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py b/wizards/com/sun/star/wizards/common/SystemDialog.py
index ab9b463..aa3426a 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -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
@@ -139,6 +140,24 @@ class SystemDialog(object):
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.
@@ -152,7 +171,7 @@ class SystemDialog(object):
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);
--
1.8.1.3