Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory
checked in at 2013-07-19 17:19:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-branding-upstream.changes
2013-06-17 10:33:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-branding-upstream.changes
2013-07-19 17:19:07.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 17 17:34:03 UTC 2013 - [email protected]
+
+- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3)
+
+-------------------------------------------------------------------
libreoffice-help-en-US.changes: same change
libreoffice-help-group1.changes: same change
libreoffice-help-group2.changes: same change
libreoffice-help-group3.changes: same change
libreoffice-help-group4.changes: same change
libreoffice-help-group5.changes: same change
libreoffice-icon-themes.changes: same change
libreoffice-l10n.changes: same change
--- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2013-06-17
10:33:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes
2013-07-19 17:19:09.000000000 +0200
@@ -1,0 +2,42 @@
+Tue Jul 16 15:01:51 UTC 2013 - [email protected]
+
+- 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 - [email protected]
+
+- 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 - [email protected]
+
+- 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 - [email protected]
+
+- 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)
+
+-------------------------------------------------------------------
Old:
----
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
libreoffice-4.0.3.3.4.tar.xz
libreoffice-help-4.0.3.3.4.tar.xz
libreoffice-translations-4.0.3.3.4.tar.xz
lo-provides
lo-requires
New:
----
buildfix-sdext-poppler-0.23.0.diff
libreoffice-4.0.3.3.5.tar.xz
libreoffice-help-4.0.3.3.5.tar.xz
libreoffice-translations-4.0.3.3.5.tar.xz
lo-provides-11.1
lo-provides-12.1
lo-requires-11.1
lo-requires-12.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-branding-upstream.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -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
++++++ libreoffice-help-en-US.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -22,7 +22,7 @@
## 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
++++++ libreoffice-help-group1.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -22,7 +22,7 @@
## 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
libreoffice-help-group2.spec: same change
libreoffice-help-group3.spec: same change
libreoffice-help-group4.spec: same change
libreoffice-help-group5.spec: same change
++++++ libreoffice-icon-themes.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -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
++++++ libreoffice-l10n.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -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
++++++ libreoffice.spec ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:16.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:16.000000000 +0200
@@ -202,7 +202,7 @@
%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 @@
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-11.1 %name
+%define __find_requires /bin/sh %_sourcedir/lo-requires-11.1 %name
+%endif
+%if 0%{?suse_version} >= 01210 && 0%{?suse_version} < 01230
%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-12.1 %name
+%define __find_requires /bin/sh %_sourcedir/lo-requires-12.1 %name
%endif
-Source900: lo-provides
-Source901: lo-requires
+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 @@
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 @@
# 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 @@
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 @@
%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 @@
--with-system-libs \
%if 0%{?suse_version} <= 01110
--without-system-postgresql \
- --without-system-cairo \
%endif
%if 0%{?suse_version} <= 01130
--without-system-lcms2 \
++++++ buildfix-sdext-poppler-0.23.0.diff ++++++
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",
++++++ libreoffice-4.0.3.3.4.tar.xz -> libreoffice-4.0.3.3.5.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-4.0.3.3.4.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-4.0.3.3.5.tar.xz
differ: char 25, line 1
++++++ libreoffice-help-4.0.3.3.4.tar.xz -> libreoffice-help-4.0.3.3.5.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libreoffice-4.0.3.3.4/ChangeLog-helpcontent2
new/libreoffice-4.0.3.3.5/ChangeLog-helpcontent2
--- old/libreoffice-4.0.3.3.4/ChangeLog-helpcontent2 2013-05-31
16:53:10.000000000 +0200
+++ new/libreoffice-4.0.3.3.5/ChangeLog-helpcontent2 2013-06-17
17:49:32.000000000 +0200
@@ -1,8 +1,3 @@
-2013-05-31 Petr Mladek <[email protected]>
[8e1d1cf2e314aef965a91e2c9cf9193df2b21c85]
-
-Release SUSE 4.0-4, build id 304, Linux version 4.0.3.3.4, tag suse-4.0-4
-
-
2013-05-31 Petr Mladek <[email protected]>
[3d4c4595c7e922ac7327829aeaf0ebff258df60e]
Branch suse-4.0.3
++++++ libreoffice-help-en-US.spec.in ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:18.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:18.000000000 +0200
@@ -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
++++++ libreoffice-help-groupX.spec.in ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:18.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:18.000000000 +0200
@@ -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
++++++ libreoffice-l10n.spec.in ++++++
--- /var/tmp/diff_new_pack.4cniSo/_old 2013-07-19 17:19:18.000000000 +0200
+++ /var/tmp/diff_new_pack.4cniSo/_new 2013-07-19 17:19:18.000000000 +0200
@@ -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
++++++ libreoffice-translations-4.0.3.3.4.tar.xz ->
libreoffice-translations-4.0.3.3.5.tar.xz ++++++
/work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-4.0.3.3.4.tar.xz
/work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-4.0.3.3.5.tar.xz
differ: char 25, line 1
++++++ lo-provides-11.1 ++++++
# 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 “$@”
++++++ lo-provides-12.1 ++++++
# hide some private libraries from provides
grep -v -e libmysqlcppconn.so \
| /usr/lib/rpm/find-provides “$@”
++++++ lo-requires-11.1 ++++++
# 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
++++++ lo-requires-12.1 ++++++
# do not require some internal libraries
/usr/lib/rpm/find-requires “$@” | \
grep -v -e libmysqlcppconn.so
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
