Date: Friday, May 14, 2010 @ 19:29:59 Author: eric Revision: 80286 upgpkg: fvwm-devel 2.5.30-1 Upstream update, Removed old patch
Modified: fvwm-devel/trunk/ChangeLog fvwm-devel/trunk/PKGBUILD Deleted: fvwm-devel/trunk/libpng-1.4.patch ------------------+ ChangeLog | 5 +++++ PKGBUILD | 15 ++++++++------- libpng-1.4.patch | 42 ------------------------------------------ 3 files changed, 13 insertions(+), 49 deletions(-) Modified: ChangeLog =================================================================== --- ChangeLog 2010-05-14 22:52:23 UTC (rev 80285) +++ ChangeLog 2010-05-14 23:29:59 UTC (rev 80286) @@ -1,3 +1,8 @@ +2010-05-13 Eric Belanger <e...@archlinux.org> + + * fvwm-devel 2.5.30-1 + * Upstream update + 2010-04-07 Eric Belanger <e...@archlinux.org> * fvwm-devel 2.5.29-1 Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-14 22:52:23 UTC (rev 80285) +++ PKGBUILD 2010-05-14 23:29:59 UTC (rev 80286) @@ -3,7 +3,7 @@ # Contributor: Tobias Kieslich <tob...@archlinux.org> pkgname=fvwm-devel -pkgver=2.5.29 +pkgver=2.5.30 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') @@ -13,17 +13,18 @@ makedepends=('pkgconfig') conflicts=('fvwm') provides=("fvwm=${pkgver}") -source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop libpng-1.4.patch) -md5sums=('3755c7e2acfa722b06ed86160c9fe902' '3f5bcb246e035ff29aa5bf54487a3db4'\ - '3fa46769c46fb8d05552c00ad37ccd2c') -sha1sums=('1a651c438b16f118eeda4e9b3c1c31554dca4086' '17db773870637b410ceb4f68743dbd517bc5c599'\ - 'b07fd3f5dd0fcd9826a80a0a9cc838ad28ea3fd6') +source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/fvwm-${pkgver}.tar.bz2 fvwm-devel.desktop) +md5sums=('9d1f787e5ad5a8f886a8e711ec2e5690' '3f5bcb246e035ff29aa5bf54487a3db4') +sha1sums=('fcc082c8e13b262bb4f86f24ed8142a77c10b4f3' '17db773870637b410ceb4f68743dbd517bc5c599') build() { cd "${srcdir}/fvwm-${pkgver}" - patch -p1 < ../libpng-1.4.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --with-stroke-library || return 1 make || return 1 +} + +package() { + cd "${srcdir}/fvwm-${pkgver}" make DESTDIR="${pkgdir}" install || return 1 install -d "${pkgdir}/etc/fvwm" Deleted: libpng-1.4.patch =================================================================== --- libpng-1.4.patch 2010-05-14 22:52:23 UTC (rev 80285) +++ libpng-1.4.patch 2010-05-14 23:29:59 UTC (rev 80286) @@ -1,42 +0,0 @@ -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)