From e51b0488b314174524b9f83dead547a35e7d8ed73397c70e3184b8cc1bb0b201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 11:43:22 +0000 Subject: [PATCH 01/24] - 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 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=246 --- libreoffice.changes | 7 +++++++ libreoffice.spec | 31 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index ed20e2d..43217b6 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 11:42:37 UTC 2015 - tchvatal@suse.com + +- 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 + ------------------------------------------------------------------- Tue Apr 14 13:49:22 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index b8deb1e..643daa2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,6 +16,17 @@ # +%if 0%{?suse_version} > 1315 +%bcond_without appdatastore +%else +%bcond_with appdatastore +%endif +%if 0%{?suse_version} > 1230 +%bcond_without systemlibs +%else +%bcond_with systemlibs +%endif + # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -965,7 +976,7 @@ export NOCONFIGURE=yes sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/source/officehelper.py # just call make here as we added the jobs in configure -# The check phase is run here too if it is split with nocheck +# The check phase is run here too if it is split with nocheck # install of jars get broken sometimes make VERBOSE=true @@ -1102,11 +1113,12 @@ ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib} # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] # fixup the appdata files internal reference to the .desktop file and rename them on the go to match the name -%if 0%{?suse_version} > 1315 +%if %{with appdatastore} install -m 0755 -d %{buildroot}%{_datadir}/appdata for appdata in base calc draw impress writer; do sed "s/libreoffice-${appdata}.desktop/${appdata}.desktop/" \ sysui/desktop/appstream-appdata/libreoffice-${appdata}.appdata.xml > %{buildroot}%{_datadir}/appdata/${appdata}.appdata.xml + echo "%{_datadir}/appdata/${appdata}.appdata.xml" >>file-lists/${appdata}_list.txt done %endif @@ -1217,36 +1229,21 @@ exit 0 %files -f file-lists/base_list.txt base %defattr(-,root,root) -%if 0%{?suse_version} > 1315 -%{_datadir}/appdata/base.appdata.xml -%endif %files -f file-lists/calc_list.txt calc %defattr(-,root,root) -%if 0%{?suse_version} > 1315 -%{_datadir}/appdata/calc.appdata.xml -%endif %files -f file-lists/draw_list.txt draw %defattr(-,root,root) -%if 0%{?suse_version} > 1315 -%{_datadir}/appdata/draw.appdata.xml -%endif %files -f file-lists/math_list.txt math %defattr(-,root,root) %files -f file-lists/impress_list.txt impress %defattr(-,root,root) -%if 0%{?suse_version} > 1315 -%{_datadir}/appdata/impress.appdata.xml -%endif %files -f file-lists/writer_list.txt writer %defattr(-,root,root) -%if 0%{?suse_version} > 1315 -%{_datadir}/appdata/writer.appdata.xml -%endif %files -f file-lists/postgresql_list.txt base-drivers-postgresql %defattr(-,root,root) From 6e9b3978a895c5c0b19b43eaf97da7683af7f9ca59dcd66fbc02cdbafa3565e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 11:56:56 +0000 Subject: [PATCH 02/24] - Add conditional for noarch subpackages - Add switch in configure to detect more of internal/external stuff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=247 --- libreoffice.changes | 6 +++++ libreoffice.spec | 54 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 43217b6..2ede634 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 15 11:56:26 UTC 2015 - tchvatal@suse.com + +- Add conditional for noarch subpackages +- Add switch in configure to detect more of internal/external stuff + ------------------------------------------------------------------- Wed Apr 15 11:42:37 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 643daa2..97094fa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,17 +16,30 @@ # +# Applications datastore %if 0%{?suse_version} > 1315 %bcond_without appdatastore %else %bcond_with appdatastore %endif +# GTK3 and gstreamer switch +%if 0%{?suse_version} > 1230 +%bcond_without newmedia +%else +%bcond_with newmedia +%endif +# Wether to use internal libs or rely on system ones %if 0%{?suse_version} > 1230 %bcond_without systemlibs %else %bcond_with systemlibs %endif - +# Wether to provide noarch subpackages +%if 0%{?suse_version} > 1130 +%bcond_without noarch_subpkgs +%else +%bcond_with noarch_subpkgs +%endif # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -274,8 +287,10 @@ License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause an Group: Productivity/Office/Suite Supplements: packageand(libreoffice:branding-upstream) Provides: libreoffice-branding = %{version} -BuildArch: noarch Conflicts: otherproviders(libreoffice-branding) +%if %{with noarch_subpkgs} +BuildArch: noarch +%endif %description branding-upstream This package includes the original branding for the LibreOffice office suite. @@ -288,7 +303,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-crystal This package provides Crystal LibreOffice icon theme. It is used in KDE3 by default. @@ -302,7 +319,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-galaxy This package provides Galaxy LibreOffice icon theme. It is used in the original OOo-3.x by default. @@ -316,7 +335,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-hicontrast This package provides Hicontrast LibreOffice icon theme. @@ -330,7 +351,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-oxygen This package provides Oxygen LibreOffice icon theme. It is used in KDE4 by default. @@ -344,7 +367,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-sifr This package provides Sifr LibreOffice icon theme. @@ -358,7 +383,9 @@ Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} Provides: libreoffice-icon-themes = %{version} Obsoletes: libreoffice-icon-themes < %{version} +%if %{with noarch_subpkgs} BuildArch: noarch +%endif %description icon-theme-tango This package provides Tango LibreOffice icon theme. It is used in GNOME by default @@ -729,7 +756,9 @@ Requires: %{name} = %{version} \ Requires(post,): %{name} = %{version} \ Requires(postun,): %{name} = %{version} \ Provides: locale(libreoffice:%{lang}) \ +%if %{with noarch_subpkgs} \ BuildArch: noarch \ +%endif \ %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \ %{-r:Requires: %{-r*}} \ %{-p:Provides: %{name}-l10n-%{-p*}} \ @@ -913,8 +942,14 @@ export NOCONFIGURE=yes --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ --with-system-headers \ +%if %{with systemlibs} --with-system-libs \ --with-system-jars \ + --with-system-ucpp \ +%else + --without-system-libs \ + --without-system-jars \ +%endif --with-system-dicts \ --with-vendor=SUSE \ --with-alloc=system \ @@ -923,11 +958,19 @@ export NOCONFIGURE=yes --with-external-tar="$RPM_SOURCE_DIR" \ --disable-epm \ --disable-gnome-vfs \ - --disable-gstreamer-0-10 \ --disable-kdeab \ --disable-kde \ --disable-online-update \ --disable-systray \ +%if %{with newmedia} + --disable-gstreamer-0-10 \ + --enable-gstreamer-1-0 \ + --disable-gtk3 \ +%else + --enable-gstreamer-0-10 \ + --disable-gstreamer-1-0 \ + --enable-gtk3 \ +%endif --enable-release-build \ --enable-split-app-modules \ --enable-split-opt-features \ @@ -948,9 +991,7 @@ export NOCONFIGURE=yes --with-help \ --enable-odk \ --with-doxygen \ - --enable-gtk3 \ --enable-kde4 \ - --enable-gstreamer-1-0 \ --enable-evolution2 \ --enable-lockdown \ --enable-dbus \ @@ -964,9 +1005,8 @@ export NOCONFIGURE=yes --enable-scripting-javascript \ --disable-vlc \ --enable-neon \ - --with-system-ucpp \ --disable-ccache \ - --enable-gltf --with-system-libgltf \ + --enable-gltf \ --disable-coinmp \ --disable-collada \ --enable-symbols From a80a38ecfcfe01a2c68737ae563f9c52209dbd7f151101108db061e3e322c555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 12:44:39 +0000 Subject: [PATCH 03/24] - Allow switch between py2 and py3 - Move external dependencies in conditional thus allow build on SLE11 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=248 --- libreoffice.changes | 7 +++ libreoffice.spec | 122 ++++++++++++++++++++++++-------------------- 2 files changed, 75 insertions(+), 54 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 2ede634..345b066 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com + +- Allow switch between py2 and py3 +- Move external dependencies in conditional thus allow build on + SLE11 + ------------------------------------------------------------------- Wed Apr 15 11:56:26 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 97094fa..7fa49b7 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -22,7 +22,7 @@ %else %bcond_with appdatastore %endif -# GTK3 and gstreamer switch +# GTK3, gstreamer and fresh doxygen switch %if 0%{?suse_version} > 1230 %bcond_without newmedia %else @@ -40,6 +40,12 @@ %else %bcond_with noarch_subpkgs %endif +# python2 or python3 as base +%if 0%{?suse_version} > 1130 +%global python_type python3 +%else +%global python_type python +%endif # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} # extensions @@ -98,13 +104,7 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff -BuildRequires: ImageMagick -BuildRequires: ant -BuildRequires: ant-apache-regexp -BuildRequires: ant-nodeps -BuildRequires: autoconf -BuildRequires: bison -BuildRequires: bluez-devel +%if %{with systemlibs} BuildRequires: boost-devel BuildRequires: bsh2 BuildRequires: clucene-core-devel @@ -112,41 +112,23 @@ BuildRequires: commons-codec BuildRequires: commons-httpclient BuildRequires: commons-lang BuildRequires: commons-logging -BuildRequires: cups-devel -BuildRequires: curl-devel -BuildRequires: db-devel -BuildRequires: dbus-1-glib-devel -BuildRequires: doxygen >= 1.8.4 -BuildRequires: fdupes -BuildRequires: flac-devel BuildRequires: flex BuildRequires: flute -BuildRequires: gcc-c++ BuildRequires: glew-devel >= 1.10.0 BuildRequires: glm-devel BuildRequires: glu-devel -BuildRequires: gnome-vfs2-devel -BuildRequires: gperf BuildRequires: graphite2-devel >= 0.9.3 -BuildRequires: gstreamer-plugins-base-devel -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel BuildRequires: harfbuzz-devel BuildRequires: hunspell-devel BuildRequires: hyphen-devel BuildRequires: icu -BuildRequires: java-devel >= 1.6 BuildRequires: junit4 -BuildRequires: krb5 -BuildRequires: krb5-devel BuildRequires: libabw-devel BuildRequires: libbase BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 BuildRequires: libcppunit-devel BuildRequires: libe-book-devel >= 0.1.1 -# Fonts are needed for tests -BuildRequires: liberation-fonts BuildRequires: libetonyek-devel >= 0.1.1 BuildRequires: libexif BuildRequires: libexpat-devel @@ -157,7 +139,6 @@ BuildRequires: libformula BuildRequires: libfreehand-devel BuildRequires: libgltf-devel BuildRequires: libicu-devel -BuildRequires: libkde4-devel BuildRequires: liblangtag-devel BuildRequires: liblayout BuildRequires: liblcms2-devel @@ -175,7 +156,6 @@ BuildRequires: librepository BuildRequires: librevenge-devel >= 0.0.1 BuildRequires: librsvg-devel BuildRequires: libserializer -BuildRequires: libtool BuildRequires: libvisio-devel >= 0.1 BuildRequires: libwpd-devel >= 0.10 BuildRequires: libwpg-devel @@ -183,45 +163,77 @@ BuildRequires: libwps-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel -BuildRequires: make BuildRequires: mdds-devel >= 0.11.2 BuildRequires: mozilla-nspr-devel >= 4.8 BuildRequires: mozilla-nss-devel >= 3.9.3 BuildRequires: mythes-devel BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk -BuildRequires: openldap2-devel -BuildRequires: pam-devel -BuildRequires: patch BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine -BuildRequires: perl-Archive-Zip -BuildRequires: perl-Compress-Zlib BuildRequires: postgresql-devel -BuildRequires: procps -BuildRequires: python3-devel -BuildRequires: python3-xml BuildRequires: recode BuildRequires: rhino BuildRequires: sac BuildRequires: sane-backends-devel BuildRequires: ucpp -BuildRequires: unixODBC-devel -BuildRequires: unzip BuildRequires: vigra-devel BuildRequires: xml-commons-apis +BuildRequires: pkgconfig(fbembed) +%endif +# Fonts are needed for tests +BuildRequires: ImageMagick +BuildRequires: ant +BuildRequires: ant-apache-regexp +BuildRequires: ant-nodeps +BuildRequires: autoconf +BuildRequires: bison +BuildRequires: bluez-devel +BuildRequires: cups-devel +BuildRequires: curl-devel +BuildRequires: db-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: fdupes +BuildRequires: flac-devel +BuildRequires: gcc-c++ +BuildRequires: gnome-vfs2-devel +BuildRequires: gperf +BuildRequires: gtk2-devel +BuildRequires: liberation-fonts +%if %{with newmedia} +BuildRequires: doxygen >= 1.8.4 +BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gtk3-devel +%else +BuildRequires: gstreamer010-plugins-base-devel +%endif +BuildRequires: %{python_type}-devel +BuildRequires: %{python_type}-xml +BuildRequires: java-devel >= 1.6 +BuildRequires: krb5 +BuildRequires: krb5-devel +BuildRequires: libkde4-devel +BuildRequires: libtool +BuildRequires: make +BuildRequires: openldap2-devel +BuildRequires: pam-devel +BuildRequires: patch +BuildRequires: perl-Archive-Zip +BuildRequires: perl-Compress-Zlib +BuildRequires: procps +BuildRequires: unixODBC-devel +BuildRequires: unzip BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip -BuildRequires: pkgconfig(fbembed) Requires: google-carlito-fonts Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} # We need at least english to launch ourselves. +Requires: %{python_type} Requires: liberation-fonts Requires: libreoffice-l10n-en = %{version} -Requires: python3 Requires(post): coreutils Requires(post): grep Requires(post): gtk2 @@ -545,11 +557,13 @@ Group: Documentation/HTML Requires: %{name} = %{version} Requires: gcc-c++ Requires: make -Requires: ucpp Requires: zip Recommends: java-devel Provides: libreoffice-ure-devel = %version Obsoletes: libreoffice-ure-devel < %version +%if %{with systemlibs} +Requires: ucpp +%endif %description sdk This package contains the files needed to build plugins/add-ons for @@ -753,25 +767,25 @@ fi \ Summary: %{langname} Localization Files for LibreOffice \ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ -Requires(post,): %{name} = %{version} \ -Requires(postun,): %{name} = %{version} \ Provides: locale(libreoffice:%{lang}) \ %if %{with noarch_subpkgs} \ +Requires(post,): %{name} = %{version} \ +Requires(postun,): %{name} = %{version} \ BuildArch: noarch \ %endif \ %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \ %{-r:Requires: %{-r*}} \ %{-p:Provides: %{name}-l10n-%{-p*}} \ %{-T: \ -Provides: %{name}-help-%{lang} = %{version} \ -Obsoletes: %{name}-help-%{lang} < %{version} \ +Provides: %{name}-help-%{lang} = %{version} \ +Obsoletes: %{name}-help-%{lang} < %{version} \ %{-L: \ -Provides: %{name}-help-%{-L*} = %{version} \ -Obsoletes: %{name}-help-%{-L*} < %{version} \ +Provides: %{name}-help-%{-L*} = %{version} \ +Obsoletes: %{name}-help-%{-L*} < %{version} \ } \ %{-p: \ -Provides: %{name}-help-%{-p*} = %{version} \ -Obsoletes: %{name}-help-%{-p*} < %{version} \ +Provides: %{name}-help-%{-p*} = %{version} \ +Obsoletes: %{name}-help-%{-p*} < %{version} \ } \ } \ \ @@ -927,11 +941,11 @@ export ARCH_FLAGS CFLAGS CXXFLAGS export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' -# Whack in our python3 so we don't have to use internal one +# Whack in our python so we don't have to use internal one # which is quite nightmare. -export PYTHON=%{_bindir}/python3 -export PYTHON_CFLAGS=`pkg-config --cflags python3` -export PYTHON_LIBS=`pkg-config --libs python3` +export PYTHON=%{_bindir}/%{python_type} +export PYTHON_CFLAGS=`pkg-config --cflags %{python_type}` +export PYTHON_LIBS=`pkg-config --libs %{python_type}` # do not run configure in autogen but use macro later export NOCONFIGURE=yes From 137f047862da9552d8f5a52f55aa6b6daec90e0ebac8756288e1493e8a3fbded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 12:57:30 +0000 Subject: [PATCH 04/24] - Reduce requirement over GCC to 4.1 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=249 --- libreoffice.changes | 5 +++++ libreoffice.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 345b066..b54bea3 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 12:57:16 UTC 2015 - tchvatal@suse.com + +- Reduce requirement over GCC to 4.1 + ------------------------------------------------------------------- Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 7fa49b7..c210942 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -760,7 +760,6 @@ fi \ %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ %define pkgname l10n-%{lang} \ %define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ -\ %global langpack_langs %{langpack_langs} %{_langpack_lang} %{-i:%{-i*}} \ \ %package %{pkgname} \ @@ -898,6 +897,11 @@ Provides additional %{langname} translations and resources for %{project}. \ # 256x256 icons tar -xjf %{SOURCE20} +# Reduce the gcc version requirement +sed -i \ + -e 's:-lt 0406:-lt 0401:g' \ + configure.ac + # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile From 726d98d211e434202fa322d97e3653668394585ad4f75ee3db4b2f9c326f6cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 13:05:12 +0000 Subject: [PATCH 05/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=250 --- libreoffice.changes | 5 ----- libreoffice.spec | 5 ----- 2 files changed, 10 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index b54bea3..345b066 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 15 12:57:16 UTC 2015 - tchvatal@suse.com - -- Reduce requirement over GCC to 4.1 - ------------------------------------------------------------------- Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index c210942..70fba74 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -897,11 +897,6 @@ Provides additional %{langname} translations and resources for %{project}. \ # 256x256 icons tar -xjf %{SOURCE20} -# Reduce the gcc version requirement -sed -i \ - -e 's:-lt 0406:-lt 0401:g' \ - configure.ac - # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile From cb626de2bf80739b2e2e1fbe309b66382ab583fff43c09e6a7a01cc976588e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 15 Apr 2015 19:41:11 +0000 Subject: [PATCH 06/24] - Try to pass configure without system libs OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=251 --- libreoffice.changes | 5 ++++ libreoffice.spec | 68 ++++++++++++++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 19 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index 345b066..06e3a3d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 15 18:50:30 UTC 2015 - tchvatal@suse.com + +- Try to pass configure without system libs + ------------------------------------------------------------------- Wed Apr 15 12:43:41 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 70fba74..9693137 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -112,32 +112,26 @@ BuildRequires: commons-codec BuildRequires: commons-httpclient BuildRequires: commons-lang BuildRequires: commons-logging -BuildRequires: flex BuildRequires: flute BuildRequires: glew-devel >= 1.10.0 BuildRequires: glm-devel BuildRequires: glu-devel BuildRequires: graphite2-devel >= 0.9.3 BuildRequires: harfbuzz-devel -BuildRequires: hunspell-devel -BuildRequires: hyphen-devel BuildRequires: icu BuildRequires: junit4 BuildRequires: libabw-devel BuildRequires: libbase BuildRequires: libcdr-devel >= 0.1 BuildRequires: libcmis-devel >= 0.5.0 -BuildRequires: libcppunit-devel BuildRequires: libe-book-devel >= 0.1.1 BuildRequires: libetonyek-devel >= 0.1.1 BuildRequires: libexif -BuildRequires: libexpat-devel BuildRequires: libexttextcat-devel >= 3.1.1 BuildRequires: libfbembed-devel BuildRequires: libfonts BuildRequires: libformula BuildRequires: libfreehand-devel -BuildRequires: libgltf-devel BuildRequires: libicu-devel BuildRequires: liblangtag-devel BuildRequires: liblayout @@ -150,7 +144,6 @@ BuildRequires: libmysqlcppconn-devel >= 1.0.6 BuildRequires: libodfgen-devel >= 0.1 BuildRequires: liborcus-devel >= 0.7.0 BuildRequires: libpagemaker-devel -BuildRequires: libpoppler-devel BuildRequires: libredland-devel BuildRequires: librepository BuildRequires: librevenge-devel >= 0.0.1 @@ -164,10 +157,6 @@ BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: lpsolve-devel BuildRequires: mdds-devel >= 0.11.2 -BuildRequires: mozilla-nspr-devel >= 4.8 -BuildRequires: mozilla-nss-devel >= 3.9.3 -BuildRequires: mythes-devel -BuildRequires: neon-devel >= 0.26.0 BuildRequires: npapi-sdk BuildRequires: pentaho-libxml BuildRequires: pentaho-reporting-flow-engine @@ -181,7 +170,6 @@ BuildRequires: vigra-devel BuildRequires: xml-commons-apis BuildRequires: pkgconfig(fbembed) %endif -# Fonts are needed for tests BuildRequires: ImageMagick BuildRequires: ant BuildRequires: ant-apache-regexp @@ -195,16 +183,28 @@ BuildRequires: db-devel BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: flac-devel +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gnome-vfs2-devel BuildRequires: gperf BuildRequires: gtk2-devel +BuildRequires: hunspell-devel +BuildRequires: hyphen-devel +BuildRequires: libcppunit-devel BuildRequires: liberation-fonts +BuildRequires: libexpat-devel +BuildRequires: libpoppler-devel +BuildRequires: mozilla-nspr-devel >= 4.8 +BuildRequires: mozilla-nss-devel >= 3.9.3 +BuildRequires: mythes-devel +BuildRequires: neon-devel >= 0.26.0 %if %{with newmedia} BuildRequires: doxygen >= 1.8.4 BuildRequires: gstreamer-plugins-base-devel BuildRequires: gtk3-devel +BuildRequires: libgltf-devel %else +BuildRequires: gcc47-c++ BuildRequires: gstreamer010-plugins-base-devel %endif BuildRequires: %{python_type}-devel @@ -227,12 +227,13 @@ BuildRequires: xorg-x11 BuildRequires: xorg-x11-fonts BuildRequires: xz BuildRequires: zip +Requires: %{python_type} Requires: google-carlito-fonts Requires: libreoffice-branding >= 4.0 Requires: libreoffice-icon-themes = %{version} -# We need at least english to launch ourselves. -Requires: %{python_type} +# Fonts are needed for tests Requires: liberation-fonts +# We need at least english to launch ourselves. Requires: libreoffice-l10n-en = %{version} Requires(post): coreutils Requires(post): grep @@ -943,8 +944,19 @@ export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOL # Whack in our python so we don't have to use internal one # which is quite nightmare. export PYTHON=%{_bindir}/%{python_type} +%if %{with newmedia} export PYTHON_CFLAGS=`pkg-config --cflags %{python_type}` export PYTHON_LIBS=`pkg-config --libs %{python_type}` +%else +export PYTHON_CFLAGS=`%{python_type}-config --cflags` +export PYTHON_LIBS=`%{python_type}-config --libs` +%endif + +# Old systems need help in finding the gcc +%if !%{with newmedia} +export CC=/usr/bin/gcc-4.7 +export CXX=/usr/bin/g++-4.7 +%endif # do not run configure in autogen but use macro later export NOCONFIGURE=yes @@ -954,14 +966,30 @@ export NOCONFIGURE=yes --enable-mergelibs \ --docdir=%{_docdir}/%{name} \ --with-compat-oowrappers \ - --with-system-headers \ %if %{with systemlibs} + --with-system-headers \ --with-system-libs \ --with-system-jars \ --with-system-ucpp \ %else --without-system-libs \ --without-system-jars \ + --without-system-headers \ + --without-junit \ + --with-system-expat \ + --with-system-curl \ + --with-system-neon \ + --with-system-hunspell \ + --with-system-mythes \ + --with-system-bluez \ + --with-system-mesa-headers \ + --with-system-openldap \ + --with-system-odbc \ + --with-system-nss \ + --with-system-jpeg \ + --with-system-cppunit \ + --with-system-poppler \ + --with-system-openssl \ %endif --with-system-dicts \ --with-vendor=SUSE \ @@ -978,11 +1006,15 @@ export NOCONFIGURE=yes %if %{with newmedia} --disable-gstreamer-0-10 \ --enable-gstreamer-1-0 \ - --disable-gtk3 \ + --enable-gtk3 \ + --with-doxygen \ + -enable-gltf \ %else --enable-gstreamer-0-10 \ --disable-gstreamer-1-0 \ - --enable-gtk3 \ + --disable-gtk3 \ + --without-doxygen \ + --disable-gltf \ %endif --enable-release-build \ --enable-split-app-modules \ @@ -1003,7 +1035,6 @@ export NOCONFIGURE=yes --with-external-thes-dir=%{_datadir}/mythes \ --with-help \ --enable-odk \ - --with-doxygen \ --enable-kde4 \ --enable-evolution2 \ --enable-lockdown \ @@ -1019,7 +1050,6 @@ export NOCONFIGURE=yes --disable-vlc \ --enable-neon \ --disable-ccache \ - --enable-gltf \ --disable-coinmp \ --disable-collada \ --enable-symbols From 617cd3d41a284926011317570a8cd2cbeb0c4ae6858c8f79127452dc2a0c7e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 08:24:48 +0000 Subject: [PATCH 07/24] - Add patch to check for poppler more nicely to work on older distros: * 0001-Make-cpp-poppler-version.h-header-optional.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=252 --- ...pp-poppler-version.h-header-optional.patch | 60 +++++++++++++++++++ libreoffice.changes | 6 ++ libreoffice.spec | 3 + 3 files changed, 69 insertions(+) create mode 100644 0001-Make-cpp-poppler-version.h-header-optional.patch diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch new file mode 100644 index 0000000..9ffaa41 --- /dev/null +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -0,0 +1,60 @@ +From 9d12508156c354b1ee903727b07a2107be99e90a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +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 +--- + configure.ac | 7 ++++--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9e8e1d2..4dff95b 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],[Define to 1 if you have .])], ++ [AC_DEFINE([HAVE_POPPLER_VERSION_H],[0],[Define to 1 if you have .])]) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index d15491b..fbe40a8 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -50,7 +50,14 @@ + class GfxPath; + class GfxFont; + class PDFDoc; ++#ifdef HAVE_POPPLER_VERSION_H + #include ++#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 + diff --git a/libreoffice.changes b/libreoffice.changes index 06e3a3d..c66b591 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 16 08:24:22 UTC 2015 - tchvatal@suse.com + +- 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 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 9693137..52b9d67 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -102,6 +102,8 @@ Patch3: system-pyuno.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff +# PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0 +Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff %if %{with systemlibs} @@ -894,6 +896,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch3 -p1 %patch4 %patch5 +%patch6 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From 13de9c81f8dc96e66723ba8aa79255aa566066b3b91831a28d97a74121600864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 09:35:24 +0000 Subject: [PATCH 08/24] - Add basic external tarballs needed for without-system-libraries OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=253 --- ...24cfac409e766913506961a8-ucpp-1.3.2.tar.gz | 3 ++ ...3651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 | 3 ++ ...3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz | 3 ++ ...1776f39b-commons-httpclient-3.1-src.tar.gz | 3 ++ ...5ce7d69ddfff7-commons-codec-1.6-src.tar.gz | 3 ++ ...d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz | 3 ++ ...2ae5f16bbd603bd1e1d03-libformula-1.1.7.zip | 3 ++ ...cea1514f1369fcfc87542390fd-sacjava-1.3.zip | 3 ++ ...199af31923e900d082ca2dd-libfonts-1.1.6.zip | 3 ++ ...a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz | 3 ++ ...e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz | 3 ++ ...7b4b1210e25438d51825404d5a-glew-1.10.0.zip | 3 ++ ...9bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz | 3 ++ ...ca43c9469d6e6b-commons-lang-2.4-src.tar.gz | 3 ++ ...df67f08e5-mysql-connector-c++-1.1.4.tar.gz | 3 ++ ...89d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 | 3 ++ ...6c41f7201d15373ed9-librepository-1.1.6.zip | 3 ++ ...62397f446b217e2b623e71-libloader-1.1.6.zip | 3 ++ Firebird-2.5.2.26540-0.tar.bz2 | 3 ++ ...722d881661-mariadb_client-2.0.0-src.tar.gz | 3 ++ ...9184e329db254e454a010f56d-libxml-1.1.7.zip | 3 ++ ...dfef197608d1f69300919b9-icu4c-53_1-src.tgz | 3 ++ ...019c2d93a8c88c651a0f-flow-engine-0.9.4.zip | 3 ++ ...daace6e199adc3-glm-0.9.4.6-libreoffice.zip | 3 ++ ...3c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 | 3 ++ commons-logging-1.2-src.tar.gz | 3 ++ ...f908e85643e557a236ea989c-vigra1.6.0.tar.gz | 3 ++ ...b2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 | 3 ++ ...ed178db6e2b18eeed243f85aa8-flute-1.1.6.zip | 3 ++ ...d6d6807523deb71ee34dc-liblayout-0.2.10.zip | 3 ++ ...84aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz | 3 ++ ...f0d302fba4bfc6e97eac9624-libbase-1.1.6.zip | 3 ++ ...e3b597f9265f4e9803-libserializer-1.1.6.zip | 3 ++ graphite2-1.2.4.tgz | 3 ++ harfbuzz-0.9.23.tar.bz2 | 3 ++ lcms2-2.6.tar.gz | 3 ++ libabw-0.1.1.tar.bz2 | 3 ++ libcdr-0.1.1.tar.bz2 | 3 ++ libe-book-0.1.2.tar.bz2 | 3 ++ libetonyek-0.1.1.tar.bz2 | 3 ++ libfreehand-0.1.0.tar.bz2 | 3 ++ libmspub-0.1.2.tar.bz2 | 3 ++ libmwaw-0.3.4.tar.bz2 | 3 ++ libodfgen-0.1.3.tar.bz2 | 3 ++ libpagemaker-0.0.2.tar.bz2 | 3 ++ libreoffice.changes | 5 ++ libreoffice.spec | 54 +++++++++++++++++++ librevenge-0.0.2.tar.bz2 | 3 ++ libvisio-0.1.1.tar.bz2 | 3 ++ libwpd-0.10.0.tar.bz2 | 3 ++ libwpg-0.3.0.tar.bz2 | 3 ++ libwps-0.3.1.tar.bz2 | 3 ++ 52 files changed, 209 insertions(+) create mode 100644 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz create mode 100644 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 create mode 100644 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz create mode 100644 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz create mode 100644 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz create mode 100644 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz create mode 100644 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip create mode 100644 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip create mode 100644 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip create mode 100644 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz create mode 100644 5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz create mode 100644 594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip create mode 100644 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz create mode 100644 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz create mode 100644 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz create mode 100644 7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 create mode 100644 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip create mode 100644 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip create mode 100644 Firebird-2.5.2.26540-0.tar.bz2 create mode 100644 a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz create mode 100644 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip create mode 100644 b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz create mode 100644 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip create mode 100644 bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip create mode 100644 cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 create mode 100644 commons-logging-1.2-src.tar.gz create mode 100644 d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz create mode 100644 d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 create mode 100644 d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip create mode 100644 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip create mode 100644 ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz create mode 100644 eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip create mode 100644 f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip create mode 100644 graphite2-1.2.4.tgz create mode 100644 harfbuzz-0.9.23.tar.bz2 create mode 100644 lcms2-2.6.tar.gz create mode 100644 libabw-0.1.1.tar.bz2 create mode 100644 libcdr-0.1.1.tar.bz2 create mode 100644 libe-book-0.1.2.tar.bz2 create mode 100644 libetonyek-0.1.1.tar.bz2 create mode 100644 libfreehand-0.1.0.tar.bz2 create mode 100644 libmspub-0.1.2.tar.bz2 create mode 100644 libmwaw-0.3.4.tar.bz2 create mode 100644 libodfgen-0.1.3.tar.bz2 create mode 100644 libpagemaker-0.0.2.tar.bz2 create mode 100644 librevenge-0.0.2.tar.bz2 create mode 100644 libvisio-0.1.1.tar.bz2 create mode 100644 libwpd-0.10.0.tar.bz2 create mode 100644 libwpg-0.3.0.tar.bz2 create mode 100644 libwps-0.3.1.tar.bz2 diff --git a/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz b/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz new file mode 100644 index 0000000..9abd3a2 --- /dev/null +++ b/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 +size 96939 diff --git a/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 b/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 new file mode 100644 index 0000000..b091a60 --- /dev/null +++ b/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163 +size 1129140 diff --git a/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz b/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz new file mode 100644 index 0000000..1f099c7 --- /dev/null +++ b/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695 +size 769268 diff --git a/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz b/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz new file mode 100644 index 0000000..ce3caeb --- /dev/null +++ b/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9a496d3418b0e15894fb351652cd4fa5ca434ebfc3ce3bb8da40defd8b097f2 +size 1882664 diff --git a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz new file mode 100644 index 0000000..7a52ac3 --- /dev/null +++ b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b +size 262206 diff --git a/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz b/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz new file mode 100644 index 0000000..57627b9 --- /dev/null +++ b/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd +size 1624112 diff --git a/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip b/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip new file mode 100644 index 0000000..9bac764 --- /dev/null +++ b/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b +size 1180582 diff --git a/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip b/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip new file mode 100644 index 0000000..451c1f5 --- /dev/null +++ b/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 +size 153157 diff --git a/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip b/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip new file mode 100644 index 0000000..5d3558d --- /dev/null +++ b/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743 +size 5750610 diff --git a/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz b/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz new file mode 100644 index 0000000..ae107e9 --- /dev/null +++ b/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab +size 2241498 diff --git a/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz b/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz new file mode 100644 index 0000000..c5c6e15 --- /dev/null +++ b/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6 +size 738119 diff --git a/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip b/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip new file mode 100644 index 0000000..a9db7e7 --- /dev/null +++ b/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43c6229d787673ac1d35ebaad52dfdcc78c8b55d13ee78d8e4d7e4a6cb72b050 +size 860275 diff --git a/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz b/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz new file mode 100644 index 0000000..490d60b --- /dev/null +++ b/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705 +size 638369 diff --git a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz new file mode 100644 index 0000000..39de5ce --- /dev/null +++ b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4 +size 522654 diff --git a/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz b/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz new file mode 100644 index 0000000..a4e94bf --- /dev/null +++ b/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 +size 506106 diff --git a/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 b/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 new file mode 100644 index 0000000..ad186ec --- /dev/null +++ b/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 +size 1665988 diff --git a/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip b/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip new file mode 100644 index 0000000..728e5d6 --- /dev/null +++ b/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095 +size 762419 diff --git a/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip b/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip new file mode 100644 index 0000000..ed38746 --- /dev/null +++ b/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8 +size 2938721 diff --git a/Firebird-2.5.2.26540-0.tar.bz2 b/Firebird-2.5.2.26540-0.tar.bz2 new file mode 100644 index 0000000..bfef83a --- /dev/null +++ b/Firebird-2.5.2.26540-0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbb9a408198898818d5be3c301dde0f8524fd8e2f509662121d7393e02520721 +size 13805637 diff --git a/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz b/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz new file mode 100644 index 0000000..62cd73f --- /dev/null +++ b/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 +size 1923436 diff --git a/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip b/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip new file mode 100644 index 0000000..1d547e9 --- /dev/null +++ b/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 +size 2929311 diff --git a/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz b/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz new file mode 100644 index 0000000..ea7eda1 --- /dev/null +++ b/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28 +size 23218952 diff --git a/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip b/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip new file mode 100644 index 0000000..3c982e6 --- /dev/null +++ b/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd +size 743031 diff --git a/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip b/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip new file mode 100644 index 0000000..75d89aa --- /dev/null +++ b/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a +size 5290295 diff --git a/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 b/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 new file mode 100644 index 0000000..6e843ad --- /dev/null +++ b/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd0a0dc8b35d6582efad6898546c86714eb058696ba26b0e7f8914faa002a5ab +size 154444 diff --git a/commons-logging-1.2-src.tar.gz b/commons-logging-1.2-src.tar.gz new file mode 100644 index 0000000..5a213c4 --- /dev/null +++ b/commons-logging-1.2-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 +size 188536 diff --git a/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz b/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz new file mode 100644 index 0000000..6bbde9d --- /dev/null +++ b/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f +size 16525605 diff --git a/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 b/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 new file mode 100644 index 0000000..ecd2d4e --- /dev/null +++ b/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 +size 58146647 diff --git a/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip b/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip new file mode 100644 index 0000000..c7d04d8 --- /dev/null +++ b/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133 +size 207563 diff --git a/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip b/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip new file mode 100644 index 0000000..bd4a309 --- /dev/null +++ b/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772 +size 1396007 diff --git a/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz b/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz new file mode 100644 index 0000000..3d41a21 --- /dev/null +++ b/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:648f10fb764d000d6a68b2d4e008117900e853c197a024d1f91dbba9b91012ca +size 726942 diff --git a/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip b/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip new file mode 100644 index 0000000..d2e8098 --- /dev/null +++ b/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba +size 427800 diff --git a/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip b/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip new file mode 100644 index 0000000..c1b3560 --- /dev/null +++ b/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343 +size 211919 diff --git a/graphite2-1.2.4.tgz b/graphite2-1.2.4.tgz new file mode 100644 index 0000000..5ae5b91 --- /dev/null +++ b/graphite2-1.2.4.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003 +size 6938866 diff --git a/harfbuzz-0.9.23.tar.bz2 b/harfbuzz-0.9.23.tar.bz2 new file mode 100644 index 0000000..bdd1935 --- /dev/null +++ b/harfbuzz-0.9.23.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7 +size 1027508 diff --git a/lcms2-2.6.tar.gz b/lcms2-2.6.tar.gz new file mode 100644 index 0000000..dabf83b --- /dev/null +++ b/lcms2-2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1 +size 4583389 diff --git a/libabw-0.1.1.tar.bz2 b/libabw-0.1.1.tar.bz2 new file mode 100644 index 0000000..8efc6d9 --- /dev/null +++ b/libabw-0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199 +size 369311 diff --git a/libcdr-0.1.1.tar.bz2 b/libcdr-0.1.1.tar.bz2 new file mode 100644 index 0000000..830cab3 --- /dev/null +++ b/libcdr-0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49 +size 664694 diff --git a/libe-book-0.1.2.tar.bz2 b/libe-book-0.1.2.tar.bz2 new file mode 100644 index 0000000..4b23dcf --- /dev/null +++ b/libe-book-0.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850 +size 465922 diff --git a/libetonyek-0.1.1.tar.bz2 b/libetonyek-0.1.1.tar.bz2 new file mode 100644 index 0000000..90a1a05 --- /dev/null +++ b/libetonyek-0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:716edf726ba3896fe85eea9a75786948d5ddeda63a54c00f3308658cc3bbd9e4 +size 423556 diff --git a/libfreehand-0.1.0.tar.bz2 b/libfreehand-0.1.0.tar.bz2 new file mode 100644 index 0000000..0d264b9 --- /dev/null +++ b/libfreehand-0.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c69962d5947561afeefeee71bc78ba7419e9d9b0fea8bcef2f625be867afe307 +size 340549 diff --git a/libmspub-0.1.2.tar.bz2 b/libmspub-0.1.2.tar.bz2 new file mode 100644 index 0000000..90e7198 --- /dev/null +++ b/libmspub-0.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a +size 429360 diff --git a/libmwaw-0.3.4.tar.bz2 b/libmwaw-0.3.4.tar.bz2 new file mode 100644 index 0000000..c54ef32 --- /dev/null +++ b/libmwaw-0.3.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:444e15e3e60e9fcc7d859b201571d9612a5347cefd6e753ce4710f638514da67 +size 1170238 diff --git a/libodfgen-0.1.3.tar.bz2 b/libodfgen-0.1.3.tar.bz2 new file mode 100644 index 0000000..8755395 --- /dev/null +++ b/libodfgen-0.1.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66d1f350fb9c0e8c9eec1b8c644d8531b8d6777ae7b8507f8abc4783b6d2981c +size 406636 diff --git a/libpagemaker-0.0.2.tar.bz2 b/libpagemaker-0.0.2.tar.bz2 new file mode 100644 index 0000000..a4607b9 --- /dev/null +++ b/libpagemaker-0.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f +size 358918 diff --git a/libreoffice.changes b/libreoffice.changes index c66b591..4f177f0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 16 09:34:00 UTC 2015 - tchvatal@suse.com + +- Add basic external tarballs needed for without-system-libraries + ------------------------------------------------------------------- Thu Apr 16 08:24:22 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 52b9d67..3d061ef 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -90,6 +90,59 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +# Bundled sources for without-system-libs build +Source2006: %{external_url}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz +Source2007: %{external_url}/librevenge-0.0.2.tar.bz2 +Source2008: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +Source2009: %{external_url}/libetonyek-0.1.1.tar.bz2 +Source2010: %{external_url}/libe-book-0.1.2.tar.bz2 +Source2011: %{external_url}/libfreehand-0.1.0.tar.bz2 +Source2012: %{external_url}/libodfgen-0.1.3.tar.bz2 +Source2013: %{external_url}/libcdr-0.1.1.tar.bz2 +Source2014: %{external_url}/libmspub-0.1.2.tar.bz2 +Source2015: %{external_url}/libmwaw-0.3.4.tar.bz2 +Source2016: %{external_url}/libpagemaker-0.0.2.tar.bz2 +Source2017: %{external_url}/libvisio-0.1.1.tar.bz2 +Source2018: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz +Source2019: %{external_url}/libwpd-0.10.0.tar.bz2 +Source2020: %{external_url}/libwpg-0.3.0.tar.bz2 +Source2021: %{external_url}/libwps-0.3.1.tar.bz2 +Source2022: %{external_url}/libabw-0.1.1.tar.bz2 +Source2023: %{external_url}/lcms2-2.6.tar.gz +Source2024: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source2025: %{external_url}/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2 +Source2026: %{external_url}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz +Source2027: %{external_url}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz +Source2028: %{external_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 +Source2029: %{external_url}/594eb47b4b1210e25438d51825404d5a-glew-1.10.0.zip +Source2030: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip +Source2031: %{external_url}/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz +Source2032: %{external_url}/graphite2-1.2.4.tgz +Source2033: %{external_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 +Source2034: %{external_url}/harfbuzz-0.9.23.tar.bz2 +Source2035: %{external_url}/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz +Source2036: %{external_url}/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 +Source2037: %{external_url}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +Source2038: %{external_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 +Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz +Source2042: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz +Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz +Source2044: %{external_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +Source2045: %{external_url}/commons-logging-1.2-src.tar.gz +Source2046: %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +Source2047: %{external_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +Source2048: %{external_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +Source2049: %{external_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +Source2050: %{external_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +Source2051: %{external_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +Source2052: %{external_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +Source2053: %{external_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +Source2054: %{external_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +Source2055: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz # 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 @@ -990,6 +1043,7 @@ export NOCONFIGURE=yes --with-system-odbc \ --with-system-nss \ --with-system-jpeg \ + --with-system-libpng \ --with-system-cppunit \ --with-system-poppler \ --with-system-openssl \ diff --git a/librevenge-0.0.2.tar.bz2 b/librevenge-0.0.2.tar.bz2 new file mode 100644 index 0000000..8aaa7c3 --- /dev/null +++ b/librevenge-0.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dedd6fe1f643fc2f254f2ad3719547084bd86bcc482104b995caf3b828368b18 +size 486777 diff --git a/libvisio-0.1.1.tar.bz2 b/libvisio-0.1.1.tar.bz2 new file mode 100644 index 0000000..93bdc35 --- /dev/null +++ b/libvisio-0.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be166f55208de20362cccab111deb371e2a81b17fb0a0aa93682e248759fca8d +size 515702 diff --git a/libwpd-0.10.0.tar.bz2 b/libwpd-0.10.0.tar.bz2 new file mode 100644 index 0000000..d9321ad --- /dev/null +++ b/libwpd-0.10.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91 +size 632272 diff --git a/libwpg-0.3.0.tar.bz2 b/libwpg-0.3.0.tar.bz2 new file mode 100644 index 0000000..e2b1be1 --- /dev/null +++ b/libwpg-0.3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28fc3580228a82948dfc01d07abd5076c8b0df76a68702c1a81eb88fdf377348 +size 381878 diff --git a/libwps-0.3.1.tar.bz2 b/libwps-0.3.1.tar.bz2 new file mode 100644 index 0000000..4c82096 --- /dev/null +++ b/libwps-0.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceb6b1aac4646c641709a00a1bdceb296b30fe8b5e52446f104892e9cc338d4f +size 496436 From bcf1a7d6394c5f074f4e742d9661da6d557709738027d6622d20accffc30505b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 11:45:25 +0000 Subject: [PATCH 09/24] - Sort out more external tarballs for the no-system-libs approach OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=254 --- ...51f3271906db5126ab76870444c4-commons-codec-1.9-src.zip | 3 +++ ...567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz | 3 --- 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 | 3 +++ 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz | 3 +++ ...f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz | 3 --- ...b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz | 3 +++ b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz | 3 +++ c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 | 3 +++ libreoffice.changes | 5 +++++ libreoffice.spec | 8 ++++++-- 10 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip delete mode 100644 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz create mode 100644 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 create mode 100644 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz delete mode 100644 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz create mode 100644 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz create mode 100644 b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz create mode 100644 c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 diff --git a/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip b/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip new file mode 100644 index 0000000..30ccdd2 --- /dev/null +++ b/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831 +size 525299 diff --git a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz deleted file mode 100644 index 7a52ac3..0000000 --- a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b -size 262206 diff --git a/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 b/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 new file mode 100644 index 0000000..c30c2ef --- /dev/null +++ b/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b +size 651785 diff --git a/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz b/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz new file mode 100644 index 0000000..96e8349 --- /dev/null +++ b/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef +size 1788163 diff --git a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz deleted file mode 100644 index 39de5ce..0000000 --- a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4 -size 522654 diff --git a/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz b/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz new file mode 100644 index 0000000..a04cf15 --- /dev/null +++ b/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908 +size 739050 diff --git a/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz b/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz new file mode 100644 index 0000000..0a2e22a --- /dev/null +++ b/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd +size 1469921 diff --git a/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 b/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 new file mode 100644 index 0000000..1586ae8 --- /dev/null +++ b/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461 +size 16113737 diff --git a/libreoffice.changes b/libreoffice.changes index 4f177f0..6055f6c 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 16 11:43:32 UTC 2015 - tchvatal@suse.com + +- Sort out more external tarballs for the no-system-libs approach + ------------------------------------------------------------------- Thu Apr 16 09:34:00 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 3d061ef..7ce2bda 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -127,8 +127,8 @@ Source2038: %{external_url}/ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.t Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz -Source2042: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz -Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz +Source2042: %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz +Source2043: %{external_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz Source2044: %{external_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz Source2045: %{external_url}/commons-logging-1.2-src.tar.gz Source2046: %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -143,6 +143,10 @@ Source2054: %{external_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1 Source2055: %{external_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz +Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 +Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 +Source2060: %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz # 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 From cfc48c49648949b5371cf66467f421db5b977607a34242a448525b4aa42ea03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 11:45:59 +0000 Subject: [PATCH 10/24] - Update the old-poppler patch to work correctly: * 0001-Make-cpp-poppler-version.h-header-optional.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=255 --- ...pp-poppler-version.h-header-optional.patch | 24 ++++++++++++------- libreoffice.changes | 6 +++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch index 9ffaa41..d0884f1 100644 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -1,4 +1,4 @@ -From 9d12508156c354b1ee903727b07a2107be99e90a Mon Sep 17 00:00:00 2001 +From e0d1a6ee0a54f677ce31c612e198f9c1a7dc555a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: [PATCH] Make cpp/poppler-version.h header optional @@ -9,12 +9,12 @@ possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c --- - configure.ac | 7 ++++--- + configure.ac | 8 +++++--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ - 2 files changed, 11 insertions(+), 3 deletions(-) + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 9e8e1d2..4dff95b 100644 +index 9e8e1d2..426e909 100644 --- a/configure.ac +++ b/configure.ac @@ -10432,14 +10432,15 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_ @@ -31,20 +31,28 @@ index 9e8e1d2..4dff95b 100644 - 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],[Define to 1 if you have .])], -+ [AC_DEFINE([HAVE_POPPLER_VERSION_H],[0],[Define to 1 if you have .])]) ++ [AC_DEFINE([HAVE_POPPLER_VERSION_H])], ++ []) 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]) + fi + else + AC_MSG_RESULT([no]) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index d15491b..fbe40a8 100644 +index d15491b..06a0120 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -50,7 +50,14 @@ class GfxPath; class GfxFont; class PDFDoc; -+#ifdef HAVE_POPPLER_VERSION_H ++#if HAVE_POPPLER_VERSION_H #include +#else +#define POPPLER_VERSION "0.12.3" diff --git a/libreoffice.changes b/libreoffice.changes index 6055f6c..de4eb40 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 16 11:45:39 UTC 2015 - tchvatal@suse.com + +- 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 - tchvatal@suse.com From eeac3d2bc70423c3d5d811584d3ee09cc2fffd4a737f43983cd3eed63d0d3c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 12:24:06 +0000 Subject: [PATCH 11/24] - Add internal make for too old system - One more stab on poppler switch: * 0001-Make-cpp-poppler-version.h-header-optional.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=256 --- ...pp-poppler-version.h-header-optional.patch | 2 +- libreoffice.changes | 7 +++++++ libreoffice.spec | 21 +++++++++++++++++++ make-4.1.tar.bz2 | 3 +++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 make-4.1.tar.bz2 diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch index d0884f1..0307b1d 100644 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -52,7 +52,7 @@ index d15491b..06a0120 100644 class GfxPath; class GfxFont; class PDFDoc; -+#if HAVE_POPPLER_VERSION_H ++#ifdef HAVE_POPPLER_VERSION_H #include +#else +#define POPPLER_VERSION "0.12.3" diff --git a/libreoffice.changes b/libreoffice.changes index de4eb40..b136bd7 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 16 12:23:40 UTC 2015 - tchvatal@suse.com + +- 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 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 7ce2bda..c638051 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -16,6 +16,12 @@ # +# Old Make and bundle or not +%if 0%{?suse_version} > 1230 +%bcond_with oldmake +%else +%bcond_without oldmake +%endif # Applications datastore %if 0%{?suse_version} > 1315 %bcond_without appdatastore @@ -147,6 +153,8 @@ Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5. Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2060: %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz +# Make for old distros where too old gnumake resides +Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # 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 @@ -958,6 +966,15 @@ Provides additional %{langname} translations and resources for %{project}. \ # 256x256 icons tar -xjf %{SOURCE20} +# Unpack and compile new gmake +%if %{with oldmake} +tar -xjvf %{SOURCE3000} +cd make-4.1 +CFLAGS="%{optflags}" %configure +make %{?_smp_mflags} +cd - +%endif + # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile @@ -1018,6 +1035,10 @@ export CC=/usr/bin/gcc-4.7 export CXX=/usr/bin/g++-4.7 %endif +%if %{with oldmake} +export PATH="$RPM_BUILD_DIR/libreoffice-%{version}/make-4.1:$PATH:/usr/sbin" +%endif + # do not run configure in autogen but use macro later export NOCONFIGURE=yes ./autogen.sh diff --git a/make-4.1.tar.bz2 b/make-4.1.tar.bz2 new file mode 100644 index 0000000..5313e31 --- /dev/null +++ b/make-4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5 +size 1327342 From 04ad05b0cad414aaf84d242112234c45bce9df6d2383daad378c326f68abff46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 12:32:42 +0000 Subject: [PATCH 12/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=257 --- language-subtag-registry-2014-12-03.tar.bz2 | 3 +++ libreoffice.spec | 1 + 2 files changed, 4 insertions(+) create mode 100644 language-subtag-registry-2014-12-03.tar.bz2 diff --git a/language-subtag-registry-2014-12-03.tar.bz2 b/language-subtag-registry-2014-12-03.tar.bz2 new file mode 100644 index 0000000..66fb3b3 --- /dev/null +++ b/language-subtag-registry-2014-12-03.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a590bab49352b655ea7ad4ac4b7758b3a541124f4eec268733ab435f71c5f4 +size 72082 diff --git a/libreoffice.spec b/libreoffice.spec index c638051..ffbafd5 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -153,6 +153,7 @@ Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5. Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 Source2060: %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz +Source2062: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2 # Make for old distros where too old gnumake resides Source3000: http://ftp.gnu.org/gnu/make/make-4.1.tar.bz2 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse From 68dd25f36059d1e5663d97269f8a32231ba300ead9d349bcf04b50a0f250c36f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 13:42:18 +0000 Subject: [PATCH 13/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=258 --- ...pp-poppler-version.h-header-optional.patch | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch index 0307b1d..f2d3a6c 100644 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -1,4 +1,4 @@ -From e0d1a6ee0a54f677ce31c612e198f9c1a7dc555a Mon Sep 17 00:00:00 2001 +From 20e8dfef3957e6e94677f7609543a24b60f2ebfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: [PATCH] Make cpp/poppler-version.h header optional @@ -9,12 +9,30 @@ possible working candidate and also raise the .pc check to the same. Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c --- - configure.ac | 8 +++++--- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) + config_host/config_poppler.h.in | 10 ++++++++++ + configure.ac | 9 ++++++--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ + 3 files changed, 23 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..426e909 100644 +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_ @@ -31,7 +49,7 @@ index 9e8e1d2..426e909 100644 - 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])], ++ [AC_DEFINE([HAVE_POPPLER_VERSION_H], 1)], + []) CXXFLAGS=$save_CXXFLAGS CPPFLAGS=$save_CPPFLAGS @@ -40,10 +58,18 @@ index 9e8e1d2..426e909 100644 AC_MSG_RESULT([internal]) SYSTEM_POPPLER= BUILD_TYPE="$BUILD_TYPE POPPLER" -+ AC_DEFINE([HAVE_POPPLER_VERSION_H]) ++ 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..06a0120 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -52,7 +78,7 @@ index d15491b..06a0120 100644 class GfxPath; class GfxFont; class PDFDoc; -+#ifdef HAVE_POPPLER_VERSION_H ++#if HAVE_POPPLER_VERSION_H #include +#else +#define POPPLER_VERSION "0.12.3" From 815d743ea800ad73cb4d2ff0c268cfe8807fbe8b9f737f476aee57a170985953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 19:54:18 +0000 Subject: [PATCH 14/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=259 --- ...cpp-poppler-version.h-header-optional.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/0001-Make-cpp-poppler-version.h-header-optional.patch b/0001-Make-cpp-poppler-version.h-header-optional.patch index f2d3a6c..3531bdf 100644 --- a/0001-Make-cpp-poppler-version.h-header-optional.patch +++ b/0001-Make-cpp-poppler-version.h-header-optional.patch @@ -1,4 +1,4 @@ -From 20e8dfef3957e6e94677f7609543a24b60f2ebfb Mon Sep 17 00:00:00 2001 +From 459fe2262e26c3f24108e5ba1bdf342b6236cf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 16 Apr 2015 10:13:06 +0200 Subject: [PATCH] Make cpp/poppler-version.h header optional @@ -11,8 +11,8 @@ Change-Id: I039c879879188fe2eb90cd119b80a1d6354a6a9c --- config_host/config_poppler.h.in | 10 ++++++++++ configure.ac | 9 ++++++--- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 7 +++++++ - 3 files changed, 23 insertions(+), 3 deletions(-) + 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 @@ -71,10 +71,18 @@ index 9e8e1d2..79effbe 100644 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..06a0120 100644 +index d15491b..f4fa810 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -50,7 +50,14 @@ +@@ -21,6 +21,7 @@ + #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX + + #include ++#include + + #if defined __GNUC__ + # pragma GCC diagnostic push +@@ -50,7 +51,14 @@ class GfxPath; class GfxFont; class PDFDoc; From 698059fe403b791e311b58b919e1297d878646dd9eb4be7d98e70dec704a5852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Apr 2015 11:18:36 +0000 Subject: [PATCH 15/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=260 --- libreoffice.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libreoffice.spec b/libreoffice.spec index ffbafd5..5c7c162 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1149,6 +1149,9 @@ make VERBOSE=true %install make DESTDIR=%{buildroot} distro-pack-install +# Do not pollute build log +set +x + # FIXME: Hack add missing file install -m755 instdir/program/libsaxlo.so %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt From df85ecbfa56e1c57a2cb219ea07b726f8fd69d520a2ea25087fc7e5fe260756f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Apr 2015 12:57:25 +0000 Subject: [PATCH 16/24] - Fix python3_sitelib not being around for py2 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=261 --- libreoffice.changes | 5 +++++ libreoffice.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index b136bd7..f4ff837 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 17 12:57:07 UTC 2015 - tchvatal@suse.com + +- Fix python3_sitelib not being around for py2 + ------------------------------------------------------------------- Thu Apr 16 12:23:40 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 5c7c162..45176d6 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -51,6 +51,7 @@ %global python_type python3 %else %global python_type python +%global python3_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") %endif # List of supported langs, populated bellow in the lang macros %global langpack_langs %{nil} @@ -1278,6 +1279,8 @@ done mkdir -p %{buildroot}%{python3_sitelib} ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py +echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt +echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt # Install appdata files, so we're shown in gnome-software (and other, future app stores) # upstream ships the files called libreoffice-{base,writer,...}, but the destop files are called base.destop [...] @@ -1425,8 +1428,6 @@ exit 0 %files -f file-lists/pyuno_list.txt pyuno %defattr(-,root,root) -%{python3_sitelib}/uno.py -%{python3_sitelib}/unohelper.py %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) From 70af66579910f06b24375a0f1976525656ab5806bcaf1811e21c02f553c8c9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 21 Apr 2015 09:17:58 +0000 Subject: [PATCH 17/24] - Try to deal with rpath on bundled libs OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=262 --- libreoffice.changes | 5 +++++ libreoffice.spec | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index f4ff837..c7f7bd0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 21 09:17:33 UTC 2015 - tchvatal@suse.com + +- Try to deal with rpath on bundled libs + ------------------------------------------------------------------- Fri Apr 17 12:57:07 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 45176d6..6d5f199 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -238,6 +238,8 @@ BuildRequires: ucpp BuildRequires: vigra-devel BuildRequires: xml-commons-apis BuildRequires: pkgconfig(fbembed) +%else +BuildRequires: chrpath %endif BuildRequires: ImageMagick BuildRequires: ant @@ -1301,6 +1303,15 @@ cat file-lists/kde_list.txt >> file-lists/kde4_list.txt # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ +# Remove RPATH on some 3rd party bundled libs +%if !%{with systemlibs} +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libmwaw-0.3.so.3 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libwps-0.3.so.3 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/libodfgen-0.1.so.1 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librdf-lo.so.0 +chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3 +%endif + # We have ton of duped files so run over it %fdupes %{buildroot}/usr From 4e8854e6dfac66d9971f8a8f8e98f832ac9f2173309dd66c7aff00b797f69e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 22 Apr 2015 09:27:37 +0000 Subject: [PATCH 18/24] - Set source/target for javac when building to work on SLE11: * 0001-Set-source-and-target-params-for-java.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=264 --- ...et-source-and-target-params-for-java.patch | 32 +++++++++++++++++++ libreoffice.changes | 6 ++++ libreoffice.spec | 3 ++ 3 files changed, 41 insertions(+) create mode 100644 0001-Set-source-and-target-params-for-java.patch diff --git a/0001-Set-source-and-target-params-for-java.patch b/0001-Set-source-and-target-params-for-java.patch new file mode 100644 index 0000000..851d5c1 --- /dev/null +++ b/0001-Set-source-and-target-params-for-java.patch @@ -0,0 +1,32 @@ +From 899c05b47c9fe944102f73e4ba27364e0d60c280 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Wed, 22 Apr 2015 11:24:34 +0200 +Subject: [PATCH] Set source and target params for java + +This fixes build on SLE11 where verification is in place to ensure +target/source are both properly set. + +Interestingly these values are also set by gb_JavaClassSet_JAVACCOMMAND +but do not propagate properly somehow so they need to be repeated here. + +Change-Id: I4138488909559319311cd5ce06968230c4973181 +--- + solenv/gbuild/JavaClassSet.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk +index 58a16d9..9f839cd 100644 +--- a/solenv/gbuild/JavaClassSet.mk ++++ b/solenv/gbuild/JavaClassSet.mk +@@ -39,6 +39,8 @@ $(call gb_Helper_abbreviate_dirs,\ + $(filter-out $(JARDEPS),$(4))) && \ + $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ + $(gb_JavaClassSet_JAVACDEBUG) \ ++ -source $(JAVA_SOURCE_VER) \ ++ -target $(JAVA_TARGET_VER) \ + -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ + -d $(call gb_JavaClassSet_get_classdir,$(2)) \ + @$$RESPONSEFILE &&) \ +-- +2.3.5 + diff --git a/libreoffice.changes b/libreoffice.changes index c7f7bd0..cc46dd6 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 22 09:27:01 UTC 2015 - tchvatal@suse.com + +- 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 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 6d5f199..60ee679 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -171,6 +171,8 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0 Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch +# PATCH-FIX-UPSTREAM: patch to build with source/target java set, will be in 5.0 +Patch7: 0001-Set-source-and-target-params-for-java.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff %if %{with systemlibs} @@ -966,6 +968,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch6 -p1 +%patch7 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From eb210709d0a1d6141464d7cb7ecb586c77f798c6c383b226d2f8aac4922a741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 23 Apr 2015 08:27:46 +0000 Subject: [PATCH 19/24] - Revert last changeset, it is caused by something else this time: * 0001-Set-source-and-target-params-for-java.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=265 --- ...et-source-and-target-params-for-java.patch | 32 ------------------- libreoffice.changes | 6 ++++ libreoffice.spec | 3 -- 3 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 0001-Set-source-and-target-params-for-java.patch diff --git a/0001-Set-source-and-target-params-for-java.patch b/0001-Set-source-and-target-params-for-java.patch deleted file mode 100644 index 851d5c1..0000000 --- a/0001-Set-source-and-target-params-for-java.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 899c05b47c9fe944102f73e4ba27364e0d60c280 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Wed, 22 Apr 2015 11:24:34 +0200 -Subject: [PATCH] Set source and target params for java - -This fixes build on SLE11 where verification is in place to ensure -target/source are both properly set. - -Interestingly these values are also set by gb_JavaClassSet_JAVACCOMMAND -but do not propagate properly somehow so they need to be repeated here. - -Change-Id: I4138488909559319311cd5ce06968230c4973181 ---- - solenv/gbuild/JavaClassSet.mk | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk -index 58a16d9..9f839cd 100644 ---- a/solenv/gbuild/JavaClassSet.mk -+++ b/solenv/gbuild/JavaClassSet.mk -@@ -39,6 +39,8 @@ $(call gb_Helper_abbreviate_dirs,\ - $(filter-out $(JARDEPS),$(4))) && \ - $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ - $(gb_JavaClassSet_JAVACDEBUG) \ -+ -source $(JAVA_SOURCE_VER) \ -+ -target $(JAVA_TARGET_VER) \ - -classpath "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \ - -d $(call gb_JavaClassSet_get_classdir,$(2)) \ - @$$RESPONSEFILE &&) \ --- -2.3.5 - diff --git a/libreoffice.changes b/libreoffice.changes index cc46dd6..13774c3 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 23 08:27:20 UTC 2015 - tchvatal@suse.com + +- 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 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 60ee679..6d5f199 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -171,8 +171,6 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0 Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch -# PATCH-FIX-UPSTREAM: patch to build with source/target java set, will be in 5.0 -Patch7: 0001-Set-source-and-target-params-for-java.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff %if %{with systemlibs} @@ -968,7 +966,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch6 -p1 -%patch7 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From fcd731e3e866795b884cdf4e8d7470f66c02c146863c2a04246b4d2cee3fc166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 23 Apr 2015 15:48:49 +0000 Subject: [PATCH 20/24] - Use old java for detection and old commons-lang/codec to pass brp check on java from sle11 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=266 --- 0001-Make-HAVE_JAVA6-be-always-false.patch | 41 +++++++++++++++++++ ...5126ab76870444c4-commons-codec-1.9-src.zip | 3 -- ...5ce7d69ddfff7-commons-codec-1.6-src.tar.gz | 3 ++ ...ca43c9469d6e6b-commons-lang-2.4-src.tar.gz | 3 ++ ...9f0656894a1-commons-lang3-3.3.1-src.tar.gz | 3 -- libreoffice.changes | 6 +++ libreoffice.spec | 9 +++- 7 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 0001-Make-HAVE_JAVA6-be-always-false.patch delete mode 100644 048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip create mode 100644 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz create mode 100644 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz delete mode 100644 8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz diff --git a/0001-Make-HAVE_JAVA6-be-always-false.patch b/0001-Make-HAVE_JAVA6-be-always-false.patch new file mode 100644 index 0000000..8bce2a3 --- /dev/null +++ b/0001-Make-HAVE_JAVA6-be-always-false.patch @@ -0,0 +1,41 @@ +From 901eeaacd7219f61816b28873e45264c7d7de1ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +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 + diff --git a/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip b/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip deleted file mode 100644 index 30ccdd2..0000000 --- a/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a751a036a3488e2519bc105dcf80df9c004ab1a982d1dd96bbfbf07802df8831 -size 525299 diff --git a/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz new file mode 100644 index 0000000..7a52ac3 --- /dev/null +++ b/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7bc26118cf1b58d8bed62ed364612d5a2380ad14acb03ca88ff3bab22b2e8b +size 262206 diff --git a/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz new file mode 100644 index 0000000..39de5ce --- /dev/null +++ b/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2445238cd0eb167e99a1147394f61325490559f3df7e7e8f628043fb70cbf2f4 +size 522654 diff --git a/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz b/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz deleted file mode 100644 index a04cf15..0000000 --- a/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97ca24c80d416f651dcd3513611d5ea855be21a994e3d48563c837a599618908 -size 739050 diff --git a/libreoffice.changes b/libreoffice.changes index 13774c3..62dd724 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 23 15:48:11 UTC 2015 - tchvatal@suse.com + +- Use old java for detection and old commons-lang/codec to pass + brp check on java from sle11 + ------------------------------------------------------------------- Thu Apr 23 08:27:20 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 6d5f199..220ce9e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -135,7 +135,7 @@ Source2039: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2040: %{external_url}/Firebird-2.5.2.26540-0.tar.bz2 Source2041: %{external_url}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz Source2042: %{external_url}/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz -Source2043: %{external_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz +Source2043: %{external_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz Source2044: %{external_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz Source2045: %{external_url}/commons-logging-1.2-src.tar.gz Source2046: %{external_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip @@ -152,7 +152,7 @@ Source2056: %{external_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source2057: %{external_url}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz Source2058: %{external_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 Source2059: %{external_url}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 -Source2060: %{external_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip +Source2060: %{external_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz Source2061: %{external_url}/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz Source2062: %{external_url}/language-subtag-registry-2014-12-03.tar.bz2 # Make for old distros where too old gnumake resides @@ -171,6 +171,8 @@ Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff # PATCH-FIX-UPSTREAM: patch to build with older poppler, will be in 5.0 Patch6: 0001-Make-cpp-poppler-version.h-header-optional.patch +# PATCH-FIX-SUSE: do not declare java6 available for without system libs build +Patch7: 0001-Make-HAVE_JAVA6-be-always-false.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff %if %{with systemlibs} @@ -966,6 +968,9 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch4 %patch5 %patch6 -p1 +%if !%{with systemlibs} +%patch7 -p1 +%endif %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20} From ed3332214c84625262960861b57e33a682dfdf6ea94a9e162087f5f86ed690ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 24 Apr 2015 11:43:45 +0000 Subject: [PATCH 21/24] - We need pre/post for libreoffice in langpkgs OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=267 --- libreoffice.changes | 5 +++++ libreoffice.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 62dd724..54a082f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 24 11:43:23 UTC 2015 - tchvatal@suse.com + +- We need pre/post for libreoffice in langpkgs + ------------------------------------------------------------------- Thu Apr 23 15:48:11 UTC 2015 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 220ce9e..ced1102 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -841,9 +841,9 @@ Summary: %{langname} Localization Files for LibreOffice \ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ Provides: locale(libreoffice:%{lang}) \ -%if %{with noarch_subpkgs} \ Requires(post,): %{name} = %{version} \ Requires(postun,): %{name} = %{version} \ +%if %{with noarch_subpkgs} \ BuildArch: noarch \ %endif \ %{-m:Requires: myspell-%{-m*}}%{!-m:%{-M:Requires: myspell-%{lang}}} \ From 1d2493a628fa0db064fb1e8a6062247fe5857565ef79ffbdf94a5b999ac8ed98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 3 May 2015 14:02:42 +0000 Subject: [PATCH 22/24] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=268 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index ced1102..c8ae28f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1152,7 +1152,7 @@ sed -i -e "s|@INSTALLDIR@|%{_libdir}/%{name}|" pyuno/source/module/uno.py pyuno/ # just call make here as we added the jobs in configure # The check phase is run here too if it is split with nocheck # install of jars get broken sometimes -make VERBOSE=true +make %install make DESTDIR=%{buildroot} distro-pack-install From 0c688057c93f9b6c371cf618ed5720ac995b912ba5e4b63d147acd9811d8c976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 3 May 2015 16:46:12 +0000 Subject: [PATCH 23/24] - Disable verbose build to pass check on maximal size of log * 0001-Make-HAVE_JAVA6-be-always-false.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=269 --- libreoffice.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 54a082f..f7a19ed 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 3 16:45:27 UTC 2015 - tchvatal@suse.com + +- Disable verbose build to pass check on maximal size of log + ------------------------------------------------------------------- Fri Apr 24 11:43:23 UTC 2015 - tchvatal@suse.com @@ -8,6 +13,7 @@ Thu Apr 23 15:48:11 UTC 2015 - tchvatal@suse.com - 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 - tchvatal@suse.com From 7d480db2dc204473bea206804a83c7b3ea5f359836b0a1c95fa2370dcabef055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 5 May 2015 04:15:09 +0000 Subject: [PATCH 24/24] Fix typo on params sent. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=270 --- libreoffice.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index c8ae28f..21679f3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1099,7 +1099,7 @@ export NOCONFIGURE=yes --enable-gstreamer-1-0 \ --enable-gtk3 \ --with-doxygen \ - -enable-gltf \ + --enable-gltf \ %else --enable-gstreamer-0-10 \ --disable-gstreamer-1-0 \