Accepting request 292439 from home:Andreas_Schwab:Factory

- jpeg-version-check.patch: Fix jpeg version check to work with gcc >= 5

OBS-URL: https://build.opensuse.org/request/show/292439
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=174

emacs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 23 10:59:36 UTC 2015 - schwab@suse.de
+
+- jpeg-version-check.patch: Fix jpeg version check to work with gcc >= 5
+
 -------------------------------------------------------------------
 Thu Mar 12 10:58:34 UTC 2015 - werner@suse.de
 

emacs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package emacs
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -112,6 +112,7 @@ Patch12:        emacs-24.3-x11r7.patch
 Patch15:        emacs-24.3-iconic.patch
 Patch16:        emacs-24.4-flyspell.patch
 Patch22:        emacs-24.1-bnc628268.patch
+Patch23:        jpeg-version-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
@@ -225,6 +226,7 @@ and most assembler-like syntaxes.
 %patch15 -p0 -b .iconic
 %patch16 -p0 -b .flyspell
 %patch22 -p0 -b .obsolate
+%patch23 -p1
 %patch   -p0 -b .0
 
 %if %{without autoconf}

jpeg-version-check.patch

@@ -0,0 +1,77 @@
+2015-03-23  Andreas Schwab  <schwab@suse.de>
+
+	* configure.ac: Fix jpeg version check to work with gcc >= 5.
+
+Index: emacs-24.4/configure
+===================================================================
+--- emacs-24.4.orig/configure
++++ emacs-24.4/configure
+@@ -13858,11 +13858,13 @@ fi
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <jpeglib.h>
+-	 version=JPEG_LIB_VERSION
++	 #if JPEG_LIB_VERSION >= 62
++	 version 6b or later
++	 #endif
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then :
++  $EGREP "version 6b or later" >/dev/null 2>&1; then :
+   $as_echo "#define HAVE_JPEG 1" >>confdefs.h
+ 
+ else
+@@ -13928,11 +13930,13 @@ fi
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <jpeglib.h>
+-	 version=JPEG_LIB_VERSION
++	 #if JPEG_LIB_VERSION >= 62
++	 version 6b or later
++	 #endif
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then :
++  $EGREP "version 6b or later" >/dev/null 2>&1; then :
+   $as_echo "#define HAVE_JPEG 1" >>confdefs.h
+ 
+ else
+Index: emacs-24.4/configure.ac
+===================================================================
+--- emacs-24.4.orig/configure.ac
++++ emacs-24.4/configure.ac
+@@ -3074,10 +3074,12 @@ if test "${opsys}" = "mingw32"; then
+   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])
+         HAVE_JPEG=no])
+@@ -3093,10 +3095,12 @@ elif test "${HAVE_X11}" = "yes" || test
+   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])],
+-	[#include <jpeglib.h>
+-	 version=JPEG_LIB_VERSION
+-],
++    AC_EGREP_CPP([version 6b or later],
++        [#include <jpeglib.h>
++	 #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])
+ 	HAVE_JPEG=no])