Accepting request 183493 from LibreOffice:Factory
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) OBS-URL: https://build.opensuse.org/request/show/183493 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=49
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
bceab25be6
34
buildfix-sdext-poppler-0.23.0.diff
Normal file
34
buildfix-sdext-poppler-0.23.0.diff
Normal file
@ -0,0 +1,34 @@
|
||||
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
===================================================================
|
||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
|
||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -181,7 +181,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;
|
||||
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
===================================================================
|
||||
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
|
||||
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
|
||||
{
|
||||
}
|
||||
|
||||
-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:3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc
|
||||
size 468395
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
|
||||
size 23558405
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c04dc63910a1e5fabec1af24088c8774ccc1da1217289db0b8c75305bbd9c6a0
|
||||
size 104878816
|
||||
3
libreoffice-4.0.3.3.5.tar.xz
Normal file
3
libreoffice-4.0.3.3.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b884dae53e6195c0e7bc546ca8d4a669064e92f34628c0e564198a7ca9a7f610
|
||||
size 106460952
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-branding-upstream
|
||||
Version: 4.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
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:ae5896788ab83e2934eaf74d2961e80f1b2e80c3e14769ae59c6f0e5f99dd392
|
||||
size 1855640
|
||||
3
libreoffice-help-4.0.3.3.5.tar.xz
Normal file
3
libreoffice-help-4.0.3.3.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67c6385d01fe41a212213262c381a30d66f848ba57b6d0bf70255bbb224d42d0
|
||||
size 1911556
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-en-US
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
Name: libreoffice-help-group@GROUP_NUMBER@
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Version: 4.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define gnu_make_version 3.82
|
||||
%define gnu_make_snapshot 20120301
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: libreoffice-icon-themes
|
||||
Version: 4.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define ooo_home libreoffice
|
||||
BuildRequires: libreoffice-icon-themes-prebuilt = %version
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 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.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
@DO_NOT_EDIT_COMMENT@
|
||||
Name: libreoffice-l10n
|
||||
Version: 4.0.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
%define piece l10n
|
||||
%define ooo_home libreoffice
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f58d6d92312c2d31d6a156279dcdbda16b34a3d20eeeb744d92e99d612a22e1b
|
||||
size 128412940
|
||||
3
libreoffice-translations-4.0.3.3.5.tar.xz
Normal file
3
libreoffice-translations-4.0.3.3.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4e441ac7adab90545f837ceb3e5afc403e31f60de069b7eced729c20be9956da
|
||||
size 129284168
|
||||
@ -1,3 +1,45 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 16 15:01:51 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- buildfix-sdext-poppler-0.23.0.diff: fix build with system poppler-0.23.0
|
||||
- fix typo in sdk package description (bnc#827119)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 3 13:42:30 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- do not hide icu and lcms2 dependency on openSUSE 12.1, 12.2, and 12.3
|
||||
where we use the system libraries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 2 13:26:21 UTC 2013 - pmladek@suse.com
|
||||
|
||||
- remove the internal libicudata.so, libicui18n.so, libicule.so,
|
||||
libicuuc.so, and liblcms2.so libraries from provides and requires;
|
||||
they are not in the system paths and cause dependency problems for
|
||||
other packages (bnc#823111)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com
|
||||
|
||||
- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
|
||||
* cairo canvas fixes
|
||||
* fix emfplus windows build.
|
||||
* EmfFillPie fix. (fdo#65502)
|
||||
* EMF: avoid ambiguity in debug output.
|
||||
* fixup alpha bitmap generation for Windows
|
||||
* improved label overlap detection. (bnc#816939)
|
||||
* transform the clipping polygon before using it
|
||||
* improved label overlap detection (bnc#816939)
|
||||
* sw: word completion: do not add trailing '.' (fdo#61923)
|
||||
* fixed libcmis handling of related multipart content types
|
||||
* avoid setting user time on unrealized windows. (fdo#56583)
|
||||
* don't display the "broken OLE link" icon except on Windows
|
||||
* fixed import of custom shapes from PPT. (i#119872, bnc#823049)
|
||||
* don't hide cell content behind pivot table buttons, (fdo#60877)
|
||||
* ignore exceptions from checking with the update service. (fdo#64962)
|
||||
- use the system cairo and pixman again on SLED11; the problems with alpha
|
||||
channel handling were fixed (bnc#818291)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com
|
||||
|
||||
|
||||
@ -202,7 +202,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.3.3.4
|
||||
Version: 4.0.3.3.5
|
||||
Release: 0
|
||||
Requires: libreoffice-branding >= 4.0
|
||||
Requires: libreoffice-icon-themes = %version
|
||||
@ -511,15 +511,23 @@ Source503: AbsoluteLayout.tar.bz2
|
||||
Source504: swing-layout-1.0.4-doc.zip
|
||||
# taken from netbeans-6.8 installed from netbeans-6.8-ml-javase-linux.sh
|
||||
Source505: swing-layout-1.0.4-src.zip
|
||||
%if 0%{?suse_version} < 01230
|
||||
# FIXME: hack the provides and requires (bnc#411538)
|
||||
# make sure external scripts are used
|
||||
# hide some internal libraries in the provides and requires; we need to bundle
|
||||
# newer versions but the bundled libraries are not available in the system path
|
||||
# so we must not confuse other packages with providing it (bnc#411538, bnc#823111)
|
||||
%if 0%{?suse_version} < 01210
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_provides /bin/sh %_sourcedir/lo-provides %name
|
||||
%define __find_requires /bin/sh %_sourcedir/lo-requires %name
|
||||
%define __find_provides /bin/sh %_sourcedir/lo-provides-11.1 %name
|
||||
%define __find_requires /bin/sh %_sourcedir/lo-requires-11.1 %name
|
||||
%endif
|
||||
Source900: lo-provides
|
||||
Source901: lo-requires
|
||||
%if 0%{?suse_version} >= 01210 && 0%{?suse_version} < 01230
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_provides /bin/sh %_sourcedir/lo-provides-12.1 %name
|
||||
%define __find_requires /bin/sh %_sourcedir/lo-requires-12.1 %name
|
||||
%endif
|
||||
Source900: lo-provides-11.1
|
||||
Source901: lo-requires-11.1
|
||||
Source902: lo-provides-12.1
|
||||
Source903: lo-requires-12.1
|
||||
#
|
||||
# offical external source
|
||||
Source1000: ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
|
||||
@ -576,10 +584,6 @@ Source1048: libmspub-0.0.6.tar.bz2
|
||||
Source1049: 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2
|
||||
Source1050: 7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
|
||||
Source1051: fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
|
||||
# sigh, the old system cairo and pixman have problems with alpha channel handling on SLED11 (bnc#818291)
|
||||
# the fix and maintenance would cost a lot, so it looks more effective and safe to use the internal cairo and pixman
|
||||
Source1052: f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
|
||||
Source1053: c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
|
||||
# search application icons in /usr/share
|
||||
# FIXME: search both lib and lib64 and push into git
|
||||
Patch2: split-icons-search-usr-share.diff
|
||||
@ -624,6 +628,8 @@ Patch17: wizards-create-temlates-with-python-2.6.diff
|
||||
# applied in 4.0.4 and later
|
||||
Patch18: boost-1.53-part1.patch
|
||||
Patch19: boost-1.53-part2.patch
|
||||
# fix build with system poppler-0.23.0
|
||||
Patch20: 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
|
||||
@ -993,7 +999,7 @@ This package contains the files needed to build plugins/add-ons for
|
||||
LibreOffice. It includes header files, IDL files, needed build
|
||||
tools, etc.
|
||||
|
||||
The documentation is in the package OpenOffice_org-sdk-doc
|
||||
The documentation is in the package libreoffice-sdk-doc
|
||||
|
||||
|
||||
|
||||
@ -1319,6 +1325,7 @@ the LibreOffice localizations separately.
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20
|
||||
#
|
||||
%if %suse_version >= 1110 && %suse_version < 1120
|
||||
# cpp/poppler-version.h is not included in older poppler packages
|
||||
@ -1443,7 +1450,6 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" solenv/src/version.c
|
||||
--with-system-libs \
|
||||
%if 0%{?suse_version} <= 01110
|
||||
--without-system-postgresql \
|
||||
--without-system-cairo \
|
||||
%endif
|
||||
%if 0%{?suse_version} <= 01130
|
||||
--without-system-lcms2 \
|
||||
|
||||
8
lo-provides-11.1
Normal file
8
lo-provides-11.1
Normal file
@ -0,0 +1,8 @@
|
||||
# hide some private libraries from provides
|
||||
grep -v -e libmysqlcppconn.so \
|
||||
-e libicudata.so \
|
||||
-e libicui18n.so \
|
||||
-e libicule.so \
|
||||
-e libicuuc.so \
|
||||
-e liblcms2.so \
|
||||
| /usr/lib/rpm/find-provides “$@”
|
||||
8
lo-requires-11.1
Normal file
8
lo-requires-11.1
Normal file
@ -0,0 +1,8 @@
|
||||
# do not require some internal libraries
|
||||
/usr/lib/rpm/find-requires “$@” | \
|
||||
grep -v -e libmysqlcppconn.so \
|
||||
-e libicudata.so \
|
||||
-e libicui18n.so \
|
||||
-e libicule.so \
|
||||
-e libicuuc.so \
|
||||
-e liblcms2.so
|
||||
Loading…
x
Reference in New Issue
Block a user