X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inkscape%2Fmingw32-inkscape.spec;h=31efb1873b60c4fb7beb3a6bbbae61328847956a;hb=7e5dca9cddc70940dd5cd0a721c19f5184d6a9ce;hp=7ffb247d2cac004ff02a949f36efd07b64320561;hpb=102dd06b4f0b79c0817d9260ef345f80f0d6619b;p=fedora-mingw.git

diff --git a/inkscape/mingw32-inkscape.spec b/inkscape/mingw32-inkscape.spec
index 7ffb247..31efb18 100644
--- a/inkscape/mingw32-inkscape.spec
+++ b/inkscape/mingw32-inkscape.spec
@@ -7,9 +7,11 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
+%define svnrev 20568
+
 Name:           mingw32-inkscape
-Version:        20081027
-Release:        3%{?dist}
+Version:        0.47
+Release:        0.2.svn%{svnrev}%{?dist}
 Summary:        MinGW Windows port of Inkscape vector graphics editor
 
 License:        LGPLv2+
@@ -18,18 +20,24 @@ URL:            http://www.inkscape.org/
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Checked out of SVN on the date shown and then just rolled up into
-# a tarball.
-# svn co https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk inkscape
-# tar zcf /tmp/inkscape-%{version}.tar.gz inkscape
-Source0:        inkscape-%{version}.tar.gz
+Source0:        http://inkscape.modevia.com/svn-snap/inkscape-%{svnrev}.tar.bz2
 
 # Rolled-up source patch, submitted upstream on 2008-10-27.
-Patch0:         mingw32-inkscape-20081027.patch
+#Patch0:         mingw32-inkscape-20081027.patch
+
+# Fix the paths.
+Patch1:         mingw32-inkscape-20081027-paths.patch
+
+# This patch is only needed to run under Wine, which doesn't
+# supported getting the outline of unhinted fonts.
+Patch2:         mingw32-inkscape-20081027-unhinted-fonts-for-wine.patch
+
+# Fixes for gcc 4.4
+Patch3:         mingw32-inkscape-20568-gcc44.patch
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 30
+BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
@@ -67,8 +75,11 @@ community-oriented development.
 
 
 %prep
-%setup -q -n inkscape
-%patch0 -p0
+%setup -q -n inkscape-%{svnrev}
+#%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p1
 
 ./autogen.sh
 
@@ -103,5 +114,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Oct 27 2008 Richard W.M. Jones <rjones@redhat.com> - 20081027-3
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 0.47-0.2.svn20568
+- Rebuild for mingw32-gcc 4.4
+
+* Sun Jan 25 2009 Richard W.M. Jones <rjones@redhat.com> - 0.47-0.1.svn20568
 - Initial RPM release.