diff options
| author | kwm <kwm@FreeBSD.org> | 2010-05-16 00:05:44 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2010-05-16 00:05:44 +0800 |
| commit | 08512d39ca6c540475e6aab01a1934a8f2db1b8e (patch) | |
| tree | e56784803c7bfb613d103b49cff329971e079d5a | |
| parent | 48d5017aa04177a87b4e144f95f9f84024ad1aab (diff) | |
| download | freebsd-ports-gnome-08512d39ca6c540475e6aab01a1934a8f2db1b8e.tar.gz freebsd-ports-gnome-08512d39ca6c540475e6aab01a1934a8f2db1b8e.tar.zst freebsd-ports-gnome-08512d39ca6c540475e6aab01a1934a8f2db1b8e.zip | |
Gtk 2.20.x got a bug fix because libpng 1.2 defines png_guint_32 as
unsigned long. However png 1.4.x fixed the problem with
Submitted by: nox@
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c | 26 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c | 26 |
4 files changed, 54 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 5c3b740e994a..b498cb7ea57e 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.20.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c new file mode 100644 index 000000000000..cca139d6b99a --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_io-png.c @@ -0,0 +1,26 @@ +--- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200 ++++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200 +@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr + gchar *icc_profile_base64; + const gchar *icc_profile_title; + const gchar *icc_profile; ++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL) ++ guint icc_profile_size; ++#else + gulong icc_profile_size; ++#endif + guint32 retval; + gint compression_type; + +@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea + gchar *icc_profile_base64; + const gchar *icc_profile_title; + const gchar *icc_profile; ++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL) ++ guint icc_profile_size; ++#else + gulong icc_profile_size; ++#endif + guint32 retval; + gint compression_type; + diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 5c3b740e994a..b498cb7ea57e 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.20.1 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c new file mode 100644 index 000000000000..cca139d6b99a --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_io-png.c @@ -0,0 +1,26 @@ +--- gdk-pixbuf/io-png.c.orig 2010-05-02 05:14:27.000000000 +0200 ++++ gdk-pixbuf/io-png.c 2010-05-15 17:30:35.000000000 +0200 +@@ -261,7 +261,11 @@ gdk_pixbuf__png_image_load (FILE *f, GEr + gchar *icc_profile_base64; + const gchar *icc_profile_title; + const gchar *icc_profile; ++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL) ++ guint icc_profile_size; ++#else + gulong icc_profile_size; ++#endif + guint32 retval; + gint compression_type; + +@@ -607,7 +611,11 @@ png_info_callback (png_structp png_rea + gchar *icc_profile_base64; + const gchar *icc_profile_title; + const gchar *icc_profile; ++#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL) ++ guint icc_profile_size; ++#else + gulong icc_profile_size; ++#endif + guint32 retval; + gint compression_type; + |