- updated to 1.44.1, now uses meson

diff --git a/crossmingw32-pango.spec b/crossmingw32-pango.spec
index c612e3a28a9eb76505dc65f6b605d4065994c9c8..fc38bc139b2c0a406eb0c9bc4d7309110ea7edd9 100644 (file)
--- a/crossmingw32-pango.spec
+++ b/crossmingw32-pango.spec
@@ -2,26 +2,26 @@ Summary:      System for layout and rendering of internationalized text - cross MinGW
 Summary(pl.UTF-8):     System renderowania międzynarodowego tekstu - wersja skrośna dla MinGW32
 %define                realname   pango
 Name:          crossmingw32-%{realname}
-Version:       1.42.4
-Release:       3
+Version:       1.44.1
+Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/pango/1.42/%{realname}-%{version}.tar.xz
-# Source0-md5: deb171a31a3ad76342d5195a1b5bbc7c
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/pango/1.44/%{realname}-%{version}.tar.xz
+# Source0-md5: af2e8343cb8e61a8bb354494bda02302
 URL:           http://www.pango.org/
-BuildRequires: autoconf >= 2.59-9
-BuildRequires: automake >= 1:1.9
 # cairo-ft cairo-pdf cairo-png cairo-ps cairo-win32
 BuildRequires: crossmingw32-cairo >= 1.12.10
 BuildRequires: crossmingw32-fontconfig >= 2.11.91
 BuildRequires: crossmingw32-freetype >= 2.1.7
 BuildRequires: crossmingw32-fribidi >= 0.19.7
 BuildRequires: crossmingw32-gcc
-BuildRequires: crossmingw32-glib2 >= 2.34.0
-BuildRequires: crossmingw32-harfbuzz >= 1.4.2
+BuildRequires: crossmingw32-glib2 >= 2.59.2
+BuildRequires: crossmingw32-harfbuzz >= 2.0.0
+BuildRequires: crossmingw32-w32api >= 5.0.2-6
 # glib-genmarshal, glib-mkenums
-BuildRequires: glib2-devel >= 1:2.34.0
-BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: glib2-devel >= 1:2.59.2
+BuildRequires: meson >= 0.50.0-2
+BuildRequires: ninja >= 1.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.15
 BuildRequires: rpmbuild(macros) >= 1.197
@@ -31,8 +31,8 @@ Requires:     crossmingw32-cairo >= 1.12.10
 Requires:      crossmingw32-fontconfig >= 2.11.91
 Requires:      crossmingw32-freetype >= 2.1.7
 Requires:      crossmingw32-fribidi >= 0.19.7
-Requires:      crossmingw32-glib2 >= 2.34.0
-Requires:      crossmingw32-harfbuzz >= 1.4.2
+Requires:      crossmingw32-glib2 >= 2.59.2
+Requires:      crossmingw32-harfbuzz >= 2.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -45,10 +45,9 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
-%define                __cc                    %{target}-gcc
-%define                __cxx                   %{target}-g++
 %define                __pkgconfig_provides    %{nil}
 %define                __pkgconfig_requires    %{nil}
+# for meson 0.50+, keep __cc/__cxx as host compiler and pass %{target}-* in meson-cross.txt
 
 %define                _ssp_cflags             %{nil}
 %ifnarch %{ix86}
@@ -67,6 +66,18 @@ MinGW32 version).
 System obsługi i renderowania międzynarodowego tekstu (wersja skrośna
 MinGW32).
 
+%package static
+Summary:       Static Pango libraries (cross MinGW32 version)
+Summary(pl.UTF-8):     Statyczne biblioteki Pango (wersja skrośna MinGW32)
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description static
+Static Pango libraries (cross MinGW32 version).
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Pango (wersja skrośna MinGW32).
+
 %package dll
 Summary:       DLL pango libraries for Windows
 Summary(pl.UTF-8):     Biblioteki DLL pango dla Windows
@@ -75,8 +86,8 @@ Requires:     crossmingw32-cairo-dll >= 1.12.10
 Requires:      crossmingw32-fontconfig-dll >= 2.11.91
 Requires:      crossmingw32-freetype-dll >= 2.1.7
 Requires:      crossmingw32-fribidi-dll >= 0.19.7
-Requires:      crossmingw32-glib2-dll >= 2.34.0
-Requires:      crossmingw32-harfbuzz-dll >= 1.4.2
+Requires:      crossmingw32-glib2-dll >= 2.59.2
+Requires:      crossmingw32-harfbuzz-dll >= 2.0.0
 Requires:      wine
 
 %description dll
@@ -88,47 +99,53 @@ Biblioteki DLL pango 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]
+c_args = ['%(echo %{rpmcflags} | sed -e "s/ \+/ /g;s/ /', '/g")', '-DWINVER=0x0600']
+EOF
+
 %build
 export PKG_CONFIG_LIBDIR=%{_pkgconfigdir}
-%{__libtoolize}
-%{__aclocal}
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-%configure \
-       --target=%{target} \
-       --host=%{target} \
-       --disable-silent-rules
-
-%{__make} \
-       GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
-       GLIB_MKENUMS=/usr/bin/glib-mkenums
+%meson build \
+       --cross-file meson-cross.txt \
+       %{?debug:--debug} \
+       -Dgtk_doc=false \
+       -Dintrospection=false
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 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}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpango*.la
-
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/pango-{list,view}.exe
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{gtk-doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README
+%doc NEWS README.md README.win32 THANKS
 %{_libdir}/libpango-1.0.dll.a
 %{_libdir}/libpangocairo-1.0.dll.a
 %{_libdir}/libpangoft2-1.0.dll.a
@@ -139,9 +156,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/pangoft2.pc
 %{_pkgconfigdir}/pangowin32.pc
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libpango-1.0.a
+%{_libdir}/libpangocairo-1.0.a
+%{_libdir}/libpangoft2-1.0.a
+%{_libdir}/libpangowin32-1.0.a
+
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libpango-1.0-*.dll
-%{_dlldir}/libpangocairo-1.0-*.dll
-%{_dlldir}/libpangoft2-1.0-*.dll
-%{_dlldir}/libpangowin32-1.0-*.dll
+%{_dlldir}/libpango-1.0-0.dll
+%{_dlldir}/libpangocairo-1.0-0.dll
+%{_dlldir}/libpangoft2-1.0-0.dll
+%{_dlldir}/libpangowin32-1.0-0.dll