From bc0657f7159d0b01373ecb59afc426b98a172b1e Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Thu, 1 Dec 2011 14:10:29 +0000
Subject: Thu Dec  1 14:10:27 UTC 2011

---
 extra/qrencode/libpng14.diff | 65 --------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 extra/qrencode/libpng14.diff

(limited to 'extra/qrencode/libpng14.diff')

diff --git a/extra/qrencode/libpng14.diff b/extra/qrencode/libpng14.diff
deleted file mode 100644
index eadf68dde..000000000
--- a/extra/qrencode/libpng14.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-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
-- 
cgit v1.2.3-54-g00ecf