From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 05:13:37 2024 Received: (at submit) by debbugs.gnu.org; 25 Feb 2024 10:13:37 +0000 Received: from localhost ([127.0.0.1]:60809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reBVo-0002Pf-IE for submit@debbugs.gnu.org; Sun, 25 Feb 2024 05:13:37 -0500 Received: from lists.gnu.org ([209.51.188.17]:40854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reBVl-0002PR-4D for submit@debbugs.gnu.org; Sun, 25 Feb 2024 05:13:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reBVI-0003nw-UN for guix-patches@gnu.org; Sun, 25 Feb 2024 05:13:06 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1reBVF-0002j1-A3 for guix-patches@gnu.org; Sun, 25 Feb 2024 05:13:03 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id A0C925C0064 for ; Sun, 25 Feb 2024 05:12:58 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 25 Feb 2024 05:12:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm2; t=1708855978; x=1708942378; bh=bvrDPBJAWZ NGXHi/X84PpaibYmRDs58zsh5PuObj2Qc=; b=LMVKfvOZO1aEoXALNqfzbhfZA7 caGphdqxx0+QkL3jGSEys3PvVVO1qHyUTw4wWzW6jgYcyWHSAdoPF8All17z+OFk OP91i0o6PNLAscwk+iCY8ib0KuzchQyOlI2W1mZygOCEI+viyOCx90+bbH+yOdBT 2wBI7k5b4VHJq3vD7HuSosFRucS9FZdHLLMXRQJbNSiRwoPDM7nd/+3eXxL57Gcr gfJ9Y+r8yXUdZaGO6o3aCn81HZiCpaxTVyynD/0KuJ6/W3mruRNsym8KlXbx52XB WSROoagwLYUZTwpdJTIhjh8WqZ0GJULu5F8BFcfNIqIa6KukHgt5sjtjveLg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1708855978; x=1708942378; bh=bvrDPBJAWZNGXHi/X84PpaibYmRD s58zsh5PuObj2Qc=; b=TtGEBqxUR7MGbrEZiM1+a3xKXWaHSr1E1K1L1Txf1qk9 j5oQ45LDJgjHBry4S7A9klY2o7rqPJmUC11u9kOGXFJYRepcIP8QuS4e7Hn3GUkL jh/mL47AOgjDPgsavw6NeBas5CaMa5452/ROVrAa4gqMA1Q2+NnWiNMXH0lGQbGz Qrtelp3YYxfzHhTO2EigrNvr8aCzZy+uEiXRPf9vFxmu4qr1cEhps7rwAkrEaM3O RGK9eTcd5elRVpbLs6yIyzCa1wkIfxIsl5AEzdSHMy4fTReH5KLJcz0iIXY8fhEs 0z5MnT42F5LP0+OwgAHaC3RIedn3uOQoh6Z1LSQgqQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedtgdduvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekredtre dtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrghtthgv rhhnpeehleevieeileelgeehfedvieetieejffejgfejueeuveeutdehtdfgtdeijeeuke enucffohhmrghinhepghhithhhuhgsrdgtohhmpdgrlhhpihhnvghlihhnuhigrdhorhhg pdhsihhohigvkhdrihhnfhhonecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomhepihesuggrnhdrghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 25 Feb 2024 05:12:57 -0500 (EST) From: dan To: guix-patches@gnu.org Subject: [PATCH] gnu: Add sioyek. Date: Sun, 25 Feb 2024 18:12:32 +0800 Message-ID: <20240225101233.13418-1-i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.26; envelope-from=i@dan.games; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * gnu/packages/pdf.scm (sioyek): New variable. Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 --- gnu/packages/pdf.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..587c952e37 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1710,3 +1711,69 @@ (define-public weasyprint Keywords: html2pdf, htmltopdf") (license license:bsd-3))) + +(define-public sioyek + (package + (name "sioyek") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrm/sioyek.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) + ;; XXX: Fix for mupdf-0.23.0+ . + (patches (list (origin + (method url-fetch) + (uri (string-append + "https://git.alpinelinux.org/aports/plain/community" + "/sioyek/mupdf-0.23.0.patch?id=" + "86e913eccf19b97a16f25d9b6cdf0f50232f1226")) + (sha256 (base32 + "0wddl7qznr7x9kmqjb05f9pag8m4w29bnnw8ghzsi1zz9ska2jmh"))))))) + (build-system gnu-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-lib-and-path + (lambda _ + (substitute* "pdf_viewer_build_config.pro" + (("-lmupdf-third") + "") + (("/share/sioyek") + "/share") + (("/etc/sioyek") + "/etc")) + (substitute* "pdf_viewer/main.cpp" + (("/usr/share/sioyek") + (string-append #$output "/share")) + (("/etc/sioyek") + (string-append #$output "/etc"))))) + (replace 'configure + (lambda _ + (invoke "qmake" + (string-append "PREFIX=" + #$output)))) + (add-after 'install 'instal-man-page + (lambda _ + (install-file "resources/sioyek.1" + (string-append #$output "/share/man/man1"))))))) + (inputs (list freetype + gumbo-parser + harfbuzz + jbig2dec + libjpeg-turbo + mujs + mupdf + openjpeg + qt3d-5 + qtbase-5 + zlib)) + (home-page "https://sioyek.info") + (synopsis + "A PDF viewer with a focus on technical books and research papers") + (description + "Sioyek is a PDF viewer with a focus on textbooks and research papers.") + (license license:gpl3+))) base-commit: 1306beaf3f6c8ddded2a956f5863bc65aad78882 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 10:55:22 2024 Received: (at 69377) by debbugs.gnu.org; 25 Feb 2024 15:55:22 +0000 Received: from localhost ([127.0.0.1]:55221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reGqU-0007Fe-IL for submit@debbugs.gnu.org; Sun, 25 Feb 2024 10:55:22 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:46878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reGpl-0007D2-FB for 69377@debbugs.gnu.org; Sun, 25 Feb 2024 10:54:35 -0500 Date: Sun, 25 Feb 2024 23:53:33 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1708876433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Egv2ZyeDVWXK5PEPos0Ll5pqR+7rKvkxhRK/yFg75qE=; b=4szPKMKeIKgrBgjyx78hhZTISZOu4akSgyfnNElUYQFmHToN5CQn89WnX49YdroRUy0N3M zSVY7dTwU75Tal9cH20TPyosOCGP+GoakmUvNnJAakO6L8wj8JWaTL2+c8t8TuBam9b1NJ SncYJ076DLxrUXNjv9k0d/z8zB8oltBpYJ4dGyvX/OwRUIYoz7CaK0bn1Db916a+NhFbJs OQ0V39Yx7LFhPrA9kV3Vnw6ZjIXoyg2O18XAl/T9+NatC32qiJfUp53NkPToUC1a9ug7Lq YCKGpzqkGK8YJCG3Z5jlCXLoHhOIMwu+F9y3JB2pClKv9UmVx0k00Tk4wuM3uQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87o7c4sfpe.wl-hako@ultrarare.space> From: Hilton Chain To: dan Subject: Re: [bug#69377] [PATCH] gnu: Add sioyek. In-Reply-To: <20240225101233.13418-1-i@dan.games> References: <20240225101233.13418-1-i@dan.games> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-7 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69377 Cc: 69377@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi dan, On Sun, 25 Feb 2024 18:12:32 +0800, dan wrote: > > * gnu/packages/pdf.scm (sioyek): New variable. > > Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 > --- > gnu/packages/pdf.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 67 insertions(+) > > diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm > index 0d796f65bb..587c952e37 100644 > --- a/gnu/packages/pdf.scm > +++ b/gnu/packages/pdf.scm > @@ -25,6 +25,7 @@ > ;;; Copyright =A9 2022 Paul A. Patience > ;;; Copyright =A9 2022 Petr Hodina > ;;; Copyright =A9 2023 Felix Gruber > +;;; Copyright =A9 2024 dan > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -1710,3 +1711,69 @@ (define-public weasyprint > > Keywords: html2pdf, htmltopdf") > (license license:bsd-3))) > + > +(define-public sioyek > + (package > + (name "sioyek") > + (version "2.0.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ahrm/sioyek.git") Please remove the =A1.git=A2 suffix, in GitHub it's used for redirection. > + (commit (string-append "v" version)))) > + (sha256 > + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) > + ;; XXX: Fix for mupdf-0.23.0+ . > + (patches (list (origin > + (method url-fetch) > + (uri (string-append > + "https://git.alpinelinux.org/aports/plain/= community" > + "/sioyek/mupdf-0.23.0.patch?id=3D" > + "86e913eccf19b97a16f25d9b6cdf0f50232f1226"= )) > + (sha256 (base32 > + "0wddl7qznr7x9kmqjb05f9pag8m4w29bnnw8gh= zsi1zz9ska2jmh"))))))) Please add the patch (with attribution) under gnu/packages/patches instead. =A1file-name=A2 field is missing, by the way. > + (build-system gnu-build-system) > + (arguments > + (list > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-lib-and-path > + (lambda _ > + (substitute* "pdf_viewer_build_config.pro" > + (("-lmupdf-third") > + "") Removing =A1-lmupdf-third=A2 can be added as a source snippet. > + (("/share/sioyek") > + "/share") > + (("/etc/sioyek") > + "/etc")) > + (substitute* "pdf_viewer/main.cpp" > + (("/usr/share/sioyek") > + (string-append #$output "/share")) > + (("/etc/sioyek") > + (string-append #$output "/etc"))))) Please keep /etc/sioyek and /share/sioyek, think where files will be when installed into a profile. > + (replace 'configure > + (lambda _ > + (invoke "qmake" > + (string-append "PREFIX=3D" > + #$output)))) This =A1PREFIX=A2 can be added to =A1#:configure-flags=A2. > + (add-after 'install 'instal-man-page > + (lambda _ > + (install-file "resources/sioyek.1" > + (string-append #$output "/share/man= /man1"))))))) > + (inputs (list freetype > + gumbo-parser > + harfbuzz > + jbig2dec > + libjpeg-turbo > + mujs > + mupdf > + openjpeg > + qt3d-5 > + qtbase-5 > + zlib)) > + (home-page "https://sioyek.info") > + (synopsis > + "A PDF viewer with a focus on technical books and research papers") Don't use an article at the beginning of synopsis. > + (description > + "Sioyek is a PDF viewer with a focus on textbooks and research pape= rs.") > + (license license:gpl3+))) > > base-commit: 1306beaf3f6c8ddded2a956f5863bc65aad78882 > -- > 2.41.0 Otherwise LGTM, please send a revised patch. Thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 13:33:02 2024 Received: (at 69377) by debbugs.gnu.org; 25 Feb 2024 18:33:02 +0000 Received: from localhost ([127.0.0.1]:37445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reJJ7-0000oe-1Y for submit@debbugs.gnu.org; Sun, 25 Feb 2024 13:33:02 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:37735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reJJ3-0000o7-Pi for 69377@debbugs.gnu.org; Sun, 25 Feb 2024 13:32:59 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 43C7932000EB for <69377@debbugs.gnu.org>; Sun, 25 Feb 2024 13:32:26 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 25 Feb 2024 13:32:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm2; t=1708885945; x=1708972345; bh=QfIt3FiPTh RFDEmVAzBnSmQh4Vt6XZCKLGlWaP+6oMs=; b=H/e0S7auZlBDd5d49Zw15HfrBU jzX17j1/ClT2uUTP51WXaXU2tL+ZDAQ9GcB1o8t24fnWBYucxpHy+qytjxS/2UDT 4qRWaotu0c5DEsjp4DLDKyLXRixjOm2IR878WbyyO32XtF0QwY59I7qpy/2xJXAu 5wER9CaWAOnZt+W7+WU0hWvoLjahsKky11W6BWJ68oA66BUUI3+F0KtSXSGuFWDx WU0Le/hPg07ptUEKtJsmrv106Vx3/lxmIevWPrFyaZmUZ/Ym43IJfxXP1/EfnBbj 1AlZfIDHX0hIpw1oQRAg4IsfoXE+5yx+hPopGV+Q749EiH4yN8eu7Fb+SyGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1708885945; x=1708972345; bh=QfIt3FiPThRFDEmVAzBnSmQh4Vt6 XZCKLGlWaP+6oMs=; b=Bf5Fx214EsNSzP044cJ/H5XpsLqNeHWbQOdFBcs5go40 kV3ssjkPdYtUQdUtfFoNM8BQYycNHJji0I0y1Oi/Lw31/yU4vN434WVDXioc/xsQ kWtt2gQBTW94gqtJZ2IazhWOtueZde6bvPWHEkmI07WhxN5vfMFV1NdNxEX6YRhq VI5x7WBbxr7AT06EKJt1zOWgKfxPg6Rj4JZfBT0i53Pd0VMDnTW1U2OLzbVIsgTB aMeG/5YdG5X9ATQvGEF06lCkXj8Rj3a2xefT7nZwhH34Taa1XFOadvi0mFH7ND29 WJgAu96zeRCOXiNw8LWGUKQRSJ/YbL4B2MJ3QzvXNw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedtgdduuddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofggtgfgsehtkeertd ertdejnecuhfhrohhmpegurghnuceoihesuggrnhdrghgrmhgvsheqnecuggftrfgrthht vghrnhepveelveekgeevteevhfehtdegledvhefhfeeugedvhfffhfeffffhveelhffhve eunecuffhomhgrihhnpehgihhthhhusgdrtghomhdpshhiohihvghkrdhinhhfohenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehisegurghnrd hgrghmvghs X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <69377@debbugs.gnu.org>; Sun, 25 Feb 2024 13:32:24 -0500 (EST) From: dan To: 69377@debbugs.gnu.org Subject: [PATCH v3] gnu: Add sioyek. Date: Mon, 26 Feb 2024 02:31:44 +0800 Message-ID: <6f33128cb1f1125430f77b86d21b31cebec44d4d.1708885904.git.i@dan.games> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69377 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch: New file. * gnu/packages/pdf.scm (sioyek): New variable. Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 --- .../sioyek-mupdf-0.23.0-fix-build.patch | 73 +++++++++++++++++++ gnu/packages/pdf.scm | 56 ++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch diff --git a/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch b/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch new file mode 100644 index 0000000000..4e0ee6de37 --- /dev/null +++ b/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch @@ -0,0 +1,73 @@ +diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp +index f48d05e..0bc3855 100644 +--- a/pdf_viewer/document_view.cpp ++++ b/pdf_viewer/document_view.cpp +@@ -1121,7 +1121,7 @@ std::vector DocumentView::find_line_definitions() { + + std::optional pdf_link = current_document->get_link_in_page_rect(get_center_page_number(), line_rects[line_index]); + if (pdf_link.has_value()) { +- auto parsed_uri = parse_uri(mupdf_context, pdf_link.value().uri); ++ auto parsed_uri = parse_uri(mupdf_context, current_document->doc, pdf_link.value().uri); + result.push_back({ parsed_uri.page - 1, parsed_uri.x, parsed_uri.y }); + return result; + } +diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp +index 19b568b..335a93f 100644 +--- a/pdf_viewer/main_widget.cpp ++++ b/pdf_viewer/main_widget.cpp +@@ -170,7 +170,7 @@ void MainWidget::set_overview_position(int page, float offset) { + + void MainWidget::set_overview_link(PdfLink link) { + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + if (page >= 1) { + set_overview_position(page - 1, offset_y); + } +@@ -3178,7 +3178,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) { + open_web_url(utf8_decode(selected_link->uri)); + } + else{ +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, selected_link->uri); + long_jump_to_destination(page-1, offset_y); + } + } +@@ -3863,7 +3863,7 @@ void MainWidget::handle_link_click(const PdfLink& link) { + return; + } + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + + // convert one indexed page to zero indexed page + page--; +diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp +index 22d4265..3150e66 100644 +--- a/pdf_viewer/utils.cpp ++++ b/pdf_viewer/utils.cpp +@@ -116,8 +116,9 @@ bool rects_intersect(fz_rect rect1, fz_rect rect2) { + return range_intersects(rect1.x0, rect1.x1, rect2.x0, rect2.x1) && range_intersects(rect1.y0, rect1.y1, rect2.y0, rect2.y1); + } + +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) { +- fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str()); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri) { ++ pdf_document* doc = pdf_document_from_fz_document(mupdf_context, fz_doc); ++ fz_link_dest dest = pdf_resolve_link_dest(mupdf_context, doc, uri.c_str()); + return { dest.loc.page + 1, dest.x, dest.y }; + } + +diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h +index 2a12211..643b030 100644 +--- a/pdf_viewer/utils.h ++++ b/pdf_viewer/utils.h +@@ -55,7 +55,7 @@ void get_flat_toc(const std::vector& roots, std::vector& + int mod(int a, int b); + bool range_intersects(float range1_start, float range1_end, float range2_start, float range2_end); + bool rects_intersect(fz_rect rect1, fz_rect rect2); +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri); + char get_symbol(int key, bool is_shift_pressed, const std::vector&special_symbols); + + template diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..553642c170 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1710,3 +1711,58 @@ (define-public weasyprint Keywords: html2pdf, htmltopdf") (license license:bsd-3))) + +(define-public sioyek + (package + (name "sioyek") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrm/sioyek") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) + (modules '((guix build utils))) + (snippet '(substitute* "pdf_viewer_build_config.pro" + (("-lmupdf-third") + ""))) + ;; XXX: Fix for mupdf-0.23.0+ . + (patches (search-patches "sioyek-mupdf-0.23.0-fix-build.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "pdf_viewer/main.cpp" + (("/usr/share") + (string-append #$output "/share")) + (("/etc") + (string-append #$output "/etc"))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "qmake" configure-flags))) + (add-after 'install 'instal-man-page + (lambda _ + (install-file "resources/sioyek.1" + (string-append #$output "/share/man/man1"))))))) + (inputs (list freetype + gumbo-parser + harfbuzz + jbig2dec + libjpeg-turbo + mujs + mupdf + openjpeg + qt3d-5 + qtbase-5 + zlib)) + (home-page "https://sioyek.info") + (synopsis "PDF viewer with a focus on technical books and research papers") + (description + "Sioyek is a PDF viewer with a focus on textbooks and research papers.") + (license license:gpl3+))) base-commit: b25b94335a3ee8d68d2145da8e5ea0325ecea451 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 13:40:30 2024 Received: (at 69377) by debbugs.gnu.org; 25 Feb 2024 18:40:30 +0000 Received: from localhost ([127.0.0.1]:37958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reJQL-0001B5-7c for submit@debbugs.gnu.org; Sun, 25 Feb 2024 13:40:30 -0500 Received: from wfhigh6-smtp.messagingengine.com ([64.147.123.157]:43933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reIwa-00086n-5K for 69377@debbugs.gnu.org; Sun, 25 Feb 2024 13:09:46 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfhigh.west.internal (Postfix) with ESMTP id 2D005180006E; Sun, 25 Feb 2024 13:09:13 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 25 Feb 2024 13:09:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1708884552; x=1708970952; bh=o/ ai30K0Gh6hjx/p0oAyMZQRF0gGy1iGUVgPB/gBnTI=; b=auK7+e+xCZYlj8lkzY K7khiK502hTKgKqqXAmZR1oVS6XeDDsAcDH1384icnOdAEYEotYyfYcAHkyjPuHO /FRHTYjcfQspH+hQSPsuBpPt+8s/MsbgHJVYN0YzqLDY1tiZptu2GcqkxSQyUnNz Nyh4B1gFL/peGaffsk3nEkZZgkUvg6d2BImdHiOFJ+Nv93fnd+W9/HkCmwN3d4TF Ytmerq7kRtQcM72dPfQRfFfwPa645EXnIG937gv90/9QkmBkL2eFovZRe1AQzFcr 1R8N0fTrGyMccT3S7f/jbyyeMbO3KCnugI57Vf35IecrNJ3zPRnVVh6dSvwU783C rakQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1708884552; x=1708970952; bh=o/ai30K0Gh6hj x/p0oAyMZQRF0gGy1iGUVgPB/gBnTI=; b=k6v+qjmmqDqX1LYlREQ5OYqKiA8aW K3NyaVIYyAHhcBxyEqT8qFqlVE7kftNkgkXHHIOatvIgowkJCkZENlCOm85bPWLv xAkjmwIDyHEzKPvTQF9jV1ca5sPtNI4685pWrsKvDH6L4YEHiF1aF2K0U5nxB1Du JuEx0bdIy8bONAWTVq+5cPbQoCaUMbzb/u07wUTqHJyP0Q2Ysrk6tichONRkl6wI iMRJGmZvkN0b7ngPymaFycYcHPqZUOBx7xHSKH9bmzzCUBhDJ86/toQf4QV/3/nL wCvl2aRNJm2naiUvGLcYtnC/1ducUCFRKsvRdCWhQySjHUOfRzTV+bouA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedtgddutdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeetleetgfduieffffdtkeejteetkeetieefgfetveefiedvudeghfffgedvke ethfenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhsihhohigvkhdrihhnfhhonecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Feb 2024 13:09:10 -0500 (EST) From: dan To: 69377@debbugs.gnu.org Subject: [PATCH v2] gnu: Add sioyek. Date: Mon, 26 Feb 2024 02:08:56 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69377 Cc: hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/pdf.scm (sioyek): New variable. Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 --- gnu/packages/pdf.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..553642c170 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1710,3 +1711,58 @@ (define-public weasyprint Keywords: html2pdf, htmltopdf") (license license:bsd-3))) + +(define-public sioyek + (package + (name "sioyek") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrm/sioyek") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) + (modules '((guix build utils))) + (snippet '(substitute* "pdf_viewer_build_config.pro" + (("-lmupdf-third") + ""))) + ;; XXX: Fix for mupdf-0.23.0+ . + (patches (search-patches "sioyek-mupdf-0.23.0-fix-build.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "pdf_viewer/main.cpp" + (("/usr/share") + (string-append #$output "/share")) + (("/etc") + (string-append #$output "/etc"))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "qmake" configure-flags))) + (add-after 'install 'instal-man-page + (lambda _ + (install-file "resources/sioyek.1" + (string-append #$output "/share/man/man1"))))))) + (inputs (list freetype + gumbo-parser + harfbuzz + jbig2dec + libjpeg-turbo + mujs + mupdf + openjpeg + qt3d-5 + qtbase-5 + zlib)) + (home-page "https://sioyek.info") + (synopsis "PDF viewer with a focus on technical books and research papers") + (description + "Sioyek is a PDF viewer with a focus on textbooks and research papers.") + (license license:gpl3+))) base-commit: b25b94335a3ee8d68d2145da8e5ea0325ecea451 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 25 13:46:38 2024 Received: (at 69377) by debbugs.gnu.org; 25 Feb 2024 18:46:39 +0000 Received: from localhost ([127.0.0.1]:38392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reJWG-0001Uv-PI for submit@debbugs.gnu.org; Sun, 25 Feb 2024 13:46:38 -0500 Received: from wfout6-smtp.messagingengine.com ([64.147.123.149]:39887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1reJWE-0001UZ-Ky for 69377@debbugs.gnu.org; Sun, 25 Feb 2024 13:46:36 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfout.west.internal (Postfix) with ESMTP id 26E781C00096; Sun, 25 Feb 2024 13:28:03 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sun, 25 Feb 2024 13:28:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dan.games; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1708885682; x=1708972082; bh=3k C7x7EmVWG9j4tq2986hi5+yL8yOf5rA34joTq+QhU=; b=mvHSUBfmz34MjGf73e T5wooR3KbtI6YQp1mYRYyOy6ce0hA6PhqxWohlQ90yXJ+wiH97iKqrkfNq1MaXnp mstzqKftQmWeRBnTZUgsa+0jtgGEfz9+gb20MOFOLuEIPc7RsNcs1qORKOc9qzVP 2ny+q98NlCksJVwxym+CegXLy/oyKabbe6ii7bS0q48NN6DQ/fWnt/aDxPG6x67V 6arJ7X9zwMZRCV3XCJVWf2mZob5TPd6bBaHLMji5cpisYfA2cEWpcnQvQHWbKP6z nHAP/yrWM8FQtJDSkmLkLadTO/+PF0CZJZTjf+m39VAoSXBozMK25vMMZwK5Ccws eNKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1708885682; x=1708972082; bh=3kC7x7EmVWG9j 4tq2986hi5+yL8yOf5rA34joTq+QhU=; b=QJ4xvopGHh+auJVjYzpJYk1kt9DJK HvND08cesJEOuEwHFiGgeBeWrFnXKe3wPaSfsf0ZHBRew8enoFMjZLv5jf8ZpKCO HkFEnHLL3k3wm+65UbsHMMKB8vSl5OMfWSSygiij+bwGqjasBvV937cdIaOydZT1 lCyFwVltQpJoeEUBWsFUaGn7WJwdFUWB0x+tfDiFgVqw1oigPlhGGWpRHA1LLeSW Di0nToyPqwHBHBcf0S9dm/nGK4dqh39/PpxANg91hzrmxAc+vsZV5K7O4gzTvhNC QUjePZoOTdjfj77ZwhAOs+Py5cdsItzW4ClXM9w+Q/GgCvyixUw50NBWw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrgedtgdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepuggrnhcuoehisegurghnrdhgrghmvghsqeenucggtffrrght thgvrhhnpeetleetgfduieffffdtkeejteetkeetieefgfetveefiedvudeghfffgedvke ethfenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhsihhohigvkhdrihhnfhhonecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihesuggrnh drghgrmhgvsh X-ME-Proxy: Feedback-ID: i3b5946ed:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 25 Feb 2024 13:28:00 -0500 (EST) From: dan To: 69377@debbugs.gnu.org Subject: [PATCH v2] gnu: Add sioyek. Date: Mon, 26 Feb 2024 02:27:48 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69377 Cc: hako@ultrarare.space X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/pdf.scm (sioyek): New variable. Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 --- .../sioyek-mupdf-0.23.0-fix-build.patch | 73 +++++++++++++++++++ gnu/packages/pdf.scm | 56 ++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch diff --git a/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch b/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch new file mode 100644 index 0000000000..4e0ee6de37 --- /dev/null +++ b/gnu/packages/patches/sioyek-mupdf-0.23.0-fix-build.patch @@ -0,0 +1,73 @@ +diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp +index f48d05e..0bc3855 100644 +--- a/pdf_viewer/document_view.cpp ++++ b/pdf_viewer/document_view.cpp +@@ -1121,7 +1121,7 @@ std::vector DocumentView::find_line_definitions() { + + std::optional pdf_link = current_document->get_link_in_page_rect(get_center_page_number(), line_rects[line_index]); + if (pdf_link.has_value()) { +- auto parsed_uri = parse_uri(mupdf_context, pdf_link.value().uri); ++ auto parsed_uri = parse_uri(mupdf_context, current_document->doc, pdf_link.value().uri); + result.push_back({ parsed_uri.page - 1, parsed_uri.x, parsed_uri.y }); + return result; + } +diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp +index 19b568b..335a93f 100644 +--- a/pdf_viewer/main_widget.cpp ++++ b/pdf_viewer/main_widget.cpp +@@ -170,7 +170,7 @@ void MainWidget::set_overview_position(int page, float offset) { + + void MainWidget::set_overview_link(PdfLink link) { + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + if (page >= 1) { + set_overview_position(page - 1, offset_y); + } +@@ -3178,7 +3178,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) { + open_web_url(utf8_decode(selected_link->uri)); + } + else{ +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, selected_link->uri); + long_jump_to_destination(page-1, offset_y); + } + } +@@ -3863,7 +3863,7 @@ void MainWidget::handle_link_click(const PdfLink& link) { + return; + } + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + + // convert one indexed page to zero indexed page + page--; +diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp +index 22d4265..3150e66 100644 +--- a/pdf_viewer/utils.cpp ++++ b/pdf_viewer/utils.cpp +@@ -116,8 +116,9 @@ bool rects_intersect(fz_rect rect1, fz_rect rect2) { + return range_intersects(rect1.x0, rect1.x1, rect2.x0, rect2.x1) && range_intersects(rect1.y0, rect1.y1, rect2.y0, rect2.y1); + } + +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) { +- fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str()); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri) { ++ pdf_document* doc = pdf_document_from_fz_document(mupdf_context, fz_doc); ++ fz_link_dest dest = pdf_resolve_link_dest(mupdf_context, doc, uri.c_str()); + return { dest.loc.page + 1, dest.x, dest.y }; + } + +diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h +index 2a12211..643b030 100644 +--- a/pdf_viewer/utils.h ++++ b/pdf_viewer/utils.h +@@ -55,7 +55,7 @@ void get_flat_toc(const std::vector& roots, std::vector& + int mod(int a, int b); + bool range_intersects(float range1_start, float range1_end, float range2_start, float range2_end); + bool rects_intersect(fz_rect rect1, fz_rect rect2); +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri); + char get_symbol(int key, bool is_shift_pressed, const std::vector&special_symbols); + + template diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..553642c170 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1710,3 +1711,58 @@ (define-public weasyprint Keywords: html2pdf, htmltopdf") (license license:bsd-3))) + +(define-public sioyek + (package + (name "sioyek") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrm/sioyek") + (commit (string-append "v" version)))) + (sha256 + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) + (modules '((guix build utils))) + (snippet '(substitute* "pdf_viewer_build_config.pro" + (("-lmupdf-third") + ""))) + ;; XXX: Fix for mupdf-0.23.0+ . + (patches (search-patches "sioyek-mupdf-0.23.0-fix-build.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list (string-append "PREFIX=" + #$output)) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "pdf_viewer/main.cpp" + (("/usr/share") + (string-append #$output "/share")) + (("/etc") + (string-append #$output "/etc"))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "qmake" configure-flags))) + (add-after 'install 'instal-man-page + (lambda _ + (install-file "resources/sioyek.1" + (string-append #$output "/share/man/man1"))))))) + (inputs (list freetype + gumbo-parser + harfbuzz + jbig2dec + libjpeg-turbo + mujs + mupdf + openjpeg + qt3d-5 + qtbase-5 + zlib)) + (home-page "https://sioyek.info") + (synopsis "PDF viewer with a focus on technical books and research papers") + (description + "Sioyek is a PDF viewer with a focus on textbooks and research papers.") + (license license:gpl3+))) base-commit: b25b94335a3ee8d68d2145da8e5ea0325ecea451 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 27 08:57:47 2024 Received: (at 69377) by debbugs.gnu.org; 27 Feb 2024 13:57:47 +0000 Received: from localhost ([127.0.0.1]:54573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rexxp-0007aN-QP for submit@debbugs.gnu.org; Tue, 27 Feb 2024 08:57:46 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:36984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rexxk-0007Zz-Co for 69377@debbugs.gnu.org; Tue, 27 Feb 2024 08:57:42 -0500 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1709041871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OsmNvb3jbDU8CaCOAgZkGzGj3iDyGzjvH45nHy5qnfU=; b=qFOwsDxT1GyvOpEpxRHHFbh4HNXqtaol7s4tNpeuqVPNTDoYOMUdrJXp2qyfKudcRABdak kJioLerUHZJrbjMtdk4dmWYbWJx8oYuZrIiXZkMddZkGEfD/1NGQs6xT+6Dsm5wZfolMzz UoHMUZPVRlLEdWhtLicI2VMjJiZzZl3ou+H+lBc/rzbINs588aPQGlcSAODGpeRoN55uJj hY5yBO96A/ZfI6frifml98jAULhf6IDUbx2ZDwwJjIZEmetKmVW5xrHvgBboAqOIWmu+uK +aDbxmC5vlQ7z0oODFOqjTjGnhqmpuVzP1CR1zGetOktah18RVLmIuMisvqKPw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space To: 69377@debbugs.gnu.org Subject: [PATCH v4] gnu: Add sioyek. Date: Tue, 27 Feb 2024 21:50:04 +0800 Message-ID: In-Reply-To: <20240225101233.13418-1-i@dan.games> References: <20240225101233.13418-1-i@dan.games> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69377 Cc: Hilton Chain , dan X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: dan * gnu/packages/patches/sioyek-fix-build.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/pdf.scm (sioyek): New variable. Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 Signed-off-by: Hilton Chain --- Slightly adjusted, now wait for QA. :) gnu/local.mk | 1 + gnu/packages/patches/sioyek-fix-build.patch | 82 +++++++++++++++++++++ gnu/packages/pdf.scm | 60 +++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 gnu/packages/patches/sioyek-fix-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9997522fb5..323f686ef0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1831,6 +1831,7 @@ dist_patch_DATA = \ %D%/packages/patches/sdl-pango-header-guard.patch \ %D%/packages/patches/sdl-pango-matrix_declarations.patch \ %D%/packages/patches/sdl-pango-sans-serif.patch \ + %D%/packages/patches/sioyek-fix-build.patch \ %D%/packages/patches/smalltalk-multiplication-overflow.patch \ %D%/packages/patches/sqlite-hurd.patch \ %D%/packages/patches/strace-readlink-tests.patch \ diff --git a/gnu/packages/patches/sioyek-fix-build.patch b/gnu/packages/patches/sioyek-fix-build.patch new file mode 100644 index 0000000000..87f19e353c --- /dev/null +++ b/gnu/packages/patches/sioyek-fix-build.patch @@ -0,0 +1,82 @@ +Patch fetch from https://git.alpinelinux.org/aports/tree/community/sioyek/mupdf-0.23.0.patch + +From 86e913eccf19b97a16f25d9b6cdf0f50232f1226 Mon Sep 17 00:00:00 2001 +From: ptrcnull +Date: Fri, 25 Aug 2023 22:44:26 +0200 +Subject: community/sioyek: fix build with mupdf-0.23.0 + +--- + +diff --git a/pdf_viewer/document_view.cpp b/pdf_viewer/document_view.cpp +index f48d05e..0bc3855 100644 +--- a/pdf_viewer/document_view.cpp ++++ b/pdf_viewer/document_view.cpp +@@ -1121,7 +1121,7 @@ std::vector DocumentView::find_line_definitions() { + + std::optional pdf_link = current_document->get_link_in_page_rect(get_center_page_number(), line_rects[line_index]); + if (pdf_link.has_value()) { +- auto parsed_uri = parse_uri(mupdf_context, pdf_link.value().uri); ++ auto parsed_uri = parse_uri(mupdf_context, current_document->doc, pdf_link.value().uri); + result.push_back({ parsed_uri.page - 1, parsed_uri.x, parsed_uri.y }); + return result; + } +diff --git a/pdf_viewer/main_widget.cpp b/pdf_viewer/main_widget.cpp +index 19b568b..335a93f 100644 +--- a/pdf_viewer/main_widget.cpp ++++ b/pdf_viewer/main_widget.cpp +@@ -170,7 +170,7 @@ void MainWidget::set_overview_position(int page, float offset) { + + void MainWidget::set_overview_link(PdfLink link) { + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + if (page >= 1) { + set_overview_position(page - 1, offset_y); + } +@@ -3178,7 +3178,7 @@ void MainWidget::handle_pending_text_command(std::wstring text) { + open_web_url(utf8_decode(selected_link->uri)); + } + else{ +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, selected_link->uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, selected_link->uri); + long_jump_to_destination(page-1, offset_y); + } + } +@@ -3863,7 +3863,7 @@ void MainWidget::handle_link_click(const PdfLink& link) { + return; + } + +- auto [page, offset_x, offset_y] = parse_uri(mupdf_context, link.uri); ++ auto [page, offset_x, offset_y] = parse_uri(mupdf_context, doc()->doc, link.uri); + + // convert one indexed page to zero indexed page + page--; +diff --git a/pdf_viewer/utils.cpp b/pdf_viewer/utils.cpp +index 22d4265..3150e66 100644 +--- a/pdf_viewer/utils.cpp ++++ b/pdf_viewer/utils.cpp +@@ -116,8 +116,9 @@ bool rects_intersect(fz_rect rect1, fz_rect rect2) { + return range_intersects(rect1.x0, rect1.x1, rect2.x0, rect2.x1) && range_intersects(rect1.y0, rect1.y1, rect2.y0, rect2.y1); + } + +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri) { +- fz_link_dest dest = pdf_parse_link_uri(mupdf_context, uri.c_str()); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri) { ++ pdf_document* doc = pdf_document_from_fz_document(mupdf_context, fz_doc); ++ fz_link_dest dest = pdf_resolve_link_dest(mupdf_context, doc, uri.c_str()); + return { dest.loc.page + 1, dest.x, dest.y }; + } + +diff --git a/pdf_viewer/utils.h b/pdf_viewer/utils.h +index 2a12211..643b030 100644 +--- a/pdf_viewer/utils.h ++++ b/pdf_viewer/utils.h +@@ -55,7 +55,7 @@ void get_flat_toc(const std::vector& roots, std::vector& + int mod(int a, int b); + bool range_intersects(float range1_start, float range1_end, float range2_start, float range2_end); + bool rects_intersect(fz_rect rect1, fz_rect rect2); +-ParsedUri parse_uri(fz_context* mupdf_context, std::string uri); ++ParsedUri parse_uri(fz_context* mupdf_context, fz_document* fz_doc, std::string uri); + char get_symbol(int key, bool is_shift_pressed, const std::vector&special_symbols); + + template diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0d796f65bb..f32403b954 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber +;;; Copyright © 2024 dan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1710,3 +1711,62 @@ (define-public weasyprint Keywords: html2pdf, htmltopdf") (license license:bsd-3))) + +(define-public sioyek + (package + (name "sioyek") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ahrm/sioyek") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vmmp2s032ygh1byz77pg9aljmp8hx745fr7mmz11831f96mlmhq")) + (modules '((guix build utils))) + ;; libmupdf-third.so no longer available since mupdf 1.18.0. + (snippet '(substitute* "pdf_viewer_build_config.pro" + (("-lmupdf-third") ""))) + ;; XXX: Fix build with mupdf-0.23.0+. + ;; See also: https://github.com/ahrm/sioyek/issues/804 + (patches (search-patches "sioyek-fix-build.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags + #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "pdf_viewer/main.cpp" + (("/usr/share") + (string-append #$output "/share")) + (("/etc") + (string-append #$output "/etc"))))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (apply invoke "qmake" configure-flags))) + (add-after 'install 'instal-man-page + (lambda _ + (install-file "resources/sioyek.1" + (string-append #$output "/share/man/man1"))))))) + (inputs + (list freetype + gumbo-parser + harfbuzz + jbig2dec + libjpeg-turbo + mujs + mupdf + openjpeg + qt3d-5 + qtbase-5 + zlib)) + (home-page "https://sioyek.info/") + (synopsis "PDF viewer with a focus on technical books and research papers") + (description + "Sioyek is a PDF viewer with a focus on textbooks and research papers.") + (license license:gpl3+))) base-commit: 75bad75367fcf2c289fae3b40dbcc850f92177be prerequisite-patch-id: c615f2b08070db6cbe847a2bdd5b7c0aae79789b prerequisite-patch-id: fd7da036342f36a8c698f5c8975f9e48d3ade435 prerequisite-patch-id: a2c81c14423bb9858f33d7d26976e8eea61982b7 prerequisite-patch-id: e30fd25b1dc4aaaff76474153836cd48e8565eb9 prerequisite-patch-id: 1d070b26dc64ee2ec95f14c4f5fc23419f766810 prerequisite-patch-id: 03de992f0312d5f0ee3368ebc3c1fad7c955d095 prerequisite-patch-id: b330efe2b0713e30b766c3b84643df67eb1eae5d prerequisite-patch-id: a233d53e8895d3f82af872fffb2e3858f44ceb23 prerequisite-patch-id: a2b6bd60bc05d7b5a75f15a06b1b614afd6a7033 prerequisite-patch-id: 9d60e5fdd3f1418caf15820650dd8c090c291c2b -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 08 22:23:19 2024 Received: (at 69377-done) by debbugs.gnu.org; 9 Mar 2024 03:23:19 +0000 Received: from localhost ([127.0.0.1]:60064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rinIs-0002tl-Nu for submit@debbugs.gnu.org; Fri, 08 Mar 2024 22:23:19 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:33840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rinIq-0002tc-WC for 69377-done@debbugs.gnu.org; Fri, 08 Mar 2024 22:23:18 -0500 Date: Sat, 09 Mar 2024 11:20:10 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1709954526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GtuazNxcSBjCmvYJo+5gXwm/+BAKobh++z7r8/Fk8FE=; b=hhYrLYaRsqbcDMkFbfSJr6JOREKpG2DaoK9gSG/+KTEVUZ4FAZ04aHUAB9rmXIPgPRa/uS t2nynwnElpH97/QU6P2oVyE56yw12oDd9qNiaERRAh4rltM8mzheiYPS5Gfp2yB6el7ll5 VIRgEDjWkDna3iNyznhY6kR3D2gXTx2dVYvZ4Xz+3jkXFQINckRbq4jZq1dT2auKZrnT3N v7BGbm9I6tfsTUG74rAAtao0OP5MSn6WYxo7jvcIiBN0iDp90lldKSvhIiK/Wz3urE4O++ 2mJHxJRz+Eozu70DW1MxlMlucsEsX4RNO2RItlzd0pXfabI++3ULxI/0ufXweA== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87wmqcrt05.wl-hako@ultrarare.space> From: Hilton Chain To: dan Subject: Re: [PATCH v4] gnu: Add sioyek. In-Reply-To: References: <20240225101233.13418-1-i@dan.games> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: -- X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 69377-done Cc: 69377-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, On Tue, 27 Feb 2024 21:50:04 +0800, Hilton Chain wrote: > > From: dan > > * gnu/packages/patches/sioyek-fix-build.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/pdf.scm (sioyek): New variable. > > Change-Id: Id2708745bd7ef672b620b8e9c907126bdc5a1f55 > Signed-off-by: Hilton Chain > --- > > Slightly adjusted, now wait for QA. :) > > gnu/local.mk | 1 + > gnu/packages/patches/sioyek-fix-build.patch | 82 +++++++++++++++++++++ > gnu/packages/pdf.scm | 60 +++++++++++++++ > 3 files changed, 143 insertions(+) > create mode 100644 gnu/packages/patches/sioyek-fix-build.patch Applied as 52f9db6503b398bd2c9d73446c51ca99ee76fafe, thanks! From unknown Sun Jun 22 17:13:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 06 Apr 2024 11:24:25 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator