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

- update to 4.1.1.2

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=53
This commit is contained in:
Petr Mladek 2013-08-22 15:09:47 +00:00 committed by Git OBS Bridge
parent 5df385adf4
commit 4639722def
33 changed files with 227 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2
View File

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

3
a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2 Normal file
View File

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

76
build-help-common.diff Normal file
View File

@ -0,0 +1,76 @@
--- configure.ac.old 2013-08-13 18:06:46.000000000 +0200
+++ configure.ac 2013-08-16 13:00:37.000000000 +0200
@@ -1652,7 +1652,16 @@ AC_ARG_WITH(jdk-home,
AC_ARG_WITH(help,
AS_HELP_STRING([--with-help],
- [Enable the build of help.]))
+ [Enable the build of help. There is a special parameter "common" that
+ can be used to bundle only the common part, .e.g help-specific icons.
+ This is useful when you build the helpcontent separately.])
+ [
+ Usage: --with-help build the entire local help
+ --without-help no local help (default)
+ --with-help=common bundle common files for the local
+ help but do not build the whole help
+ ],
+,)
AC_ARG_WITH(java,
AS_HELP_STRING([--with-java],
@@ -4386,14 +4395,21 @@ fi
AC_SUBST(DO_FETCH_TARBALLS)
AC_MSG_CHECKING([whether to build help])
-if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then
- AC_MSG_RESULT([yes])
+HELP_COMMON_ONLY=FALSE
+if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
BUILD_TYPE="$BUILD_TYPE HELP"
- SCPDEFS="$SCPDEFS -DWITH_HELP"
GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
+ if test "$with_help" = "common" ; then
+ HELP_COMMON_ONLY=TRUE
+ AC_MSG_RESULT([common only])
+ else
+ SCPDEFS="$SCPDEFS -DWITH_HELP"
+ AC_MSG_RESULT([yes])
+ fi
else
AC_MSG_RESULT([no])
fi
+AC_SUBST(HELP_COMMON_ONLY)
dnl Test whether to include MySpell dictionaries
dnl ===================================================================
--- config_host.mk.in.old 2013-08-06 19:25:04.000000000 +0200
+++ config_host.mk.in 2013-08-16 13:05:10.000000000 +0200
@@ -228,6 +228,7 @@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIP
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
export HAVE_READDIR_R=@HAVE_READDIR_R@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
+export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
export HOST_PLATFORM=@host@
export HSQLDB_JAR=@HSQLDB_JAR@
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
--- helpcontent2/Module_helpcontent2.mk.old 2013-08-06 19:24:32.000000000 +0200
+++ helpcontent2/Module_helpcontent2.mk 2013-08-16 14:51:47.000000000 +0200
@@ -9,6 +9,7 @@
$(eval $(call gb_Module_Module,helpcontent2))
+ifneq ($(HELP_COMMON_ONLY),TRUE)
$(eval $(call gb_Module_add_targets,helpcontent2,\
AllLangHelp_sbasic \
AllLangHelp_scalc \
@@ -19,6 +20,10 @@ $(eval $(call gb_Module_add_targets,help
AllLangHelp_simpress \
AllLangHelp_smath \
AllLangHelp_swriter \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,helpcontent2,\
CustomTarget_imagelist \
Package_imagelist \
))

51
buildfix-neon-0.30.0.diff Normal file
View File

@ -0,0 +1,51 @@
From b74bf4146e866fbcd41ad075296c9a4eee16c829 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 12 Aug 2013 09:39:59 +0200
Subject: [PATCH] only use the SSPI support with internal neon
neon 0.30.0 has added support for SSPI (author of the commit is kso,
which sounds familiar :-), so NE_FEATURE_SSPI is defined, but the
signature of ne_auth_creds remains the same as before. That means that
build with system neon 0.30.0 fails...
---
RepositoryExternal.mk | 1 +
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f866957..8c19c27 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -867,6 +867,7 @@ ifeq ($(SYSTEM_NEON),YES)
define gb_LinkTarget__use_neon
$(call gb_LinkTarget_add_defs,$(1),\
-DNEON_VERSION=0x$(NEON_VERSION) \
+ -DSYSTEM_NEON \
)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 34a1937..cee643a 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -228,7 +228,7 @@ extern "C" int NeonSession_ResponseBlockWriter( void * inUserData,
}
extern "C" int NeonSession_NeonAuth( void * inUserData,
-#ifdef NE_FEATURE_SSPI
+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
const char * inAuthProtocol,
#endif
const char * inRealm,
@@ -297,7 +297,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData,
bool bCanUseSystemCreds = false;
-#ifdef NE_FEATURE_SSPI
+#if defined NE_FEATURE_SSPI && ! defined SYSTEM_NEON
bCanUseSystemCreds
= (attempt == 0) && // avoid endless loops
ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
--
1.7.12.4

3
libreoffice-4.1.1.1.tar.xz
View File

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

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

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

5
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com

2
libreoffice-branding-upstream.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-branding-upstream
Version: 4.1.1.1
Version: 4.1.1.2
Release: 0
%define lo_home libreoffice
Summary: Original Branding for LibreOffice

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

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

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

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

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

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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.1.1.1
Version: 4.1.1.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 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com

2
libreoffice-icon-themes.spec
View File

@ -17,7 +17,7 @@
Name: libreoffice-icon-themes
Version: 4.1.1.1
Version: 4.1.1.2
Release: 0
%define ooo_home libreoffice
BuildRequires: libreoffice-icon-themes-prebuilt = %version

5
libreoffice-l10n.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2
-------------------------------------------------------------------
Tue Aug 13 15:21:02 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.1.1.1
Version: 4.1.1.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.1.1.1
Version: 4.1.1.2
Release: 0
%define piece l10n
%define ooo_home libreoffice

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

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

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

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

21
libreoffice.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com
- update to 4.1.1.2:
* first page styles (fdo#66145)
* Calc crashes on spell check (fdo#68220)
* broken options in ReportBuilder (fdo#67109)
* can't save new autocorrect entries (fdo#67743)
* checking for extension updates crasher (fdo#67539)
* font style is not saved in ODG and ODP (fdo#67665)
* broken formula expressions on XLS export (fdo#67571)
* can't select other fill than color in Writer (fdo#66827)
* soffice.bin segfault in libvclplug_gtklo.so (rhbz#998136)
- update libwpd to version 0.9.9:
+ infinite loop when using WPXBinaryData
- build-help-common.diff: allow to bundle the help icons even when
help is built separately
- buildfix-neon-0.30.0.diff: fix build with neon-0.30.0; only use the SSPI
support with internal neon; took from master branch
- use the new --with-help=common configure option
-------------------------------------------------------------------
Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com

13
libreoffice.spec
View File

@ -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.1.1.1
Version: 4.1.1.2
Release: 0
Requires: libreoffice-branding >= 4.0
Requires: libreoffice-icon-themes = %version
@ -566,7 +566,7 @@ Source1033: b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
Source1034: 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2
Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
Source1037: 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2
Source1037: a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
Source1038: 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
@ -594,6 +594,8 @@ Patch2: split-icons-search-usr-share.diff
# search help icons in /usr/share
# FIXME: make it configurable in integrate into git
Patch3: officecfg-help-in-usr-share.diff
# allow to bundle the help icons even when help is built separately
Patch4: build-help-common.diff
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build
# FIXME: make it configurable and push upstream
@ -603,6 +605,9 @@ Patch6: pack-desktop-files-for-optional-filters.diff
# put internal rhino into XBootClasspath to fix build with OpenJDK
# FIXME: make it clean to be able to push upstream
Patch7: scripting-prefer-internal-rhino.diff
# fix build with neon-0.30.0; only use the SSPI support with internal neon
# FIXME: this has already been included in upstream 4.1.2, and 4.2
Patch8: buildfix-neon-0.30.0.diff
# search <lo-home>/share/template/common for language independent templates
# FIXME: make it configurable to push upstream
Patch9: office-cfg-linux-common-template-dir.diff
@ -1299,9 +1304,11 @@ the LibreOffice localizations separately.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4
%patch5
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11
@ -1382,7 +1389,7 @@ export PYTHON_LIBS=`python-config --libs`
--with-external-hyph-dir=/usr/share/ooo/hyphen \
--with-external-thes-dir=/usr/share/ooo/thesaurus \
--without-doxygen \
--without-help \
--with-help=common \
%if %lo_build_sdk == yes
--enable-odk \
%endif