Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] new package: sioyek [wip]
@ 2022-07-07 12:32 dkwo
  2022-07-07 18:01 ` [PR PATCH] [Updated] new package: sioyek dkwo
                   ` (23 more replies)
  0 siblings, 24 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 12:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek [wip]
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
I'm struggling with some missing libraries, possibly mujs and others, any help appreciated.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 8097 bytes --]

From 9f76fe3991203cbc6dbe678eb8e86fbd2e3e13ee Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH] new package: sioyek

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  19 ++++
 2 files changed, 171 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..f90b02b46e7c
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,19 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+make_build_args="pdf_viewer_build_config.pro"
+make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+ pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+ tutorial.pdf"
+hostmakedepends="zlib-devel qt5-qmake qt5-host-tools mupdf-devel
+ gumbo-parser-devel libharfbuzz
+ qt5-3d-devel qt5-opengl qt5-gui qt5-widgets qt5-network qt5-gamepad-devel"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
@ 2022-07-07 18:01 ` dkwo
  2022-07-07 18:54 ` dkwo
                   ` (22 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 18:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added new package mujs needed.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 9132 bytes --]

From 76848b30a51a1dade1c011445e328405aea9a6f9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH 1/2] new package: sioyek

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  20 ++++
 2 files changed, 172 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..3b6988a70408
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,20 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+make_build_args="pdf_viewer_build_config.pro"
+make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+ pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+ tutorial.pdf"
+# hostmakedepends="" do it later
+makedepends="zlib-devel qt5-qmake qt5-host-tools mupdf-devel
+ gumbo-parser-devel harfbuzz-devel mujs
+ qt5-3d-devel qt5-opengl qt5-gui qt5-widgets qt5-network qt5-gamepad-devel"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"

From 50365435f12dac08521bf20471ac25661613562a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 19:56:41 +0200
Subject: [PATCH 2/2] new package: mujs

---
 srcpkgs/mujs/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mujs/template

diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template
new file mode 100644
index 000000000000..7ee43a2f4c33
--- /dev/null
+++ b/srcpkgs/mujs/template
@@ -0,0 +1,17 @@
+# Template file for 'mujs'
+pkgname=mujs
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+makedepends="readline-devel"
+short_desc="Embeddable JavaScript interpreter written in C"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://mujs.com/"
+distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz"
+checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0
+make_install_args+=" prefix=/usr"
+
+post_install() {
+	vlicense COPYING
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
  2022-07-07 18:01 ` [PR PATCH] [Updated] new package: sioyek dkwo
@ 2022-07-07 18:54 ` dkwo
  2022-07-07 18:55 ` dkwo
                   ` (21 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 18:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added new package mujs needed.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 9585 bytes --]

From a6532afb0a598ec81087a26e2334bc869a999712 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 19:56:41 +0200
Subject: [PATCH 1/2] new package: mujs

---
 srcpkgs/mujs/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mujs/template

diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template
new file mode 100644
index 000000000000..7ee43a2f4c33
--- /dev/null
+++ b/srcpkgs/mujs/template
@@ -0,0 +1,17 @@
+# Template file for 'mujs'
+pkgname=mujs
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+makedepends="readline-devel"
+short_desc="Embeddable JavaScript interpreter written in C"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://mujs.com/"
+distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz"
+checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0
+make_install_args+=" prefix=/usr"
+
+post_install() {
+	vlicense COPYING
+}

From 509c01e92da1a803e44860eaf52982f7f5d37b30 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH 2/2] new package: sioyek

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  37 ++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..243c122390a8
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,37 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+#make_build_args="pdf_viewer_build_config.pro"
+#make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+# pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+# tutorial.pdf"
+makedepends="zlib-devel qt5-qmake qt5-host-tools mupdf-devel
+ gumbo-parser-devel harfbuzz-devel mujs
+ qt5-3d-devel qt5-opengl qt5-gui qt5-widgets qt5-network qt5-gamepad-devel"
+hostmakedepends="${makedepends}" # figure this out
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vconf pdf_viewer/prefs.config
+	vconf pdf_viewer/prefs_user.config
+	vconf pdf_viewer/keys.config
+	vconf pdf_viewer/keys_user.config
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
  2022-07-07 18:01 ` [PR PATCH] [Updated] new package: sioyek dkwo
  2022-07-07 18:54 ` dkwo
@ 2022-07-07 18:55 ` dkwo
  2022-07-07 19:47 ` dkwo
                   ` (20 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 18:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1178079608

Comment:
Not sure why it depends on gcc;
still not correct path in etc for some configs;
hack for hostmakedepends to see if cross work.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (2 preceding siblings ...)
  2022-07-07 18:55 ` dkwo
@ 2022-07-07 19:47 ` dkwo
  2022-07-07 19:53 ` [PR PATCH] [Updated] " dkwo
                   ` (19 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 19:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1178144383

Comment:
cross are all failing due to either
```
/usr/lib/libQt5OpenGL.so: file not recognized: file format not recognized
/usr/lib/libQt5OpenGL.so: error adding symbols: file in wrong format
```

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (3 preceding siblings ...)
  2022-07-07 19:47 ` dkwo
@ 2022-07-07 19:53 ` dkwo
  2022-07-08 14:55 ` dkwo
                   ` (18 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-07 19:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added new package mujs needed.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 9578 bytes --]

From a6532afb0a598ec81087a26e2334bc869a999712 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 19:56:41 +0200
Subject: [PATCH 1/2] new package: mujs

---
 srcpkgs/mujs/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mujs/template

diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template
new file mode 100644
index 000000000000..7ee43a2f4c33
--- /dev/null
+++ b/srcpkgs/mujs/template
@@ -0,0 +1,17 @@
+# Template file for 'mujs'
+pkgname=mujs
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+makedepends="readline-devel"
+short_desc="Embeddable JavaScript interpreter written in C"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://mujs.com/"
+distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz"
+checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0
+make_install_args+=" prefix=/usr"
+
+post_install() {
+	vlicense COPYING
+}

From fdfc203c5a97e74d8b186374b94d03e0bbd204eb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH 2/2] new package: sioyek

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  37 ++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..6c7f98a18fd4
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,37 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+#make_build_args="pdf_viewer_build_config.pro"
+#make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+# pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+# tutorial.pdf"
+hostmakedepends="zlib-devel qt5-qmake qt5-host-tools mupdf-devel
+ gumbo-parser-devel harfbuzz-devel mujs
+ qt5-3d-devel qt5-opengl qt5-gui qt5-widgets qt5-network qt5-gamepad-devel"
+makedepends="${makedepends} qt5-opengl"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vconf pdf_viewer/prefs.config
+	vconf pdf_viewer/prefs_user.config
+	vconf pdf_viewer/keys.config
+	vconf pdf_viewer/keys_user.config
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (4 preceding siblings ...)
  2022-07-07 19:53 ` [PR PATCH] [Updated] " dkwo
@ 2022-07-08 14:55 ` dkwo
  2022-07-08 14:56 ` dkwo
                   ` (17 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-08 14:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added new package mujs needed.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 9561 bytes --]

From 5964b212743e497b8c0c049251f6aaa3eff24c28 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 19:56:41 +0200
Subject: [PATCH 1/2] new package: mujs

---
 srcpkgs/mujs/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mujs/template

diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template
new file mode 100644
index 000000000000..7ee43a2f4c33
--- /dev/null
+++ b/srcpkgs/mujs/template
@@ -0,0 +1,17 @@
+# Template file for 'mujs'
+pkgname=mujs
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+makedepends="readline-devel"
+short_desc="Embeddable JavaScript interpreter written in C"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://mujs.com/"
+distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz"
+checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0
+make_install_args+=" prefix=/usr"
+
+post_install() {
+	vlicense COPYING
+}

From 7619ab7f021fe79a397e38a35eba838b5cb6a105 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH 2/2] new package: sioyek

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  36 ++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..ecdfa8a8c12b
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,36 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+#make_build_args="pdf_viewer_build_config.pro"
+#make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+# pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+# tutorial.pdf"
+hostmakedepends="zlib-devel qt5-qmake qt5-host-tools mupdf-devel
+ gumbo-parser-devel harfbuzz-devel mujs
+ qt5-3d-devel qt5-opengl qt5-gui qt5-widgets qt5-network qt5-gamepad-devel"
+makedepends="${makedepends} qt5-opengl"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (5 preceding siblings ...)
  2022-07-08 14:55 ` dkwo
@ 2022-07-08 14:56 ` dkwo
  2022-07-08 16:01 ` dkwo
                   ` (16 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-08 14:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1178079608

Comment:
Not sure why it depends on gcc.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (6 preceding siblings ...)
  2022-07-08 14:56 ` dkwo
@ 2022-07-08 16:01 ` dkwo
  2022-08-19 13:53 ` abenson
                   ` (15 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-07-08 16:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1178144383

Comment:
cross builds are failing due to `fatal error: mupdf/fitz.h: No such file or directory`

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (7 preceding siblings ...)
  2022-07-08 16:01 ` dkwo
@ 2022-08-19 13:53 ` abenson
  2022-08-19 13:55 ` [PR REVIEW] " abenson
                   ` (14 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: abenson @ 2022-08-19 13:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1220710071

Comment:
For each commit, please follow the [conventions](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes) for the commit message.

- `New package: mujs-1.2.0`
- `New package: sioyek-1.4.0`

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (8 preceding siblings ...)
  2022-08-19 13:53 ` abenson
@ 2022-08-19 13:55 ` abenson
  2022-08-20 12:28 ` [PR PATCH] [Updated] " dkwo
                   ` (13 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: abenson @ 2022-08-19 13:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#discussion_r950215972

Comment:
These `-devel` packages should be in `makedepends`.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (9 preceding siblings ...)
  2022-08-19 13:55 ` [PR REVIEW] " abenson
@ 2022-08-20 12:28 ` dkwo
  2022-08-20 12:29 ` [PR REVIEW] " dkwo
                   ` (12 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-08-20 12:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 9558 bytes --]

From 147920f34c6d520361eb479598091921f61137f3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 19:56:41 +0200
Subject: [PATCH 1/2] New package: mujs-1.2.0

---
 srcpkgs/mujs/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mujs/template

diff --git a/srcpkgs/mujs/template b/srcpkgs/mujs/template
new file mode 100644
index 000000000000..7ee43a2f4c33
--- /dev/null
+++ b/srcpkgs/mujs/template
@@ -0,0 +1,17 @@
+# Template file for 'mujs'
+pkgname=mujs
+version=1.2.0
+revision=1
+build_style=gnu-makefile
+makedepends="readline-devel"
+short_desc="Embeddable JavaScript interpreter written in C"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://mujs.com/"
+distfiles="https://github.com/ccxvii/mujs/archive/refs/tags/${version}.tar.gz"
+checksum=bbb74b96c168e7120f1aa2ce0a42026eba01cff14a9234108c91795f3a4c8cd0
+make_install_args+=" prefix=/usr"
+
+post_install() {
+	vlicense COPYING
+}

From 798e8c7ffd93b09da76a3bea552dd53a69585085 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH 2/2] New package: sioyek-1.4.0

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  36 ++++++++
 2 files changed, 188 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..d9fef7cc8aae
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,36 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+#make_build_args="pdf_viewer_build_config.pro"
+#make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+# pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+# tutorial.pdf"
+hostmakedepends="qt5-qmake qt5-host-tools mujs
+ qt5-opengl qt5-gui qt5-widgets qt5-network"
+makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel
+ gumbo-parser-devel harfbuzz-devel qt5-opengl"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (10 preceding siblings ...)
  2022-08-20 12:28 ` [PR PATCH] [Updated] " dkwo
@ 2022-08-20 12:29 ` dkwo
  2022-09-08  0:55 ` dexgs
                   ` (11 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-08-20 12:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#discussion_r950690331

Comment:
Done.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (11 preceding siblings ...)
  2022-08-20 12:29 ` [PR REVIEW] " dkwo
@ 2022-09-08  0:55 ` dexgs
  2022-09-08 12:53 ` dkwo
                   ` (10 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dexgs @ 2022-09-08  0:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by dexgs on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1240072123

Comment:
Could mujs be moved into its own PR? I ask because its absence also blocks updating zathura-pdf-mupdf to 0.3.9.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (12 preceding siblings ...)
  2022-09-08  0:55 ` dexgs
@ 2022-09-08 12:53 ` dkwo
  2022-09-20 15:36 ` [PR PATCH] [Updated] " dkwo
                   ` (9 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-08 12:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1240677695

Comment:
Sure, see #39167

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (13 preceding siblings ...)
  2022-09-08 12:53 ` dkwo
@ 2022-09-20 15:36 ` dkwo
  2022-09-20 19:46 ` [PR REVIEW] " abenson
                   ` (8 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-20 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 8594 bytes --]

From 6442224ce6d42820694e023fc4bf81edc278b7d8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH] New package: sioyek-1.4.0

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  37 ++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..6bc3d6936d73
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,37 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+#make_build_args="pdf_viewer_build_config.pro"
+#make_install_args="sioyek pdf_viewer/prefs.config pdf_viewer/prefs_user.config
+# pdf_viewer/keys.config pdf_viewer/keys_user.config pdf_viewer/shaders
+# tutorial.pdf"
+hostmakedepends="qt5-qmake qt5-host-tools mujs
+ qt5-opengl qt5-gui qt5-widgets qt5-network"
+makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel
+ gumbo-parser-devel harfbuzz-devel qt5-opengl"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+# configure_args+=" linux_app_image"
+nocross="fails to configure with qt5"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR REVIEW] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (14 preceding siblings ...)
  2022-09-20 15:36 ` [PR PATCH] [Updated] " dkwo
@ 2022-09-20 19:46 ` abenson
  2022-09-20 19:58 ` [PR PATCH] [Updated] " dkwo
                   ` (7 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: abenson @ 2022-09-20 19:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#discussion_r975753615

Comment:
Remove these comments.  Same with the `configure_args` further down.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (15 preceding siblings ...)
  2022-09-20 19:46 ` [PR REVIEW] " abenson
@ 2022-09-20 19:58 ` dkwo
  2022-09-20 19:59 ` dkwo
                   ` (6 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-20 19:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 8336 bytes --]

From 613673ffbed243dd123629c7140ea5bf6d820fb3 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH] New package: sioyek-1.4.0

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  32 +++++++
 2 files changed, 184 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..51fb9b3a98b9
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,32 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools mujs
+ qt5-opengl qt5-gui qt5-widgets qt5-network"
+makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel
+ gumbo-parser-devel harfbuzz-devel qt5-opengl"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+nocross="fails to configure with qt5"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (16 preceding siblings ...)
  2022-09-20 19:58 ` [PR PATCH] [Updated] " dkwo
@ 2022-09-20 19:59 ` dkwo
  2022-09-20 22:45 ` leahneukirchen
                   ` (5 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-20 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1252841233

Comment:
Done.
I'm still unable to cross compile though.


^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (17 preceding siblings ...)
  2022-09-20 19:59 ` dkwo
@ 2022-09-20 22:45 ` leahneukirchen
  2022-09-20 22:52 ` leahneukirchen
                   ` (4 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2022-09-20 22:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 195 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1252991375

Comment:
Sorry, you need to depend on `mujs-devel` now.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (18 preceding siblings ...)
  2022-09-20 22:45 ` leahneukirchen
@ 2022-09-20 22:52 ` leahneukirchen
  2022-09-21 13:27 ` [PR PATCH] [Updated] " dkwo
                   ` (3 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2022-09-20 22:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1252991375

Comment:
Sorry, you need to makedepend on `mujs-devel` now.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (19 preceding siblings ...)
  2022-09-20 22:52 ` leahneukirchen
@ 2022-09-21 13:27 ` dkwo
  2022-09-22 14:03 ` leahneukirchen
                   ` (2 subsequent siblings)
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-21 13:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 8333 bytes --]

From 405359ae6d474840d5746333af402d279b267087 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH] New package: sioyek-1.4.0

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  32 +++++++
 2 files changed, 184 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..1fc0081dafbf
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,32 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools
+ qt5-opengl qt5-gui qt5-widgets qt5-network"
+makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel
+ gumbo-parser-devel harfbuzz-devel qt5-opengl mujs-devel"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+nocross="fails to configure"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (20 preceding siblings ...)
  2022-09-21 13:27 ` [PR PATCH] [Updated] " dkwo
@ 2022-09-22 14:03 ` leahneukirchen
  2022-09-23 13:59 ` [PR PATCH] [Updated] " dkwo
  2022-09-23 20:01 ` [PR PATCH] [Merged]: " leahneukirchen
  23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2022-09-22 14:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/37912#issuecomment-1255072317

Comment:
Please also install the manpage in `resources/`. I like it, can be merged then.

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Updated] new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (21 preceding siblings ...)
  2022-09-22 14:03 ` leahneukirchen
@ 2022-09-23 13:59 ` dkwo
  2022-09-23 20:01 ` [PR PATCH] [Merged]: " leahneukirchen
  23 siblings, 0 replies; 25+ messages in thread
From: dkwo @ 2022-09-23 13:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages sioyek
https://github.com/void-linux/void-packages/pull/37912

new package: sioyek
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

A patch file from https://github.com/void-linux/void-packages/pull/37912.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sioyek-37912.patch --]
[-- Type: text/x-diff, Size: 8359 bytes --]

From 6d950029c5d4a805d5709a9f101fb7454b627405 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 7 Jul 2022 10:39:04 +0200
Subject: [PATCH] New package: sioyek-1.4.0

---
 srcpkgs/sioyek/patches/294.patch | 152 +++++++++++++++++++++++++++++++
 srcpkgs/sioyek/template          |  33 +++++++
 2 files changed, 185 insertions(+)
 create mode 100644 srcpkgs/sioyek/patches/294.patch
 create mode 100644 srcpkgs/sioyek/template

diff --git a/srcpkgs/sioyek/patches/294.patch b/srcpkgs/sioyek/patches/294.patch
new file mode 100644
index 000000000000..cc35d1e55879
--- /dev/null
+++ b/srcpkgs/sioyek/patches/294.patch
@@ -0,0 +1,152 @@
+From 35fa37f9485bf933e754b995902f69d53dac1670 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 18:01:36 +0200
+Subject: [PATCH 1/2] 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 9a7d8ea2..d8305620 100644
+--- a/pdf_viewer/document_view.cpp
++++ b/pdf_viewer/document_view.cpp
+@@ -1013,7 +1013,7 @@ std::optional<DocumentPos> DocumentView::find_line_definition() {
+ 
+ 			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);
+ 				DocumentPos res;
+ 				res.page = parsed_uri.page-1;
+ 				res.x = parsed_uri.x;
+diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp
+index 9e02e2c6..5bd7ed1f 100644
+--- a/pdf_viewer/main_widget.cpp
++++ b/pdf_viewer/main_widget.cpp
+@@ -135,7 +135,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);
+     }
+@@ -2647,7 +2647,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) {
+             }
+             if ((link_index >= 0) && (link_index < static_cast<int>(visible_page_links.size()))) {
+                 auto [selected_page, selected_link] = visible_page_links[link_index];
+-                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);
+             }
+         }
+@@ -3223,7 +3223,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 be9d2e76..505b7d12 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 919ff6eb..f7934b7f 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>
+
+From 5b2488e7cd9a454faf0ff488ba97c11f22805e25 Mon Sep 17 00:00:00 2001
+From: lennonhill <31923882+lennonhill@users.noreply.github.com>
+Date: Tue, 28 Jun 2022 19:18:53 +0200
+Subject: [PATCH 2/2] Upgrade mupdf to 1.20
+
+---
+ pdf_viewer/document.cpp     | 4 ++--
+ pdf_viewer/pdf_renderer.cpp | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/pdf_viewer/document.cpp b/pdf_viewer/document.cpp
+index f1585ad3..e906594a 100644
+--- a/pdf_viewer/document.cpp
++++ b/pdf_viewer/document.cpp
+@@ -542,14 +542,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 de4c43fc..9adbc998 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();
diff --git a/srcpkgs/sioyek/template b/srcpkgs/sioyek/template
new file mode 100644
index 000000000000..53349e65d09a
--- /dev/null
+++ b/srcpkgs/sioyek/template
@@ -0,0 +1,33 @@
+# Template file for 'sioyek'
+pkgname=sioyek
+version=1.4.0
+revision=1
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-host-tools
+ qt5-opengl qt5-gui qt5-widgets qt5-network"
+makedepends="zlib-devel qt5-3d-devel qt5-gamepad-devel mupdf-devel
+ gumbo-parser-devel harfbuzz-devel qt5-opengl mujs-devel"
+depends="mupdf"
+short_desc="PDF viewer designed for reading research papers and technical books"
+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=44d49aec28e49bb79c2d0fb7cefd26aecc53b60136bf02dfec9863ac586aacd0
+nocross="fails to configure"
+
+do_build() {
+	qmake pdf_viewer_build_config.pro
+	make ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+do_install() {
+	vbin sioyek
+	vmkdir etc/sioyek
+	vinstall pdf_viewer/prefs.config 644 etc/sioyek
+	vinstall pdf_viewer/keys.config 644 etc/sioyek
+	vmkdir usr/share/sioyek/shaders
+	vcopy pdf_viewer/shaders/* usr/share/sioyek/shaders
+	vinstall tutorial.pdf 644 usr/share/sioyek
+	vman resources/sioyek.1
+}

^ permalink raw reply	[flat|nested] 25+ messages in thread

* Re: [PR PATCH] [Merged]: new package: sioyek
  2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
                   ` (22 preceding siblings ...)
  2022-09-23 13:59 ` [PR PATCH] [Updated] " dkwo
@ 2022-09-23 20:01 ` leahneukirchen
  23 siblings, 0 replies; 25+ messages in thread
From: leahneukirchen @ 2022-09-23 20:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

There's a merged pull request on the void-packages repository

new package: sioyek
https://github.com/void-linux/void-packages/pull/37912

Description:
Sioyek is a PDF viewer designed for reading research papers and technical books. https://sioyek.info/
I applied a patch from a PR to use system mupdf, otherwise it would build its own.
I translated their build_linux.sh into our qmake build helper.
Added required package mujs.

^ permalink raw reply	[flat|nested] 25+ messages in thread

end of thread, other threads:[~2022-09-23 20:01 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-07 12:32 [PR PATCH] new package: sioyek [wip] dkwo
2022-07-07 18:01 ` [PR PATCH] [Updated] new package: sioyek dkwo
2022-07-07 18:54 ` dkwo
2022-07-07 18:55 ` dkwo
2022-07-07 19:47 ` dkwo
2022-07-07 19:53 ` [PR PATCH] [Updated] " dkwo
2022-07-08 14:55 ` dkwo
2022-07-08 14:56 ` dkwo
2022-07-08 16:01 ` dkwo
2022-08-19 13:53 ` abenson
2022-08-19 13:55 ` [PR REVIEW] " abenson
2022-08-20 12:28 ` [PR PATCH] [Updated] " dkwo
2022-08-20 12:29 ` [PR REVIEW] " dkwo
2022-09-08  0:55 ` dexgs
2022-09-08 12:53 ` dkwo
2022-09-20 15:36 ` [PR PATCH] [Updated] " dkwo
2022-09-20 19:46 ` [PR REVIEW] " abenson
2022-09-20 19:58 ` [PR PATCH] [Updated] " dkwo
2022-09-20 19:59 ` dkwo
2022-09-20 22:45 ` leahneukirchen
2022-09-20 22:52 ` leahneukirchen
2022-09-21 13:27 ` [PR PATCH] [Updated] " dkwo
2022-09-22 14:03 ` leahneukirchen
2022-09-23 13:59 ` [PR PATCH] [Updated] " dkwo
2022-09-23 20:01 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).