From 48430f8d571ea70820f4625293cb55b34684b1a4 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 25 Dec 2024 12:46:36 +0300 Subject: [PATCH] import libwmf-0.2.13-6.el10 --- .gitignore | 2 +- .libwmf.metadata | 2 +- ...c35bc2a36fdca760a4577761d30d9cc876e2.patch | 32 ++++++++++++ SPECS/libwmf.spec | 49 +++++++++++++++---- 4 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 SOURCES/1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch diff --git a/.gitignore b/.gitignore index 1da9934..4f56ec7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v0.2.12.tar.gz +SOURCES/v0.2.13.tar.gz diff --git a/.libwmf.metadata b/.libwmf.metadata index 0431e43..1c714fe 100644 --- a/.libwmf.metadata +++ b/.libwmf.metadata @@ -1 +1 @@ -490a26175ad667fbc0c009d390bf56644919bed6 SOURCES/v0.2.12.tar.gz +fbabff335a3e46427c506cd33322949c7d34b25f SOURCES/v0.2.13.tar.gz diff --git a/SOURCES/1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch b/SOURCES/1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch new file mode 100644 index 0000000..bc6071f --- /dev/null +++ b/SOURCES/1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch @@ -0,0 +1,32 @@ +From 1f87c35bc2a36fdca760a4577761d30d9cc876e2 Mon Sep 17 00:00:00 2001 +From: Bo Anderson +Date: Tue, 27 Jun 2023 04:07:35 +0100 +Subject: [PATCH] Fix missing includes on macOS + +--- + src/extra/gd/gd.c | 1 + + src/extra/gd/gd_gd2.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/extra/gd/gd.c b/src/extra/gd/gd.c +index dc6a9a7..a3395d6 100644 +--- a/src/extra/gd/gd.c ++++ b/src/extra/gd/gd.c +@@ -1,4 +1,5 @@ + #include ++#include + #include + #include + #include +diff --git a/src/extra/gd/gd_gd2.c b/src/extra/gd/gd_gd2.c +index 05d8dcb..e5c5d32 100644 +--- a/src/extra/gd/gd_gd2.c ++++ b/src/extra/gd/gd_gd2.c +@@ -12,6 +12,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/SPECS/libwmf.spec b/SPECS/libwmf.spec index 844bbc2..d9d28f6 100644 --- a/SPECS/libwmf.spec +++ b/SPECS/libwmf.spec @@ -1,16 +1,18 @@ Summary: Windows MetaFile Library Name: libwmf -Version: 0.2.12 -Release: 10%{?dist} +Version: 0.2.13 +Release: 6%{?dist} #libwmf is under the LGPLv2+, however... #1. The tarball contains an old version of the urw-fonts under GPL+. # Those fonts are not installed #2. The header of the command-line wmf2plot utility places it under the GPLv2+. # wmf2plot is neither built or install -License: LGPLv2+ and GPLv2+ and GPL+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-1.0-or-later Source: https://github.com/caolanm/libwmf/archive/v%{version}.tar.gz URL: https://github.com/caolanm/libwmf +Patch0: 1f87c35bc2a36fdca760a4577761d30d9cc876e2.patch + Provides: bundled(gd) = 2.0.0 Requires: urw-fonts @@ -19,7 +21,7 @@ Requires: %{name}-lite = %{version}-%{release} # for file triggers Requires: gdk-pixbuf2%{?_isa} >= 2.31.5-2.fc24 -BuildRequires: gtk2-devel, libtool, libxml2-devel, libpng-devel +BuildRequires: freetype-devel, gdk-pixbuf2-devel, libtool, libxml2-devel, libpng-devel BuildRequires: libjpeg-devel, libXt-devel, libX11-devel, dos2unix, libtool BuildRequires: make @@ -35,7 +37,7 @@ A library for parsing Windows MetaFile vector graphics (WMF). %package devel Summary: Support files necessary to compile applications with libwmf Requires: libwmf = %{version}-%{release} -Requires: gtk2-devel, libxml2-devel, libjpeg-devel +Requires: freetype-devel, libX11-devel, libxml2-devel, libjpeg-devel, libpng-devel %description devel Libraries, headers, and support files necessary to compile applications @@ -45,6 +47,8 @@ using libwmf. %setup -q f=README ; iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +%patch -P 0 -p1 + %build autoreconf -i -f -Ipatches %configure --with-libxml2 --disable-static --disable-dependency-tracking --with-gsfontdir=/usr/share/fonts/urw-base35 @@ -94,11 +98,38 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ %changelog -* Mon Aug 15 2022 Josef Ridky - 0.2.12-10 -- ship libwmf-devel in CRB +* Wed Dec 25 2024 Arkady L. Shane - 0.2.13-6 +- Rebuilt for MSVSphere 10 + +* Thu Jul 18 2024 Fedora Release Engineering - 0.2.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 31 2024 Gwyn Ciesla - 0.2.13-5 +- Upstream patch to fix FTBFS. + +* Thu Jan 25 2024 Fedora Release Engineering - 0.2.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.2.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.2.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Apr 17 2023 Caolán McNamara - 0.2.13-1 +- latest release + +* Mon Apr 03 2023 Yaakov Selkowitz - 0.2.12-12 +- Fix build and devel dependencies + +* Thu Feb 23 2023 Caolán McNamara - 0.2.12-11 +- migrated to SPDX license + +* Thu Jan 19 2023 Fedora Release Engineering - 0.2.12-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Wed Feb 09 2022 Josef Ridky - 0.2.12-9 -- add gating.yaml file +* Thu Jul 21 2022 Fedora Release Engineering - 0.2.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild * Thu Jan 20 2022 Fedora Release Engineering - 0.2.12-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild