[arch-commits] Commit in libmatchbox/repos (8 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Fri Nov 1 21:15:51 UTC 2013
Date: Friday, November 1, 2013 @ 22:15:51
Author: spupykin
Revision: 100206
archrelease: copy trunk to community-i686, community-x86_64
Added:
libmatchbox/repos/community-i686/PKGBUILD
(from rev 100205, libmatchbox/trunk/PKGBUILD)
libmatchbox/repos/community-i686/libpng15.patch
(from rev 100205, libmatchbox/trunk/libpng15.patch)
libmatchbox/repos/community-x86_64/PKGBUILD
(from rev 100205, libmatchbox/trunk/PKGBUILD)
libmatchbox/repos/community-x86_64/libpng15.patch
(from rev 100205, libmatchbox/trunk/libpng15.patch)
Deleted:
libmatchbox/repos/community-i686/PKGBUILD
libmatchbox/repos/community-i686/libpng15.patch
libmatchbox/repos/community-x86_64/PKGBUILD
libmatchbox/repos/community-x86_64/libpng15.patch
---------------------------------+
/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++
/libpng15.patch | 46 ++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 27 -------------------
community-i686/libpng15.patch | 23 ----------------
community-x86_64/PKGBUILD | 27 -------------------
community-x86_64/libpng15.patch | 23 ----------------
6 files changed, 100 insertions(+), 100 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-11-01 21:15:37 UTC (rev 100205)
+++ community-i686/PKGBUILD 2013-11-01 21:15:51 UTC (rev 100206)
@@ -1,27 +0,0 @@
-# $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')
-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-i686/PKGBUILD (from rev 100205, libmatchbox/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-11-01 21:15:51 UTC (rev 100206)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Henrique C. Alves <hcarvalhoalves at gmail.com>
+
+pkgname=libmatchbox
+pkgver=1.10
+pkgrel=3
+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')
+
+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
+}
Deleted: community-i686/libpng15.patch
===================================================================
--- community-i686/libpng15.patch 2013-11-01 21:15:37 UTC (rev 100205)
+++ community-i686/libpng15.patch 2013-11-01 21:15:51 UTC (rev 100206)
@@ -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
Copied: libmatchbox/repos/community-i686/libpng15.patch (from rev 100205, libmatchbox/trunk/libpng15.patch)
===================================================================
--- community-i686/libpng15.patch (rev 0)
+++ community-i686/libpng15.patch 2013-11-01 21:15:51 UTC (rev 100206)
@@ -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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-11-01 21:15:37 UTC (rev 100205)
+++ community-x86_64/PKGBUILD 2013-11-01 21:15:51 UTC (rev 100206)
@@ -1,27 +0,0 @@
-# $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')
-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-x86_64/PKGBUILD (from rev 100205, libmatchbox/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-11-01 21:15:51 UTC (rev 100206)
@@ -0,0 +1,27 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Henrique C. Alves <hcarvalhoalves at gmail.com>
+
+pkgname=libmatchbox
+pkgver=1.10
+pkgrel=3
+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')
+
+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
+}
Deleted: community-x86_64/libpng15.patch
===================================================================
--- community-x86_64/libpng15.patch 2013-11-01 21:15:37 UTC (rev 100205)
+++ community-x86_64/libpng15.patch 2013-11-01 21:15:51 UTC (rev 100206)
@@ -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
Copied: libmatchbox/repos/community-x86_64/libpng15.patch (from rev 100205, libmatchbox/trunk/libpng15.patch)
===================================================================
--- community-x86_64/libpng15.patch (rev 0)
+++ community-x86_64/libpng15.patch 2013-11-01 21:15:51 UTC (rev 100206)
@@ -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
More information about the arch-commits
mailing list