snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

sioyek: update to 2.0.0

Browse source
This commit is contained in:
dkwo 2022-12-27 16:45:57 +01:00 • committed by Leah Neukirchen
parent 6377322e2a
commit 344c030274
3 changed files with 3 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
srcpkgs/sioyek/patches/310c7c65cf85d1eee4515ef67b9a89c939ae9492.patch
View file

@ -1,107 +0,0 @@
From 310c7c65cf85d1eee4515ef67b9a89c939ae9492 Mon Sep 17 00:00:00 2001
From: hrdl <31923882+lennonhill@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:43:31 +0200
Subject: [PATCH] Parse mupdf 1.20 links
---
pdf_viewer/document_view.cpp | 2 +-
pdf_viewer/main_widget.cpp | 6 +++---
pdf_viewer/utils.cpp | 20 +++++---------------
pdf_viewer/utils.h | 2 +-
4 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp
index ace3f161d..1362ee4b5 100644
--- a/pdf_viewer/document_view.cpp
+++ b/pdf_viewer/document_view.cpp
@@ -1077,7 +1077,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(pdf_link.value().uri);
+ auto parsed_uri = parse_uri(mupdf_context, 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 5265398d2..707d11b30 100644
--- a/pdf_viewer/main_widget.cpp
+++ b/pdf_viewer/main_widget.cpp
@@ -153,7 +153,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(link.uri);
+ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri);
if (page >= 1) {
set_overview_position(page - 1, offset_y);
}
@@ -2861,7 +2861,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(selected_link->uri);
+ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri);
long_jump_to_destination(page-1, offset_y);
}
}
@@ -3472,7 +3472,7 @@ void MainWidget::handle_link_click(const PdfLink& link) {
return;
}
- auto [page, offset_x, offset_y] = parse_uri(link.uri);
+ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri);
// convert one indexed page to zero indexed page
page--;
diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp
index a25d18f10..e416737ba 100644
--- a/pdf_viewer/utils.cpp
+++ b/pdf_viewer/utils.cpp
@@ -24,6 +24,8 @@
#include <qnetworkreply.h>
#include <qscreen.h>
+#include <mupdf/pdf.h>
+
extern std::wstring LIBGEN_ADDRESS;
extern std::wstring GOOGLE_SCHOLAR_ADDRESS;
extern std::ofstream LOG_FILE;
@@ -106,21 +108,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(std::string uri) {
- int comma_index = -1;
-
- uri = uri.substr(1, uri.size() - 1);
- comma_index = static_cast<int>(uri.find(","));
- int page = atoi(uri.substr(0, comma_index ).c_str());
-
- uri = uri.substr(comma_index+1, uri.size() - comma_index-1);
- comma_index = static_cast<int>(uri.find(","));
- float offset_x = atof(uri.substr(0, comma_index ).c_str());
-
- uri = uri.substr(comma_index+1, uri.size() - comma_index-1);
- float offset_y = atof(uri.c_str());
-
- return { page, offset_x, offset_y };
+ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) {
+ fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str());
+ return { dest.loc.page + 1, dest.x, dest.y };
}
char get_symbol(int key, bool is_shift_pressed, const std::vector<char>& special_symbols) {
diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h
index 4d551c35a..aa0d0d61b 100644
--- a/pdf_viewer/utils.h
+++ b/pdf_viewer/utils.h
@@ -33,7 +33,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(std::string uri);
+ParsedUri parse_uri(fz_context* mupdf_context, std::string uri);
char get_symbol(int key, bool is_shift_pressed, const std::vector<char>&special_symbols);
template<typename T>

44
srcpkgs/sioyek/patches/7a9e876fb2dcd3c82d619316e1cf8959521d4071.patch
View file

@ -1,44 +0,0 @@
From 7a9e876fb2dcd3c82d619316e1cf8959521d4071 Mon Sep 17 00:00:00 2001
From: ahrm <a.hr.mostafavi@gmail.com>
Date: Mon, 29 Aug 2022 14:57:02 +0430
Subject: [PATCH] Fix some compatibility issues with mupdf 1.20.0
---
pdf_viewer/document.cpp | 4 ++--
pdf_viewer/pdf_renderer.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
index 083e40244..61375d598 100644
--- a/pdf_viewer/document.cpp
+++ b/pdf_viewer/document.cpp
@@ -559,14 +559,14 @@ void Document::convert_toc_tree(fz_outline* root, std::vector<TocNode*>& output)
current_node->title = utf8_decode(root->title);
current_node->x = root->x;
current_node->y = root->y;
- if (root->page == -1) {
+ if (root->page.page == -1) {
float xp, yp;
fz_location loc = fz_resolve_link(context, doc, root->uri, &xp, &yp);
int chapter_page = accum_chapter_pages[loc.chapter];
current_node->page = chapter_page + loc.page;
}
else {
- current_node->page = root->page;
+ current_node->page = root->page.page;
}
convert_toc_tree(root->down, current_node->children);
diff --git a/pdf_viewer/pdf_renderer.cpp b/pdf_viewer/pdf_renderer.cpp
index cc8a89d16..fd17a52c4 100644
--- a/pdf_viewer/pdf_renderer.cpp
+++ b/pdf_viewer/pdf_renderer.cpp
@@ -315,7 +315,7 @@ void PdfRenderer::run_search(int thread_index)
const int max_hits_per_page = 20;
fz_quad hitboxes[max_hits_per_page];
- int num_results = fz_search_page(mupdf_context, page, utf8_encode(req.search_term).c_str(), hitboxes, max_hits_per_page);
+ int num_results = fz_search_page(mupdf_context, page, utf8_encode(req.search_term).c_str(), nullptr, hitboxes, max_hits_per_page);
if (num_results > 0) {
req.search_results_mutex->lock();

5
srcpkgs/sioyek/template
View file

@ -1,6 +1,6 @@
# Template file for 'sioyek'
pkgname=sioyek
version=1.5.0
version=2.0.0
revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools
@ -14,7 +14,7 @@ maintainer="dkwo <npiazza@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://sioyek.info/"
distfiles="https://github.com/ahrm/sioyek/archive/refs/tags/v${version}.tar.gz"
checksum=2d01c757953c3f2d98428376e642d13b8a9edeba8fee506477e8aa178756f16b
checksum=92398b6da5e297c59f22cd3c6b562194846f28bc17bb4ae9432869aafeb5df17
nocross=yes
do_build() {
@ -30,5 +30,6 @@ do_install() {
vmkdir usr/share/sioyek/shaders
vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
vinstall tutorial.pdf 644 usr/share/sioyek
vinstall resources/sioyek.desktop 644 usr/share/applications
vman resources/sioyek.1
}