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

[notifications at fedoraproject.org]

>From 69ee05afc25f8a6958e1063cdf0b2e1a8d0c2c4d Mon Sep 17 00:00:00 2001
From: Petr Hracek <phracek at redhat.com>
Date: Fri, 27 Mar 2015 15:05:36 +0100
Subject: emacs option --no-bitmap-icon does not work (#1199160)

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

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 a6d8a07..2c5b7f7 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,55 +1,56 @@
 # 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}
-License: GPLv3+ and CC0-1.0
-URL: http://www.gnu.org/software/emacs/
-Group: Applications/Editors
-Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
-Source1: emacs.desktop
-Source2: emacsclient.desktop
-Source3: dotemacs.el
-Source4: site-start.el
-Source5: default.el
+Summary:        GNU Emacs text editor
+Name:           emacs
+Epoch:          1
+Version:        24.4
+Release:        5%{?dist}
+License:        GPLv3+ and CC0-1.0
+URL:            http://www.gnu.org/software/emacs/
+Group:          Applications/Editors
+Source0:        ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
+Source1:        emacs.desktop
+Source2:        emacsclient.desktop
+Source3:        dotemacs.el
+Source4:        site-start.el
+Source5:        default.el
 # Emacs Terminal Mode, #551949, #617355
-Source6: emacs-terminal.desktop
-Source7: emacs-terminal.sh
-Source8: emacs.service
-Source9: %{name}.appdata.xml
+Source6:        emacs-terminal.desktop
+Source7:        emacs-terminal.sh
+Source8:        emacs.service
+Source9:        %{name}.appdata.xml
 # rhbz#713600
-Patch1: emacs-spellchecker.patch
+Patch1:         emacs-spellchecker.patch
 
 # Fix for default PDF viewer bug #971162
-Patch2: emacs-pdf-default.patch
-Patch3: emacs-adds-extra-spaces.patch
+Patch2:         emacs-pdf-default.patch
+Patch3:         emacs-adds-extra-spaces.patch
+Patch4:         emacs-no-bitmap-icon.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
+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
 
 %if 0%{?rhel} == 6
-BuildRequires: gtk2-devel
+BuildRequires:  gtk2-devel
 %else
 %if 0%{?rhel} == 7
-BuildRequires: gtk3-devel python2-devel 
+BuildRequires:  gtk3-devel 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 python2-devel python3-devel
 %endif
 %endif
 
 %ifarch %{ix86}
-BuildRequires: util-linux
+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 dejavu-sans-mono-fonts
 Requires(preun): %{_sbindir}/alternatives
 Requires(posttrans): %{_sbindir}/alternatives
 Requires: emacs-common = %{epoch}:%{version}-%{release}
@@ -150,6 +151,7 @@ packages that add functionality to Emacs.
 %patch1 -p1 -b .spellchecker
 %patch2 -p1 -b .pdf-default.patch
 %patch3 -p1 -b .add-extra-spaces
+%patch4 -p1 -b .no-bitmap-icon
 
 # We prefer our emacs.desktop file
 cp %SOURCE1 etc/emacs.desktop
@@ -433,6 +435,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Fri Mar 27 2015 Petr Hracek <phracek at redhat.com> - 1:24.4-5
+- emacs option --no-bitmap-icon does not work (#1199160)
+
 * Wed Mar 04 2015 Petr Hracek <phracek at redhat.com> - 1:24.4-4
 - emacs adds extra spaces on copy/paste (#1161786)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/emacs.git/commit/?h=f21&id=69ee05afc25f8a6958e1063cdf0b2e1a8d0c2c4d