Created
May 3, 2012 06:48
-
-
Save 7shi/2583844 to your computer and use it in GitHub Desktop.
gtk+-2.18.9のパッチ
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- gtk+-2.18.9/configure.orig 2012-05-03 15:17:33 +0900 | |
+++ gtk+-2.18.9/configure 2012-05-03 15:17:59 +0900 | |
@@ -21731,14 +21731,14 @@ | |
fi | |
if test x$with_libpng != xno && test -z "$LIBPNG"; then | |
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5 | |
-$as_echo_n "checking for libpng12... " >&6; } | |
- if $PKG_CONFIG --exists libpng12 ; then | |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng15" >&5 | |
+$as_echo_n "checking for libpng15... " >&6; } | |
+ if $PKG_CONFIG --exists libpng15 ; then | |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |
$as_echo "yes" >&6; } | |
PNG='png' | |
- PNG_DEP_CFLAGS_PACKAGES=libpng12 | |
- LIBPNG=`$PKG_CONFIG --libs libpng12` | |
+ PNG_DEP_CFLAGS_PACKAGES=libpng15 | |
+ LIBPNG=`$PKG_CONFIG --libs libpng15` | |
else | |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
$as_echo "no" >&6; } | |
--- gtk+-2.18.9/gdk-pixbuf/io-png.c.orig 2012-05-03 15:18:18 +0900 | |
+++ gtk+-2.18.9/gdk-pixbuf/io-png.c 2012-05-03 15:46:11 +0900 | |
@@ -184,7 +184,7 @@ | |
error_msg); | |
} | |
- longjmp (png_save_ptr->jmpbuf, 1); | |
+ png_longjmp (png_save_ptr, 1); | |
} | |
static void | |
@@ -282,7 +282,7 @@ | |
return NULL; | |
} | |
- if (setjmp (png_ptr->jmpbuf)) { | |
+ if (setjmp (png_jmpbuf(png_ptr))) { | |
g_free (rows); | |
if (pixbuf) | |
@@ -442,7 +442,7 @@ | |
return NULL; | |
} | |
- if (setjmp (lc->png_read_ptr->jmpbuf)) { | |
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { | |
if (lc->png_info_ptr) | |
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); | |
g_free(lc); | |
@@ -514,7 +514,7 @@ | |
lc->error = error; | |
/* Invokes our callbacks as needed */ | |
- if (setjmp (lc->png_read_ptr->jmpbuf)) { | |
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { | |
lc->error = NULL; | |
return FALSE; | |
} else { | |
@@ -734,7 +734,7 @@ | |
error_msg); | |
} | |
- longjmp (png_read_ptr->jmpbuf, 1); | |
+ png_longjmp (png_read_ptr, 1); | |
} | |
static void | |
@@ -924,7 +924,7 @@ | |
success = FALSE; | |
goto cleanup; | |
} | |
- if (setjmp (png_ptr->jmpbuf)) { | |
+ if (setjmp (png_jmpbuf(png_ptr))) { | |
success = FALSE; | |
goto cleanup; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- gtk+-2.18.9/tests/Makefile.in.orig 2012-05-03 15:39:14 +0900 | |
+++ gtk+-2.18.9/tests/Makefile.in 2012-05-03 15:39:41 +0900 | |
@@ -72,7 +72,7 @@ | |
$(am__EXEEXT_3) | |
@HAVE_CXX_TRUE@am__append_1 = autotestkeywords | |
@HAVE_CXX_TRUE@TESTS = autotestkeywords$(EXEEXT) | |
-@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 -x objective-c++ | |
+#@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@am__append_2 = -DHAVE_OBJC=1 -x objective-c++ | |
subdir = tests | |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | |
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment