[arch-commits] Commit in fvwm-devel/repos (4 files)

Eric Bélanger eric at archlinux.org
Tue Jan 19 23:32:41 EST 2010


    Date: Tuesday, January 19, 2010 @ 23:32:41
  Author: eric
Revision: 64387

Merged revisions 64386 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/fvwm-devel/trunk

........
  r64386 | eric | 2010-01-19 23:32:05 -0500 (Tue, 19 Jan 2010) | 2 lines
  
  upgpkg: fvwm-devel 2.5.28-3
      Fixed libpng patch
........

Added:
  fvwm-devel/repos/testing-i686/libpng-1.4.patch
    (from rev 64386, fvwm-devel/trunk/libpng-1.4.patch)
Modified:
  fvwm-devel/repos/testing-i686/	(properties)
  fvwm-devel/repos/testing-i686/ChangeLog
  fvwm-devel/repos/testing-i686/PKGBUILD

------------------+
 ChangeLog        |    5 +++++
 PKGBUILD         |    6 +++---
 libpng-1.4.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 3 deletions(-)


Property changes on: fvwm-devel/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /fvwm-devel/trunk:1-63932
   + /fvwm-devel/trunk:1-64386

Modified: testing-i686/ChangeLog
===================================================================
--- testing-i686/ChangeLog	2010-01-20 04:32:05 UTC (rev 64386)
+++ testing-i686/ChangeLog	2010-01-20 04:32:41 UTC (rev 64387)
@@ -1,3 +1,8 @@
+2010-01-19  Eric Belanger  <eric at archlinux.org>
+
+	* fvwm-devel 2.5.28-3
+	* Fixed libpng patch
+
 2010-01-18  Eric Belanger  <eric at archlinux.org>
 
 	* fvwm-devel 2.5.28-2

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2010-01-20 04:32:05 UTC (rev 64386)
+++ testing-i686/PKGBUILD	2010-01-20 04:32:41 UTC (rev 64387)
@@ -4,7 +4,7 @@
 
 pkgname=fvwm-devel
 pkgver=2.5.28
-pkgrel=2
+pkgrel=3
 pkgdesc="A multiple large virtual desktop window manager originally derived from twm"
 arch=('i686' 'x86_64')
 url="http://www.fvwm.org"
@@ -15,9 +15,9 @@
 provides=("fvwm=${pkgver}")
 source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop libpng-1.4.patch)
 md5sums=('8e11fa4f752c568b392973d13af993df' '3f5bcb246e035ff29aa5bf54487a3db4'\
-         'e96c92f76f6aa4ba2a22bff67d45c15f')
+         '3fa46769c46fb8d05552c00ad37ccd2c')
 sha1sums=('26b83b88656faa3d21ab55544269954e534abe08' '17db773870637b410ceb4f68743dbd517bc5c599'\
-         'cbedadc8d75bda3f2cdf505398811069a7a31796')
+         'b07fd3f5dd0fcd9826a80a0a9cc838ad28ea3fd6')
 
 build() {
   cd "${srcdir}/fvwm-${pkgver}"

Copied: fvwm-devel/repos/testing-i686/libpng-1.4.patch (from rev 64386, fvwm-devel/trunk/libpng-1.4.patch)
===================================================================
--- testing-i686/libpng-1.4.patch	                        (rev 0)
+++ testing-i686/libpng-1.4.patch	2010-01-20 04:32:41 UTC (rev 64387)
@@ -0,0 +1,42 @@
+diff -Naur fvwm-2.5.28-orig/libs/PictureImageLoader.c fvwm-2.5.28/libs/PictureImageLoader.c
+--- fvwm-2.5.28-orig/libs/PictureImageLoader.c	2010-01-19 23:04:51.000000000 -0500
++++ fvwm-2.5.28/libs/PictureImageLoader.c	2010-01-19 23:09:12.000000000 -0500
+@@ -417,7 +417,7 @@
+ 		return False;
+ 	}
+ 	fread(buf, 1, FPNG_BYTES_TO_CHECK, f);
+-	if (!Fpng_check_sig(buf, FPNG_BYTES_TO_CHECK))
++	if (Fpng_sig_cmp(buf, 0, FPNG_BYTES_TO_CHECK))
+ 	{
+ 		fclose(f);
+ 		return False;
+@@ -503,7 +503,7 @@
+ 		Fpng_set_gray_to_rgb(Fpng_ptr);
+ 		if (Fpng_get_bit_depth(Fpng_ptr, Finfo_ptr) < 8)
+ 		{
+-			Fpng_set_gray_1_2_4_to_8(Fpng_ptr);
++			Fpng_set_expand_gray_1_2_4_to_8(Fpng_ptr);
+ 		}
+ 	}
+ 	for (i = 0; i < h; i++)
+diff -Naur fvwm-2.5.28-orig/libs/Fpng.h fvwm-2.5.28/libs/Fpng.h
+--- fvwm-2.5.28-orig/libs/Fpng.h	2010-01-19 23:13:34.000000000 -0500
++++ fvwm-2.5.28/libs/Fpng.h	2010-01-19 23:15:57.000000000 -0500
+@@ -429,7 +429,7 @@
+ #define FPNG_FILLER_AFTER PNG_FILLER_AFTER
+ #define FPNG_INFO_tRNS PNG_INFO_tRNS
+ 
+-#define Fpng_check_sig(a,b) png_check_sig(a,b)
++#define Fpng_sig_cmp(a,b,c) png_sig_cmp(a,b,c)
+ #define Fpng_create_read_struct(a,b,c,d) png_create_read_struct(a,b,c,d)
+ #define Fpng_create_info_struct(a) png_create_info_struct(a)
+ #define Fpng_destroy_read_struct(a,b,c) png_destroy_read_struct(a,b,c)
+@@ -444,7 +444,7 @@
+ #define Fpng_set_packing(a) png_set_packing(a)
+ #define Fpng_set_gray_to_rgb(a) png_set_gray_to_rgb(a)
+ #define Fpng_get_bit_depth(a,b) png_get_bit_depth(a,b)
+-#define Fpng_set_gray_1_2_4_to_8(a) png_set_gray_1_2_4_to_8(a)
++#define Fpng_set_expand_gray_1_2_4_to_8(a) png_set_expand_gray_1_2_4_to_8(a)
+ #define Fpng_get_valid(a,b,c) png_get_valid(a,b,c)
+ #define Fpng_read_end(a,b) png_read_end(a,b)
+ #define Fpng_set_interlace_handling(a) png_set_interlace_handling(a)



More information about the arch-commits mailing list