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