commit: a522741e3d974f314fa96b3672739a2dbf0ca43c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 19:21:48 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:21:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a522741e
Fix jpeg version check in Emacs 23.4 to work with GCC 5.
emacs/23.4/25_all_jpeg-version.patch | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/emacs/23.4/25_all_jpeg-version.patch
b/emacs/23.4/25_all_jpeg-version.patch
new file mode 100644
index 0000000..8b82827
--- /dev/null
+++ b/emacs/23.4/25_all_jpeg-version.patch
@@ -0,0 +1,25 @@
+Fix jpeg version check to work with gcc >= 5.
+Comprises part of the following commit from the emacs-24 branch:
+
+commit ff3878d749591ebf78da532ec1eb6fa00cb5757d
+Author: Andreas Schwab <sch...@suse.de>
+Date: Mon Mar 23 11:55:24 2015 +0100
+
+ * configure.ac: Fix jpeg version check to work with gcc >= 5.
+
+--- emacs-23.4-orig/configure.in
++++ emacs-23.4/configure.in
+@@ -2176,9 +2176,11 @@
+ AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library
(-ljpeg).])dnl
+ if test "${HAVE_JPEG}" = "yes"; then
+ AC_DEFINE(HAVE_JPEG)
+- AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])],
++ AC_EGREP_CPP([version 6b or later],
+ [#include <jpeglib.h>
+- version=JPEG_LIB_VERSION
++ #if JPEG_LIB_VERSION >= 62
++ version 6b or later
++ #endif
+ ],
+ [AC_DEFINE(HAVE_JPEG)],
+ [AC_MSG_WARN([libjpeg found, but not version 6b or later])
