Hello community, here is the log from the commit of package fvwm2 for openSUSE:Factory checked in at Sun Apr 4 20:06:09 CEST 2010. -------- --- fvwm2/fvwm2.changes 2009-12-28 18:39:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/fvwm2/fvwm2.changes 2010-04-04 18:56:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 4 18:55:54 CEST 2010 - ro@suse.de + +- fix build with libpng14 (replace long deprecated functions) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fvwm-2.5.26-libpng.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fvwm2.spec ++++++ --- /var/tmp/diff_new_pack.DCSa7I/_old 2010-04-04 20:05:50.000000000 +0200 +++ /var/tmp/diff_new_pack.DCSa7I/_new 2010-04-04 20:05:50.000000000 +0200 @@ -26,7 +26,7 @@ Obsoletes: fvwm xpmroot AutoReqProv: on Version: 2.5.26 -Release: 42 +Release: 43 Summary: Improved Version of FVWM Window Manager Url: http://www.fvwm.org Source0: fvwm-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Patch3: fvwm-%{version}-sv_SE.patch Patch4: fvwm-%{version}-utf_encoding.patch Patch5: fvwm-%{version}-charset_in_title.patch +Patch6: fvwm-2.5.26-libpng.patch %description FVWM is a virtual desktop window manager for the X Window System. @@ -80,6 +81,7 @@ %patch2 %patch3 %patch5 +%patch6 find . -name *sv_SE* |xargs rename sv_SE sv mkdir icons tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2 ++++++ fvwm-2.5.26-libpng.patch ++++++ --- libs/Fpng.h +++ libs/Fpng.h @@ -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) @@ -462,7 +462,7 @@ #define FPNG_FILLER_AFTER 5 #define FPNG_INFO_tRNS 7 -#define Fpng_check_sig(a,b) 0 +#define Fpng_sig_cmp(a,b,c) 0 #define Fpng_create_read_struct(a,b,c,d) NULL #define Fpng_create_info_struct(a) NULL #define Fpng_destroy_read_struct(a,b,c) @@ -477,7 +477,7 @@ #define Fpng_set_packing(a) #define Fpng_set_gray_to_rgb(a) #define Fpng_get_bit_depth(a,b) 0 -#define Fpng_set_gray_1_2_4_to_8(a) +#define Fpng_set_expand_gray_1_2_4_to_8(a) #define Fpng_get_valid(a,b,c) 0 #define Fpng_read_end(a,b) #define Fpng_set_interlace_handling(a) 0 --- libs/PictureImageLoader.c +++ libs/PictureImageLoader.c @@ -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++) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org