Loading pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch +5 −5 Original line number Diff line number Diff line diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt index b33569d39..fdbfa10a9 100644 index 7e42016629..7211663408 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -1,6 +1,6 @@ set(_BIN_FILES "") -foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in) +foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-dump.in) -foreach(file gnc-fq-update.in finance-quote-wrapper.in) +foreach(file finance-quote-wrapper.in) string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) Loading @@ -14,5 +14,5 @@ index b33569d39..fdbfa10a9 100644 install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) -set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README) +set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in Quote_example.pl README) -set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-update.in finance-quote-wrapper.in README) +set_dist_list(quotes_DIST CMakeLists.txt finance-quote-wrapper.in README) pkgs/applications/office/gnucash/0003-remove-valgrind.patch +4 −5 Original line number Diff line number Diff line diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt index 8e6e339d1..3936a8cb6 100644 index 95ff42cd8f..1c1944a811 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt @@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") @@ -169,13 +169,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") set(VALGRIND_OUTDIR ${BINDIR_BUILD}) Loading @@ -16,7 +16,7 @@ index 8e6e339d1..3936a8cb6 100644 ## Create the environment file file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN) @@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT} @@ -259,14 +252,13 @@ file(COPY ${ENV_FILE_OUT} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) Loading @@ -24,12 +24,11 @@ index 8e6e339d1..3936a8cb6 100644 install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) @@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp - gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in + gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-gresources.xml ${gresource_files} price-quotes.scm ${gnucash_GRESOURCES} ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST}) pkgs/applications/office/gnucash/0004-exec-fq-helpers.patchdeleted 100644 → 0 +0 −23 Original line number Diff line number Diff line diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm index 8e3ff255f..a6b805fa5 100644 --- a/gnucash/price-quotes.scm +++ b/gnucash/price-quotes.scm @@ -44,7 +44,7 @@ (define (start-program) (set! program (gnc-spawn-process-async - (list "perl" "-w" gnc:*finance-quote-check*) #t))) + (list gnc:*finance-quote-check*) #t))) (define (get-sources) (when program @@ -119,7 +119,7 @@ (define (start-quoter) (set! quoter - (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) + (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) (define (get-quotes) (when quoter pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp index 3003fca71f..e01cb10b50 100644 --- a/libgnucash/app-utils/gnc-quotes.cpp +++ b/libgnucash/app-utils/gnc-quotes.cpp @@ -122,7 +122,6 @@ private: class GncFQQuoteSource final : public GncQuoteSource { - const bfs::path c_cmd; std::string c_fq_wrapper; std::string m_version; StrVec m_sources; @@ -145,7 +144,6 @@ static std::string parse_quotesource_error(const std::string& line); static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : -c_cmd{bp::search_path("perl")}, m_version{}, m_sources{}, m_api_key{} { char *bindir = gnc_path_get_bindir(); @@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const { - StrVec args{"-w", c_fq_wrapper, "-f" }; + StrVec args{"-f" }; return run_cmd(args, json_str); } @@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c auto input_buf = bp::buffer (json_string); bp::child process; if (m_api_key.empty()) - process = bp::child(c_cmd, args, + process = bp::child(c_fq_wrapper, args, bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, svc); else - process = bp::child(c_cmd, args, + process = bp::child(c_fq_wrapper, args, bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch 0 → 100644 +31 −0 Original line number Diff line number Diff line diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp index 8a5221d19d..d14e96cb66 100644 --- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp @@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) EXPECT_EQ(4u, commodities.size()); } -#ifdef HAVE_F_Q -TEST_F(GncQuotesTest, online_wiggle) -{ - GncQuotes quotes; - quotes.fetch(m_book); - auto pricedb{gnc_pricedb_get_db(m_book)}; - auto failures{quotes.failures()}; - ASSERT_EQ(1u, failures.size()); - EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); -// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); - EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); -} -#else -TEST_F(GncQuotesTest, fq_failure) -{ - EXPECT_THROW(GncQuotes quotes;, GncQuoteException); -} -#endif - TEST_F(GncQuotesTest, offline_wiggle) { StrVec quote_vec{ Loading
pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch +5 −5 Original line number Diff line number Diff line diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt index b33569d39..fdbfa10a9 100644 index 7e42016629..7211663408 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -1,6 +1,6 @@ set(_BIN_FILES "") -foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in) +foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-dump.in) -foreach(file gnc-fq-update.in finance-quote-wrapper.in) +foreach(file finance-quote-wrapper.in) string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) Loading @@ -14,5 +14,5 @@ index b33569d39..fdbfa10a9 100644 install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) -set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README) +set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in Quote_example.pl README) -set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-update.in finance-quote-wrapper.in README) +set_dist_list(quotes_DIST CMakeLists.txt finance-quote-wrapper.in README)
pkgs/applications/office/gnucash/0003-remove-valgrind.patch +4 −5 Original line number Diff line number Diff line diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt index 8e6e339d1..3936a8cb6 100644 index 95ff42cd8f..1c1944a811 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt @@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") @@ -169,13 +169,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") set(VALGRIND_OUTDIR ${BINDIR_BUILD}) Loading @@ -16,7 +16,7 @@ index 8e6e339d1..3936a8cb6 100644 ## Create the environment file file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN) @@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT} @@ -259,14 +252,13 @@ file(COPY ${ENV_FILE_OUT} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) Loading @@ -24,12 +24,11 @@ index 8e6e339d1..3936a8cb6 100644 install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) @@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp - gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in + gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-gresources.xml ${gresource_files} price-quotes.scm ${gnucash_GRESOURCES} ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST})
pkgs/applications/office/gnucash/0004-exec-fq-helpers.patchdeleted 100644 → 0 +0 −23 Original line number Diff line number Diff line diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm index 8e3ff255f..a6b805fa5 100644 --- a/gnucash/price-quotes.scm +++ b/gnucash/price-quotes.scm @@ -44,7 +44,7 @@ (define (start-program) (set! program (gnc-spawn-process-async - (list "perl" "-w" gnc:*finance-quote-check*) #t))) + (list gnc:*finance-quote-check*) #t))) (define (get-sources) (when program @@ -119,7 +119,7 @@ (define (start-quoter) (set! quoter - (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) + (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) (define (get-quotes) (when quoter
pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch 0 → 100644 +46 −0 Original line number Diff line number Diff line diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp index 3003fca71f..e01cb10b50 100644 --- a/libgnucash/app-utils/gnc-quotes.cpp +++ b/libgnucash/app-utils/gnc-quotes.cpp @@ -122,7 +122,6 @@ private: class GncFQQuoteSource final : public GncQuoteSource { - const bfs::path c_cmd; std::string c_fq_wrapper; std::string m_version; StrVec m_sources; @@ -145,7 +144,6 @@ static std::string parse_quotesource_error(const std::string& line); static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : -c_cmd{bp::search_path("perl")}, m_version{}, m_sources{}, m_api_key{} { char *bindir = gnc_path_get_bindir(); @@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const { - StrVec args{"-w", c_fq_wrapper, "-f" }; + StrVec args{"-f" }; return run_cmd(args, json_str); } @@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c auto input_buf = bp::buffer (json_string); bp::child process; if (m_api_key.empty()) - process = bp::child(c_cmd, args, + process = bp::child(c_fq_wrapper, args, bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, svc); else - process = bp::child(c_cmd, args, + process = bp::child(c_fq_wrapper, args, bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf,
pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch 0 → 100644 +31 −0 Original line number Diff line number Diff line diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp index 8a5221d19d..d14e96cb66 100644 --- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp @@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) EXPECT_EQ(4u, commodities.size()); } -#ifdef HAVE_F_Q -TEST_F(GncQuotesTest, online_wiggle) -{ - GncQuotes quotes; - quotes.fetch(m_book); - auto pricedb{gnc_pricedb_get_db(m_book)}; - auto failures{quotes.failures()}; - ASSERT_EQ(1u, failures.size()); - EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); -// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); - EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); -} -#else -TEST_F(GncQuotesTest, fq_failure) -{ - EXPECT_THROW(GncQuotes quotes;, GncQuoteException); -} -#endif - TEST_F(GncQuotesTest, offline_wiggle) { StrVec quote_vec{