diff options
| author | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-02-06 23:14:50 +0000 |
| commit | 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch) | |
| tree | 8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /community/libmatchbox | |
| parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) | |
Mon Feb 6 23:14:50 UTC 2012
Diffstat (limited to 'community/libmatchbox')
| -rw-r--r-- | community/libmatchbox/PKGBUILD | 13 | ||||
| -rw-r--r-- | community/libmatchbox/libpng15.patch | 23 |
2 files changed, 31 insertions, 5 deletions
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 63eb2cb29..7024885ce 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 58821 2011-11-18 16:44:16Z spupykin $ +# $Id: PKGBUILD 63648 2012-02-05 12:03:24Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=libmatchbox pkgver=1.9 -pkgrel=4 +pkgrel=5 pkgdesc="Base library for Matchbox WM" arch=('i686' 'x86_64') license=('LGPL') depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') options=('!libtool') url="http://matchbox-project.org/" -source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('9f73e7515cc4679171a5db180dc1343b') +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + libpng15.patch) +md5sums=('9f73e7515cc4679171a5db180dc1343b' + '09f782c76fe313efd0e87fabb276e2fe') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c - ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings + patch -Rp1 <$srcdir/libpng15.patch + LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings make make DESTDIR="$pkgdir" install } diff --git a/community/libmatchbox/libpng15.patch b/community/libmatchbox/libpng15.patch new file mode 100644 index 000000000..6c4ddef4d --- /dev/null +++ b/community/libmatchbox/libpng15.patch @@ -0,0 +1,23 @@ +diff -wbBur libmatchbox-1.9/libmb/mbpixbuf.c libmatchbox-1.9.org/libmb/mbpixbuf.c +--- libmatchbox-1.9/libmb/mbpixbuf.c 2012-01-19 21:57:56.000000000 +0400 ++++ libmatchbox-1.9.org/libmb/mbpixbuf.c 2006-07-26 23:12:25.000000000 +0400 +@@ -247,7 +247,7 @@ + return NULL; + } + +- if ( setjmp( png_jmpbuf(png_ptr) ) ) { ++ if ( setjmp( png_ptr->jmpbuf ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -269,8 +269,8 @@ + ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) + png_set_gray_to_rgb(png_ptr); + +- if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA +- || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA ++ if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ++ || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA + ) + *has_alpha = 1; + else |