Accepting request 1226115 from Office

- Add gnucash-icu.patch: Fix build with recent ICU libraries
- Add gnucash-swig43.patch: Fix build with SWIG 4.3

OBS-URL: https://build.opensuse.org/request/show/1226115
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=109
This commit is contained in:
Ana Guerrero 2024-11-25 22:20:29 +00:00 committed by Git OBS Bridge
commit 1546b65b78
4 changed files with 42 additions and 0 deletions

21
gnucash-icu.patch Normal file
View File

@ -0,0 +1,21 @@
--- gnucash-5.9/libgnucash/engine/CMakeLists.txt.orig 2024-11-24 16:03:34.430747300 +0100
+++ gnucash-5.9/libgnucash/engine/CMakeLists.txt 2024-11-24 16:08:45.978821800 +0100
@@ -136,6 +136,8 @@ add_custom_command (
)
add_custom_target(iso-4217-c DEPENDS ${ISO_4217_C})
+find_package(ICU REQUIRED COMPONENTS uc i18n)
+
set (engine_SOURCES
Account.cpp
Recurrence.cpp
@@ -237,7 +239,8 @@ target_link_libraries(gnc-engine
gnc-core-utils
${Boost_DATE_TIME_LIBRARY}
${Boost_REGEX_LIBRARY}
- ${ICU4C_I18N_LDFLAGS}
+ ICU::uc
+ ICU::i18n
${REGEX_LDFLAGS}
${GMODULE_LDFLAGS}
PkgConfig::GLIB2

13
gnucash-swig43.patch Normal file
View File

@ -0,0 +1,13 @@
--- gnucash-5.9/bindings/python/time64.i.orig 2024-11-24 15:50:32.091682300 +0100
+++ gnucash-5.9/bindings/python/time64.i 2024-11-24 15:50:49.204226200 +0100
@@ -149,8 +149,8 @@
t.tm_mday, t.tm_hour, t.tm_min,
t.tm_sec, 0);
- $result = SWIG_Python_AppendOutput($result, tp);
- } else $result = SWIG_Python_AppendOutput($result, Py_None);
+ $result = SWIG_AppendOutput($result, tp);
+ } else $result = SWIG_AppendOutput($result, Py_None);
}
%apply time64 *date { time64 *last_date };

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 14:56:33 UTC 2024 - Johannes Engel <jcnengel@gmail.com>
- Add gnucash-icu.patch: Fix build with recent ICU libraries
- Add gnucash-swig43.patch: Fix build with SWIG 4.3
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 29 21:38:08 UTC 2024 - RN <R_Nik_C@proton.me> Sun Sep 29 21:38:08 UTC 2024 - RN <R_Nik_C@proton.me>

View File

@ -48,6 +48,8 @@ Patch0: gnucash-cpan-warning.patch
# PATCH-FIX-UPSTREAM gnucash-libm.patch gh#gnucash/gnucash#632 dimstar@opensuse.org -- Link libm: gnucash uses e.g. log10 without explicitly requesting libm # PATCH-FIX-UPSTREAM gnucash-libm.patch gh#gnucash/gnucash#632 dimstar@opensuse.org -- Link libm: gnucash uses e.g. log10 without explicitly requesting libm
Patch1: gnucash-libm.patch Patch1: gnucash-libm.patch
Patch2: gnucash-4.1-fix-gtest-path.patch Patch2: gnucash-4.1-fix-gtest-path.patch
Patch3: gnucash-icu.patch
Patch4: gnucash-swig43.patch
BuildRequires: cmake >= 3.14 BuildRequires: cmake >= 3.14
BuildRequires: doxygen BuildRequires: doxygen