- updated to 2.30.0, build system changed to meson

- no .la file, so could be problematic for use in packages using libtool - leaving on branch for now

diff --git a/crossmingw32-atk.spec b/crossmingw32-atk.spec
index ca71b80b66a2bb1c079a790745efa62d7e7fce50..2ae771a5c68329c46360228532f69fdce6534ce9 100644 (file)
--- a/crossmingw32-atk.spec
+++ b/crossmingw32-atk.spec
@@ -2,24 +2,22 @@
 Summary:       ATK - Accessibility Toolkit - cross MinGW32 version
 Summary(pl.UTF-8):     ATK - biblioteka ułatwiająca niepełnosprawnym korzystanie z komputerów - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.28.1
+Version:       2.30.0
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/atk/2.28/%{realname}-%{version}.tar.xz
-# Source0-md5: dfb5e7474220afa3f4ca7e45af9f3a11
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/atk/2.30/%{realname}-%{version}.tar.xz
+# Source0-md5: 769c85005d392ad17ffbc063f2d26454
 URL:           https://developer.gnome.org/atk/
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.11
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-glib2 >= 2.32.0
 # glib-genmarshal, glib-mkenums
 BuildRequires: glib2-devel >= 1:2.32.0
-BuildRequires: libtool >= 2:2.2
-BuildRequires: perl-base
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: python >= 1:2.5
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.728
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires:      crossmingw32-glib2 >= 2.32.0
@@ -95,29 +93,38 @@ Biblioteka DLL atk dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 
+# enable static library
+%{__sed} -i -e '/^libatk/ s/shared_library/library/' atk/meson.build
+
+cat > meson-cross.txt <<'EOF'
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i386'
+endian='little'
+[binaries]
+c = '%{__cc}'
+ar = '%{target}-ar'
+windres = '%{target}-windres'
+pkgconfig = 'pkg-config'
+[properties]
+; force gnu99 to disable __STRICT_ANSI__ and unblock fdopen() in mingw32
+c_args = ['%(echo %{rpmcflags} | sed -e "s/ \+/ /g;s/ /', '/g")']
+;, '-std=gnu99'
+EOF
+
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --target=%{target} \
-       --host=%{target} \
-       --disable-gtk-doc \
-       --disable-silent-rules \
-       --enable-static
-
-%{__make} \
-       GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
-       GLIB_MKENUMS=/usr/bin/glib-mkenums
+%meson build \
+       --cross-file meson-cross.txt \
+       -Ddocs=false
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
-       DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
@@ -127,7 +134,6 @@ install -d $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gtk-doc
 # runtime
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
 
@@ -138,7 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %{_libdir}/libatk-1.0.dll.a
-%{_libdir}/libatk-1.0.la
 %{_includedir}/atk-1.0
 %{_pkgconfigdir}/atk.pc