File project.diff of Package mingw64-cairo

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw64-cairo

--- mingw64-cairo.spec.orig
+++ mingw64-cairo.spec
@@ -15,6 +15,10 @@ License:        LGPLv2.1 ; MPLv1.1
 Url:            http://cairographics.org
 Source0:        http://cairographics.org/snapshots/cairo-%{version}.tar.gz
 Patch0:         cairo-1.10.2-win32_surfaces.patch
+
+Patch100:       cairo-1.10.2-onzin.patch
+Patch101:       cairo-1.10.2-print.patch
+Patch1000:      cairo-1.10.2-wix.patch
 Group:          Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -32,6 +36,9 @@ BuildRequires:  mingw64-fontconfig-devel
 BuildRequires:  mingw64-freetype-devel
 BuildRequires:  mingw64-glib2-devel
 
+BuildRequires:  autoconf automake libtool
+BuildRequires:  wixwine
+
 %description
 Cairo is a vector graphics library with cross-device output support.
 Currently supported output targets include the X Window System,
@@ -93,12 +100,16 @@ cairo.
 
 %prep
 %setup -q -n cairo-%{version}
+%patch100 -p1
+%patch101 -p1
+%patch1000 -p1 -b .wix
 
 %patch0 -p1 -b .win32_surfaces
 
-
 %build
+autoreconf -f -i
 echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw64_cache}
+png_REQUIRES=libpng \
 MINGW64_CFLAGS="-Dffs=__builtin_ffs %{_mingw64_cflags}" \
 %{_mingw64_configure} \
 	--disable-xlib --disable-xcb \
@@ -106,7 +117,7 @@ MINGW64_CFLAGS="-Dffs=__builtin_ffs %{_m
 	--enable-win32-font --enable-fc --enable-ft \
 	--enable-png --enable-gobject --enable-tee \
 	--enable-shared --disable-static
-%{_mingw64_make} %{?_smp_mflags} || %{_mingw64_make}
+%{_mingw64_make} --jobs=1
 
 
 %install
@@ -150,6 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw64_libdir}/pkgconfig/cairo-win32.pc
 %{_mingw64_libdir}/pkgconfig/cairo.pc
 %{_mingw64_datadir}/gtk-doc/html/cairo/
+%{_mingw64_datadir}/wixlib/cairo.wixlib
+%{_mingw64_datadir}/wixlib/cairo-gobject.wixlib
 
 
 %changelog

Places

File project.diff of Package mingw64-cairo

Places