Hello community,
here is the log from the commit of package emacs for openSUSE:Factory checked
in at 2018-07-06 10:38:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/emacs (Old)
and /work/SRC/openSUSE:Factory/.emacs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs"
Fri Jul 6 10:38:54 2018 rev:138 rq:619898 version:26.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2018-04-01
17:25:35.273557956 +0200
+++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2018-07-06
10:39:00.747467637 +0200
@@ -1,0 +2,70 @@
+Fri Jun 15 05:14:18 UTC 2018 - wer...@suse.de
+
+- Simplify patch emacs-25.3-xft4x11.patch (from Henryk Hecht) for
+ boo#1096354
+
+-------------------------------------------------------------------
+Tue Jun 12 07:52:20 UTC 2018 - wer...@suse.de
+
+- Add patch emacs-26.1-xft4x11.patch to allow emacs-x11 to use
+ xft even for its menu bar (boo#1096354)
+
+-------------------------------------------------------------------
+Fri Jun 8 17:35:59 UTC 2018 - bjorn....@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer needed, nor
+ used. Emacs-x11 uses gsettings on openSUSE.
+
+-------------------------------------------------------------------
+Thu Jun 7 13:05:03 UTC 2018 - wer...@suse.de
+
+- Use -fPIE/-pie for helper binaries
+- Use Groups tag Productivity/Text/Editors
+
+-------------------------------------------------------------------
+Thu Jun 7 11:33:27 UTC 2018 - wer...@suse.de
+
+- Add configure option for mailutils as recommended by GNU Emacs upstream
+- Re-enable games with GNU Emacs which requires system-user-games
+
+-------------------------------------------------------------------
+Thu Jun 7 08:14:04 UTC 2018 - wer...@suse.de
+
+- Cleanup the spec file by removing old suse_versions
+ and reordering configure options
+- Add some missed packages for configure
+- Avoid Xwidgets on 32bit architectures as this does not build
+
+-------------------------------------------------------------------
+Tue May 29 13:09:38 UTC 2018 - wer...@suse.de
+
+- Update to emacs version 26.1
+ * Startup Changes in Emacs 26.1
+ - New option '--fg-daemon'
+ - New option '--module-assertions'
+ - Emacs now supports 24-bit colors on capable text terminals
+ - Emacs now obeys the X resource "scrollBar" at startup
+ * Various Changes in Emacs 26.1, see NEWS
+ * Various Editing Changes in Emacs 26.1, see NEWS
+ * Various Changes in Specialized Modes and Packages in Emacs 26.1, see NEWS
+ * Some Incompatible Lisp Changes in Emacs 26.1, see NEWS
+ * Various Lisp Changes in Emacs 26.1, see NEWS
+- Removed patch now upstream
+ * emacs-24.4-decl.dif
+ * emacs-25.2-bsc1058425.patch
+ * emacs-25.2-xwidget.patch
+ * gnulib.git-94e01571.patch
+- Remove patch emacs-24.1-bnc628268.patch as spell.el is gone for ever
+- Modify/port patches
+ * emacs-24.1-ps-mule.patch
+ * emacs-24.3-iconic.patch
+ * emacs-24.3-x11r7.patch
+ * emacs-24.4-flyspell.patch
+ * emacs-24.4-glibc.patch
+ * emacs-24.4-nonvoid.patch
+ * emacs-24.4-ps-bdf.patch
+ * emacs-24.4-xim.patch
+ * emacs-25.2-ImageMagick7.patch
+- Port and rename patch emacs-25.3.dif to emacs-26.1.dif
+
+-------------------------------------------------------------------
Old:
----
emacs-24.1-bnc628268.patch
emacs-24.4-decl.dif
emacs-25.2-bsc1058425.patch
emacs-25.2-xwidget.patch
emacs-25.3.dif
emacs-25.3.tar.xz
gnulib.git-94e01571.patch
New:
----
emacs-26.1-xft4x11.patch
emacs-26.1.dif
emacs-26.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
++++ 1590 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/emacs/emacs.spec
++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs.spec
++++++ emacs-24.1-ps-mule.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.631465397 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.635465392 +0200
@@ -16,7 +16,7 @@
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2016-09-19 09:01:56.930605125 +0000
-@@ -1709,10 +1709,18 @@ Protects against bogus binding of `enabl
+@@ -1524,10 +1524,18 @@ Protects against bogus binding of `enabl
nil ;; in pipe mode. Disable extended-char-mode
(nth 6 (or (assoc ispell-current-dictionary ispell-local-dictionary-alist)
(assoc ispell-current-dictionary ispell-dictionary-alist)))))
++++++ emacs-24.3-iconic.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.647465378 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.647465378 +0200
@@ -4,7 +4,7 @@
--- lisp/startup.el
+++ lisp/startup.el 2016-09-19 09:15:26.871345783 +0000
-@@ -2349,6 +2349,9 @@ nil default-directory" name)
+@@ -2353,6 +2353,9 @@ nil default-directory" name)
((equal argi "-no-splash")
(setq inhibit-startup-screen t))
++++++ emacs-24.3-x11r7.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.655465368 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.655465368 +0200
@@ -14,7 +14,7 @@
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
-@@ -496,6 +499,15 @@ x_load_resources (Display *display, cons
+@@ -502,6 +505,15 @@ x_load_resources (Display *display, cons
XrmPutLineResource (&rdb, line);
#endif /* not USE_MOTIF */
@@ -30,7 +30,7 @@
user_database = get_user_db (display);
-@@ -537,6 +549,10 @@ x_load_resources (Display *display, cons
+@@ -543,6 +555,10 @@ x_load_resources (Display *display, cons
XrmMergeDatabases (db, &rdb);
}
++++++ emacs-24.4-flyspell.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.663465359 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.667465354 +0200
@@ -4,7 +4,7 @@
--- lisp/textmodes/flyspell.el
+++ lisp/textmodes/flyspell.el 2016-09-19 09:22:48.535025631 +0000
-@@ -287,6 +287,12 @@ If this variable is nil, all regions are
+@@ -310,6 +310,12 @@ If this variable is nil, all regions are
:type 'key-sequence
:group 'flyspell)
@@ -17,7 +17,7 @@
;;*---------------------------------------------------------------------*/
;;* Mode specific options */
;;* ------------------------------------------------------------- */
-@@ -310,7 +316,6 @@ property of the major mode name.")
+@@ -333,7 +339,6 @@ property of the major mode name.")
;;*--- mail mode -------------------------------------------------------*/
(put 'mail-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
(put 'message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
@@ -25,7 +25,7 @@
(defun mail-mode-flyspell-verify ()
"Function used for `flyspell-generic-check-word-predicate' in Mail mode."
(let* ((header-end (save-excursion
-@@ -322,11 +327,11 @@ property of the major mode name.")
+@@ -345,11 +350,11 @@ property of the major mode name.")
nil t)
(point)))
(signature-begin
++++++ emacs-24.4-glibc.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.675465344 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.675465344 +0200
@@ -4,21 +4,21 @@
2 files changed, 2 insertions(+)
--- configure.ac
-+++ configure.ac 2017-02-27 14:03:47.908816992 +0000
-@@ -2197,6 +2197,7 @@ fi
++++ configure.ac 2018-05-29 12:18:31.133648098 +0000
+@@ -2296,6 +2296,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
- cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+ mingw32) use_mmap_for_buffers=yes ;;
+ gnu-linux) use_mmap_for_buffers=yes ;;
esac
AC_FUNC_MMAP
--- configure
-+++ configure 2017-02-27 14:03:47.912816917 +0000
-@@ -11576,6 +11576,7 @@ fi
++++ configure 2018-05-29 12:20:07.583908486 +0000
+@@ -11423,6 +11423,7 @@ fi
use_mmap_for_buffers=no
case "$opsys" in
- cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;;
+ mingw32) use_mmap_for_buffers=yes ;;
+ gnu-linux) use_mmap_for_buffers=yes ;;
esac
++++++ emacs-24.4-nonvoid.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.683465335 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.687465330 +0200
@@ -1,11 +1,10 @@
---
- src/emacs-module.c | 1 +
src/xmenu.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
--- src/xmenu.c
+++ src/xmenu.c 2016-09-19 09:01:56.930605125 +0000
-@@ -1922,8 +1922,8 @@ Lisp_Object
+@@ -1967,8 +1967,8 @@ Lisp_Object
xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
{
Lisp_Object title;
@@ -16,13 +15,3 @@
ptrdiff_t specpdl_count = SPECPDL_INDEX ();
check_window_system (f);
---- src/emacs-module.c
-+++ src/emacs-module.c 2016-09-20 09:36:52.881778063 +0000
-@@ -787,6 +787,7 @@ usage: (module-call ENVOBJ &rest ARGLIST
- default:
- eassume (false);
- }
-+ return Qnil;
- }
-
-
++++++ emacs-24.4-ps-bdf.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.699465316 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.699465316 +0200
@@ -4,9 +4,9 @@
2 files changed, 4 insertions(+), 4 deletions(-)
--- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el 2017-09-22 09:54:57.114564921 +0000
-@@ -22141,9 +22141,9 @@ With prefix argument ARG, restart the Pr
- ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22768 58519 620336 792000))
++++ lisp/ldefs-boot.el 2018-05-29 12:23:32.824206557 +0000
+@@ -26339,9 +26339,9 @@ With prefix argument ARG, restart the Pr
+ ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (0 0 0 0))
;;; 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")) "\
@@ -18,7 +18,7 @@
(custom-autoload 'bdf-directory-list "ps-bdf" t)
--- lisp/ps-bdf.el
-+++ lisp/ps-bdf.el 2017-09-22 09:53:18.780402545 +0000
++++ lisp/ps-bdf.el 2018-05-29 12:21:53.126004842 +0000
@@ -42,9 +42,9 @@
(defcustom bdf-directory-list
(if (memq system-type '(ms-dos windows-nt))
++++++ emacs-24.4-xim.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.707465306 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.707465306 +0200
@@ -4,7 +4,7 @@
--- src/xfns.c
+++ src/xfns.c 2016-09-19 09:10:35.504833294 +0000
-@@ -1957,8 +1957,8 @@ static XIMStyle best_xim_style (XIMStyle
+@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyle
static const XIMStyle supported_xim_styles[] =
{
++++++ emacs-25.2-ImageMagick7.patch ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.719465292 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.719465292 +0200
@@ -1,24 +1,24 @@
Index: emacs-25.2/configure.ac
===================================================================
---
- emacs-25.3/configure.ac | 2 +-
- emacs-25.3/src/image.c | 12 ++++++++++++
+ emacs-26.1/configure.ac | 2 +-
+ emacs-26.1/src/image.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
---- emacs-25.3/configure.ac
-+++ emacs-25.3/configure.ac 2017-09-22 09:59:44.049203440 +0000
-@@ -2408,7 +2408,7 @@ if test "${HAVE_X11}" = "yes" || test "$
- if test "${with_imagemagick}" != "no"; then
+--- emacs-26.1/configure.ac
++++ emacs-26.1/configure.ac 2018-05-29 12:46:11.911662417 +0000
+@@ -2525,7 +2525,7 @@ if test "${HAVE_X11}" = "yes" || test "$
## 6.3.5 is the earliest version known to work; see Bug#17339.
## 6.8.2 makes Emacs crash; see Bug#13867.
-- IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
+ ## 7 and later have not been ported to; See Bug#25967.
+- IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
+ IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2"
EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
- AC_SUBST(IMAGEMAGICK_CFLAGS)
- AC_SUBST(IMAGEMAGICK_LIBS)
---- emacs-25.3/src/image.c
-+++ emacs-25.3/src/image.c 2017-09-22 09:59:44.053203364 +0000
-@@ -8402,7 +8402,11 @@ imagemagick_compute_animated_image (Magi
+
+ if test $HAVE_IMAGEMAGICK = yes; then
+--- emacs-26.1/src/image.c
++++ emacs-26.1/src/image.c 2018-05-29 12:43:23.178732705 +0000
+@@ -8432,7 +8432,11 @@ imagemagick_compute_animated_image (Magi
PixelWand **source, **dest;
size_t source_width, source_height;
ssize_t source_left, source_top;
@@ -30,7 +30,7 @@
DisposeType dispose;
ptrdiff_t lines = 0;
-@@ -8467,7 +8471,11 @@ imagemagick_compute_animated_image (Magi
+@@ -8497,7 +8501,11 @@ imagemagick_compute_animated_image (Magi
if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
{
PixelGetMagickColor (source[x], &pixel);
@@ -42,7 +42,7 @@
}
}
PixelSyncIterator (dest_iterator);
-@@ -8512,7 +8520,11 @@ imagemagick_load_image (struct frame *f,
+@@ -8542,7 +8550,11 @@ imagemagick_load_image (struct frame *f,
MagickWand *image_wand;
PixelIterator *iterator;
PixelWand **pixels, *bg_wand = NULL;
++++++ emacs-26.1-xft4x11.patch ++++++
---
lwlib/xlwmenu.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
--- lwlib/xlwmenu.c
+++ lwlib/xlwmenu.c 2018-06-15 05:50:45.749287186 +0000
@@ -1887,21 +1887,18 @@ XlwMenuInitialize (Widget request, Widge
gray_width, gray_height,
(unsigned long)1, (unsigned long)0, 1);
+ mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
#ifdef HAVE_XFT
- if (openXftFont (mw))
+ if (mw->menu.font || openXftFont (mw))
;
else
#endif
{
- mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
+ mw->menu.font = XLoadQueryFont (display, "fixed");
if (!mw->menu.font)
{
- mw->menu.font = XLoadQueryFont (display, "fixed");
- if (!mw->menu.font)
- {
- fprintf (stderr, "Menu font fixed not found, can't continue.\n");
- emacs_abort ();
- }
+ fprintf (stderr, "Menu font fixed not found, can't continue.\n");
+ emacs_abort ();
}
}
++++++ emacs-24.4-decl.dif -> emacs-26.1.dif ++++++
++++ 755 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/emacs/emacs-24.4-decl.dif
++++ and /work/SRC/openSUSE:Factory/.emacs.new/emacs-26.1.dif
++++++ emacs-25.3.tar.xz -> emacs-26.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/emacs/emacs-25.3.tar.xz
/work/SRC/openSUSE:Factory/.emacs.new/emacs-26.1.tar.xz differ: char 26, line 1
++++++ emacs-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.vVrUn9/_old 2018-07-06 10:39:02.763465240 +0200
+++ /var/tmp/diff_new_pack.vVrUn9/_new 2018-07-06 10:39:02.767465235 +0200
@@ -6,3 +6,6 @@
addFilter(".*no-manual-page-for-binary.*emacs-*")
addFilter(".*name-repeated-in-summar.*")
addFilter(".*idden-file-or-dir.*\.dir-locals.el.*")
+addFilter(".*position-independent-executable-suggested.*/usr/bin/emacs-.*")
+addFilter(".*files-duplicate.*/usr/share/emacs.*")
+addFilter(".*desktopfile-without-binary.*/usr/share/applications/emacs.desktop.*emacs.*")
