From fd27b8fde17415580448191a63959b421d0abead634b34d9aa623e3a14ab56ce Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 2 Mar 2024 13:13:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1139 --- fontconfig-2.14.2.tar.xz | 3 +++ freetype-2.13.0.tar.xz | 3 +++ libreoffice.changes | 5 +++++ libreoffice.spec | 12 ++++++++++-- phc-winner-argon2-20190702.tar.gz | 3 +++ tiff-4.6.0.tar.xz | 3 +++ 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 fontconfig-2.14.2.tar.xz create mode 100644 freetype-2.13.0.tar.xz create mode 100644 phc-winner-argon2-20190702.tar.gz create mode 100644 tiff-4.6.0.tar.xz diff --git a/fontconfig-2.14.2.tar.xz b/fontconfig-2.14.2.tar.xz new file mode 100644 index 0000000..b6a612a --- /dev/null +++ b/fontconfig-2.14.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b +size 1440844 diff --git a/freetype-2.13.0.tar.xz b/freetype-2.13.0.tar.xz new file mode 100644 index 0000000..73237ba --- /dev/null +++ b/freetype-2.13.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c +size 2492440 diff --git a/libreoffice.changes b/libreoffice.changes index 9ca65a3..5257de0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 2 13:12:07 UTC 2024 - Fridrich Strba + +- Fix build on SLE12 and SLE15 + ------------------------------------------------------------------- Fri Mar 1 08:59:56 UTC 2024 - Fridrich Strba diff --git a/libreoffice.spec b/libreoffice.spec index 8114b03..b02aa5c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -124,7 +124,6 @@ Patch991: libreoffice-no-destdircheck.patch Patch992: python34-no-f-strings.patch BuildRequires: %{name}-share-linker BuildRequires: ant -BuildRequires: argon2-devel BuildRequires: autoconf BuildRequires: awk BuildRequires: bison @@ -240,7 +239,6 @@ BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7 -BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpg-0.3) @@ -293,6 +291,7 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version} Source2020: %{external_url}/boost_1_82_0.tar.xz Source2023: %{external_url}/poppler-23.09.0.tar.xz Source2024: %{external_url}/poppler-data-0.4.12.tar.gz +Source2030: %{external_url}/tiff-4.6.0.tar.xz Provides: bundled(boost) = 1.82.0 Provides: bundled(poppler) = 23.06.0 Provides: bundled(poppler-data) = 0.4.12 @@ -302,6 +301,7 @@ BuildRequires: libboost_filesystem-devel BuildRequires: libboost_iostreams-devel BuildRequires: libboost_locale-devel BuildRequires: libboost_system-devel +BuildRequires: pkgconfig(libtiff-4) >= 4.0.10 BuildRequires: pkgconfig(poppler) >= 21.01.0 BuildRequires: pkgconfig(poppler-cpp) %endif @@ -309,6 +309,9 @@ BuildRequires: pkgconfig(poppler-cpp) # Too old icu on the system Source2021: %{external_url}/icu4c-73_2-src.tgz Source2022: %{external_url}/icu4c-73_2-data.zip +Source2027: %{external_url}/phc-winner-argon2-20190702.tar.gz +Source2028: %{external_url}/fontconfig-2.14.2.tar.xz +Source2029: %{external_url}/freetype-2.13.0.tar.xz Provides: bundled(icu) = 73.2 BuildRequires: libBox2D-devel BuildRequires: libmysqlclient-devel @@ -317,6 +320,7 @@ Requires(postun): update-desktop-files %else # genbrk binary is required BuildRequires: icu +BuildRequires: argon2-devel BuildRequires: libbox2d-devel BuildRequires: libmariadb-devel BuildRequires: pkgconfig(icu-i18n) @@ -1173,10 +1177,14 @@ export NOCONFIGURE=yes %if 0%{?suse_version} < 1550 --without-system-boost \ --without-system-poppler \ + --without-system-libtiff \ %endif %if 0%{?suse_version} < 1500 + --without-system-argon2 \ --without-system-icu \ --without-system-openjpeg \ + --without-system-fontconfig \ + --without-system-freetype \ %else --with-system-openjpeg \ %endif diff --git a/phc-winner-argon2-20190702.tar.gz b/phc-winner-argon2-20190702.tar.gz new file mode 100644 index 0000000..34c4c7c --- /dev/null +++ b/phc-winner-argon2-20190702.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c +size 1505307 diff --git a/tiff-4.6.0.tar.xz b/tiff-4.6.0.tar.xz new file mode 100644 index 0000000..69e233d --- /dev/null +++ b/tiff-4.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2 +size 2124388