aboutsummaryrefslogtreecommitdiffstats
path: root/main/slim
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2011-05-13 12:47:40 -0500
committerWilliam Pitcock <nenolod@dereferenced.org>2011-05-13 12:47:40 -0500
commit5edb701de2ac648ee192cd05d44cddd783945c02 (patch)
tree598383456bc0a8e1fccacc5a8b50acaf67bf1d74 /main/slim
parent229d0c24d5529816478cfda17c3d0ba77d0a7209 (diff)
downloadaports-5edb701de2ac648ee192cd05d44cddd783945c02.tar.bz2
aports-5edb701de2ac648ee192cd05d44cddd783945c02.tar.xz
main/slim: fix build with png 1.5
Diffstat (limited to 'main/slim')
-rw-r--r--main/slim/APKBUILD8
-rw-r--r--main/slim/slim-png15.patch11
2 files changed, 16 insertions, 3 deletions
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD
index a3602abb77..55ebe923b4 100644
--- a/main/slim/APKBUILD
+++ b/main/slim/APKBUILD
@@ -14,7 +14,8 @@ source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
http://dev.alpinelinux.org/~ncopa/alpine/slim-alpinelinux.tar.gz
$pkgname.logrotate
$pkgname.initd
- slim-restart.patch"
+ slim-restart.patch
+ slim-png15.patch"
prepare() {
cd "$srcdir/slim-$pkgver"
@@ -23,7 +24,7 @@ prepare() {
done
#libpng 1.4.0
- sed -i -e 's/png12/png14/g' Makefile || return 1
+ sed -i -e 's/png12/png15/g' Makefile || return 1
sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|'\
-e 's|/var/run/slim.lock|/var/lock/slim.lock|' \
@@ -61,4 +62,5 @@ md5sums="ca1ae6120e6f4b4969f2d6cf94f47b42 slim-1.3.2.tar.gz
cd63232c7770b0e67a009a94c2a46b82 slim-alpinelinux.tar.gz
43da096480bf72c3ccec8ad8400f34f0 slim.logrotate
6ee3a023e56052528295034be809cfc6 slim.initd
-648d871fe7d2a97b7d7b928019e2feee slim-restart.patch"
+648d871fe7d2a97b7d7b928019e2feee slim-restart.patch
+8f63afd7cd390cb8d65f10fb167d4a71 slim-png15.patch"
diff --git a/main/slim/slim-png15.patch b/main/slim/slim-png15.patch
new file mode 100644
index 0000000000..25caaed576
--- /dev/null
+++ b/main/slim/slim-png15.patch
@@ -0,0 +1,11 @@
+--- slim-1.3.2.orig/png.c
++++ slim-1.3.2/png.c
+@@ -57,7 +57,7 @@
+ return(0);
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
+ fclose(infile);