Date: Wednesday, March 18, 2015 @ 16:50:35 Author: spupykin Revision: 129515
upgpkg: libmatchbox 1.11-1 upd Modified: libmatchbox/trunk/PKGBUILD Deleted: libmatchbox/trunk/libpng15.patch ----------------+ PKGBUILD | 10 ++++------ libpng15.patch | 23 ----------------------- 2 files changed, 4 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-18 15:38:06 UTC (rev 129514) +++ PKGBUILD 2015-03-18 15:50:35 UTC (rev 129515) @@ -3,20 +3,18 @@ # Contributor: Henrique C. Alves <[email protected]> pkgname=libmatchbox -pkgver=1.10 -pkgrel=3 +pkgver=1.11 +pkgrel=1 pkgdesc="Base library for Matchbox WM" arch=('i686' 'x86_64') license=('LGPL') depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') url="http://matchbox-project.org/"; -source=(http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz) -md5sums=('042c5874631dfb95151aa793dc1434b8') +source=(http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.bz2) +md5sums=('fc6cc807f55a3e7c752d8013176875d7') build() { cd "$srcdir/$pkgname-$pkgver" -# sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c -# patch -Rp1 <$srcdir/libpng15.patch LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings make } Deleted: libpng15.patch =================================================================== --- libpng15.patch 2015-03-18 15:38:06 UTC (rev 129514) +++ libpng15.patch 2015-03-18 15:50:35 UTC (rev 129515) @@ -1,23 +0,0 @@ -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
