[arch-commits] Commit in mrxvt/trunk (PKGBUILD libpng14.patch)

Ionut Biru ibiru at archlinux.org
Sat Jan 30 09:58:32 EST 2010


    Date: Saturday, January 30, 2010 @ 09:58:32
  Author: ibiru
Revision: 65510

upgpkg: mrxvt 0.5.4-3
    proper rebuild against libpng/libjpeg and bump pkgrel

Added:
  mrxvt/trunk/libpng14.patch
Modified:
  mrxvt/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 ++++++++-----
 libpng14.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-30 14:40:59 UTC (rev 65509)
+++ PKGBUILD	2010-01-30 14:58:32 UTC (rev 65510)
@@ -5,24 +5,27 @@
 
 pkgname=mrxvt
 pkgver=0.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-tabbed X terminal emulator based on rxvt code (also known as materm)"
 arch=('i686' 'x86_64')
-url="http://materm.sourceforge.net/wiki/pmwiki.php"
+url="http://materm.sourceforge.net"
 license=('GPL')
-depends=('libpng' 'libjpeg>=7' 'libxft' 'libxpm')
+depends=('libpng' 'libjpeg' 'libxft' 'libxpm')
 replaces=('materm')
 backup=('etc/mrxvt/mrxvtrc' 'etc/mrxvt/submenus.menu' 'etc/mrxvt/default.menu')
 source=(http://downloads.sourceforge.net/materm/${pkgname}-${pkgver}.tar.gz
 	mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
-	mrxvt.desktop)
+	mrxvt.desktop libpng14.patch)
 md5sums=('0232c8868484751dcb931a28f0756f69'
 	'2b6ecc9d68185e56a50eca0a2548fa8b'
-	'6ba3bcd484c8dad1b0b48465ded54de3')
+	'6ba3bcd484c8dad1b0b48465ded54de3'
+	'3465d6b86d550e9aa868a918d2e4e3f2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p0 < ../mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch || return 1
+  patch -Np1 -i $srcdir/libpng14.patch || return 1
+  autoreconf -fi || return 1
   # mrxvt is not a default xterm emulator, let's add some fancy options here, ey
   ./configure --prefix=/usr --sysconfdir=/etc --enable-xft --enable-text-shadow \
     --enable-transparency --enable-smart-resize --enable-menubar \

Added: libpng14.patch
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2010-01-30 14:58:32 UTC (rev 65510)
@@ -0,0 +1,33 @@
+diff -Nur mrxvt-0.5.4.old/configure.ac mrxvt-0.5.4/configure.ac
+--- mrxvt-0.5.4.old/configure.ac	2008-05-12 20:21:56.000000000 +0300
++++ mrxvt-0.5.4/configure.ac	2010-01-30 16:51:04.000000000 +0200
+@@ -952,7 +952,7 @@
+ if test "x$support_png" = "xyes"; then
+     AC_CHECK_LIB(
+         png,
+-        png_check_sig,
++        png_sig_cmp,
+         [],
+         [support_png=no],
+         [-lz -lm]
+diff -Nur mrxvt-0.5.4.old/src/mpng.c mrxvt-0.5.4/src/mpng.c
+--- mrxvt-0.5.4.old/src/mpng.c	2008-02-18 00:04:50.000000000 +0200
++++ mrxvt-0.5.4/src/mpng.c	2010-01-30 16:55:28.000000000 +0200
+@@ -83,7 +83,7 @@
+     display_depth = XDefaultDepth(display,XDefaultScreen(display));
+ 
+     fread(sig, 1, 8, ifile);
+-    if (!png_check_sig(sig, 8)){
++    if (png_sig_cmp(sig, 0, 8)){
+       fclose(ifile);
+       return -1;
+     }
+@@ -113,7 +113,7 @@
+ 
+     if (png_depth < 8){
+       if (png_color_type == PNG_COLOR_TYPE_GRAY ){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         png_row_bytes = png_width;
+       }else{
+         png_set_expand(png_ptr);



More information about the arch-commits mailing list