aboutsummaryrefslogtreecommitdiffstats
path: root/main/sxiv
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-07-15 08:39:26 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-07-15 08:56:21 +0000
commit0019412cc518dd8eb17f0b8385b45b1ad049cf5b (patch)
treee25e6c758cb7dc2516294ea1d261b9bcdc5aba83 /main/sxiv
parent64404d37152700c946764ea0eb6f352612d57c13 (diff)
downloadaports-0019412cc518dd8eb17f0b8385b45b1ad049cf5b.tar.bz2
aports-0019412cc518dd8eb17f0b8385b45b1ad049cf5b.tar.xz
main/sxiv: rebuild against giflib 5.1
Diffstat (limited to 'main/sxiv')
-rw-r--r--main/sxiv/APKBUILD15
-rw-r--r--main/sxiv/sxiv-giflib5.1.patch28
2 files changed, 38 insertions, 5 deletions
diff --git a/main/sxiv/APKBUILD b/main/sxiv/APKBUILD
index 6eb2645f58..1da9ee6194 100644
--- a/main/sxiv/APKBUILD
+++ b/main/sxiv/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=sxiv
pkgver=1.2
-pkgrel=0
+pkgrel=1
pkgdesc="Simple X Image Viewer"
url="https://github.com/muennich/sxiv"
arch="all"
@@ -11,7 +11,9 @@ depends_dev=""
makedepends="imlib2-dev giflib-dev"
install=""
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz
+ sxiv-giflib5.1.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
@@ -36,6 +38,9 @@ package() {
make PREFIX="$pkgdir"/usr install
}
-md5sums="9b79d3c70693d9abbc66295cf6f281a0 sxiv-1.2.tar.gz"
-sha256sums="ac76b69e4889137f2ce531ec4dc5ce9c4916bc575a30d351ebc7b0a684ef8cf3 sxiv-1.2.tar.gz"
-sha512sums="6058a8f89c540083549d91fe469f8f9d1a4acf60a19dc1d7115b7fe9a807143c9f8c0e8320e7695f7b6afe8d9ae040e9daaa09a976219228afb929133c8a6957 sxiv-1.2.tar.gz"
+md5sums="9b79d3c70693d9abbc66295cf6f281a0 sxiv-1.2.tar.gz
+c3cfa504ef7352b52f96682e8ba845ba sxiv-giflib5.1.patch"
+sha256sums="ac76b69e4889137f2ce531ec4dc5ce9c4916bc575a30d351ebc7b0a684ef8cf3 sxiv-1.2.tar.gz
+385478f42f2dbe142590dcd3f20b5ebb8a7ada169c35036502c46dd25b5cab88 sxiv-giflib5.1.patch"
+sha512sums="6058a8f89c540083549d91fe469f8f9d1a4acf60a19dc1d7115b7fe9a807143c9f8c0e8320e7695f7b6afe8d9ae040e9daaa09a976219228afb929133c8a6957 sxiv-1.2.tar.gz
+ffdef5c9118575e9c464010039b94c3a7c86b4321140091ef364c1990cb25c8fa587667ebd0064ceb07f4d647c33e6a9d1caf739a27d0a866917d48603d6986f sxiv-giflib5.1.patch"
diff --git a/main/sxiv/sxiv-giflib5.1.patch b/main/sxiv/sxiv-giflib5.1.patch
new file mode 100644
index 0000000000..43f6cfbdfe
--- /dev/null
+++ b/main/sxiv/sxiv-giflib5.1.patch
@@ -0,0 +1,28 @@
+From b901236261dc717dc08ed10f63e2d5cd3f3031f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl>
+Date: Tue, 27 May 2014 11:46:06 +0200
+Subject: [PATCH] Fix build with giflib >= 5.1.0.
+
+---
+ image.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/image.c b/image.c
+index e62a69f..7eec544 100644
+--- a/image.c
++++ b/image.c
+@@ -278,7 +278,11 @@ bool img_load_gif(img_t *img, const fileinfo_t *file)
+ }
+ } while (rec != TERMINATE_RECORD_TYPE);
+
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++ DGifCloseFile(gif, NULL);
++#else
+ DGifCloseFile(gif);
++#endif
+
+ if (err && !file->loaded)
+ warn("corrupted gif file: %s", file->name);
+--
+1.9.3
+