- started work on 4.2.0.2; build fails due to binutils/gcc bug

diff --git a/libreoffice-mdds.patch b/libreoffice-mdds.patch
deleted file mode 100644 (file)
index 562a038..0000000
--- a/libreoffice-mdds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- libreoffice-4.1.0.4/sc/inc/mtvelements.hxx.org     2013-07-25 21:25:20.837766596 +0200
-+++ libreoffice-4.1.0.4/sc/inc/mtvelements.hxx 2013-07-25 21:26:32.853493134 +0200
-@@ -63,11 +63,11 @@
- namespace sc {
- 
- // Broadcaster storage container
--typedef mdds::mtv::custom_block_func1<sc::element_type_broadcaster, sc::custom_broadcaster_block> BCBlkFunc;
-+typedef mdds::mtv::custom_block_func1<sc::custom_broadcaster_block> BCBlkFunc;
- typedef mdds::multi_type_vector<BCBlkFunc> BroadcasterStoreType;
- 
- // Cell text attribute container.
--typedef mdds::mtv::custom_block_func1<sc::element_type_celltextattr, sc::custom_celltextattr_block> CTAttrFunc;
-+typedef mdds::mtv::custom_block_func1<sc::custom_celltextattr_block> CTAttrFunc;
- typedef mdds::multi_type_vector<CTAttrFunc> CellTextAttrStoreType;
- 
- /**
---- libreoffice-4.1.0.4/sc/source/core/tool/scmatrix.cxx.org   2013-07-25 21:26:36.733621612 +0200
-+++ libreoffice-4.1.0.4/sc/source/core/tool/scmatrix.cxx       2013-07-25 21:27:08.784683394 +0200
-@@ -89,7 +89,7 @@
-             }
-         }
- 
--        static void delete_block(mdds::mtv::base_element_block* p)
-+        static void delete_block(const mdds::mtv::base_element_block* p)
-         {
-             if (!p)
-                 return;

diff --git a/libreoffice.spec b/libreoffice.spec
index 5082895cafb80854649a5071d39301e6eeb3a471..a571238235e73d6b6778ac3aab8d25de83febc1e 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -41,13 +41,13 @@
 %undefine      with_system_hsqldb
 %endif
 
-%define                major_ver               4.1.4
+%define                major_ver               4.2.0
 
 Summary:       LibreOffice - powerful office suite
 Summary(pl.UTF-8):     LibreOffice - potężny pakiet biurowy
 Name:          libreoffice
-Version:       %{major_ver}.2
-Release:       2
+Version:       %{major_ver}.4
+Release:       0.1
 License:       GPL/LGPL
 Group:         X11/Applications
 # we use git because released tarballs are buggy too often
@@ -55,13 +55,13 @@ Group:              X11/Applications
 # cd build
 # git checkout -b libreoffice-3-3 origin/libreoffice-3-3
 Source0:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-%{version}.tar.xz
-# Source0-md5: 2e7880600b26387f342f277c5d198bfa
+# Source0-md5: 98674d57d6dd24baef38f007b5020e8e
 Source1:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-dictionaries-%{version}.tar.xz
-# Source1-md5: ff5315098547da976dd1ffdd57e88d6b
+# Source1-md5: c2b9d603b416d3efc11bf6dd3fc4d92e
 Source2:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-help-%{version}.tar.xz
-# Source2-md5: 1235bb27ff2a060cc666752143dfbf6b
+# Source2-md5: 8554bbbdfc72db998a191c71eeafdb55
 Source3:       http://download.documentfoundation.org/libreoffice/src/%{major_ver}/%{name}-translations-%{version}.tar.xz
-# Source3-md5: 083f211866fe1f77fd2712b822a56f5c
+# Source3-md5: 4873b18cd8a535814777c8630fe2db9f
 
 Source20:       http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 # Source20-md5:        0168229624cfac409e766913506961a8
@@ -77,9 +77,9 @@ Source25:     http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xs
 # Source25-md5:        a7983f859eafb2677d7ff386a023bc40
 
 Patch0:                %{name}-hamcrest.patch
-Patch1:                %{name}-mdds.patch
 URL:           http://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
+BuildRequires: Firebird-devel
 BuildRequires: GConf2-devel
 BuildRequires: ImageMagick
 BuildRequires: OpenGL-GLU-devel
@@ -109,7 +109,7 @@ BuildRequires:      gperf
 BuildRequires: graphite2-devel
 BuildRequires: gstreamer0.10-devel >= 0.10.0
 BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10.0
-BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: gtk+3-devel
 BuildRequires: harfbuzz-icu-devel
 %{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2}
 BuildRequires: hyphen-devel
@@ -127,11 +127,13 @@ BuildRequires:    java-junit
 BuildRequires: java-lucene
 BuildRequires: java-lucene-contrib
 BuildRequires: java-servletapi
-BuildRequires: libcmis-devel >= 0.3
+BuildRequires: libabw-devel
+BuildRequires: libcmis-devel >= 0.4
+BuildRequires: libe-book-devel >= 0.0.2
+BuildRequires: libfreehand-devel
 BuildRequires: liblangtag-devel
 BuildRequires: libmspub-devel
-BuildRequires: libmwaw-devel >= 0.1.0
-BuildRequires: libmwaw-devel < 0.2.0
+BuildRequires: libmwaw-devel >= 0.2.0
 BuildRequires: libodfgen-devel
 BuildRequires: liborcus-devel >= 0.4
 BuildRequires: libvisio-devel
@@ -164,7 +166,7 @@ BuildRequires:      libxml2-devel >= 2.0
 BuildRequires: libxslt-devel
 BuildRequires: libxslt-progs
 %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
-BuildRequires: mdds-devel >= 0.9.0
+BuildRequires: mdds-devel >= 0.10.1
 %{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
 %{?with_mono:BuildRequires:    mono-static >= 1.2.3}
 %{?with_system_myspell:BuildRequires:  myspell-devel}
@@ -2516,7 +2518,6 @@ dialogs.
 %setup -q -n %{name}-%{version} -a1 -a2 -a3
 
 %patch0 -p0
-%patch1 -p1
 
 for dir in *-%{version}; do
        [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir
@@ -2584,17 +2585,17 @@ RPM_BUILD_NR_THREADS="1"
 %{__autoconf}
 touch autogen.lastrun
 
+export PATH=$PATH:%{_libdir}/interbase/bin
 %configure \
+       --with-vendor="%{distribution}" \
+       --with-extra-buildid="%{name}-%{epoch}:%{version}-%{release}" \
        --enable-release-build \
        --with-parallelism=$RPM_BUILD_NR_THREADS \
-       --with-max-jobs=1 \
-       --with-unix-wrapper=%{name} \
        --disable-odk \
        %{?with_ccache:--with-gcc-speedup=ccache} \
        %{?with_icecream:--with-gcc-speedup=icecream} \
        %{?with_system_agg:--with-system-agg} \
        %{?with_system_beanshell:--with-system-beanshell} \
-       %{?with_system_db:--with-system-db} \
        --with%{!?with_system_hsqldb:out}-system-hsqldb \
        %{?with_system_hunspell:--with-system-hunspell --without-myspell-dicts} \
        %{?with_system_libhnj:--with-system-altlinuxhyphen} \
@@ -2608,6 +2609,7 @@ touch autogen.lastrun
        --with-external-dict-dir=/usr/share/myspell \
        --with-external-tar=$(pwd)/ext_sources \
        --with-system-expat \
+       --with-system-firebird \
        --with-system-graphite \
        --with-system-icu \
        --with-system-jpeg \
@@ -2615,45 +2617,30 @@ touch autogen.lastrun
        --with-system-libwpg \
        --with-system-libwps \
        --with-system-libxml \
-       --with-system-libxslt \
-       --with-system-lucene \
-       --with-lucene-analyzers-jar=%{_javadir}/lucene-analyzers.jar \
+       --with-system-clucene \
        --with-system-neon \
        --with-system-openssl \
        --with-system-poppler \
-       --with-system-python \
+       --enable-python=system \
        --with-system-redland \
-       --with-system-sane-header \
-       --with-system-stdlibs \
+       --with-system-sane \
        --with-system-vigra \
-       --with-system-xrender-headers=yes \
        --with-system-zlib \
        --with-system-libexttextcat \
        --with-system-jfreereport \
        --enable-vba \
-       --with-vba-package-format="builtin" \
        --with-system-libs \
        --with-system-headers \
        --with-system-mythes \
        --with-system-apache-commons \
        --with-junit=%{_datadir}/java/junit.jar \
-       --without-system-saxon \
-       --without-system-sampleicc \
-       --enable-ext-presenter-minimizer \
-       --enable-ext-presenter-console \
        --enable-ext-nlpsolver \
-       --enable-ext-pdfimport \
+       --enable-pdfimport \
        --enable-ext-wiki-publisher \
-       --enable-ext-report-builder \
-       --enable-ext-scripting-beanshell \
-       --enable-ext-scripting-javascript \
-       --enable-ext-scripting-python \
-%if %{with mozilla}
-       --with-system-mozilla=libxul \
-%else
-       --disable-mozilla \
-%endif
-       --enable-gtk \
+       --enable-report-builder \
+       --enable-scripting-beanshell \
+       --enable-scripting-javascript \
+       --with%{!?mozilla:out}-system-npapi-headers \
        %{?with_kde:--enable-kde --disable-kde4} \
        %{?with_kde4:--enable-kde4 --disable-kde} \
        --with-lang=%{?with_i18n:ALL} \
@@ -2666,17 +2653,16 @@ touch autogen.lastrun
 %endif
        --disable-gnome-vfs \
        --enable-gio \
-       --without-stlport \
        --with-x \
        --without-fonts \
        --without-ppds \
        --without-afms \
        --disable-epm \
-       --enable-cairo \
+       --disable-gtk \
+       --enable-gtk3 \
        --enable-dbus \
        --enable-opengl \
-       --with-openldap \
-       --disable-rpath \
+       --with-system-openldap \
 %if 0%{?debug:1}
        --enable-debug \
        --enable-crashdump=yes \
@@ -2689,9 +2675,7 @@ touch autogen.lastrun
        --enable-split-app-modules \
        --enable-split-opt-features \
        --enable-cups \
-       --enable-fontconfig \
        --enable-lockdown \
-       --disable-layout \
        --disable-fetch-external
 
 # this limits processing some files but doesn't limit parallel build