Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
gtk+-2.16.6のパッチ
--- gtk+-2.16.6/configure.orig 2012-05-03 04:28:31 +0900
+++ gtk+-2.16.6/configure 2012-05-03 13:30:22 +0900
@@ -25484,14 +25484,14 @@
fi
if test x$with_libpng != xno && test -z "$LIBPNG"; then
- { $as_echo "$as_me:$LINENO: checking for libpng12" >&5
-$as_echo_n "checking for libpng12... " >&6; }
- if $PKG_CONFIG --exists libpng12 ; then
+ { $as_echo "$as_me:$LINENO: checking for libpng15" >&5
+$as_echo_n "checking for libpng15... " >&6; }
+ if $PKG_CONFIG --exists libpng15 ; then
{ $as_echo "$as_me:$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:$LINENO: result: no" >&5
$as_echo "no" >&6; }
--- gtk+-2.16.6/gdk-pixbuf/io-png.c.orig 2012-05-03 04:28:49 +0900
+++ gtk+-2.16.6/gdk-pixbuf/io-png.c 2012-05-03 05:04:06 +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;
}
--- gtk+-2.16.6/tests/Makefile.in.orig 2012-05-03 15:30:42 +0900
+++ gtk+-2.16.6/tests/Makefile.in 2012-05-03 15:34:14 +0900
@@ -533,7 +533,7 @@
@HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc
@HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers $(am__append_2)
-@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@autotestkeywords_CXXFLAGS = -x objective-c++
+#@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE@autotestkeywords_CXXFLAGS = -x objective-c++
simple_DEPENDENCIES = $(TEST_DEPS)
print_editor_DEPENDENCIES = $(TEST_DEPS)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment