Fridrich Strba 2024-03-02 13:13:20 +00:00 committed by Git OBS Bridge
parent 3fcea75415
commit fd27b8fde1
6 changed files with 27 additions and 2 deletions

BIN
fontconfig-2.14.2.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

3
freetype-2.13.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c
size 2492440

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 2 13:12:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Fix build on SLE12 and SLE15
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 1 08:59:56 UTC 2024 - Fridrich Strba <fstrba@suse.com> Fri Mar 1 08:59:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -124,7 +124,6 @@ Patch991: libreoffice-no-destdircheck.patch
Patch992: python34-no-f-strings.patch Patch992: python34-no-f-strings.patch
BuildRequires: %{name}-share-linker BuildRequires: %{name}-share-linker
BuildRequires: ant BuildRequires: ant
BuildRequires: argon2-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: awk BuildRequires: awk
BuildRequires: bison BuildRequires: bison
@ -240,7 +239,6 @@ BuildRequires: pkgconfig(libqxp-0.0)
BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1 BuildRequires: pkgconfig(librevenge-0.0) >= 0.0.1
BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7 BuildRequires: pkgconfig(libstaroffice-0.0) >= 0.0.7
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libvisio-0.1) >= 0.1 BuildRequires: pkgconfig(libvisio-0.1) >= 0.1
BuildRequires: pkgconfig(libwpd-0.10) >= 0.10 BuildRequires: pkgconfig(libwpd-0.10) >= 0.10
BuildRequires: pkgconfig(libwpg-0.3) BuildRequires: pkgconfig(libwpg-0.3)
@ -293,6 +291,7 @@ Obsoletes: %{name}-icon-theme-oxygen < %{version}
Source2020: %{external_url}/boost_1_82_0.tar.xz Source2020: %{external_url}/boost_1_82_0.tar.xz
Source2023: %{external_url}/poppler-23.09.0.tar.xz Source2023: %{external_url}/poppler-23.09.0.tar.xz
Source2024: %{external_url}/poppler-data-0.4.12.tar.gz 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(boost) = 1.82.0
Provides: bundled(poppler) = 23.06.0 Provides: bundled(poppler) = 23.06.0
Provides: bundled(poppler-data) = 0.4.12 Provides: bundled(poppler-data) = 0.4.12
@ -302,6 +301,7 @@ BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_iostreams-devel BuildRequires: libboost_iostreams-devel
BuildRequires: libboost_locale-devel BuildRequires: libboost_locale-devel
BuildRequires: libboost_system-devel BuildRequires: libboost_system-devel
BuildRequires: pkgconfig(libtiff-4) >= 4.0.10
BuildRequires: pkgconfig(poppler) >= 21.01.0 BuildRequires: pkgconfig(poppler) >= 21.01.0
BuildRequires: pkgconfig(poppler-cpp) BuildRequires: pkgconfig(poppler-cpp)
%endif %endif
@ -309,6 +309,9 @@ BuildRequires: pkgconfig(poppler-cpp)
# Too old icu on the system # Too old icu on the system
Source2021: %{external_url}/icu4c-73_2-src.tgz Source2021: %{external_url}/icu4c-73_2-src.tgz
Source2022: %{external_url}/icu4c-73_2-data.zip 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 Provides: bundled(icu) = 73.2
BuildRequires: libBox2D-devel BuildRequires: libBox2D-devel
BuildRequires: libmysqlclient-devel BuildRequires: libmysqlclient-devel
@ -317,6 +320,7 @@ Requires(postun): update-desktop-files
%else %else
# genbrk binary is required # genbrk binary is required
BuildRequires: icu BuildRequires: icu
BuildRequires: argon2-devel
BuildRequires: libbox2d-devel BuildRequires: libbox2d-devel
BuildRequires: libmariadb-devel BuildRequires: libmariadb-devel
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
@ -1173,10 +1177,14 @@ export NOCONFIGURE=yes
%if 0%{?suse_version} < 1550 %if 0%{?suse_version} < 1550
--without-system-boost \ --without-system-boost \
--without-system-poppler \ --without-system-poppler \
--without-system-libtiff \
%endif %endif
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
--without-system-argon2 \
--without-system-icu \ --without-system-icu \
--without-system-openjpeg \ --without-system-openjpeg \
--without-system-fontconfig \
--without-system-freetype \
%else %else
--with-system-openjpeg \ --with-system-openjpeg \
%endif %endif

BIN
phc-winner-argon2-20190702.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

BIN
tiff-4.6.0.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.