Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sioyek for openSUSE:Factory checked in at 2023-10-05 20:03:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sioyek (Old) and /work/SRC/openSUSE:Factory/.sioyek.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sioyek" Thu Oct 5 20:03:17 2023 rev:7 rq:1115029 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sioyek/sioyek.changes 2023-08-10 15:34:54.276539527 +0200 +++ /work/SRC/openSUSE:Factory/.sioyek.new.28202/sioyek.changes 2023-10-05 20:03:57.504458570 +0200 @@ -1,0 +2,10 @@ +Tue Oct 3 13:02:55 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildserv...@uncomfyhalomacro.pl> + +- Fix mupdf incompatibility errors by adding mupdf-0.23.0.patch + +------------------------------------------------------------------- +Tue Oct 3 08:24:25 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildserv...@uncomfyhalomacro.pl> + +- Add fix-sqlite-memory-leak.patch. + +------------------------------------------------------------------- New: ---- fix-sqlite-memory-leak.patch mupdf-0.23.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sioyek.spec ++++++ --- /var/tmp/diff_new_pack.kXPiaz/_old 2023-10-05 20:03:58.816505970 +0200 +++ /var/tmp/diff_new_pack.kXPiaz/_new 2023-10-05 20:03:58.816505970 +0200 @@ -25,6 +25,8 @@ URL: https://github.com/ahrm/sioyek Source0: https://github.com/ahrm/sioyek/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1: no-link-gumbo.patch +Patch2: https://github.com/ahrm/sioyek/pull/694.patch#/fix-sqlite-memory-leak.patch +Patch3: https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226#/mupdf-0.23.0.patch BuildRequires: binutils BuildRequires: c++_compiler BuildRequires: libQt5Gui-devel ++++++ fix-sqlite-memory-leak.patch ++++++ ++++ 131949 lines (skipped) ++++++ mupdf-0.23.0.patch ++++++ diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp index f48d05e..0bc3855 100644 --- a/pdf_viewer/document_view.cpp +++ b/pdf_viewer/document_view.cpp @@ -1121,7 +1121,7 @@ std::vector<DocumentPos> DocumentView::find_line_definitions() { std::optional<PdfLink> pdf_link = current_document->get_link_in_page_rect(get_center_page_number(), line_rects[line_index]); if (pdf_link.has_value()) { - auto parsed_uri = parse_uri(mupdf_context, pdf_link.value().uri); + auto parsed_uri = parse_uri(mupdf_context, current_document->doc, pdf_link.value().uri); result.push_back({ parsed_uri.page - 1, parsed_uri.x, parsed_uri.y }); return result; } diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp index 19b568b..335a93f 100644 --- a/pdf_viewer/main_widget.cpp +++ b/pdf_viewer/main_widget.cpp @@ -170,7 +170,7 @@ void MainWidget::set_overview_position(int page, float offset) { void MainWidget::set_overview_link(PdfLink link) { - auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); + auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); if (page >= 1) { set_overview_position(page - 1, offset_y); } @@ -3178,7 +3178,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) { open_web_url(utf8_decode(selected_link->uri)); } else{ - auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri); + auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, selected_link->uri); long_jump_to_destination(page-1, offset_y); } } @@ -3863,7 +3863,7 @@ void MainWidget::handle_link_click(const PdfLink& link) { return; } - auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); + auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); // convert one indexed page to zero indexed page page--; diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp index 22d4265..3150e66 100644 --- a/pdf_viewer/utils.cpp +++ b/pdf_viewer/utils.cpp @@ -116,8 +116,9 @@ bool rects_intersect(fz_rect rect1, fz_rect rect2) { return range_intersects(rect1.x0, rect1.x1, rect2.x0, rect2.x1) && range_intersects(rect1.y0, rect1.y1, rect2.y0, rect2.y1); } -ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) { - fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str()); +ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri) { + pdf_document* doc = pdf_document_from_fz_document(mupdf_context, fz_doc); + fz_link_dest dest = pdf_resolve_link_dest(mupdf_context, doc, uri.c_str()); return { dest.loc.page + 1, dest.x, dest.y }; } diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h index 2a12211..643b030 100644 --- a/pdf_viewer/utils.h +++ b/pdf_viewer/utils.h @@ -55,7 +55,7 @@ void get_flat_toc(const std::vector<TocNode*>& roots, std::vector<std::wstring>& int mod(int a, int b); bool range_intersects(float range1_start, float range1_end, float range2_start, float range2_end); bool rects_intersect(fz_rect rect1, fz_rect rect2); -ParsedUri parse_uri(fz_context* mupdf_context, std::string uri); +ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri); char get_symbol(int key, bool is_shift_pressed, const std::vector<char>&special_symbols); template<typename T>
