Skip to content

Commit 3f12c49

Browse files
committed
Merge latest translations from Weblate.
2 parents ab04715 + c04033e commit 3f12c49

File tree

318 files changed

+68470
-29486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+68470
-29486
lines changed

.github/workflows/mac-tests.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ jobs:
2020
uses: carlosperate/download-file-action@v2
2121
id: dependencies
2222
with:
23-
file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-5.6-mac-dependencies.tar.xz'
23+
file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-5.13-mac-dependencies.tar.xz'
2424
file-name: gnucash-dependencies.tar.xz
25+
sha256: '51bae6f0ff384bbcb1547e21553398a0a399ca1f5f2f517b8de5cd2316464760'
2526
- name: download googletest
2627
uses: carlosperate/download-file-action@v2
2728

@@ -42,7 +43,7 @@ jobs:
4243
run: |
4344
mkdir $HOME/gnucash/build
4445
cd $HOME/gnucash/build
45-
cmake -GNinja -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DWITH_PYTHON=ON -DGTEST_ROOT=$SRCROOT/googletest $GITHUB_WORKSPACE
46+
cmake -GNinja -DPKG_CONFIG_EXECUTABLE=$PREFIX/bin/pkgconf -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DWITH_PYTHON=ON -DGTEST_ROOT=$SRCROOT/googletest $GITHUB_WORKSPACE
4647
- name: Build and Test GnuCash
4748
run: |
4849
cd $HOME/gnucash/build

CMakeLists.txt

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ endif()
1414
if (POLICY CMP0167)
1515
cmake_policy(SET CMP0167 OLD)
1616
endif()
17+
# CMake 3.31+ Use normalization rules on install DESTINATION
18+
# command. We shouldn't be impacted so allow the new behavior.
19+
if (POLICY CMP0177)
20+
cmake_policy(SET CMP0177 NEW)
21+
endif()
1722

1823
project (gnucash
1924
VERSION 5.12
@@ -204,8 +209,18 @@ if (WIN32)
204209
set(REGEX_LDFLAGS "-L${REGEX_LIB_PATH} -lregex")
205210
#set(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include)
206211
#set(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc)
207-
#Prevent creating a console window on startup and harden the executable.
212+
#Prevent creating a console window on startup and harden the executable.
208213
set(CMAKE_EXE_LINKER_FLAGS "-mwindows -Wl,--nxcompat -Wl,--dynamicbase")
214+
#Find the winsock2 library
215+
find_library(WINSOCK_LIB wsock32)
216+
find_library(WS2_LIB ws2_32)
217+
endif()
218+
219+
if (APPLE)
220+
# Prefer libraries in the PREFIX over Apple-provided frameworks:
221+
if (NOT DEFINED CMAKE_FIND_FRAMEWORK)
222+
set(CMAKE_FIND_FRAMEWORK LAST)
223+
endif()
209224
endif()
210225

211226
find_package(Threads REQUIRED)
@@ -521,6 +536,14 @@ if (WITH_PYTHON)
521536
if (NOT DEFINED Python3_FIND_UNVERSIONED_NAMES)
522537
set (Python3_FIND_UNVERSIONED_NAMES FIRST)
523538
endif()
539+
if (NOT DEFINED Python3_FIND_VIRTUALENV)
540+
# Don't prefer virtualenv python3: Prefer the one that's first on $PATH
541+
set(Python3_FIND_VIRTUALENV STANDARD)
542+
endif()
543+
if (APPLE)
544+
# The macOS SDK-provided Python framework lacks SQLite3 support
545+
set(Python3_FIND_FRAMEWORK NEVER)
546+
endif()
524547
find_package (Python3 ${PYTHON_MIN_VERSION} COMPONENTS Interpreter Development)
525548
if (NOT Python3_FOUND)
526549
message(SEND_ERROR "Python support enabled, but Python3 interpreter and/or libaries not found.")
@@ -617,7 +640,8 @@ if (MINGW)
617640
endif()
618641

619642
if (APPLE)
620-
execute_process(COMMAND clang --print-file-name=libclang_rt.asan_osx_dynamic.dylib
643+
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-folding-constant")
644+
execute_process(COMMAND clang --print-file-name=libclang_rt.asan_osx_dynamic.dylib
621645
OUTPUT_VARIABLE ASAN_DYNAMIC_LIB
622646
OUTPUT_STRIP_TRAILING_WHITESPACE)
623647
set(ASAN_DYNAMIC_LIB_ENV "DYLD_INSERT_LIBRARIES=${ASAN_DYNAMIC_LIB}")

bindings/guile/test/test-engine-extras.scm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,7 @@
524524

525525
;; inv-1 is generated for a customer
526526
(inv-1 (let ((inv-1 (gncInvoiceCreate (gnc-get-current-book))))
527+
(gncInvoiceSetID inv-1 "0001")
527528
(gncInvoiceSetOwner inv-1 owner-1)
528529
(gncInvoiceSetNotes inv-1 "inv-1-notes")
529530
(gncInvoiceSetBillingID inv-1 "inv-1-billing-id")
@@ -542,6 +543,7 @@
542543

543544
;; inv-2 is generated from a customer's job
544545
(inv-2 (let ((inv-2 (gncInvoiceCreate (gnc-get-current-book))))
546+
(gncInvoiceSetID inv-2 "0002")
545547
(gncInvoiceSetOwner inv-2 owner-2)
546548
(gncInvoiceSetNotes inv-2 "inv-2-notes")
547549
(gncInvoiceSetCurrency inv-2 USD)
@@ -561,6 +563,7 @@
561563

562564
;; inv-3 is generated from a vendor
563565
(inv-3 (let ((inv-3 (gncInvoiceCreate (gnc-get-current-book))))
566+
(gncInvoiceSetID inv-3 "0003")
564567
(gncInvoiceSetOwner inv-3 owner-3)
565568
(gncInvoiceSetNotes inv-3 "inv-3-notes")
566569
(gncInvoiceSetCurrency inv-3 USD)
@@ -578,30 +581,35 @@
578581

579582
;; inv-4 is generated for an employee
580583
(inv-4 (let ((inv-4 (gncInvoiceCreate (gnc-get-current-book))))
584+
(gncInvoiceSetID inv-4 "0004")
581585
(gncInvoiceSetOwner inv-4 owner-4)
582586
(gncInvoiceSetNotes inv-4 "inv-4-notes")
583587
(gncInvoiceSetCurrency inv-4 USD)
584588
inv-4))
585589

586590
;; inv-5 cust-credit-note
587591
(inv-5 (let ((inv-5 (gncInvoiceCopy inv-1)))
592+
(gncInvoiceSetID inv-5 "0005")
588593
(gncInvoiceSetIsCreditNote inv-5 #t)
589594
(gncInvoiceSetCurrency inv-5 USD)
590595
inv-5))
591596

592597
;; inv-6 vend-credit-note
593598
(inv-6 (let ((inv-6 (gncInvoiceCopy inv-3)))
599+
(gncInvoiceSetID inv-6 "0006")
594600
(gncInvoiceSetIsCreditNote inv-6 #t)
595601
(gncInvoiceSetCurrency inv-6 USD)
596602
inv-6))
597603

598604
;; inv-7 emp-credit-note
599605
(inv-7 (let ((inv-7 (gncInvoiceCopy inv-4)))
606+
(gncInvoiceSetID inv-7 "0007")
600607
(gncInvoiceSetIsCreditNote inv-7 #t)
601608
(gncInvoiceSetCurrency inv-7 USD)
602609
inv-7))
603610

604611
(inv-8 (let ((inv-8 (gncInvoiceCreate (gnc-get-current-book))))
612+
(gncInvoiceSetID inv-8 "0008")
605613
(gncInvoiceSetOwner inv-8 owner-1)
606614
(gncInvoiceSetCurrency inv-8 USD)
607615
inv-8))

borrowed/CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
add_subdirectory(libc)
22
add_subdirectory(goffice)
3-
add_subdirectory(chartjs)
3+
add_subdirectory(chartjs-2)
4+
add_subdirectory(chartjs-4)
45
add_subdirectory(guile-json)
56

67
set_local_dist(borrowed_DIST_local jenny/jenny.c CMakeLists.txt README)
7-
set(borrowed_DIST ${borrowed_DIST_local} ${chartjs_DIST} ${libc_DIST} ${guile-json_DIST} ${goffice_DIST} PARENT_SCOPE)
8+
set(borrowed_DIST
9+
${borrowed_DIST_local}
10+
${chartjs-2_DIST}
11+
${chartjs-4_DIST}
12+
${libc_DIST}
13+
${guile-json_DIST}
14+
${goffice_DIST}
15+
PARENT_SCOPE)

borrowed/chartjs-2/CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
set(chartjs-2_DATA
3+
Chart.bundle.min.js
4+
Chart.bundle.js
5+
)
6+
7+
file(GLOB_RECURSE chartjs-2_NOINST_DATA
8+
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
9+
samples Chart*)
10+
11+
list(REMOVE_ITEM chartjs-2_NOINST_DATA ${chartjs-2_DATA})
12+
13+
install (FILES ${chartjs-2_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs-2)
14+
15+
set_dist_list(chartjs-2_DIST CMakeLists.txt ${chartjs-2_DATA} ${chartjs-2_NOINST_DATA})
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)