diff options
author | wiz <wiz@pkgsrc.org> | 2011-04-01 15:31:33 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2011-04-01 15:31:33 +0000 |
commit | c0b6489bcb57788004c6d58af3b1b474820b3137 (patch) | |
tree | 2f504bef1f81301b2b7cf061983c418fb3a7a3ab /games | |
parent | bd73396860605abb3b1e88716d4363afdd690b82 (diff) | |
download | pkgsrc-c0b6489bcb57788004c6d58af3b1b474820b3137.tar.gz |
Fix the crossfire-client* packages for png-1.5.
Diffstat (limited to 'games')
-rw-r--r-- | games/crossfire-client/Makefile.common | 4 | ||||
-rw-r--r-- | games/crossfire-client/distinfo | 5 | ||||
-rw-r--r-- | games/crossfire-client/patches/patch-gtk-v2_src_png.c | 15 | ||||
-rw-r--r-- | games/crossfire-client/patches/patch-gtk_png.c | 15 | ||||
-rw-r--r-- | games/crossfire-client/patches/patch-x11_png.c | 24 |
5 files changed, 60 insertions, 3 deletions
diff --git a/games/crossfire-client/Makefile.common b/games/crossfire-client/Makefile.common index 0ab5018b9dd..fd267f14180 100644 --- a/games/crossfire-client/Makefile.common +++ b/games/crossfire-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2011/01/12 10:36:43 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2011/04/01 15:31:33 wiz Exp $ # used by games/crossfire-client/Makefile # used by games/crossfire-client-gtk/Makefile # used by games/crossfire-client-gtk2/Makefile @@ -13,7 +13,7 @@ HOMEPAGE= http://crossfire.real-time.com/ CROSSFIRE_VERSION= 1.11.0 DISTINFO_FILE= ${.CURDIR}/../../games/crossfire-client/distinfo -#PATCHDIR= ${.CURDIR}/../../games/crossfire-client/patches +PATCHDIR= ${.CURDIR}/../../games/crossfire-client/patches PKG_DESTDIR_SUPPORT= user-destdir diff --git a/games/crossfire-client/distinfo b/games/crossfire-client/distinfo index 64840462581..e4899d8e958 100644 --- a/games/crossfire-client/distinfo +++ b/games/crossfire-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2008/11/04 08:36:34 adam Exp $ +$NetBSD: distinfo,v 1.3 2011/04/01 15:31:33 wiz Exp $ SHA1 (crossfire-client-1.11.0.tar.gz) = 934618207de854841c3e4673f896e9784ee70073 RMD160 (crossfire-client-1.11.0.tar.gz) = 9fffcd301c0f32a583b5f6e5a9db77c7900d1cd7 @@ -9,3 +9,6 @@ Size (crossfire-client-images-1.11.0.tar.gz) = 2731254 bytes SHA1 (crossfire-client-sounds-1.11.0.tar.gz) = a6e2d6b7b00ef610ffc8b3462cf51655415791b6 RMD160 (crossfire-client-sounds-1.11.0.tar.gz) = 85250759a46927ea45976e86acb26c6b61c7686c Size (crossfire-client-sounds-1.11.0.tar.gz) = 322847 bytes +SHA1 (patch-gtk-v2_src_png.c) = 07fd35221a197124203daa066e687fe282190f3d +SHA1 (patch-gtk_png.c) = 56bbe0d69725b9401754368b72776efa53df18d2 +SHA1 (patch-x11_png.c) = c04898bcd7d14f311f3d2a10431c9dfb651ef982 diff --git a/games/crossfire-client/patches/patch-gtk-v2_src_png.c b/games/crossfire-client/patches/patch-gtk-v2_src_png.c new file mode 100644 index 00000000000..87c1598727e --- /dev/null +++ b/games/crossfire-client/patches/patch-gtk-v2_src_png.c @@ -0,0 +1,15 @@ +$NetBSD: patch-gtk-v2_src_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $ + +Fix build with png-1.5. + +--- gtk-v2/src/png.c.orig 2008-01-29 07:29:07.000000000 +0000 ++++ gtk-v2/src/png.c +@@ -532,7 +532,7 @@ int png_to_gdkpixmap(GdkWindow *window, + png_destroy_read_struct (&png_ptr, NULL, NULL); + return PNGX_OUTOFMEM; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr,NULL); + return PNGX_DATA; + } diff --git a/games/crossfire-client/patches/patch-gtk_png.c b/games/crossfire-client/patches/patch-gtk_png.c new file mode 100644 index 00000000000..cd6cfb57a30 --- /dev/null +++ b/games/crossfire-client/patches/patch-gtk_png.c @@ -0,0 +1,15 @@ +$NetBSD: patch-gtk_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $ + +Fix build with png-1.5. + +--- gtk/png.c.orig 2008-01-29 07:29:04.000000000 +0000 ++++ gtk/png.c +@@ -86,7 +86,7 @@ uint8 *png_to_data(uint8 *data, int len, + png_destroy_read_struct (&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, NULL); + return NULL; + } diff --git a/games/crossfire-client/patches/patch-x11_png.c b/games/crossfire-client/patches/patch-x11_png.c new file mode 100644 index 00000000000..92e3784b41b --- /dev/null +++ b/games/crossfire-client/patches/patch-x11_png.c @@ -0,0 +1,24 @@ +$NetBSD: patch-x11_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $ + +Fix build with png-1.5. + +--- x11/png.c.orig 2008-01-29 07:29:06.000000000 +0000 ++++ x11/png.c +@@ -88,7 +88,7 @@ uint8 *png_to_data(unsigned char *data, + png_destroy_read_struct (&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, NULL); + return NULL; + } +@@ -600,7 +600,7 @@ int png_to_xpixmap(Display *display, Dra + png_destroy_read_struct (&png_ptr, NULL, NULL); + return PNGX_OUTOFMEM; + } +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, NULL); + return PNGX_DATA; + } |