phracek pushed to emacs (master). "emacs option --no-bitmap-icon does not work (#1199160) (..more)"

Fri Mar 27 09:58:51 UTC 2015

>From 832068b18c2beb558e14df5a608366f1763141d2 Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek at redhat.com>
Date: Tue, 17 Mar 2015 09:36:40 +0100
Subject: emacs option --no-bitmap-icon does not work (#1199160)

Signed-off-by: Petr Hracek <phracek at redhat.com>

diff --git a/emacs-configure.patch b/emacs-configure.patch
new file mode 100644
index 0000000..eae4a70
--- /dev/null
+++ b/emacs-configure.patch
@@ -0,0 +1,37 @@
+diff --git a/configure.ac b/configure.ac
+index 458648e..077fe50 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3072,10 +3072,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])
+@@ -3091,10 +3093,12 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; 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])],
+-	[#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])
diff --git a/emacs-no-bitmap-icon.patch b/emacs-no-bitmap-icon.patch
new file mode 100644
index 0000000..c683e94
--- /dev/null
+++ b/emacs-no-bitmap-icon.patch
@@ -0,0 +1,13 @@
+diff --git a/src/frame.h b/src/frame.h
+index ff696df..fc19768 100644
+--- a/src/frame.h
++++ b/src/frame.h
+@@ -1349,7 +1349,7 @@ x_set_bitmap_icon (struct frame *f)
+ {
+   Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist);
+ 
+-  if (CONSP (obj))
++  if (CONSP (obj) && !NILP (XCDR (obj)))
+     x_bitmap_icon (f, XCDR (obj));
+ }
+ 
diff --git a/emacs.spec b/emacs.spec
index a101d5c..7950660 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,9 +1,11 @@
+%global _hardened_build 1
+
 # This file is encoded in UTF-8.  -*- coding: utf-8 -*-
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+ and CC0-1.0
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -23,23 +25,58 @@ Patch1: emacs-spellchecker.patch
 
 # Fix for default PDF viewer bug #971162
 Patch2: emacs-pdf-default.patch
-
-BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
-BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
-BuildRequires: libXpm-devel ncurses-devel xorg-x11-proto-devel zlib-devel gnutls-devel
-BuildRequires: librsvg2-devel m17n-lib-devel libotf-devel ImageMagick-devel libselinux-devel
-BuildRequires: GConf2-devel alsa-lib-devel gpm-devel liblockfile-devel libxml2-devel
-BuildRequires: bzip2 cairo texinfo gzip desktop-file-utils
+Patch3: emacs-no-bitmap-icon.patch
+Patch4: emacs-configure.patch
+
+BuildRequires: atk-devel
+BuildRequires: cairo-devel
+BuildRequires: freetype-devel
+BuildRequires: fontconfig-devel
+BuildRequires: dbus-devel
+BuildRequires: giflib-devel
+BuildRequires: glibc-devel
+BuildRequires: libpng-devel
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libjpeg-turbo
+BuildRequires: libtiff-devel
+BuildRequires: libX11-devel
+BuildRequires: libXau-devel
+BuildRequires: libXdmcp-devel
+BuildRequires: libXrender-devel
+BuildRequires: libXt-devel
+BuildRequires: libXpm-devel
+BuildRequires: ncurses-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: zlib-devel
+BuildRequires: gnutls-devel
+BuildRequires: librsvg2-devel
+BuildRequires: m17n-lib-devel
+BuildRequires: libotf-devel
+BuildRequires: ImageMagick-devel
+BuildRequires: libselinux-devel
+BuildRequires: GConf2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: gpm-devel
+BuildRequires: liblockfile-devel
+BuildRequires: libxml2-devel
+BuildRequires: bzip2
+BuildRequires: cairo
+BuildRequires: texinfo
+BuildRequires: gzip
+BuildRequires: desktop-file-utils
 
 %if 0%{?rhel} == 6
 BuildRequires: gtk2-devel
 %else
 %if 0%{?rhel} == 7
-BuildRequires: gtk3-devel python2-devel 
+BuildRequires: gtk3-devel
+BuildRequires: python2-devel 
 # Buildrequire both python2 and python3 on systems containing both,
 # since below we turn off the brp-python-bytecompile script
 %else
-BuildRequires: gtk3-devel python2-devel python3-devel
+BuildRequires: gtk3-devel
+BuildRequires: python2-devel
+BuildRequires: python3-devel
 %endif
 %endif
 
@@ -48,7 +85,8 @@ BuildRequires: util-linux
 %endif
 
 # Emacs doesn't run without dejavu-sans-mono-fonts, rhbz#732422
-Requires: desktop-file-utils dejavu-sans-mono-fonts
+Requires: desktop-file-utils
+Requires: dejavu-sans-mono-fonts
 Requires(preun): %{_sbindir}/alternatives
 Requires(posttrans): %{_sbindir}/alternatives
 Requires: emacs-common = %{epoch}:%{version}-%{release}
@@ -148,6 +186,9 @@ packages that add functionality to Emacs.
 
 %patch1 -p1 -b .spellchecker
 %patch2 -p1 -b .pdf-default.patch
+%patch3 -p1 -b .bitmap
+%patch4 -p1 -b .config
+autoconf
 
 # We prefer our emacs.desktop file
 cp %SOURCE1 etc/emacs.desktop
@@ -197,6 +238,8 @@ ln -s ../configure .
 %define toolkit gtk3
 %endif
 
+LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
+
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=%{toolkit} --with-gpm=no
 make bootstrap
@@ -446,9 +489,12 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
-* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 1:24.4-4
+* Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 1:24.4-5
 - Add an AppData file for the software center
 
+* Tue Mar 17 2015 Petr Hracek <phracek at redhat.com> - 1:24.4-4
+- emacs option --no-bitmap-icon does not work (#1199160)
+
 * Tue Nov 18 2014 Petr Hracek <phracek at redhat.com> - 1:24.4-3
 - Resolves #1124892 Add appdata file
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/emacs.git/commit/?h=master&id=832068b18c2beb558e14df5a608366f1763141d2
