public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mingw-graphite2] rawhide: Read -static packages
@ 2026-07-21 16:45 Sandro Mani
  0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-07-21 16:45 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/mingw-graphite2
            Branch : rawhide
            Commit : 0a5936b89fdf99229c3de16adf36007485ba5e62
            Author : Sandro Mani <manisandro@gmail.com>
            Date   : 2026-07-21T18:45:38+02:00
            Stats  : +47/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/mingw-graphite2/c/0a5936b89fdf99229c3de16adf36007485ba5e62?branch=rawhide

            Log:
            Read -static packages

Required for mingw-qt5-qtdeclarative

---
diff --git a/graphite2_fonttest.patch b/graphite2_fonttest.patch
new file mode 100644
index 0000000..eeb2f31
--- /dev/null
+++ b/graphite2_fonttest.patch
@@ -0,0 +1,18 @@
+diff -rupN graphite2-1.3.15/CMakeLists.txt graphite2-1.3.15-new/CMakeLists.txt
+--- graphite2-1.3.15/CMakeLists.txt	2026-05-31 23:03:26.000000000 +0200
++++ graphite2-1.3.15-new/CMakeLists.txt	2026-07-21 18:32:16.417999349 +0200
+@@ -85,11 +85,11 @@ endif()
+ add_subdirectory(src)
+ if (BUILD_TESTING)
+     add_subdirectory(tests)
++    if (NOT GRAPHITE2_NFILEFACE)
++        add_subdirectory(gr2fonttest)
++    endif()
+ endif()
+ add_subdirectory(doc)
+-if (NOT GRAPHITE2_NFILEFACE)
+-    add_subdirectory(gr2fonttest)
+-endif()
+ 
+ get_property(version DIRECTORY src PROPERTY lib_so_version)
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})

diff --git a/mingw-graphite2.spec b/mingw-graphite2.spec
index 8535d96..ed75c84 100644
--- a/mingw-graphite2.spec
+++ b/mingw-graphite2.spec
@@ -11,7 +11,8 @@ Summary:       MinGW Windows %{pkgname} library
 License:       LGPL-2.1-or-later OR MPL-2.0 OR GPL-2.0-or-later
 URL:           https://github.com/silnrsi/graphite
 Source0:       https://github.com/silnrsi/graphite/releases/download/%{version}/%{pkgname}-%{version}.tgz
-
+# Only build gr2fonttest if testing is enabled
+Patch0:        graphite2_fonttest.patch
 
 BuildArch:     noarch
 
@@ -43,6 +44,11 @@ Summary:       MinGW Windows %{pkgname} library
 %description -n mingw32-%{pkgname}
 MinGW Windows %{pkgname} library.
 
+%package -n mingw32-%{pkgname}-static
+Summary:       Static version of the MinGW Windows %{pkgname} library
+
+%description -n mingw32-%{pkgname}-static
+Static version of the MinGW Windows %{pkgname} library.
 
 # Win64
 %package -n mingw64-%{pkgname}
@@ -51,6 +57,12 @@ Summary:       MinGW Windows %{pkgname} library
 %description -n mingw64-%{pkgname}
 MinGW Windows %{pkgname} library.
 
+%package -n mingw64-%{pkgname}-static
+Summary:       Static version of the MinGW Windows %{pkgname} library
+
+%description -n mingw64-%{pkgname}-static
+Static version of the MinGW Windows %{pkgname} library.
+
 
 %{?mingw_debug_package}
 
@@ -60,11 +72,19 @@ MinGW Windows %{pkgname} library.
 
 
 %build
+export MINGW_BUILDDIR_SUFFIX=_shared
 %mingw_cmake -DGRAPHITE2_COMPARE_RENDERER=OFF
 %mingw_make_build
 
+export MINGW_BUILDDIR_SUFFIX=_static
+%mingw_cmake -DGRAPHITE2_COMPARE_RENDERER=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF
+%mingw_make_build
+
 
 %install
+export MINGW_BUILDDIR_SUFFIX=_shared
+%mingw_make_install
+export MINGW_BUILDDIR_SUFFIX=_static
 %mingw_make_install
 
 rm -rf %{buildroot}%{mingw32_datadir}
@@ -80,6 +100,10 @@ rm -rf %{buildroot}%{mingw64_datadir}
 %{mingw32_libdir}/pkgconfig/%{pkgname}.pc
 %{mingw32_includedir}/%{pkgname}/
 
+%files -n mingw32-%{pkgname}-static
+%license LICENSE COPYING
+%{mingw32_libdir}/lib%{pkgname}.a
+
 # Win64
 %files -n mingw64-%{pkgname}
 %license LICENSE COPYING
@@ -89,6 +113,10 @@ rm -rf %{buildroot}%{mingw64_datadir}
 %{mingw64_libdir}/pkgconfig/%{pkgname}.pc
 %{mingw64_includedir}/%{pkgname}/
 
+%files -n mingw64-%{pkgname}-static
+%license LICENSE COPYING
+%{mingw64_libdir}/lib%{pkgname}.a
+
 
 %changelog
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.15-2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-21 16:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-21 16:45 [rpms/mingw-graphite2] rawhide: Read -static packages Sandro Mani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox