Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2015-05-07 09:20:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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.changes 2015-04-22 01:06:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2015-05-07 09:21:00.000000000 +0200 @@ -1,0 +2,93 @@ +Sun May 3 16:45:27 UTC 2015 - [email protected] + +- Disable verbose build to pass check on maximal size of log + +------------------------------------------------------------------- +Fri Apr 24 11:43:23 UTC 2015 - [email protected] + +- We need pre/post for libreoffice in langpkgs + +------------------------------------------------------------------- +Thu Apr 23 15:48:11 UTC 2015 - [email protected] + +- Use old java for detection and old commons-lang/codec to pass + brp check on java from sle11 + * 0001-Make-HAVE_JAVA6-be-always-false.patch + +------------------------------------------------------------------- +Thu Apr 23 08:27:20 UTC 2015 - [email protected] + +- Revert last changeset, it is caused by something else this time: + * 0001-Set-source-and-target-params-for-java.patch + +------------------------------------------------------------------- +Wed Apr 22 09:27:01 UTC 2015 - [email protected] + +- Set source/target for javac when building to work on SLE11: + * 0001-Set-source-and-target-params-for-java.patch + +------------------------------------------------------------------- +Tue Apr 21 09:17:33 UTC 2015 - [email protected] + +- Try to deal with rpath on bundled libs + +------------------------------------------------------------------- +Fri Apr 17 12:57:07 UTC 2015 - [email protected] + +- Fix python3_sitelib not being around for py2 + +------------------------------------------------------------------- +Thu Apr 16 12:23:40 UTC 2015 - [email protected] + +- Add internal make for too old system +- One more stab on poppler switch: + * 0001-Make-cpp-poppler-version.h-header-optional.patch + +------------------------------------------------------------------- +Thu Apr 16 11:45:39 UTC 2015 - [email protected] + +- Update the old-poppler patch to work correctly: + * 0001-Make-cpp-poppler-version.h-header-optional.patch + +------------------------------------------------------------------- +Thu Apr 16 11:43:32 UTC 2015 - [email protected] + +- Sort out more external tarballs for the no-system-libs approach + +------------------------------------------------------------------- +Thu Apr 16 09:34:00 UTC 2015 - [email protected] + +- Add basic external tarballs needed for without-system-libraries + +------------------------------------------------------------------- +Thu Apr 16 08:24:22 UTC 2015 - [email protected] + +- Add patch to check for poppler more nicely to work on older distros: + * 0001-Make-cpp-poppler-version.h-header-optional.patch + +------------------------------------------------------------------- +Wed Apr 15 18:50:30 UTC 2015 - [email protected] + +- Try to pass configure without system libs + +------------------------------------------------------------------- +Wed Apr 15 12:43:41 UTC 2015 - [email protected] + +- Allow switch between py2 and py3 +- Move external dependencies in conditional thus allow build on + SLE11 + +------------------------------------------------------------------- +Wed Apr 15 11:56:26 UTC 2015 - [email protected] + +- Add conditional for noarch subpackages +- Add switch in configure to detect more of internal/external stuff + +------------------------------------------------------------------- +Wed Apr 15 11:42:37 UTC 2015 - [email protected] + +- Add conditional for appdatastore thing and redo it to impact the + spec less +- Add systemlibs switch to be used in attempt to build sle11 build + +------------------------------------------------------------------- New: ---- 0001-Make-HAVE_JAVA6-be-always-false.patch 0001-Make-cpp-poppler-version.h-header-optional.patch 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz 594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Firebird-2.5.2.26540-0.tar.bz2 a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 commons-logging-1.2-src.tar.gz d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip graphite2-1.2.4.tgz harfbuzz-0.9.23.tar.bz2 language-subtag-registry-2014-12-03.tar.bz2 lcms2-2.6.tar.gz libabw-0.1.1.tar.bz2 libcdr-0.1.1.tar.bz2 libe-book-0.1.2.tar.bz2 libetonyek-0.1.1.tar.bz2 libfreehand-0.1.0.tar.bz2 libmspub-0.1.2.tar.bz2 libmwaw-0.3.4.tar.bz2 libodfgen-0.1.3.tar.bz2 libpagemaker-0.0.2.tar.bz2 librevenge-0.0.2.tar.bz2 libvisio-0.1.1.tar.bz2 libwpd-0.10.0.tar.bz2 libwpg-0.3.0.tar.bz2 libwps-0.3.1.tar.bz2 make-4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ ++++ 646 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libreoffice/libreoffice.spec ++++ and /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.spec ++++++ 0001-Make-HAVE_JAVA6-be-always-false.patch ++++++ >From 901eeaacd7219f61816b28873e45264c7d7de1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> Date: Thu, 23 Apr 2015 17:41:10 +0200 Subject: [PATCH] Make HAVE_JAVA6 be always false Even if we have newer java for bundling we still test for 1.5 java to be able to execute our bitecode. Change-Id: I7bf5d86c4558b8ed583e3741c10e10daaaa825a7 NOTE: Do NOT upstream this. --- configure.ac | 6 ------ 1 file changed, 6 deletions(-) diff --git a/configure.ac b/configure.ac index 0d492ad..ba02fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -6725,9 +6725,6 @@ if test "$ENABLE_JAVA" != ""; then if test "$_jdk_ver" -lt 10500; then AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5]) fi - if test "$_jdk_ver" -ge 10600; then - HAVE_JAVA6=TRUE - fi AC_MSG_RESULT([checked (IBM JDK $_jdk)]) @@ -6750,9 +6747,6 @@ you must use the "--with-jdk-home" configure option explicitly]) if test "$_jdk_ver" -gt 10600; then JAVA_CLASSPATH_NOT_SET="1" fi - if test "$_jdk_ver" -ge 10600; then - HAVE_JAVA6=TRUE - fi if test "$_jdk_ver" -ge 10900; then HAVE_JAVA9=TRUE fi -- 2.3.5 ++++++ 0001-Make-cpp-poppler-version.h-header-optional.patch ++++++ >From 459fe2262e26c3f24108e5ba1bdf342b6236cf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <[email protected]> Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: [PATCH] Make cpp/poppler-version.h header optional Older popler (SLE11) does not have this header yet. With the code simply if the header not found define version to oldest possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c --- config_host/config_poppler.h.in | 10 ++++++++++ configure.ac | 9 ++++++--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 8 ++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 config_host/config_poppler.h.in diff --git a/config_host/config_poppler.h.in b/config_host/config_poppler.h.in new file mode 100644 index 0000000..458c49b --- /dev/null +++ b/config_host/config_poppler.h.in @@ -0,0 +1,10 @@ +/* +Settings for poppler header file dection +*/ + +#ifndef CONFIG_POPPLER_H +#define CONFIG_POPPLER_H + +#define HAVE_POPPLER_VERSION_H 0 + +#endif diff --git a/configure.ac b/configure.ac index 9e8e1d2..79effbe 100644 --- a/configure.ac +++ b/configure.ac @@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ if test "$with_system_poppler" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_POPPLER=TRUE - PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) + PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.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])], []) + AC_CHECK_HEADER([cpp/poppler-version.h], + [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)], + []) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS AC_LANG_POP([C++]) @@ -10449,6 +10450,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ AC_MSG_RESULT([internal]) SYSTEM_POPPLER= BUILD_TYPE="$BUILD_TYPE POPPLER" + AC_DEFINE([HAVE_POPPLER_VERSION_H], 1) fi else AC_MSG_RESULT([no]) @@ -13002,6 +13004,7 @@ AC_CONFIG_HEADERS([config_host/config_vcl.h]) AC_CONFIG_HEADERS([config_host/config_vclplug.h]) AC_CONFIG_HEADERS([config_host/config_version.h]) AC_CONFIG_HEADERS([config_host/config_oauth2.h]) +AC_CONFIG_HEADERS([config_host/config_poppler.h]) AC_OUTPUT if test "$CROSS_COMPILING" = TRUE; then diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx index d15491b..f4fa810 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX #include <sal/types.h> +#include <config_poppler.h> #if defined __GNUC__ # pragma GCC diagnostic push @@ -50,7 +51,14 @@ class GfxPath; class GfxFont; class PDFDoc; +#if HAVE_POPPLER_VERSION_H #include <cpp/poppler-version.h> +#else +#define POPPLER_VERSION "0.12.3" +#define POPPLER_VERSION_MAJOR 0 +#define POPPLER_VERSION_MINOR 12 +#define POPPLER_VERSION_MICRO 3 +#endif #define POPPLER_CHECK_VERSION(major,minor,micro) \ (POPPLER_VERSION_MAJOR > (major) || \ (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ -- 2.3.5
