From 3fb12e4b6f482e67da203fbe99525cae82ac10c4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 29 Jun 2010 03:40:41 +0000 Subject: [PATCH] Adapt to standalone gdk-pixbuf --- libwmf-0.2.8.4-pixbufloaderdir.patch | 14 ++++++++++++++ libwmf.spec | 19 +++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 libwmf-0.2.8.4-pixbufloaderdir.patch diff --git a/libwmf-0.2.8.4-pixbufloaderdir.patch b/libwmf-0.2.8.4-pixbufloaderdir.patch new file mode 100644 index 0000000..adb7c92 --- /dev/null +++ b/libwmf-0.2.8.4-pixbufloaderdir.patch @@ -0,0 +1,14 @@ +diff -up libwmf-0.2.8.4/configure.ac.pixbufloaderdir libwmf-0.2.8.4/configure.ac +--- libwmf-0.2.8.4/configure.ac.pixbufloaderdir 2010-06-28 23:35:06.227167269 -0400 ++++ libwmf-0.2.8.4/configure.ac 2010-06-28 23:36:00.948420306 -0400 +@@ -744,8 +744,8 @@ GDK_PIXBUF_DIR="" + + if test $LIBWMF_BUILDSTYLE != lite; then + PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ +- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_VERSION=`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` ++ GDK_PIXBUF_DIR="gdk-pixbuf-2.0/$GDK_PIXBUF_VERSION/loaders" + wmf_gdk_pixbuf=yes + ],[ wmf_gdk_pixbuf=no + ]) diff --git a/libwmf.spec b/libwmf.spec index e381ba0..d64f40c 100644 --- a/libwmf.spec +++ b/libwmf.spec @@ -1,7 +1,7 @@ Summary: Windows MetaFile Library Name: libwmf Version: 0.2.8.4 -Release: 22%{?dist} +Release: 23%{?dist} Group: System Environment/Libraries #libwmf is under the LGPLv2+, however... #1. The tarball contains an old version of the urw-fonts under GPL+. @@ -32,6 +32,9 @@ Patch6: libwmf-0.2.8.4-reducesymbols.patch #CVE-2009-1364, Use-after-free vulnerability in the modified embedded GD #library Patch7: libwmf-0.2.8.4-useafterfree.patch +# adapt to standalone gdk-pixbuf +Patch8: libwmf-0.2.8.4-pixbufloaderdir.patch + Requires: urw-fonts Requires: %{name}-lite = %{version}-%{release} Requires(post): %{_bindir}/update-gdk-pixbuf-loaders @@ -69,6 +72,7 @@ using libwmf. %patch5 -p1 -b .intoverflow %patch6 -p1 -b .reducesymbols.patch %patch7 -p1 -b .useafterfree.patch +%patch8 -p1 -b .pixbufloaderdir f=README ; iconv -f iso-8859-2 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f %build @@ -86,8 +90,8 @@ export tagname=CC make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.a -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.la rm -rf $RPM_BUILD_ROOT%{_includedir}/libwmf/gd find doc -name "Makefile*" -exec rm {} \; #we're carrying around duplicate fonts @@ -97,13 +101,13 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ %post /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || : +gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || : %post lite -p /sbin/ldconfig %postun /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || : +gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || : %postun lite -p /sbin/ldconfig @@ -111,7 +115,7 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/libwmf-*.so.* -%{_libdir}/gtk-2.0/*/loaders/*.so +%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so %{_bindir}/wmf2svg %{_bindir}/wmf2gd %{_bindir}/wmf2eps @@ -140,6 +144,9 @@ sed -i $RPM_BUILD_ROOT%{_datadir}/libwmf/fonts/fontmap -e 's#libwmf/fonts#fonts/ rm -r $RPM_BUILD_ROOT %changelog +* Mon Jun 28 2010 Matthias Clasen - 0.2.8.4-23 +- Adapt to standalone gdk-pixbuf + * Fri Apr 16 2010 Caolán McNamara - 0.2.8.4-22 - Clarify licences