[PR PATCH] Update girara and zathura

[PR PATCH] Update girara and zathura

[lemmi]

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

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

https://github.com/lemmi/void-packages zathura
https://github.com/void-linux/void-packages/pull/50696

Update girara and zathura
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 330d1327d4a35c539b93119afe09980501ee3038 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 22:41:03 +0200
Subject: [PATCH 1/7] girara: update to 0.4.4.

---
 common/shlibs           |  2 +-
 srcpkgs/girara/template | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 279bf10d77d26e..ab9f46ad23a3d5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1732,7 +1732,7 @@ libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
 libnetpbm.so.11 libnetpbm-10.66.03_2
 libid3.so id3lib-3.8.3_7
 libid3-3.8.so.3 id3lib-3.8.3_7
-libgirara-gtk3.so.3 girara-0.2.8_1
+libgirara-gtk3.so.4 girara-0.4.4_1
 libjq.so.1 jq-1.6_2
 libcrypto.so.3 libcrypto3-3.1.2_1
 libssl.so.3 libssl3-3.1.2_1
diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index 8cf7d348c15e5d..2601b8d1bf5271 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -1,24 +1,20 @@
 # Template file for 'girara'
 pkgname=girara
-version=0.4.2
+version=0.4.4
 revision=1
 build_style=meson
-configure_args="$(vopt_feature notify notify)"
 hostmakedepends="pkg-config intltool doxygen glib-devel"
-makedepends="gtk+3-devel $(vopt_if notify libnotify-devel) libglib-devel json-glib-devel"
+makedepends="gtk+3-devel libglib-devel json-glib-devel"
 checkdepends="check-devel xvfb-run"
 short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
 changelog="https://pwmt.org/projects/girara/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/girara/-/archive/${version}/girara-${version}.tar.gz"
-checksum=e13c1f7c8984ef791b9e60fe3a22926dab9581eb179fe29a29808ac7d328cf5c
+distfiles="https://pwmt.org/projects/girara/download/girara-${version}.tar.xz"
+checksum=a321079b3cda000d16d978e8609fb631381f54d7596e7218aaba05c6f4b8bac1
 make_check_pre="xvfb-run"
 
-build_options="notify"
-build_options_default="notify"
-
 post_install() {
 	vlicense LICENSE
 }

From 6cb55b915823b4ab2eed6abdad57fb57eca30c1b Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 22:52:41 +0200
Subject: [PATCH 2/7] zathura: update to 0.5.6.

---
 ...e_valid_extension-should-return-True.patch | 26 -------------------
 srcpkgs/zathura/template                      |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/zathura/patches/0001-The-function-file_valid_extension-should-return-True.patch

diff --git a/srcpkgs/zathura/patches/0001-The-function-file_valid_extension-should-return-True.patch b/srcpkgs/zathura/patches/0001-The-function-file_valid_extension-should-return-True.patch
deleted file mode 100644
index 517c0d49cb3db2..00000000000000
--- a/srcpkgs/zathura/patches/0001-The-function-file_valid_extension-should-return-True.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d74091a7452846112c0bb11e1412cd2af48ee7cd Mon Sep 17 00:00:00 2001
-From: Carlo Buccisano <slashdeipoveri@gmail.com>
-Date: Tue, 12 Dec 2023 00:24:20 +0100
-Subject: [PATCH] The function file_valid_extension should return True if
- plugin is different then NULL, not if it is equal.
-
----
- zathura/utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/zathura/utils.c b/zathura/utils.c
-index 802757f..8f379be 100644
---- a/zathura/utils.c
-+++ b/zathura/utils.c
-@@ -60,7 +60,7 @@ file_valid_extension(zathura_t* zathura, const char* path)
-   zathura_plugin_t* plugin = zathura_plugin_manager_get_plugin(zathura->plugins.manager, content_type);
-   g_free(content_type);
- 
--  return plugin == NULL;
-+  return plugin != NULL;
- }
- 
- static void
--- 
-2.43.0
-
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 2e1efbcd709be2..f63fb3ddcd3817 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura'
 pkgname=zathura
-version=0.5.4
-revision=2
+version=0.5.6
+revision=1
 build_style=meson
 configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config gettext python3-Sphinx desktop-file-utils
@@ -15,7 +15,7 @@ license="Zlib"
 homepage="https://pwmt.org/projects/zathura/"
 changelog="https://pwmt.org/projects/zathura/changelog/${version}/index.html"
 distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
-checksum=a3037f7aa94d4096bfd97069f62ffcdca9f06431e8663548c1cd6b945c556f32
+checksum=b478e35e87cce57d651b4112dc8193c4b744a07f121b7b6465229a8f386f10da
 
 if [ -z "$CROSS_BUILD" ] && [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"

From ff2ddb038785cf7d79e86f9e0d27a0d9f50027e7 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 23:00:18 +0200
Subject: [PATCH 3/7] zathura-pdf-mupdf: update to 0.4.3.

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 9f428b7699a9fa..6377608c71d31b 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-mupdf'
 pkgname=zathura-pdf-mupdf
-version=0.4.1
-revision=8
+version=0.4.3
+revision=1
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="mupdf-devel zathura-devel libopenjpeg2-devel tesseract-ocr-devel
@@ -13,7 +13,7 @@ license="Zlib"
 homepage="https://pwmt.org/projects/zathura-pdf-mupdf/"
 changelog="https://pwmt.org/projects/zathura-pdf-mupdf/changelog/${version}/index.html"
 distfiles="https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${version}.tar.xz"
-checksum=f982a01d6523fa25669381184c06a625edbfd7961cbdb0711dccfdb9c402ac2f
+checksum=8ccf84ee087ea72a8e88bb2f25a9c010baea261ceb52cc3f732abad25f776776
 conflicts="zathura-pdf-poppler>=0"
 
 post_install() {

From 9c09bfa46005bf4eeaec6db9ef75fe4501dd7297 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 23:04:14 +0200
Subject: [PATCH 4/7] zathura-cb: revbump for girara-0.4.4

---
 srcpkgs/zathura-cb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template
index 3147e4d3b6dbe3..4caf813f76fa26 100644
--- a/srcpkgs/zathura-cb/template
+++ b/srcpkgs/zathura-cb/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-cb'
 pkgname=zathura-cb
 version=0.1.10
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="zathura-devel libarchive-devel"
@@ -11,8 +11,8 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/zathura-cb/"
 changelog="https://pwmt.org/projects/zathura-cb/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=37cb945b2bf607d1f8a3bd0c696dd7f45a63633c7ba152601cbc0e4b9d68bb6c
+distfiles="https://pwmt.org/projects/zathura-cb/download/zathura-cb-${version}.tar.xz"
+checksum=89b0ca17a80cba1ea9fd1b3b72f3a7173f0aad3a06a8c364d865c4999c18bbc8
 
 post_install() {
 	vlicense LICENSE

From f406d16f3bd65d808eb8cf0530b549c536278c3d Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 23:04:15 +0200
Subject: [PATCH 5/7] zathura-pdf-poppler: revbump for girara-0.4.4

---
 srcpkgs/zathura-pdf-poppler/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 1af4a4d88e19ef..be2b366f43c825 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-pdf-poppler'
 pkgname=zathura-pdf-poppler
 version=0.3.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="poppler-devel poppler-glib-devel zathura-devel"
@@ -11,8 +11,8 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/"
 changelog="https://pwmt.org/projects/zathura-pdf-poppler/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=2e64e59ed46b0d93fbad70eca9a77cc720c5909c988b0b6637333504da52b23d
+distfiles="https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${version}.tar.xz"
+checksum=71abeed51cd1d188cef3dbd4c164758e3c371604756967b23ad176ae53453011
 
 conflicts="zathura-pdf-mupdf>=0"
 

From 5ce820850f5864249d25c8a6d95d41bda0e73bb7 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 23:04:15 +0200
Subject: [PATCH 6/7] zathura-ps: revbump for girara-0.4.4

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 72f8c99eab2d07..9c850a4d40d31f 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-ps'
 pkgname=zathura-ps
 version=0.2.7
-revision=4
+revision=5
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libspectre-devel zathura-devel"
@@ -11,8 +11,8 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://git.pwmt.org/pwmt/zathura-ps/"
 changelog="https://pwmt.org/projects/zathura-ps/changelog/${version}/index.html"
-distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e
+distfiles="https://pwmt.org/projects/zathura-ps/download/zathura-ps-${version}.tar.xz"
+checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
 
 post_install() {
 	vlicense LICENSE

From 28af08eb4ad61fd5c00c5d86f1a508207f2e2fbe Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 4 Jun 2024 23:05:00 +0200
Subject: [PATCH 7/7] zathura-djvu: revbump for girara-0.4.4

---
 srcpkgs/zathura-djvu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template
index 402ff750c43ee7..a7db73907b94d6 100644
--- a/srcpkgs/zathura-djvu/template
+++ b/srcpkgs/zathura-djvu/template
@@ -1,7 +1,7 @@
 # Template file for 'zathura-djvu'
 pkgname=zathura-djvu
 version=0.2.9
-revision=4
+revision=5
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="djvulibre-devel zathura-devel"

Re: [PR PATCH] [Merged]: Update girara and zathura

[lemmi]

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

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

Update girara and zathura
https://github.com/void-linux/void-packages/pull/50696

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->