From 2721e33845926025630aeb5718fd2a104bf2d29574780c64e73032390eb8323f Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Fri, 1 Oct 2021 08:23:06 +0000
Subject: [PATCH] Accepting request 921814 from LibreOffice:7.2

OBS-URL: https://build.opensuse.org/request/show/921814
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=979
---
 boost_1_71_0.tar.xz        |  3 ---
 boost_1_75_0.tar.xz        |  3 +++
 libreoffice.changes        | 11 +++++++++++
 libreoffice.spec           | 28 ++++++++++++++++++----------
 poppler-21.01.0.tar.xz     |  3 +++
 poppler-data-0.4.10.tar.gz |  3 +++
 6 files changed, 38 insertions(+), 13 deletions(-)
 delete mode 100644 boost_1_71_0.tar.xz
 create mode 100644 boost_1_75_0.tar.xz
 create mode 100644 poppler-21.01.0.tar.xz
 create mode 100644 poppler-data-0.4.10.tar.gz

diff --git a/boost_1_71_0.tar.xz b/boost_1_71_0.tar.xz
deleted file mode 100644
index 3f59df5..0000000
--- a/boost_1_71_0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543
-size 15137604
diff --git a/boost_1_75_0.tar.xz b/boost_1_75_0.tar.xz
new file mode 100644
index 0000000..c2f1564
--- /dev/null
+++ b/boost_1_75_0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b
+size 19322176
diff --git a/libreoffice.changes b/libreoffice.changes
index 0009cc6..bbe87d8 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Sep 24 13:39:16 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Add vendored poppler to use for all codestreams except Tumbleweed.
+
+-------------------------------------------------------------------
+Thu Sep 23 11:45:36 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
+
+- Use vendored boost for all codestreams except Tumbleweed.
+  Update boost vendored version.
+
 -------------------------------------------------------------------
 Tue Sep 14 10:26:02 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/libreoffice.spec b/libreoffice.spec
index b744698..8e50654 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -217,8 +217,6 @@ BuildRequires:  pkgconfig(mdds-1.5) >= 1.5.0
 BuildRequires:  pkgconfig(mythes)
 BuildRequires:  pkgconfig(nspr) >= 4.8
 BuildRequires:  pkgconfig(nss) >= 3.9.3
-BuildRequires:  pkgconfig(poppler) >= 21.01.0
-BuildRequires:  pkgconfig(poppler-cpp)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(redland)
 BuildRequires:  pkgconfig(sane-backends)
@@ -257,9 +255,21 @@ Obsoletes:      %{name}-icon-theme-crystal < %{version}
 Provides:       %{name}-icon-theme-oxygen = %{version}
 Obsoletes:      %{name}-icon-theme-oxygen < %{version}
 ExclusiveArch:  aarch64 %{ix86} x86_64 ppc64le
-%if 0%{?suse_version} < 1500
+%if 0%{?suse_version} < 1550
 # Too old boost on the system
-Source2020:     %{external_url}/boost_1_71_0.tar.xz
+Source2020:     %{external_url}/boost_1_75_0.tar.xz
+Source2023:     %{external_url}/poppler-21.01.0.tar.xz
+Source2024:     %{external_url}/poppler-data-0.4.10.tar.gz
+%else
+BuildRequires:  libboost_date_time-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_iostreams-devel
+BuildRequires:  libboost_locale-devel
+BuildRequires:  libboost_system-devel
+BuildRequires:  pkgconfig(poppler) >= 21.01.0
+BuildRequires:  pkgconfig(poppler-cpp)
+%endif
+%if 0%{?suse_version} < 1500
 # Too old icu on the system
 Source2021:     %{external_url}/icu4c-68_1-src.tgz
 Source2022:     %{external_url}/icu4c-68_1-data.zip
@@ -279,11 +289,6 @@ Requires(postun):update-desktop-files
 %else
 BuildRequires:  gcc >= 7
 BuildRequires:  gcc-c++ >= 7
-BuildRequires:  libboost_date_time-devel
-BuildRequires:  libboost_filesystem-devel
-BuildRequires:  libboost_iostreams-devel
-BuildRequires:  libboost_locale-devel
-BuildRequires:  libboost_system-devel
 # genbrk binary is required
 BuildRequires:  icu
 BuildRequires:  java-devel >= 9
@@ -1124,8 +1129,11 @@ export NOCONFIGURE=yes
 %else
         --disable-firebird-sdbc \
 %endif
-%if 0%{?suse_version} < 1500
+%if 0%{?suse_version} < 1550
         --without-system-boost \
+        --without-system-poppler \
+%endif
+%if 0%{?suse_version} < 1500
         --without-system-icu \
 %endif
         --enable-evolution2 \
diff --git a/poppler-21.01.0.tar.xz b/poppler-21.01.0.tar.xz
new file mode 100644
index 0000000..baafd5a
--- /dev/null
+++ b/poppler-21.01.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3
+size 1680536
diff --git a/poppler-data-0.4.10.tar.gz b/poppler-data-0.4.10.tar.gz
new file mode 100644
index 0000000..e9f34f8
--- /dev/null
+++ b/poppler-data-0.4.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69c274ce67387967b30
+size 4497684