From afe3cf2eddce2ebf84221a380aa5bbeda0a9d99e7716155c0ba82a97e3a5795d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 30 Apr 2015 14:18:04 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=176 --- emacs-24.4-ps-bdf.patch | 6 +-- emacs-24.4.tar.xz | 3 -- emacs-24.5.tar.xz | 3 ++ emacs-gnupg-15th-field.patch | 24 ----------- emacs.changes | 24 +++++++++++ emacs.spec | 43 ++++++++++---------- jpeg-version-check.patch | 77 ------------------------------------ 7 files changed, 50 insertions(+), 130 deletions(-) delete mode 100644 emacs-24.4.tar.xz create mode 100644 emacs-24.5.tar.xz delete mode 100644 emacs-gnupg-15th-field.patch delete mode 100644 jpeg-version-check.patch diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index 047498a..475b908 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -4,9 +4,9 @@ 2 files changed, 4 insertions(+), 4 deletions(-) --- lisp/ldefs-boot.el -+++ lisp/ldefs-boot.el 2014-10-21 14:01:58.127837849 +0000 -@@ -21589,9 +21589,9 @@ With prefix argument ARG, restart the Pr - ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21291 53104 431149 0)) ++++ lisp/ldefs-boot.el 2015-04-30 13:03:34.058018924 +0000 +@@ -21554,9 +21554,9 @@ With prefix argument ARG, restart the Pr + ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (21710 25077 708662 334000)) ;;; Generated autoloads from ps-bdf.el -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ diff --git a/emacs-24.4.tar.xz b/emacs-24.4.tar.xz deleted file mode 100644 index 3c701dc..0000000 --- a/emacs-24.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd -size 39733124 diff --git a/emacs-24.5.tar.xz b/emacs-24.5.tar.xz new file mode 100644 index 0000000..5a264c2 --- /dev/null +++ b/emacs-24.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e +size 39759804 diff --git a/emacs-gnupg-15th-field.patch b/emacs-gnupg-15th-field.patch deleted file mode 100644 index 730275e..0000000 --- a/emacs-gnupg-15th-field.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 07 Nov 2014 02:31:12 +0000 -Subject: epg: Adjust to GnuPG 2.1 key listing change - -* epg.el (epg--list-keys-1): Ignore fields after the 15th field -(bug#18979). Reported by Hideki Saito. ---- -(limited to 'lisp/epg.el') - ---- a/lisp/epg.el -+++ b/lisp/epg.el 2015-01-13 00:00:00.000000000 +0000 -@@ -1910,8 +1910,9 @@ This function is for internal use only." - string (match-string 0) - index 0 - field 0) -- (while (eq index -- (string-match "\\([^:]+\\)?:" string index)) -+ (while (and (< field (length (car keys))) -+ (eq index -+ (string-match "\\([^:]+\\)?:" string index))) - (setq index (match-end 0)) - (aset (car keys) field (match-string 1 string)) - (setq field (1+ field)))) diff --git a/emacs.changes b/emacs.changes index 511be70..a58c235 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Thu Apr 30 13:08:13 UTC 2015 - werner@suse.de + +- Update to emacs version 24.5 + * This is mainly a bug-fix release, but there are some other changes. + * The default value of `history-length' has increased to 100. + * The variable `redisplay-dont-pause' is obsolete. + * `call-process-shell-command' and `process-file-shell-command' no longer + take "&rest args". + * The option `browse-url-firefox-startup-arguments' no longer has an effect. + * New option `erc-rename-buffers'. + * New faces `erc-my-nick-prefix-face' and `erc-nick-prefix-face'. + * `erc-format-@nick' displays all user modes instead of only op and voice. + * The display of irc commands in the current buffer has been disabled. + * `erc-version' now follows the Emacs version. + * Obsolete packages + + cc-compat.el + + crisp.el (moved to elpa.gnu.org) + + tpu-edt.el, ws-mode.el + + vi.el, vip.el (try M-x viper instead) +- Remove patch emacs-gnupg-15th-field.patch and patch + jpeg-version-check.patch as now upstream +- Modify patch emacs-24.4-ps-bdf.patch + ------------------------------------------------------------------- Mon Mar 23 10:59:36 UTC 2015 - schwab@suse.de diff --git a/emacs.spec b/emacs.spec index e817c55..4241b14 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ # # spec file for package emacs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -72,7 +72,7 @@ BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: zlib-devel Url: http://www.gnu.org/software/emacs/ -Version: 24.4 +Version: 24.5 Release: 0 %if 0%{suse_version} >= 1300 Requires: etags @@ -89,7 +89,7 @@ Obsoletes: nxml-mode < 20041004 Provides: epg = 1.0.0 Obsoletes: epg < 1.0.0 Requires(pre): fileutils -Source: ftp://ftp.gnu.org/gnu/emacs/emacs-24.4.tar.xz +Source: ftp://ftp.gnu.org/gnu/emacs/emacs-24.5.tar.xz Source1: app-defaults.Emacs Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs @@ -97,7 +97,6 @@ Source4: emacs-rpmlintrc Source5: emacs.sh Patch: emacs-24.4.dif # PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change -Patch1: emacs-gnupg-15th-field.patch Patch2: emacs-24.4-glibc.patch Patch3: emacs-24.4-decl.dif Patch4: emacs-24.3-asian-print.patch @@ -112,7 +111,6 @@ 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" @@ -212,7 +210,6 @@ and most assembler-like syntaxes. %prep %setup -q -b 2 -%patch1 -p1 -b .gnupg %patch2 -p0 -b .glibc %patch3 -p0 -b .decl %patch4 -p0 -b .print @@ -226,7 +223,6 @@ 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} @@ -1978,7 +1974,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/warnings.elc %{_datadir}/emacs/%{version}/lisp/emacs-lock.elc %dir %{_datadir}/emacs/%{version}/lisp/emulation/ -%{_datadir}/emacs/%{version}/lisp/emulation/crisp.elc %{_datadir}/emacs/%{version}/lisp/emulation/cua-base.elc %{_datadir}/emacs/%{version}/lisp/emulation/cua-gmrk.elc %{_datadir}/emacs/%{version}/lisp/emulation/cua-rect.elc @@ -1988,11 +1983,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emulation/edt-vt100.elc %{_datadir}/emacs/%{version}/lisp/emulation/edt.elc %{_datadir}/emacs/%{version}/lisp/emulation/keypad.elc -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-edt.elc -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-extras.elc -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-mapper.elc -%{_datadir}/emacs/%{version}/lisp/emulation/vi.elc -%{_datadir}/emacs/%{version}/lisp/emulation/vip.elc %{_datadir}/emacs/%{version}/lisp/emulation/viper-cmd.elc %{_datadir}/emacs/%{version}/lisp/emulation/viper-ex.elc %{_datadir}/emacs/%{version}/lisp/emulation/viper-init.elc @@ -2001,7 +1991,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emulation/viper-mous.elc %{_datadir}/emacs/%{version}/lisp/emulation/viper-util.elc %{_datadir}/emacs/%{version}/lisp/emulation/viper.elc -%{_datadir}/emacs/%{version}/lisp/emulation/ws-mode.elc %{_datadir}/emacs/%{version}/lisp/env.elc %{_datadir}/emacs/%{version}/lisp/epa-dired.elc %{_datadir}/emacs/%{version}/lisp/epa-file.elc @@ -2297,6 +2286,7 @@ fi %{_datadir}/emacs/%{version}/lisp/international/titdic-cnv.elc %{_datadir}/emacs/%{version}/lisp/international/ucs-normalize.elc %{_datadir}/emacs/%{version}/lisp/international/uni-bidi.el +%{_datadir}/emacs/%{version}/lisp/international/uni-brackets.el %{_datadir}/emacs/%{version}/lisp/international/uni-category.el %{_datadir}/emacs/%{version}/lisp/international/uni-combining.el %{_datadir}/emacs/%{version}/lisp/international/uni-comment.el @@ -2607,8 +2597,10 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/assoc.elc %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.elc %{_datadir}/emacs/%{version}/lisp/obsolete/bruce.el +%{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.elc %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc %{_datadir}/emacs/%{version}/lisp/obsolete/complete.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/crisp.elc %{_datadir}/emacs/%{version}/lisp/obsolete/cust-print.elc %{_datadir}/emacs/%{version}/lisp/obsolete/erc-hecomplete.elc %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.elc @@ -2649,7 +2641,13 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/swedish.elc %{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.elc %{_datadir}/emacs/%{version}/lisp/obsolete/terminal.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-mapper.elc %{_datadir}/emacs/%{version}/lisp/obsolete/vc-mcvs.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/vi.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/vip.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.elc %{_datadir}/emacs/%{version}/lisp/obsolete/xesam.elc %{_datadir}/emacs/%{version}/lisp/obsolete/yow.elc %dir %{_datadir}/emacs/%{version}/lisp/org/ @@ -2814,7 +2812,6 @@ fi %{_datadir}/emacs/%{version}/lisp/progmodes/cc-awk.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-bytecomp.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-cmds.elc -%{_datadir}/emacs/%{version}/lisp/progmodes/cc-compat.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-defs.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-engine.elc %{_datadir}/emacs/%{version}/lisp/progmodes/cc-fonts.elc @@ -3522,7 +3519,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emacs-lisp/unsafep.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/warnings.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lock.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/crisp.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/cua-base.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/cua-gmrk.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/cua-rect.el.gz @@ -3532,11 +3528,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emulation/edt-vt100.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/edt.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/keypad.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-edt.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-extras.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/tpu-mapper.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/vi.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/vip.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/viper-cmd.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/viper-ex.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/viper-init.el.gz @@ -3545,7 +3536,6 @@ fi %{_datadir}/emacs/%{version}/lisp/emulation/viper-mous.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/viper-util.el.gz %{_datadir}/emacs/%{version}/lisp/emulation/viper.el.gz -%{_datadir}/emacs/%{version}/lisp/emulation/ws-mode.el.gz %{_datadir}/emacs/%{version}/lisp/env.el.gz %{_datadir}/emacs/%{version}/lisp/epa-dired.el.gz %{_datadir}/emacs/%{version}/lisp/epa-file.el.gz @@ -4105,8 +4095,10 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/abbrevlist.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/assoc.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/cc-compat.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/complete.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/crisp.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/cust-print.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/erc-hecomplete.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.gz @@ -4145,7 +4137,13 @@ fi %{_datadir}/emacs/%{version}/lisp/obsolete/swedish.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/sym-comp.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/terminal.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-edt.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-extras.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/tpu-mapper.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/vc-mcvs.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/vi.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/vip.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/ws-mode.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/xesam.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/yow.el.gz %{_datadir}/emacs/%{version}/lisp/org/ob-C.el.gz @@ -4304,7 +4302,6 @@ fi %{_datadir}/emacs/%{version}/lisp/progmodes/cc-awk.el.gz %{_datadir}/emacs/%{version}/lisp/progmodes/cc-bytecomp.el.gz %{_datadir}/emacs/%{version}/lisp/progmodes/cc-cmds.el.gz -%{_datadir}/emacs/%{version}/lisp/progmodes/cc-compat.el.gz %{_datadir}/emacs/%{version}/lisp/progmodes/cc-defs.el.gz %{_datadir}/emacs/%{version}/lisp/progmodes/cc-engine.el.gz %{_datadir}/emacs/%{version}/lisp/progmodes/cc-fonts.el.gz diff --git a/jpeg-version-check.patch b/jpeg-version-check.patch deleted file mode 100644 index d620d1e..0000000 --- a/jpeg-version-check.patch +++ /dev/null @@ -1,77 +0,0 @@ -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])