Use --enable-vala instead of patching configure for the same effect

This commit is contained in:
Kalev Lember 2014-09-14 12:38:29 +02:00
parent faccbefe94
commit 227c32fc5b
2 changed files with 2 additions and 23 deletions

View File

@ -1,13 +0,0 @@
diff -up librsvg-2.37.0/configure.in.vala librsvg-2.37.0/configure.in
--- librsvg-2.37.0/configure.in.vala 2013-01-15 21:07:11.264576371 -0500
+++ librsvg-2.37.0/configure.in 2013-01-15 21:07:17.638576143 -0500
@@ -285,7 +285,7 @@ fi
GOBJECT_INTROSPECTION_CHECK([0.10.8])
# Vala bindings
-VAPIGEN_CHECK([0.17.1.26],,,[no])
+VAPIGEN_CHECK([0.18.1],,,[auto])
dnl ===========================================================================
diff -up librsvg-2.37.0/Rsvg-2.0-custom.vala librsvg-2.37.0/Rsvg-2.0-custom

View File

@ -8,9 +8,6 @@ Group: System Environment/Libraries
#VCS: git:git://git.gnome.org/librsvg #VCS: git:git://git.gnome.org/librsvg
Source: http://download.gnome.org/sources/librsvg/2.40/librsvg-%{version}.tar.xz Source: http://download.gnome.org/sources/librsvg/2.40/librsvg-%{version}.tar.xz
# build with vala 0.18
Patch0: librsvg-vala.patch
Requires(post): gdk-pixbuf2 Requires(post): gdk-pixbuf2
Requires(postun): gdk-pixbuf2 Requires(postun): gdk-pixbuf2
BuildRequires: libpng-devel BuildRequires: libpng-devel
@ -28,10 +25,6 @@ BuildRequires: libgsf-devel
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: vala-devel BuildRequires: vala-devel
BuildRequires: vala-tools BuildRequires: vala-tools
# grr, librsvg does not install api docs if --disable-gtk-doc
BuildRequires: gtk-doc
BuildRequires: automake
BuildRequires: autoconf
Provides: librsvg3 = %{name}.%{version}-%{release} Provides: librsvg3 = %{name}.%{version}-%{release}
Obsoletes: librsvg3 <= 2.26.3-3.fc14 Obsoletes: librsvg3 <= 2.26.3-3.fc14
@ -63,9 +56,7 @@ This package provides extra utilities based on the librsvg library.
%prep %prep
%setup -q -n librsvg-%{version} %setup -q -n librsvg-%{version}
%patch0 -p1 -b .vala
autoreconf -i -f
%build %build
GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits} GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
@ -76,7 +67,8 @@ export enable_pixbuf_loader
%configure --disable-static \ %configure --disable-static \
--disable-gtk-doc \ --disable-gtk-doc \
--disable-gtk-theme \ --disable-gtk-theme \
--enable-introspection --enable-introspection \
--enable-vala
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install