summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/qrencode/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/qrencode/files')
-rw-r--r--media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch b/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
new file mode 100644
index 000000000000..09c15eedfbe6
--- /dev/null
+++ b/media-gfx/qrencode/files/qrencode-3.2.0-pngregenfix.patch
@@ -0,0 +1,44 @@
+ Makefile.am | 2 +-
+ configure.ac | 9 +--------
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 55659c5..a065514 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -27,7 +27,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ 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 --git a/configure.ac b/configure.ac
+index 6fb1409..ca30225 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@ AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+ 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])
+
+ AC_CHECK_FUNCS([strdup])
+
+@@ -71,13 +71,6 @@ echo "#define __STATIC static" >>confdefs.h
+ echo "/* #undef WITH_TESTS */" >>confdefs.h
+ 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.]))
+- AC_MSG_NOTICE([SDL check done.])
+- AM_ICONV_LINK
+-fi
+-AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
+
+
+ dnl --enable-gprof