- meson build requires mm-common 1.0.0

[packages/crossmingw32-cairomm.git] / crossmingw32-cairomm.spec

diff --git a/crossmingw32-cairomm.spec b/crossmingw32-cairomm.spec
index b6cf2525f98524fe7fb90ed8791c0b97ae8e37f5..da09a22d499d4d03ffaf6913a2cdf792db946ed2 100644 (file)
--- a/crossmingw32-cairomm.spec
+++ b/crossmingw32-cairomm.spec
@@ -2,24 +2,27 @@ Summary:      C++ wrapper for cairo - cross MinGW32 version
 Summary(pl.UTF-8):     Interfejs C++ do cairo - wersja skrośna dla MinGW32
 %define                realname   cairomm
 Name:          crossmingw32-%{realname}
-Version:       1.12.0
+Version:       1.14.2
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://cairographics.org/releases/%{realname}-%{version}.tar.gz
-# Source0-md5: 481501be65bcc34a605d6bc0f57a0023
-URL:           http://cairographics.org/
-BuildRequires: autoconf >= 2.62
-BuildRequires: automake >= 1:1.11
-BuildRequires: crossmingw32-cairo >= 1.10.0
+Source0:       https://www.cairographics.org/releases/%{realname}-%{version}.tar.xz
+# Source0-md5: fbcaad2d3756b42592fe8c92b39945f5
+URL:           https://www.cairographics.org/
+BuildRequires: crossmingw32-cairo >= 1.12.0
 BuildRequires: crossmingw32-gcc-c++ >= 1:4.6
-BuildRequires: crossmingw32-libsigc++ >= 2.5.1
-BuildRequires: libtool >= 2:1.5
-BuildRequires: mm-common >= 0.8
+BuildRequires: crossmingw32-libsigc++ >= 2.6.0
+BuildRequires: meson >= 0.50.0
+BuildRequires: mm-common >= 1.0.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig >= 1:0.15
-Requires:      crossmingw32-cairo >= 1.10.0
+BuildRequires: python3 >= 1:3.5
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires:      crossmingw32-cairo >= 1.12.0
 Requires:      crossmingw32-gcc-c++ >= 1:4.6
-Requires:      crossmingw32-libsigc++ >= 2.5.1
+Requires:      crossmingw32-libsigc++ >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -37,14 +40,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                __pkgconfig_provides    %{nil}
 %define                __pkgconfig_requires    %{nil}
 
-%define                _ssp_cflags             %{nil}
-%ifnarch %{ix86}
-# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
-%define                optflags        -O2
-%endif
 # -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
-%define                filterout_c             -f[-a-z0-9=]*
+%define                filterout_c     -f[-a-z0-9=]*
+%define                filterout_cxx   -f[-a-z0-9=]*
 
 %description
 C++ wrapper for cairo (cross MinGW32 version).
@@ -68,8 +67,8 @@ Statyczna biblioteka cairomm (wersja skrośna MinGW32).
 Summary:       DLL cairomm library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL cairomm dla Windows
 Group:         Applications/Emulators
-Requires:      crossmingw32-cairo-dll >= 1.10.0
-Requires:      crossmingw32-libsigc++-dll >= 2.5.1
+Requires:      crossmingw32-cairo-dll >= 1.12.0
+Requires:      crossmingw32-libsigc++-dll >= 2.6.0
 
 %description dll
 DLL cairomm library for Windows.
@@ -80,26 +79,39 @@ Biblioteka DLL cairomm dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 
+cat > meson-cross.txt <<'EOF'
+[host_machine]
+system = 'windows'
+cpu_family = 'x86'
+cpu = 'i386'
+endian='little'
+[binaries]
+c = '%{target}-gcc'
+cpp = '%{target}-g++'
+ar = '%{target}-ar'
+windres = '%{target}-windres'
+pkgconfig = 'pkg-config'
+[properties]
+%ifarch %{ix86}
+c_args = ['%(echo %{rpmcflags} | sed -e "s/ \+/ /g;s/ /', '/g")']
+%else
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc.
+# now at least i486 is required for atomic operations
+c_args = ['-O2']
+%endif
+EOF
+
 %build
 export PKG_CONFIG_LIBDIR=%{_prefix}/lib/pkgconfig
-%{__libtoolize}
-%{__aclocal} -I build
-%{__automake}
-%{__autoconf}
-# mingw32 requires gnu++11 (instead of c++11) for M_PI
-CXXFLAGS="%{rpmcxxflags} -std=gnu++11"
-%configure \
-       --enable-static \
-       --target=%{target} \
-       --host=%{target}
-
-%{__make}
+%meson build \
+       --cross-file meson-cross.txt
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
 %{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
@@ -109,8 +121,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}/{doc/cairomm-1.0,devhelp}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,7 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %{_libdir}/libcairomm-1.0.dll.a
-%{_libdir}/libcairomm-1.0.la
 %{_libdir}/cairomm-1.0
 %{_includedir}/cairomm-1.0
 %{_pkgconfigdir}/cairomm-1.0.pc
@@ -136,4 +145,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libcairomm-1.0-*.dll
+%{_dlldir}/libcairomm-1.0-1.dll