From 5e2ae324508e0ea001618404c41256e8d778f055 Mon Sep 17 00:00:00 2001 From: cinerea0 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 + + # include +-# include + #include + # include + # include +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 + # include + # include +-# include + #include + #include + # include +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 + #include + # include +-# include + # include + # include + # include +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 + # include + # include +-# include + # include + # include + # include 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 " 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"