public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sandro Mani <manisandro@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mingw-fontconfig] rawhide: Switch to ninja-build
Date: Sun, 12 Jul 2026 18:37:11 GMT	[thread overview]
Message-ID: <178388143106.1.13444622473340486688.rpms-mingw-fontconfig-148e6ff38bf2@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/mingw-fontconfig
Branch : rawhide
Commit : 148e6ff38bf2a1d24ed114c3483d8bfed3e6d145
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-07-12T20:37:02+02:00
Stats  : +11/-43 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/mingw-fontconfig/c/148e6ff38bf2a1d24ed114c3483d8bfed3e6d145?branch=rawhide

Log:
Switch to ninja-build

---
diff --git a/mingw-fontconfig.spec b/mingw-fontconfig.spec
index 8eb8af6..703c698 100644
--- a/mingw-fontconfig.spec
+++ b/mingw-fontconfig.spec
@@ -9,32 +9,26 @@ License:        MIT
 URL:            http://fontconfig.org
 Source0:        https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/%{version}/fontconfig-%{version}.tar.bz2
 
-# Allow disabling tests (do not build)
-Patch0:         fontconfig_tests.patch
-
 BuildArch:      noarch
 
-BuildRequires: make
-BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  meson
+BuildRequires:  ninja-build
+BuildRequires:  gperf
+
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-expat
 BuildRequires:  mingw32-freetype
 BuildRequires:  mingw32-win-iconv
 
-BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw64-gcc
 BuildRequires:  mingw64-binutils
 BuildRequires:  mingw64-expat
 BuildRequires:  mingw64-freetype
 BuildRequires:  mingw64-win-iconv
 
-BuildRequires:  gperf
-BuildRequires:  pkgconfig
-BuildRequires:  python3
-
-BuildRequires:  automake autoconf libtool gettext-devel
-
 
 %description
 MinGW Windows Fontconfig library.
@@ -48,13 +42,6 @@ Requires:       pkgconfig
 %description -n mingw32-fontconfig
 MinGW Windows Fontconfig library.
 
-%package -n mingw32-fontconfig-static
-Summary:       Static version of the cross compiled Fontconfig library
-Requires:      mingw32-fontconfig = %{version}-%{release}
-
-%description -n mingw32-fontconfig-static
-Static version of the cross compiled Fontconfig library.
-
 # Win64
 %package -n mingw64-fontconfig
 Summary:        MinGW Windows Fontconfig library
@@ -63,15 +50,8 @@ Requires:       pkgconfig
 %description -n mingw64-fontconfig
 MinGW Windows Fontconfig library.
 
-%package -n mingw64-fontconfig-static
-Summary:       Static version of the cross compiled Fontconfig library
-Requires:      mingw64-fontconfig = %{version}-%{release}
-
-%description -n mingw64-fontconfig-static
-Static version of the cross compiled Fontconfig library.
-
 
-%?mingw_debug_package
+%{?mingw_debug_package}
 
 
 %prep
@@ -79,15 +59,11 @@ Static version of the cross compiled Fontconfig library.
 
 
 %build
-export MINGW32_CONFIGURE_ARGS="--with-arch=i686"
-export MINGW64_CONFIGURE_ARGS="--with-arch=x86_64"
-autoreconf -ifv
-%mingw_configure --disable-docs --disable-tests --enable-static --enable-shared
-%mingw_make_build
+%mingw_meson
 
 
 %install
-%mingw_make_install
+%mingw_ninja_install
 
 rm -f %{buildroot}/%{mingw32_libdir}/charset.alias
 rm -f %{buildroot}/%{mingw64_libdir}/charset.alias
@@ -96,10 +72,6 @@ rm -f %{buildroot}/%{mingw64_libdir}/charset.alias
 rm -f %{buildroot}%{mingw32_libdir}/fontconfig.def
 rm -f %{buildroot}%{mingw64_libdir}/fontconfig.def
 
-# Remove .la files
-rm -f %{buildroot}%{mingw32_libdir}/*.la
-rm -f %{buildroot}%{mingw64_libdir}/*.la
-
 # Remove duplicate manpages.
 rm -rf %{buildroot}%{mingw32_mandir}
 rm -rf %{buildroot}%{mingw64_mandir}
@@ -115,6 +87,7 @@ rm -rf %{buildroot}%{mingw64_datadir}/doc
 %{mingw32_bindir}/fc-cache.exe
 %{mingw32_bindir}/fc-cat.exe
 %{mingw32_bindir}/fc-conflist.exe
+%{mingw32_bindir}/fc-genconf.exe
 %{mingw32_bindir}/fc-list.exe
 %{mingw32_bindir}/fc-match.exe
 %{mingw32_bindir}/fc-pattern.exe
@@ -133,15 +106,13 @@ rm -rf %{buildroot}%{mingw64_datadir}/doc
 %{mingw32_datadir}/gettext/its/fontconfig.loc
 %{mingw32_datadir}/xml/fontconfig/
 
-%files -n mingw32-fontconfig-static
-%{mingw32_libdir}/libfontconfig.a
-
 # Win64
 %files -n mingw64-fontconfig
 %license COPYING
 %{mingw64_bindir}/fc-cache.exe
 %{mingw64_bindir}/fc-cat.exe
 %{mingw64_bindir}/fc-conflist.exe
+%{mingw64_bindir}/fc-genconf.exe
 %{mingw64_bindir}/fc-list.exe
 %{mingw64_bindir}/fc-match.exe
 %{mingw64_bindir}/fc-pattern.exe
@@ -160,9 +131,6 @@ rm -rf %{buildroot}%{mingw64_datadir}/doc
 %{mingw64_datadir}/gettext/its/fontconfig.loc
 %{mingw64_datadir}/xml/fontconfig/
 
-%files -n mingw64-fontconfig-static
-%{mingw64_libdir}/libfontconfig.a
-
 
 %changelog
 * Sun Jul 12 2026 Sandro Mani <manisandro@gmail.com> - 2.18.2-1

                 reply	other threads:[~2026-07-12 18:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178388143106.1.13444622473340486688.rpms-mingw-fontconfig-148e6ff38bf2@fedoraproject.org \
    --to=manisandro@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox