[PR PATCH] libsixel: update to 1.10.2, switch upstream

[PR PATCH] libsixel: update to 1.10.2, switch upstream

[cinerea0]

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

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

https://github.com/cinerea0/void-packages sixel
https://github.com/void-linux/void-packages/pull/33144

libsixel: update to 1.10.2, switch upstream
<!-- Mark items with [x] where applicable -->

#### 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/33144.patch is attached

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

From 98686839374981b69209b6240bb2607a7fb68692 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 26 Sep 2021 22:48:19 -0400
Subject: [PATCH] libsixel: update to 1.10.2, switch upstream

---
 common/shlibs             |  2 +-
 srcpkgs/libsixel/template | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..5de62d0da829 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3985,7 +3985,7 @@ libsmb-transport-samba4.so samba-libs-4.13.2_1
 libtdb-wrap-samba4.so samba-libs-4.13.3_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
-libsixel.so.1 libsixel-1.8.6_1
+libsixel.so libsixel-1.10.2_1
 libpamtest.so.0 pam_wrapper-1.1.3_1
 libopenaptx.so.0 libopenaptx-0.2.0_1
 libsimavr.so.1 simavr-1.6_2
diff --git a/srcpkgs/libsixel/template b/srcpkgs/libsixel/template
index 8523f3b50ec0..5fb781e71bf6 100644
--- a/srcpkgs/libsixel/template
+++ b/srcpkgs/libsixel/template
@@ -1,15 +1,16 @@
 # Template file for 'libsixel'
 pkgname=libsixel
-version=1.8.6
+version=1.10.2
 revision=1
-build_style=gnu-configure
-makedepends="libpng-devel zlib-devel libjpeg-turbo-devel"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="SIXEL encoder/decoder"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
-homepage="https://github.com/saitoha/libsixel"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9
+homepage="https://github.com/libsixel/libsixel"
+distfiles="https://github.com/libsixel/libsixel/archive/refs/tags/v${version}.tar.gz"
+checksum=a811b7f78c3b904661e02c753bcba064dbea3b6d46b4e0a61448f062327082f8
 
 libsixel-devel_package() {
 	short_desc+=" - development files"
@@ -18,7 +19,6 @@ libsixel-devel_package() {
 		vmove usr/bin/libsixel-config
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }

Re: [WIP] libsixel: update to 1.10.2, switch upstream

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930548847

Comment:
This won't build properly until the new upstream adds SONAME versioning; waiting on this issue to be resolved: https://github.com/libsixel/libsixel/issues/37.

Re: [WIP] libsixel: update to 1.10.2, switch upstream

[dankamongmen]

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

New comment by dankamongmen on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930586850

Comment:
> This won't build properly until the new upstream adds SONAME versioning; waiting on this issue to be resolved: [libsixel/libsixel#37](https://github.com/libsixel/libsixel/issues/37).

i've got your corner; done

Re: [WIP] libsixel: update to 1.10.2, switch upstream

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930654985

Comment:
@dankamongmen Thank you! I'll watch the libsixel repo for releases so I can update this when the next release comes out.

Re: [WIP] libsixel: update to 1.10.2, switch upstream

[dankamongmen]

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

New comment by dankamongmen on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930664438

Comment:
> @dankamongmen Thank you! I'll watch the libsixel repo for releases so I can update this when the next release comes out.

you can just ask =] i'll put one out for you now.

Re: [WIP] libsixel: update to 1.10.2, switch upstream

[dankamongmen]

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

New comment by dankamongmen on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930664972

Comment:
> > @dankamongmen Thank you! I'll watch the libsixel repo for releases so I can update this when the next release comes out.
> 
> you can just ask =] i'll put one out for you now.

1.10.3 hot off the presses for my good friends in void linux

Re: [PR PATCH] [Updated] [WIP] libsixel: update to 1.10.2, switch upstream

[cinerea0]

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

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

https://github.com/cinerea0/void-packages sixel
https://github.com/void-linux/void-packages/pull/33144

[WIP] libsixel: update to 1.10.2, switch upstream
<!-- Mark items with [x] where applicable -->

#### 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/33144.patch is attached

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

From c63077212b0ffc69fb0042f3919ad8b23c75179f Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 29 Sep 2021 21:39:05 -0400
Subject: [PATCH] libsixel: update to 1.10.3, switch upstream

---
 srcpkgs/libsixel/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libsixel/template b/srcpkgs/libsixel/template
index 8523f3b50ec0..ea23cdf3b83c 100644
--- a/srcpkgs/libsixel/template
+++ b/srcpkgs/libsixel/template
@@ -1,15 +1,16 @@
 # Template file for 'libsixel'
 pkgname=libsixel
-version=1.8.6
+version=1.10.3
 revision=1
-build_style=gnu-configure
-makedepends="libpng-devel zlib-devel libjpeg-turbo-devel"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="SIXEL encoder/decoder"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
-homepage="https://github.com/saitoha/libsixel"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9
+homepage="https://github.com/libsixel/libsixel"
+distfiles="https://github.com/libsixel/libsixel/archive/refs/tags/v${version}.tar.gz"
+checksum=028552eb8f2a37c6effda88ee5e8f6d87b5d9601182ddec784a9728865f821e0
 
 libsixel-devel_package() {
 	short_desc+=" - development files"

Re: [PR PATCH] [Updated] [WIP] libsixel: update to 1.10.3, switch upstream

[cinerea0]

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

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

https://github.com/cinerea0/void-packages sixel
https://github.com/void-linux/void-packages/pull/33144

[WIP] libsixel: update to 1.10.3, switch upstream
<!-- Mark items with [x] where applicable -->

#### 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/33144.patch is attached

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

From 5e2ae324508e0ea001618404c41256e8d778f055 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 29 Sep 2021 23:27:29 -0400
Subject: [PATCH] libsixel: update to 1.10.3, switch upstream

---
 srcpkgs/libsixel/patches/unistd.patch | 62 +++++++++++++++++++++++++++
 srcpkgs/libsixel/template             | 13 +++---
 2 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/libsixel/patches/unistd.patch

diff --git a/srcpkgs/libsixel/patches/unistd.patch b/srcpkgs/libsixel/patches/unistd.patch
new file mode 100644
index 000000000000..6fc92eecf058
--- /dev/null
+++ b/srcpkgs/libsixel/patches/unistd.patch
@@ -0,0 +1,62 @@
+# Remove sys/unistd.h (will be included in next release)
+# https://github.com/libsixel/libsixel/commit/a8d60939d00af520e7139741b58928a9cc2c5f04
+diff --git a/converters/img2sixel.c b/converters/img2sixel.c
+index eeeccdf..5152fa9 100644
+--- a/converters/img2sixel.c
++++ b/converters/img2sixel.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+ 
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ # include <getopt.h>
+ # include <inttypes.h>
+diff --git a/meson.build b/meson.build
+index 6a243a3..6e47fcc 100644
+--- a/meson.build
++++ b/meson.build
+@@ -66,7 +66,6 @@ needed_headers = [
+   'string.h',
+   'unistd.h',
+   'stdint.h',
+-  'sys/unistd.h',
+   'getopt.h',
+   'sys/types.h',
+   'sys/stat.h',
+diff --git a/src/decoder.c b/src/decoder.c
+index 7619792..95803fa 100644
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -26,7 +26,6 @@
+ # include <stdarg.h>
+ # include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ #include <sys/select.h>
+ # include <time.h>
+diff --git a/src/encoder.c b/src/encoder.c
+index 9fd289b..ea0714c 100644
+--- a/src/encoder.c
++++ b/src/encoder.c
+@@ -27,7 +27,6 @@
+ # include <stdarg.h>
+ #include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/types.h>
+ # include <time.h>
+ # include <sys/time.h>
+diff --git a/src/tty.c b/src/tty.c
+index 92f9f8e..d020543 100644
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -28,7 +28,6 @@
+ # include <sys/time.h>
+ # include <sys/types.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/select.h>
+ # include <errno.h>
+ # include <termios.h>
diff --git a/srcpkgs/libsixel/template b/srcpkgs/libsixel/template
index 8523f3b50ec0..ea23cdf3b83c 100644
--- a/srcpkgs/libsixel/template
+++ b/srcpkgs/libsixel/template
@@ -1,15 +1,16 @@
 # Template file for 'libsixel'
 pkgname=libsixel
-version=1.8.6
+version=1.10.3
 revision=1
-build_style=gnu-configure
-makedepends="libpng-devel zlib-devel libjpeg-turbo-devel"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel"
 short_desc="SIXEL encoder/decoder"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
-homepage="https://github.com/saitoha/libsixel"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=37611d60c7dbcee701346967336dbf135fdd5041024d5f650d52fae14c731ab9
+homepage="https://github.com/libsixel/libsixel"
+distfiles="https://github.com/libsixel/libsixel/archive/refs/tags/v${version}.tar.gz"
+checksum=028552eb8f2a37c6effda88ee5e8f6d87b5d9601182ddec784a9728865f821e0
 
 libsixel-devel_package() {
 	short_desc+=" - development files"

Re: libsixel: update to 1.10.3, switch upstream

[cinerea0]

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/33144#issuecomment-930751633

Comment:
@dankamongmen Thanks again! I've switched to the new release for this PR. @abenson, I'm pinging you here because this is your package.

Re: [PR PATCH] [Merged]: libsixel: update to 1.10.3, switch upstream

[ericonr]

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

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

libsixel: update to 1.10.3, switch upstream
https://github.com/void-linux/void-packages/pull/33144

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

#### 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
-->