diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
| commit | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch) | |
| tree | f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra/qrencode/libpng14.diff | |
| parent | 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff) | |
Tue Aug 2 04:35:55 UTC 2011
Diffstat (limited to 'extra/qrencode/libpng14.diff')
| -rw-r--r-- | extra/qrencode/libpng14.diff | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/extra/qrencode/libpng14.diff b/extra/qrencode/libpng14.diff new file mode 100644 index 000000000..eadf68dde --- /dev/null +++ b/extra/qrencode/libpng14.diff @@ -0,0 +1,65 @@ +diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure qrencode-3.1.1-ok/configure +--- qrencode-3.1.1/configure 2010-02-02 19:43:16.000000000 -0500 ++++ qrencode-3.1.1-ok/configure 2010-02-03 21:41:43.205709796 -0500 +@@ -11445,12 +11445,12 @@ + pkg_cv_png_CFLAGS="$png_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 +- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null` ++ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng14"" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11463,12 +11463,12 @@ + pkg_cv_png_LIBS="$png_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\""; } >&5 +- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"libpng14\"\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors ""libpng14"") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null` ++ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng14"" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -11487,14 +11487,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""` ++ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng14""` + else +- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""` ++ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng14""` + fi + # Put the nasty error message in config.log where it belongs + echo "$png_PKG_ERRORS" >&5 + +- as_fn_error "Package requirements (\"libpng12\") were not met: ++ as_fn_error "Package requirements (\"libpng14\") were not met: + + $png_PKG_ERRORS + +diff -U 3 -H -d -r -N -- qrencode-3.1.1/configure.ac qrencode-3.1.1-ok/configure.ac +--- qrencode-3.1.1/configure.ac 2010-02-02 19:42:12.000000000 -0500 ++++ qrencode-3.1.1-ok/configure.ac 2010-02-03 21:42:07.202419056 -0500 +@@ -36,7 +36,7 @@ + [build_tools=$withval], [build_tools=yes]) + AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ]) + if test x$build_tools = xyes ; then +- PKG_CHECK_MODULES(png, "libpng12") ++ PKG_CHECK_MODULES(png, "libpng14") + fi + + dnl --with-tests |