[arch-commits] Commit in libmatchbox/repos (6 files)

[Sergej Pupykin]

    Date: Monday, April 29, 2013 @ 16:37:43
  Author: spupykin
Revision: 89488

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  libmatchbox/repos/community-staging-i686/
  libmatchbox/repos/community-staging-i686/PKGBUILD
    (from rev 89487, libmatchbox/trunk/PKGBUILD)
  libmatchbox/repos/community-staging-i686/libpng15.patch
    (from rev 89487, libmatchbox/trunk/libpng15.patch)
  libmatchbox/repos/community-staging-x86_64/
  libmatchbox/repos/community-staging-x86_64/PKGBUILD
    (from rev 89487, libmatchbox/trunk/PKGBUILD)
  libmatchbox/repos/community-staging-x86_64/libpng15.patch
    (from rev 89487, libmatchbox/trunk/libpng15.patch)

-----------------------------------------+
 community-staging-i686/PKGBUILD         |   28 ++++++++++++++++++++++++++++
 community-staging-i686/libpng15.patch   |   23 +++++++++++++++++++++++
 community-staging-x86_64/PKGBUILD       |   28 ++++++++++++++++++++++++++++
 community-staging-x86_64/libpng15.patch |   23 +++++++++++++++++++++++
 4 files changed, 102 insertions(+)

Copied: libmatchbox/repos/community-staging-i686/PKGBUILD (from rev 89487, libmatchbox/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2013-04-29 14:37:43 UTC (rev 89488)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Henrique C. Alves <hcarvalhoalves at gmail.com>
+
+pkgname=libmatchbox
+pkgver=1.10
+pkgrel=2
+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://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz)
+md5sums=('042c5874631dfb95151aa793dc1434b8')
+
+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
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Copied: libmatchbox/repos/community-staging-i686/libpng15.patch (from rev 89487, libmatchbox/trunk/libpng15.patch)
===================================================================
--- community-staging-i686/libpng15.patch	                        (rev 0)
+++ community-staging-i686/libpng15.patch	2013-04-29 14:37:43 UTC (rev 89488)
@@ -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

Copied: libmatchbox/repos/community-staging-x86_64/PKGBUILD (from rev 89487, libmatchbox/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2013-04-29 14:37:43 UTC (rev 89488)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Henrique C. Alves <hcarvalhoalves at gmail.com>
+
+pkgname=libmatchbox
+pkgver=1.10
+pkgrel=2
+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://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz)
+md5sums=('042c5874631dfb95151aa793dc1434b8')
+
+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
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}

Copied: libmatchbox/repos/community-staging-x86_64/libpng15.patch (from rev 89487, libmatchbox/trunk/libpng15.patch)
===================================================================
--- community-staging-x86_64/libpng15.patch	                        (rev 0)
+++ community-staging-x86_64/libpng15.patch	2013-04-29 14:37:43 UTC (rev 89488)
@@ -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