[PR PATCH] Zim

[PR PATCH] Zim

[ericonr]

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

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

https://github.com/ericonr/void-packages zim
https://github.com/void-linux/void-packages/pull/28601

Zim
<!-- Mark items with [x] where applicable -->

This kinda looks like an accidental ABI break, to be honest. If @Johnnynator prefers to fix `libzim` instead, it should be ok (we should almost certainly open an issue there, either way). This is a workaround.

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28601.patch is attached

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

From 2985dc02eaa51f9a03ee07e3e657cce10fb59b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 22:06:39 -0300
Subject: [PATCH 1/2] zimwriterfs: rebuild for libzim API break.

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

diff --git a/srcpkgs/zimwriterfs/template b/srcpkgs/zimwriterfs/template
index e8b9c7899e0..5d42e16a119 100644
--- a/srcpkgs/zimwriterfs/template
+++ b/srcpkgs/zimwriterfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zimwriterfs'
 pkgname=zimwriterfs
 version=1.3.7
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="file-devel gumbo-parser-devel icu-devel libzim-devel

From 437cdd7841a75931225d80b2bb3aafd345d5e6ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 8 Feb 2021 22:06:39 -0300
Subject: [PATCH 2/2] zim-tools: rebuild for libzim API break.

libzim seems to be missing the _ZN3zim6writer7CreatorC2Eb symbol which
these programs rely on.

Fixes #28600
---
 srcpkgs/zim-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zim-tools/template b/srcpkgs/zim-tools/template
index f4900c02d49..6f765d11c42 100644
--- a/srcpkgs/zim-tools/template
+++ b/srcpkgs/zim-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'zim-tools'
 pkgname=zim-tools
 version=1.2.1
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libzim-devel xapian-core-devel icu-devel"

Re: Zim

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28601#issuecomment-775582743

Comment:
I believe https://github.com/openzim/libzim/commit/936018525e1d72b05b76753ffccad5f15bba65ff# would have changed the ABI? They added more class members.

Re: [PR PATCH] [Merged]: Zim

[Johnnynator]

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

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

Zim
https://github.com/void-linux/void-packages/pull/28601

Description:
<!-- Mark items with [x] where applicable -->

This kinda looks like an accidental ABI break, to be honest. If @Johnnynator prefers to fix `libzim` instead, it should be ok (we should almost certainly open an issue there, either way). This is a workaround.

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Re: Zim

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28601#issuecomment-775756993

Comment:
The next release of libzim will already bump the soname. So rebuild is fine for now.

Re: Zim

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/28601#issuecomment-775756993

Comment:
The next release of libzim will bump the soname. So rebuild is fine for now.