Accepting request 198789 from LibreOffice:Factory
Needed to have builded lo for beta, tomorow will check if we need some of the underlying libraries. OBS-URL: https://build.opensuse.org/request/show/198789 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=53
This commit is contained in:
commit
ae353c05d8
972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2bridges-missing-cxxflags.diffbuild-help-common.diffbuild-link-rt.diffbuildfix-neon-0.30.0.diffbuildfix-sdext-poppler-0.23.0.difflibreoffice-4.1.0.4.tar.xzlibreoffice-4.1.1.2.tar.xzlibreoffice-branding-upstream.changeslibreoffice-branding-upstream.speclibreoffice-help-4.1.0.4.tar.xzlibreoffice-help-4.1.1.2.tar.xzlibreoffice-help-en-US.changeslibreoffice-help-en-US.speclibreoffice-help-en-US.spec.inlibreoffice-help-group1.changeslibreoffice-help-group1.speclibreoffice-help-group2.changeslibreoffice-help-group2.speclibreoffice-help-group3.changeslibreoffice-help-group3.speclibreoffice-help-group4.changeslibreoffice-help-group4.speclibreoffice-help-group5.changeslibreoffice-help-group5.speclibreoffice-help-groupX.spec.inlibreoffice-icon-themes.changeslibreoffice-icon-themes.speclibreoffice-l10n.changeslibreoffice-l10n.speclibreoffice-l10n.spec.inlibreoffice-translations-4.1.0.4.tar.xzlibreoffice-translations-4.1.1.2.tar.xzlibreoffice.changeslibreoffice.spec
@ -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
3
a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:210c216bbbf67603f891373362ec0427aeb36bfcaf881d43433db85ca2160d7c
|
||||
size 684918
|
11
bridges-missing-cxxflags.diff
Normal file
11
bridges-missing-cxxflags.diff
Normal file
@ -0,0 +1,11 @@
|
||||
--- bridges/Library_cpp_uno.mk.old 2013-08-02 13:53:59.000000000 +0200
|
||||
+++ bridges/Library_cpp_uno.mk 2013-08-02 13:54:22.000000000 +0200
|
||||
@@ -230,7 +230,7 @@ $(eval $(call gb_Library_add_exception_o
|
||||
|
||||
$(eval $(call gb_Library_add_cxxobjects,$(gb_CPPU_ENV)_uno,\
|
||||
bridges/source/cpp_uno/shared/cppinterfaceproxy \
|
||||
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
||||
+ , $(CXXFLAGS) $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
76
build-help-common.diff
Normal file
76
build-help-common.diff
Normal 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 \
|
||||
))
|
@ -1,10 +0,0 @@
|
||||
--- Library_merged.mk.old 2013-07-23 12:40:26.000000000 +0200
|
||||
+++ Library_merged.mk 2013-07-31 16:33:34.000000000 +0200
|
||||
@@ -89,6 +89,7 @@ ifeq ($(OS),LINUX)
|
||||
$(eval $(call gb_Library_add_libs,merged,\
|
||||
-lm \
|
||||
-ldl \
|
||||
+ -lrt \
|
||||
-lpthread \
|
||||
))
|
||||
endif
|
51
buildfix-neon-0.30.0.diff
Normal file
51
buildfix-neon-0.30.0.diff
Normal 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
|
||||
|
@ -1,30 +0,0 @@
|
||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2013-06-20 09:13:52.000000000 +0200
|
||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2013-07-16 15:49:35.000000000 +0200
|
||||
@@ -178,7 +178,11 @@ namespace pdfi
|
||||
virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
|
||||
|
||||
// Start a page.
|
||||
- virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
|
||||
+ virtual void startPage(int pageNum, GfxState *state
|
||||
+#if POPPLER_CHECK_VERSION(0, 23, 0)
|
||||
+ , XRef *xref
|
||||
+#endif
|
||||
+ ) SAL_OVERRIDE;
|
||||
|
||||
// End a page.
|
||||
virtual void endPage() SAL_OVERRIDE;
|
||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2013-06-20 09:13:52.000000000 +0200
|
||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2013-07-16 15:49:21.000000000 +0200
|
||||
@@ -491,7 +491,11 @@ PDFOutDev::~PDFOutDev()
|
||||
delete m_pUtf8Map;
|
||||
}
|
||||
|
||||
-void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
|
||||
+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
|
||||
+#if POPPLER_CHECK_VERSION(0, 23, 0)
|
||||
+ , XRef* /*xref*/
|
||||
+#endif
|
||||
+)
|
||||
{
|
||||
assert(state);
|
||||
printf("startPage %f %f\n",
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8e42a149f37043f8a2e4456779324745621683c759bb451fcd69539f219d8075
|
||||
size 121670716
|
3
libreoffice-4.1.1.2.tar.xz
Normal file
3
libreoffice-4.1.1.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f62611bdd13f8197ebdaf8f2fa24a8d40d75de11c996f5280e8765377bb1ea03
|
||||
size 121747824
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-branding-upstream
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define lo_home libreoffice
|
||||
Summary: Original Branding for LibreOffice
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:273003ceb9758ab0f4ee1952b61f787353d55e059a93ff9ca4141a5d59d5e0a0
|
||||
size 1847260
|
3
libreoffice-help-4.1.1.2.tar.xz
Normal file
3
libreoffice-help-4.1.1.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5391d0ff9f7e6bbb4517ec8fb192effeb8e93903b58f99f1411ebe4bd3048965
|
||||
size 1847556
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
- do not unpack the huge libreoffice-translations tarball for en-US help
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -108,7 +108,6 @@ Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
@ -143,7 +142,7 @@ stuff is in LibreOffice-l10n-en-US.
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%setup -q -a30 -a31 -b1 -n libreoffice-%version
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -162,6 +161,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-en-US
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -104,7 +104,6 @@ Group: Productivity/Office/Suite
|
||||
Url: http://www.documentfoundation.org/
|
||||
Source0: libreoffice-%version.tar.xz
|
||||
Source1: libreoffice-help-%version.tar.xz
|
||||
Source2: libreoffice-translations-%version.tar.xz
|
||||
Source10: build_prepare.inc
|
||||
# make-3.82 is needed for parallel build
|
||||
# this version extends plain make-3.82 with --warn-undefined-functions option
|
||||
@ -139,7 +138,7 @@ stuff is in LibreOffice-l10n-en-US.
|
||||
%if %prepare_build == 0
|
||||
%setup -D -T -q -n libreoffice-%version
|
||||
%else
|
||||
%setup -q -a30 -a31 -b1 -b2 -n libreoffice-%version
|
||||
%setup -q -a30 -a31 -b1 -n libreoffice-%version
|
||||
#
|
||||
# patch zip-3.0
|
||||
%if %suse_version < 1140
|
||||
@ -158,6 +157,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -346,6 +346,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -334,6 +334,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -346,6 +346,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -334,6 +334,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
- set PYTHON_FOR_BUILD=no because python is not really needed to build help;
|
||||
this fixes build on SLED11
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -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.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -361,6 +361,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-group@GROUP_NUMBER@
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
@ -139,6 +139,8 @@ cd -
|
||||
|
||||
%build
|
||||
%{expand:%(cat %_sourcedir/build_prepare.inc)}
|
||||
# hack to pass configure check for python; it is not really needed to build the help
|
||||
export PYTHON_FOR_BUILD=no
|
||||
%if %prepare_build != 0
|
||||
./autogen.sh $PARALLEL_BUILD \
|
||||
--libdir=%{_libdir} \
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-icon-themes
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define ooo_home libreoffice
|
||||
BuildRequires: libreoffice-icon-themes-prebuilt = %version
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data
|
||||
###################################################################
|
||||
Name: libreoffice-l10n
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Name: libreoffice-l10n
|
||||
Version: 4.1.0.4
|
||||
Version: 4.1.1.2
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:366dd84d06ad63ece03979a3ac2bc16e4318552ab949fc1f8648a4f4d136278a
|
||||
size 128151924
|
3
libreoffice-translations-4.1.1.2.tar.xz
Normal file
3
libreoffice-translations-4.1.1.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c937e66623c1986f23eecd9d289f40e9182689929b787a57478758098f244a88
|
||||
size 130017392
|
@ -1,7 +1,65 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- update to 4.1.1.1:
|
||||
* non-saved dialogs (fdo#67685)
|
||||
* lost cell range name (fdo#62729)
|
||||
* several performance regressions fixes
|
||||
* allow to connect MariaDB (rhbz#989246)
|
||||
* more on broken XLSX export (bnc#823935)
|
||||
* broken master pages editing (fdo#66924)
|
||||
* messed slide in PPTX import (bnc#593612)
|
||||
* crossing lines in WMF pictures (i#122509)
|
||||
* lost formatting in ODS export (fdo#67684)
|
||||
* misplaced cursor in Web layout (fdo#66577)
|
||||
* shapes anchoring in VML import (bnc#820504)
|
||||
* several problems with time stamps (fdo#67387)
|
||||
* lost lines created in report builder (fdo#33617)
|
||||
* lost sheet protection in XLSX export (fdo#64753)
|
||||
* paragraph style dialog height problems (fdo#67395)
|
||||
* complex hyperlinks broken in PDF export (fdo#33605)
|
||||
* lost background pictures in DOCX export (fdo#60990)
|
||||
* VoiceOver does not follow keyboard focus (fdo#54320)
|
||||
* some fields don't fit into options dialog (fdo#61544)
|
||||
* lost text frame in DOCX export (bnc#822175, fdo#58577)
|
||||
* non-smooth lines around fontwork (fdo#60282, fdo#66745)
|
||||
* embedded fonts renders strangely on first load (fdo#67086)
|
||||
* hyperlinks in table of illustrations (bnc#825976, fdo#39904)
|
||||
* Calc reads any number of spaces as a single space (fdo#67094)
|
||||
* initial MCE support in writerfilter OOXML tokenizer (bnc#820503)
|
||||
* several RTF import/export fixes (fdo#39001, fdo#54900, fdo#64637,
|
||||
fdo#65632, fdo#66274, fdo#66565, fdo#66682, fdo#67365)
|
||||
- remove obsolete patches:
|
||||
+ buildfix-sdext-poppler-0.23.0.diff: integrated upstream
|
||||
+ build-link-rt.diff: integrated upstream
|
||||
- bridges-missing-cxxflags.diff: lost RPM optflags when compiling bridges;
|
||||
it is still not fixed and breaks build on SLED11 i586
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 12 12:30:27 UTC 2013 - dvaleev@suse.com
|
||||
|
||||
- disable jfreereport extention for powerpc64
|
||||
- disable jfreereport extension for powerpc64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 1 14:46:22 UTC 2013 - pmladek@suse.com
|
||||
|
@ -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.0.4
|
||||
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,9 +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
|
||||
# liblt is linked with librt, so we need to link the mergedlib with librt as well
|
||||
# it fixes build on SLED11
|
||||
Patch4: build-link-rt.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
|
||||
@ -606,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
|
||||
@ -620,10 +622,10 @@ Patch13: jvmfwk-disable-gcj.diff
|
||||
# generate selected bytecode version also in gbuild
|
||||
# FIXME: push upstream and be ready to fix problem on other systems
|
||||
Patch14: solenv-java-source-version.diff
|
||||
# lost RPM optflags when compiling bridges
|
||||
Patch15: bridges-missing-cxxflags.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
|
||||
# fix build with system poppler-0.23.0
|
||||
Patch18: buildfix-sdext-poppler-0.23.0.diff
|
||||
#
|
||||
# cpp/poppler-version.h is not included in older poppler packages
|
||||
# FIXME: make it configurable to push upstream
|
||||
@ -1306,14 +1308,15 @@ the LibreOffice localizations separately.
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11
|
||||
%patch12
|
||||
%patch13 -p1
|
||||
%patch14
|
||||
%patch15
|
||||
%patch17 -p1
|
||||
%patch18
|
||||
#
|
||||
%if %suse_version >= 1110 && %suse_version < 1120
|
||||
# cpp/poppler-version.h is not included in older poppler packages
|
||||
@ -1386,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user