- Fix build

This commit is contained in:
Lubomir Rintel 2010-02-18 19:10:08 +00:00
parent e9fc7d2b22
commit 75b82f4e6f
2 changed files with 22 additions and 1 deletions

16
inkscape-0.47-x11.patch Normal file
View File

@ -0,0 +1,16 @@
diff -up inkscape-0.47/configure.ac.x11 inkscape-0.47/configure.ac
--- inkscape-0.47/configure.ac.x11 2010-02-18 19:14:43.000000000 +0100
+++ inkscape-0.47/configure.ac 2010-02-18 19:34:08.000000000 +0100
@@ -675,10 +675,9 @@ if test "x$cairo_pdf" = "xyes"; then
fi
dnl Shouldn't we test for libpng and libz?
+INKSCAPE_LIBS="-lpng -lz -lX11 -lxml2"
if test "x$openmp_ok" = "xyes"; then
- INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lgomp"
-else
- INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz"
+ INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
fi
AC_CHECK_HEADER(popt.h,

View File

@ -1,6 +1,6 @@
Name: inkscape
Version: 0.47
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
@ -13,6 +13,7 @@ Patch4: inkscape-20090410svn-formats.patch
Patch5: inkscape-20090925svn-el5.patch
Patch6: inkscape-20091101svn-icon.patch
Patch7: inkscape-0.47-newpoppler.patch
Patch8: inkscape-0.47-x11.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@ -136,6 +137,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format.
%patch5 -p1 -b .el5
%patch6 -p0 -b .japierdole
%patch7 -p1 -b .poppler
%patch8 -p1 -b .x11
# https://bugs.launchpad.net/inkscape/+bug/314381
# A couple of files have executable bits set,
@ -227,6 +229,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Feb 18 2010 Lubomir Rintel <lkundrak@v3.sk> - 0.47-7
- Fix build
* Wed Jan 20 2010 Stepan Kasal <skasal@redhat.com> - 0.47-6
- ExcludeArch: s390 s390x