diff options
Diffstat (limited to 'media-gfx/qrencode')
| -rw-r--r-- | media-gfx/qrencode/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch | 45 | ||||
| -rw-r--r-- | media-gfx/qrencode/qrencode-3.1.1.ebuild | 11 |
3 files changed, 57 insertions, 9 deletions
diff --git a/media-gfx/qrencode/ChangeLog b/media-gfx/qrencode/ChangeLog index ef32d8aa8ea8..9a9449185bde 100644 --- a/media-gfx/qrencode/ChangeLog +++ b/media-gfx/qrencode/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/qrencode -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.9 2010/09/29 15:13:39 ranger Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/ChangeLog,v 1.10 2011/01/31 08:37:00 joker Exp $ + + 31 Jan 2011; Christian Birchinger <joker@gentoo.org> + qrencode-3.1.1.ebuild, +files/qrencode-3.1.1-pngregenfix.patch: + 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. 29 Sep 2010; Brent Baude <ranger@gentoo.org> qrencode-3.1.1.ebuild: Marking qrencode-3.1.1 ~ppc for bug 338861 diff --git a/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch new file mode 100644 index 000000000000..9791c09b6407 --- /dev/null +++ b/media-gfx/qrencode/files/qrencode-3.1.1-pngregenfix.patch @@ -0,0 +1,45 @@ +diff -ruN qrencode-3.1.1-orig/Makefile.am qrencode-3.1.1/Makefile.am +--- qrencode-3.1.1-orig/Makefile.am 2010-01-19 21:13:25.000000000 +0100 ++++ qrencode-3.1.1/Makefile.am 2011-01-31 09:21:17.000000000 +0100 +@@ -24,7 +24,7 @@ + pkgconfig_DATA = libqrencode.pc + + EXTRA_DIST = libqrencode.pc.in autogen.sh configure.ac acinclude.m4 \ +- Makefile.am tests/Makefile.am qrencode.spec.in qrencode.spec \ ++ Makefile.am qrencode.spec.in qrencode.spec \ + qrencode.1.in Doxyfile tests/test_all.sh + + if BUILD_TOOLS +diff -ruN qrencode-3.1.1-orig/configure.ac qrencode-3.1.1/configure.ac +--- qrencode-3.1.1-orig/configure.ac 2010-02-03 01:42:12.000000000 +0100 ++++ qrencode-3.1.1/configure.ac 2011-01-31 09:21:17.000000000 +0100 +@@ -29,14 +29,14 @@ + AC_PROG_LIBTOOL + PKG_PROG_PKG_CONFIG + +-AC_CONFIG_FILES([Makefile libqrencode.pc tests/Makefile qrencode.spec qrencode.1]) ++AC_CONFIG_FILES([Makefile libqrencode.pc qrencode.spec qrencode.1]) + + dnl --with-tools + AC_ARG_WITH([tools], [AC_HELP_STRING([--with-tools], [build utility tools [default=yes]])], + [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, "libpng") + fi + + dnl --with-tests +@@ -54,12 +54,6 @@ + fi + + +-if test x$build_tests = xyes ; then +- SDL_REQUIRED_VERSION=1.2.0 +- AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.])) +-fi +-AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ]) +- + + dnl --enable-gprof + AC_ARG_ENABLE([gprof], [AC_HELP_STRING([--enable-gprof], [generate extra code to write profile information suitable for gprof [default=no]])], diff --git a/media-gfx/qrencode/qrencode-3.1.1.ebuild b/media-gfx/qrencode/qrencode-3.1.1.ebuild index da03bf3e3f1e..9920de1f5ee3 100644 --- a/media-gfx/qrencode/qrencode-3.1.1.ebuild +++ b/media-gfx/qrencode/qrencode-3.1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.1.1.ebuild,v 1.5 2010/09/29 15:13:39 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/qrencode/qrencode-3.1.1.ebuild,v 1.6 2011/01/31 08:37:00 joker Exp $ EAPI=2 -inherit autotools +inherit autotools eutils DESCRIPTION="C library for encoding data in a QR Code symbol" HOMEPAGE="http://megaui.net/fukuchi/works/qrencode/index.en.html" @@ -19,10 +19,7 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - sed -i \ - -e 's:libpng12:libpng:' \ - configure.ac || die - + epatch "${FILESDIR}/${P}-pngregenfix.patch" eautoreconf } |