From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] libsixel: update to 1.10.3, switch upstream
Date: Thu, 30 Sep 2021 05:27:52 +0200 [thread overview]
Message-ID: <20210930032752.3m5nno4PuTfjLq457glJPStKMlzoF8omz_OnKahZ25A@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33144@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2021-09-30 3:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 2:52 [PR PATCH] libsixel: update to 1.10.2, " cinerea0
2021-09-29 21:13 ` [WIP] " cinerea0
2021-09-29 22:18 ` dankamongmen
2021-09-30 0:49 ` cinerea0
2021-09-30 1:13 ` dankamongmen
2021-09-30 1:14 ` dankamongmen
2021-09-30 1:39 ` [PR PATCH] [Updated] " cinerea0
2021-09-30 3:27 ` cinerea0 [this message]
2021-09-30 3:32 ` libsixel: update to 1.10.3, " cinerea0
2021-10-02 19:52 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210930032752.3m5nno4PuTfjLq457glJPStKMlzoF8omz_OnKahZ25A@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).