| 1 |
joker 11/01/31 08:37:00 |
| 2 |
|
| 3 |
Added: qrencode-3.1.1-pngregenfix.patch |
| 4 |
Log: |
| 5 |
Replace the libpng 1.4 sed fix with a patch, because autoreconf would require SDL to regen the build files. No version bump because already installed versions are not affected. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: qrencode-3.1.1-pngregenfix.patch |
| 16 |
=================================================================== |
| 17 |
diff -ruN qrencode-3.1.1-orig/Makefile.am qrencode-3.1.1/Makefile.am |
| 18 |
--- qrencode-3.1.1-orig/Makefile.am 2010-01-19 21:13:25.000000000 +0100 |
| 19 |
+++ qrencode-3.1.1/Makefile.am 2011-01-31 09:21:17.000000000 +0100 |
| 20 |
@@ -24,7 +24,7 @@ |
| 21 |
pkgconfig_DATA = libqrencode.pc |
| 22 |
|
| 23 |
EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \ |
| 24 |
- Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \ |
| 25 |
+ Makefile.am qrencode.spec.in qrencode.spec \ |
| 26 |
qrencode.1.in Doxyfile tests/test_all.sh |
| 27 |
|
| 28 |
if BUILD_TOOLS |
| 29 |
diff -ruN qrencode-3.1.1-orig/configure.ac qrencode-3.1.1/configure.ac |
| 30 |
--- qrencode-3.1.1-orig/configure.ac 2010-02-03 01:42:12.000000000 +0100 |
| 31 |
+++ qrencode-3.1.1/configure.ac 2011-01-31 09:21:17.000000000 +0100 |
| 32 |
@@ -29,14 +29,14 @@ |
| 33 |
AC_PROG_LIBTOOL |
| 34 |
PKG_PROG_PKG_CONFIG |
| 35 |
|
| 36 |
-AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1]) |
| 37 |
+AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1]) |
| 38 |
|
| 39 |
dnl --with-tools |
| 40 |
AC_ARG_WITH([tools], [AC_HELP_STRING([--with-tools], [build utility tools [default=yes]])], |
| 41 |
[build_tools=$withval], [build_tools=yes]) |
| 42 |
AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ]) |
| 43 |
if test x$build_tools = xyes ; then |
| 44 |
- PKG_CHECK_MODULES(png, "libpng12") |
| 45 |
+ PKG_CHECK_MODULES(png, "libpng") |
| 46 |
fi |
| 47 |
|
| 48 |
dnl --with-tests |
| 49 |
@@ -54,12 +54,6 @@ |
| 50 |
fi |
| 51 |
|
| 52 |
|
| 53 |
-if test x$build_tests = xyes ; then |
| 54 |
- SDL_REQUIRED_VERSION=1.2.0 |
| 55 |
- AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.])) |
| 56 |
-fi |
| 57 |
-AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ]) |
| 58 |
- |
| 59 |
|
| 60 |
dnl --enable-gprof |
| 61 |
AC_ARG_ENABLE([gprof], [AC_HELP_STRING([--enable-gprof], [generate extra code to write profile information suitable for gprof [default=no]])], |
Archives