diff --git a/0001-Always-build-tinygettext-as-a-static-library.patch b/0001-Always-build-tinygettext-as-a-static-library.patch new file mode 100644 index 0000000..127e279 --- /dev/null +++ b/0001-Always-build-tinygettext-as-a-static-library.patch @@ -0,0 +1,28 @@ +From 164c51cb2eeaa7343c1cbd6a346ad27439a16516 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 7 Oct 2021 00:52:32 +0200 +Subject: [PATCH] Always build tinygettext as a static library + +Explicitly pass STATIC to tinygettext add_library() call to make sure +it's always built as static, even when distro's cmake is configured to +build libs shared by default. +--- + lib/tinygettext/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/tinygettext/CMakeLists.txt b/lib/tinygettext/CMakeLists.txt +index 108339c42..5a67ab425 100644 +--- a/lib/tinygettext/CMakeLists.txt ++++ b/lib/tinygettext/CMakeLists.txt +@@ -94,7 +94,7 @@ file(GLOB TINYGETTEXT_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} include/tinyg + + ## define a target for building the library + +-add_library(tinygettext ${TINYGETTEXT_SOURCES}) ++add_library(tinygettext STATIC ${TINYGETTEXT_SOURCES}) + + ## Add tinygettext dir to search path + +-- +2.31.1 + diff --git a/supertuxkart.spec b/supertuxkart.spec index af24632..2136fdc 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -21,6 +21,8 @@ Source2: supertuxkart-0.7.3-license-clarification.txt # https://github.com/supertuxkart/stk-code/pull/4642 Patch0: 0001-Use-tilde-for-pre-release-versioning-in-appdata.patch +# https://github.com/supertuxkart/stk-code/pull/4643 +Patch1: 0001-Always-build-tinygettext-as-a-static-library.patch BuildRequires: make BuildRequires: gcc-c++ @@ -52,8 +54,6 @@ Requires: %{name}-data = %{version} Provides: bundled(bullet) = 2.87 Provides: bundled(libtinygettext) = 0.1.0 -%global __requires_exclude .*libtinygettext\\.so* - %description 3D go-kart racing game for kids with several famous OpenSource mascots participating. Race as Tux against 3 computer players in many different fun @@ -88,7 +88,6 @@ popd %install pushd build %cmake_install - install -m755 -D lib/tinygettext/libtinygettext.so %{buildroot}%{_libdir}/libtinygettext.so popd # Remove a too large icon that goes outside of hicolor-icon-theme spec and breaks flatpak builds @@ -117,7 +116,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %exclude %{_includedir}/wiiuse.h %exclude %{_libdir}/libwiiuse.a -%{_libdir}/libtinygettext.so %files data %{_datadir}/%{name}/ @@ -125,6 +123,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop %changelog * Wed Oct 06 2021 Kalev Lember - 1.3-2 - Fix appdata to pass validation +- Build bundled tinygettext as static library * Wed Sep 29 2021 Gwyn Ciesla - 1.3-1 - 1.3