Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked in at 2015-03-27 09:37:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2015-03-16 06:59:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2015-03-27 09:37:48.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 23 10:59:36 UTC 2015 - schwab@suse.de
+
+- jpeg-version-check.patch: Fix jpeg version check to work with gcc >= 5
+
+-------------------------------------------------------------------
New:
----
jpeg-version-check.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.iMS2Wi/_old 2015-03-27 09:37:49.000000000 +0100
+++ /var/tmp/diff_new_pack.iMS2Wi/_new 2015-03-27 09:37:49.000000000 +0100
@@ -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 @@
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 @@
%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 ++++++
2015-03-23 Andreas Schwab
* 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
- 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
- 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
- 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
- version=JPEG_LIB_VERSION
-],
+ AC_EGREP_CPP([version 6b or later],
+ [#include
+ #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])
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
