* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2014-05-10 13:22 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2014-05-10 13:22 UTC (permalink / raw
To: gentoo-commits
commit: afece1b88834fd6241e97d89dcfa500732352a64
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat May 10 13:13:09 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat May 10 13:13:09 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=afece1b8
Backport xz support to Emacs 23.4.
---
emacs/23.4/20_all_xz.patch | 323 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 323 insertions(+)
diff --git a/emacs/23.4/20_all_xz.patch b/emacs/23.4/20_all_xz.patch
new file mode 100644
index 0000000..2c55b21
--- /dev/null
+++ b/emacs/23.4/20_all_xz.patch
@@ -0,0 +1,323 @@
+Backport xz support to Emacs 23.4.
+This comprises parts of the following commits from upstream bzr:
+
+revno: 112525
+committer: Glenn Morris <rgm@gnu.org>
+branch nick: trunk
+timestamp: Wed 2013-05-08 21:06:10 -0400
+message:
+ * lisp/jka-cmpr-hook.el (jka-compr-mode-alist-additions): Fix typo.
+
+revno: 111835
+fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13770
+author: Ulrich Müller <ulm@gentoo.org>
+committer: Stefan Monnier <monnier@iro.umontreal.ca>
+branch nick: trunk
+timestamp: Wed 2013-02-20 09:30:23 -0500
+message:
+ * lisp/jka-cmpr-hook.el (jka-compr-compression-info-list)
+ (jka-compr-mode-alist-additions): Handle .txz suffix for
+ XZ-compressed tar archives.
+
+revno: 110764.1.62
+committer: Chong Yidong <cyd@gnu.org>
+branch nick: emacs-24
+timestamp: Fri 2012-11-09 16:34:17 +0800
+message:
+ More updates for the URL library manual.
+
+revno: 110534
+fixes bug: http://debbugs.gnu.org/11839
+author: Liam Stitt <stittl@cuug.ab.ca>
+committer: Chong Yidong <cyd@gnu.org>
+branch nick: trunk
+timestamp: Sat 2012-10-13 18:51:26 +0800
+message:
+ Add .xz to some url code (tiny change).
+ * url-vars.el (url-uncompressor-alist):
+ * url-file.el (url-file-find-possibly-compressed-file, url-file):
+ Recognize .xz compression.
+
+revno: 107781.1.349
+fixes bug: http://debbugs.gnu.org/12382
+author: Joel Bion <jpbion@westvi.com>
+committer: Glenn Morris <rgm@gnu.org>
+branch nick: emacs-24
+timestamp: Fri 2012-09-07 20:59:04 -0400
+message:
+ * lisp/pcmpl-gnu.el (pcmpl-gnu-tarfile-regexp): Add tar.xz. (tiny change)
+
+revno: 105835
+committer: Michael Albinus <michael.albinus@gmx.de>
+branch nick: trunk
+timestamp: Mon 2011-09-19 08:53:45 +0200
+message:
+ * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".
+ Suggested by Liam Stitt <stittl@cuug.ab.ca>.
+
+revno: 101620
+author: Ulrich Mueller <ulm@gentoo.org>
+committer: Glenn Morris <rgm@gnu.org>
+branch nick: trunk
+timestamp: Sat 2010-09-25 14:42:48 -0700
+message:
+ Add more xz compression support.
+
+ * doc/man/etags.1: xz compression is now supported.
+ * doc/misc/woman.texi (Interface Options): xz compression is now supported.
+
+ * lib-src/etags.c (compressors, print_language_names): Support xz compression.
+
+ * lisp/eshell/em-ls.el (eshell-ls-archive-regexp):
+ * lisp/eshell/esh-util.el (eshell-tar-regexp):
+ * lisp/ibuffer.el (ibuffer-compressed-file-name-regexp):
+ * lisp/info.el (Info-suffix-list):
+ * lisp/international/mule.el (auto-coding-alist):
+ * lisp/woman.el (woman-file-regexp, woman-file-compression-regexp):
+ * lisp/progmodes/etags.el (tags-compression-info-list):
+ Support xz compression.
+
+--- emacs-23.4-orig/doc/man/etags.1
++++ emacs-23.4/doc/man/etags.1
+@@ -62,7 +62,7 @@
+ with absolute file names. Files generated from a source file\-\-like
+ a C file generated from a source Cweb file\-\-will be recorded with
+ the name of the source file.
+-Compressed files are supported using gzip and bzip2.
++Compressed files are supported using gzip, bzip2, and xz.
+ The programs recognize the language used in an input file based on its
+ file name and contents. The \fB\-\-language\fP switch can be used to force
+ parsing of the file names following the switch according to the given
+--- emacs-23.4-orig/doc/misc/url.texi
++++ emacs-23.4/doc/misc/url.texi
+@@ -420,8 +420,8 @@
+
+ Compressed files are handled, but support is hard-coded so that
+ @code{jka-compr-compression-info-list} and so on have no affect.
+-Suffixes recognized are @samp{.z}, @samp{.gz}, @samp{.Z} and
+-@samp{.bz2}.
++Suffixes recognized are @samp{.z}, @samp{.gz}, @samp{.Z}, @samp{.bz2}
++and @samp{.xz}.
+
+ @defopt url-directory-index-file
+ The filename to look for when indexing a directory, default
+--- emacs-23.4-orig/doc/misc/woman.texi
++++ emacs-23.4/doc/misc/woman.texi
+@@ -1121,8 +1121,8 @@
+ for which decompressors are available and handled by auto-compression
+ mode. It should begin with @code{\\.} and end with @code{\\'} and
+ @emph{must not} be optional. The default value is
+-@code{"\\.\\(g?z\\|bz2\\)\\'"}, which matches the @code{gzip} and
+-@code{bzip2} compression extensions.
++@code{"\\.\\(g?z\\|bz2\\|xz\\)\\'"}, which matches the @code{gzip},
++@code{bzip2}, and @code{xz} compression extensions.
+
+ @emph{Do not change this unless you are sure you know what you are doing!}
+
+--- emacs-23.4-orig/lib-src/etags.c
++++ emacs-23.4/lib-src/etags.c
+@@ -569,6 +569,7 @@
+ { "gz", "gzip -d -c"},
+ { "GZ", "gzip -d -c"},
+ { "bz2", "bzip2 -d -c" },
++ { "xz", "xz -d -c" },
+ { NULL }
+ };
+
+@@ -882,7 +883,7 @@
+ Fortran is tried first; if no tags are found, C is tried next.\n\
+ When parsing any C file, a \"class\" or \"template\" keyword\n\
+ switches to C++.");
+- puts ("Compressed files are supported using gzip and bzip2.\n\
++ puts ("Compressed files are supported using gzip, bzip2, and xz.\n\
+ \n\
+ For detailed help on a given language use, for example,\n\
+ etags --help --lang=ada.");
+--- emacs-23.4-orig/lisp/eshell/em-ls.el
++++ emacs-23.4/lisp/eshell/em-ls.el
+@@ -162,7 +162,7 @@
+
+ (defcustom eshell-ls-archive-regexp
+ (concat "\\.\\(t\\(a[rz]\\|gz\\)\\|arj\\|lzh\\|"
+- "zip\\|[zZ]\\|gz\\|bz2\\|deb\\|rpm\\)\\'")
++ "zip\\|[zZ]\\|gz\\|bz2\\|xz\\|deb\\|rpm\\)\\'")
+ "*A regular expression that matches names of file archives.
+ This typically includes both traditional archives and compressed
+ files."
+--- emacs-23.4-orig/lisp/eshell/esh-util.el
++++ emacs-23.4/lisp/eshell/esh-util.el
+@@ -71,7 +71,7 @@
+ :group 'eshell-util)
+
+ (defcustom eshell-tar-regexp
+- "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
++ "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|xz\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
+ "*Regular expression used to match tar file names."
+ :type 'regexp
+ :group 'eshell-util)
+--- emacs-23.4-orig/lisp/ibuffer.el
++++ emacs-23.4/lisp/ibuffer.el
+@@ -332,7 +332,7 @@
+ :group 'ibuffer)
+
+ (defcustom ibuffer-compressed-file-name-regexp
+- "\\.\\(arj\\|bgz\\|bz2\\|gz\\|lzh\\|taz\\|tgz\\|zip\\|z\\)$"
++ "\\.\\(arj\\|bgz\\|bz2\\|gz\\|lzh\\|taz\\|tgz\\|xz\\|zip\\|z\\)$"
+ "Regexp to match compressed file names."
+ :type 'regexp
+ :group 'ibuffer)
+--- emacs-23.4-orig/lisp/info.el
++++ emacs-23.4/lisp/info.el
+@@ -398,24 +398,28 @@
+ (".info.gz". "gunzip")
+ (".info.z". "gunzip")
+ (".info.bz2" . ("bzip2" "-dc"))
++ (".info.xz". "unxz")
+ (".info". nil)
+ ("-info.Z". "uncompress")
+ ("-info.Y". "unyabba")
+ ("-info.gz". "gunzip")
+ ("-info.bz2" . ("bzip2" "-dc"))
+ ("-info.z". "gunzip")
++ ("-info.xz". "unxz")
+ ("-info". nil)
+ ("/index.Z". "uncompress")
+ ("/index.Y". "unyabba")
+ ("/index.gz". "gunzip")
+ ("/index.z". "gunzip")
+ ("/index.bz2". ("bzip2" "-dc"))
++ ("/index.xz". "unxz")
+ ("/index". nil)
+ (".Z". "uncompress")
+ (".Y". "unyabba")
+ (".gz". "gunzip")
+ (".z". "gunzip")
+ (".bz2" . ("bzip2" "-dc"))
++ (".xz". "unxz")
+ ("". nil)))
+ "List of file name suffixes and associated decoding commands.
+ Each entry should be (SUFFIX . STRING); the file is given to
+--- emacs-23.4-orig/lisp/international/mule.el
++++ emacs-23.4/lisp/international/mule.el
+@@ -1629,7 +1629,7 @@
+ . no-conversion-multibyte)
+ ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
+ ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
+- ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
++ ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion)
+ ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
+ ("\\.pdf\\'" . no-conversion)
+ ("/#[^/]+#\\'" . emacs-mule)))
+--- emacs-23.4-orig/lisp/jka-cmpr-hook.el
++++ emacs-23.4/lisp/jka-cmpr-hook.el
+@@ -225,6 +225,10 @@
+ "XZ compressing" "xz" ("-c" "-q")
+ "XZ uncompressing" "xz" ("-c" "-q" "-d")
+ t t "\3757zXZ\0"]
++ ["\\.txz\\'"
++ "XZ compressing" "xz" ("-c" "-q")
++ "XZ uncompressing" "xz" ("-c" "-q" "-d")
++ t nil "\3757zXZ\0"]
+ ;; dzip is gzip with random access. Its compression program can't
+ ;; read/write stdin/out, so .dz files can only be viewed without
+ ;; saving, having their contents decompressed with gzip.
+@@ -292,7 +296,9 @@
+ :group 'jka-compr)
+
+ (defcustom jka-compr-mode-alist-additions
+- (list (cons (purecopy "\\.tgz\\'") 'tar-mode) (cons (purecopy "\\.tbz2?\\'") 'tar-mode))
++ (purecopy '(("\\.tgz\\'" . tar-mode)
++ ("\\.tbz2?\\'" . tar-mode)
++ ("\\.txz\\'" . tar-mode)))
+ "List of pairs added to `auto-mode-alist' when installing jka-compr.
+ Uninstalling jka-compr removes all pairs from `auto-mode-alist' that
+ installing added.
+--- emacs-23.4-orig/lisp/net/tramp.el
++++ emacs-23.4/lisp/net/tramp.el
+@@ -7364,6 +7364,7 @@
+ (defconst tramp-inline-compress-commands
+ '(("gzip" "gzip -d")
+ ("bzip2" "bzip2 -d")
++ ("xz" "xz -d")
+ ("compress" "compress -d"))
+ "List of compress and decompress commands for inline transfer.
+ Each item is a list that looks like this:
+--- emacs-23.4-orig/lisp/pcmpl-gnu.el
++++ emacs-23.4/lisp/pcmpl-gnu.el
+@@ -122,7 +122,7 @@
+ (pcomplete-uniqify-list rules))))
+
+ (defcustom pcmpl-gnu-tarfile-regexp
+- "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
++ "\\.t\\(ar\\(\\.\\(gz\\|bz2\\|Z\\|xz\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
+ "A regexp which matches any tar archive."
+ :type 'regexp
+ :group 'pcmpl-gnu)
+--- emacs-23.4-orig/lisp/progmodes/etags.el
++++ emacs-23.4/lisp/progmodes/etags.el
+@@ -67,7 +67,8 @@
+ :type '(repeat file))
+
+ ;;;###autoload
+-(defcustom tags-compression-info-list (purecopy '("" ".Z" ".bz2" ".gz" ".tgz"))
++(defcustom tags-compression-info-list
++ (purecopy '("" ".Z" ".bz2" ".gz" ".xz" ".tgz"))
+ "*List of extensions tried by etags when jka-compr is used.
+ An empty string means search the non-compressed file.
+ These extensions will be tried only if jka-compr was activated
+--- emacs-23.4-orig/lisp/url/url-file.el
++++ emacs-23.4/lisp/url/url-file.el
+@@ -42,7 +42,7 @@
+ 'foo.gz' exists, even though the FTP server would happily serve it up
+ to them."
+ (let ((scratch nil)
+- (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2"))
++ (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2" ".xz"))
+ (found nil))
+ (while (and compressed-extensions (not found))
+ (if (file-exists-p (setq scratch (concat fname (pop compressed-extensions))))
+@@ -172,6 +172,7 @@
+ (\.uue "x-uuencoded")
+ (\.hqx "x-hqx")
+ (\.bz2 "x-bzip2")
++ (\.xz "x-xz")
+ (otherwise nil)))
+
+ (if (file-directory-p filename)
+--- emacs-23.4-orig/lisp/url/url-vars.el
++++ emacs-23.4/lisp/url/url-vars.el
+@@ -165,7 +165,8 @@
+ (".uue" . "x-uuencoded")
+ (".hqx" . "x-hqx")
+ (".Z" . "x-compress")
+- (".bz2" . "x-bzip2"))
++ (".bz2" . "x-bzip2")
++ (".xz" . "x-xz"))
+ "*An alist of file extensions and appropriate content-transfer-encodings."
+ :type '(repeat (cons :format "%v"
+ (string :tag "Extension")
+--- emacs-23.4-orig/lisp/woman.el
++++ emacs-23.4/lisp/woman.el
+@@ -810,7 +810,7 @@
+
+ (defvar woman-file-regexp nil
+ "Regexp used to select (possibly compressed) man source files, e.g.
+-\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\)\\)?\\'\".
++\"\\.\\([0-9lmnt]\\w*\\)\\(\\.\\(g?z\\|bz2\\|xz\\)\\)?\\'\".
+ Built automatically from the customizable user options
+ `woman-uncompressed-file-regexp' and `woman-file-compression-regexp'.")
+
+@@ -846,11 +846,11 @@
+ :group 'woman-interface)
+
+ (defcustom woman-file-compression-regexp
+- "\\.\\(g?z\\|bz2\\)\\'"
++ "\\.\\(g?z\\|bz2\\|xz\\)\\'"
+ "Do not change this unless you are sure you know what you are doing!
+ Regexp used to match compressed man file extensions for which
+ decompressors are available and handled by auto-compression mode,
+-e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\)\\\\'\" for `gzip' or `bzip2'.
++e.g. \"\\\\.\\\\(g?z\\\\|bz2\\\\|xz\\\\)\\\\'\" for `gzip', `bzip2', or `xz'.
+ Should begin with \\. and end with \\' and MUST NOT be optional."
+ ;; Should be compatible with car of
+ ;; `jka-compr-file-name-handler-entry', but that is unduly
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2014-06-04 17:16 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2014-06-04 17:16 UTC (permalink / raw
To: gentoo-commits
commit: f807e471d4e116943b4d7e0ddfad7b7173362609
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 4 16:49:25 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 4 16:49:25 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=f807e471
Avoid gcc -Wformat-security warning, bug 512426.
---
emacs/23.4/21_all_format-security.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/emacs/23.4/21_all_format-security.patch b/emacs/23.4/21_all_format-security.patch
new file mode 100644
index 0000000..e49e6df
--- /dev/null
+++ b/emacs/23.4/21_all_format-security.patch
@@ -0,0 +1,14 @@
+Avoid gcc -Wformat-security warning.
+https://bugs.gentoo.org/512426
+
+--- emacs-23.4-orig/lib-src/movemail.c
++++ emacs-23.4/lib-src/movemail.c
+@@ -615,7 +615,7 @@
+ else if (s2)
+ fprintf (stderr, s1, s2);
+ else
+- fprintf (stderr, s1);
++ fprintf (stderr, "%s", s1);
+ fprintf (stderr, "\n");
+ }
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2014-11-10 20:53 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2014-11-10 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 07847684e6889d85675130b393047e48de0b9301
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 20:39:11 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 20:39:11 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=07847684
Remove redundant _BSD_SOURCE macro causing warnings with glibc 2.20.
---
emacs/23.4/22_all_glibc-2.20.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/emacs/23.4/22_all_glibc-2.20.patch b/emacs/23.4/22_all_glibc-2.20.patch
new file mode 100644
index 0000000..538dc9e
--- /dev/null
+++ b/emacs/23.4/22_all_glibc-2.20.patch
@@ -0,0 +1,15 @@
+Remove redundant _BSD_SOURCE macro causing warnings with glibc 2.20.
+
+--- emacs-23.4-orig/src/s/gnu-linux.h
++++ emacs-23.4/src/s/gnu-linux.h
+@@ -210,10 +210,6 @@
+ /* alane@wozzle.linet.org says that -lipc is not a separate library,
+ since libc-4.4.1. So -lipc was deleted. */
+ #define LIBS_SYSTEM
+-/* _BSD_SOURCE is redundant, at least in glibc2, since we define
+- _GNU_SOURCE. Left in in case it's relevant to libc5 systems and
+- anyone's still using Emacs on those. --fx 2002-12-14 */
+-#define C_SWITCH_SYSTEM -D_BSD_SOURCE
+
+ /* Paul Abrahams <abrahams@equinox.shaysnet.com> says this is needed. */
+ #define LIB_MOTIF -lXm -lXpm
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2015-12-20 20:29 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2015-12-20 20:29 UTC (permalink / raw
To: gentoo-commits
commit: a522741e3d974f314fa96b3672739a2dbf0ca43c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 19:21:48 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 19:21:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a522741e
Fix jpeg version check in Emacs 23.4 to work with GCC 5.
emacs/23.4/25_all_jpeg-version.patch | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/emacs/23.4/25_all_jpeg-version.patch b/emacs/23.4/25_all_jpeg-version.patch
new file mode 100644
index 0000000..8b82827
--- /dev/null
+++ b/emacs/23.4/25_all_jpeg-version.patch
@@ -0,0 +1,25 @@
+Fix jpeg version check to work with gcc >= 5.
+Comprises part of the following commit from the emacs-24 branch:
+
+commit ff3878d749591ebf78da532ec1eb6fa00cb5757d
+Author: Andreas Schwab <schwab@suse.de>
+Date: Mon Mar 23 11:55:24 2015 +0100
+
+ * configure.ac: Fix jpeg version check to work with gcc >= 5.
+
+--- emacs-23.4-orig/configure.in
++++ emacs-23.4/configure.in
+@@ -2176,9 +2176,11 @@
+ 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])
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2016-01-17 2:42 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2016-01-17 2:42 UTC (permalink / raw
To: gentoo-commits
commit: 866dfcae6b4f3ae8d4af7ac5f687e24ee10589d1
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 02:14:11 2016 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 02:14:11 2016 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=866dfcae
Fix compilation of Emacs 23.4 with giflib-5.
emacs/23.4/26_all_giflib-5.patch | 150 +++++++++++++++++++++++++++++++++++++++
1 file changed, 150 insertions(+)
diff --git a/emacs/23.4/26_all_giflib-5.patch b/emacs/23.4/26_all_giflib-5.patch
new file mode 100644
index 0000000..b3b4ed0
--- /dev/null
+++ b/emacs/23.4/26_all_giflib-5.patch
@@ -0,0 +1,150 @@
+Fix compilation with giflib-5.
+Backported from Emacs 24, comprises parts of the following commits:
+
+commit be316ede5fffb724852ee225489e70778d240bb0
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Tue Jan 7 13:14:32 2014 -0800
+
+ Fix misdisplay of interlaced GIFs with libgif5.
+
+commit f3606ef766bcec86789316a05949f1e67a51e7c1
+Author: Barry Fishman <barry_fishman@acm.org>
+Date: Wed Oct 9 20:37:44 2013 -0400
+
+ Handle giflib 5 changes (tiny change)
+
+--- emacs-23.4-orig/configure.in
++++ emacs-23.4/configure.in
+@@ -2226,8 +2226,9 @@
+ if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
+ AC_CHECK_HEADER(gif_lib.h,
+ # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+-# Earlier versions can crash Emacs.
+- [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes)])
++# Earlier versions can crash Emacs, but version 5.0 removes EGifPutExtensionLast.
++ [AC_CHECK_LIB(gif, GifMakeMapObject, HAVE_GIF=yes,
++ [AC_CHECK_LIB(gif, EGifPutExtensionLast, HAVE_GIF=yes, try_libungif=yes)])])
+
+ if test "$HAVE_GIF" = yes; then
+ ac_gif_lib_name="-lgif"
+--- emacs-23.4-orig/src/image.c
++++ emacs-23.4/src/image.c
+@@ -7244,6 +7244,13 @@
+
+ #endif /* HAVE_NTGUI */
+
++/* Giflib before 5.0 didn't define these macros. */
++#ifndef GIFLIB_MAJOR
++#define GIFLIB_MAJOR 0
++#endif
++#ifndef GIFLIB_MINOR
++#define GIFLIB_MINOR 0
++#endif
+
+ #ifdef HAVE_NTGUI
+
+@@ -7350,7 +7357,11 @@
+ }
+
+ /* Open the GIF file. */
++#if GIFLIB_MAJOR < 5
+ gif = fn_DGifOpenFileName (SDATA (file));
++#else
++ gif = fn_DGifOpenFileName (SDATA (file), NULL);
++#endif
+ if (gif == NULL)
+ {
+ image_error ("Cannot open `%s'", file, Qnil);
+@@ -7366,7 +7377,11 @@
+ memsrc.len = SBYTES (specified_data);
+ memsrc.index = 0;
+
++#if GIFLIB_MAJOR < 5
+ gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++#else
++ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
++#endif
+ if (!gif)
+ {
+ image_error ("Cannot open memory source `%s'", img->spec, Qnil);
+@@ -7379,7 +7394,11 @@
+ if (!check_image_size (f, gif->SWidth, gif->SHeight))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+ UNGCPRO;
+ return 0;
+ }
+@@ -7389,7 +7408,11 @@
+ if (rc == GIF_ERROR)
+ {
+ image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+ UNGCPRO;
+ return 0;
+ }
+@@ -7400,7 +7423,11 @@
+ {
+ image_error ("Invalid image number `%s' in image `%s'",
+ image, img->spec);
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+ UNGCPRO;
+ return 0;
+ }
+@@ -7422,7 +7449,11 @@
+ if (!check_image_size (f, width, height))
+ {
+ image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+ UNGCPRO;
+ return 0;
+ }
+@@ -7430,7 +7461,11 @@
+ /* Create the X image and pixmap. */
+ if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+ {
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+ UNGCPRO;
+ return 0;
+ }
+@@ -7482,7 +7517,7 @@
+ problems with bytes >= 0x80. */
+ raster = (unsigned char *) gif->SavedImages[ino].RasterBits;
+
+- if (gif->SavedImages[ino].ImageDesc.Interlace)
++ if (GIFLIB_MAJOR < 5 && gif->SavedImages[ino].ImageDesc.Interlace)
+ {
+ int pass;
+ int row = interlace_start[0];
+@@ -7537,7 +7572,11 @@
+ Fcons (make_number (gif->ImageCount),
+ img->data.lisp_val));
+
++#if GIFLIB_MAJOR < 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0)
+ fn_DGifCloseFile (gif);
++#else
++ fn_DGifCloseFile (gif, NULL);
++#endif
+
+ /* Maybe fill in the background field while we have ximg handy. */
+ if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/
@ 2017-02-19 14:49 Ulrich Müller
0 siblings, 0 replies; 6+ messages in thread
From: Ulrich Müller @ 2017-02-19 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 1af0cd151374d5dfafab3a89d0c79f17f69dcdde
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 14:36:54 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 14:36:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=1af0cd15
Fix compilation with glibc-2.24.
emacs/23.4/27_all_conftest-doug-lea.patch | 46 ++++++++++++++++++++++
emacs/23.4/28_all_gmalloc.patch | 65 +++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/emacs/23.4/27_all_conftest-doug-lea.patch b/emacs/23.4/27_all_conftest-doug-lea.patch
new file mode 100644
index 0000000..d4a79b8
--- /dev/null
+++ b/emacs/23.4/27_all_conftest-doug-lea.patch
@@ -0,0 +1,46 @@
+Fix segmentation fault in emacs during compile phase.
+https://bugs.gentoo.org/602992
+
+Backported from Emacs 24:
+
+commit 4b5b5289577b4cc89ee45595832f943ef9a43de6
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat Apr 21 23:56:42 2012 -0700
+
+ * configure.in (doug_lea_malloc): Check for __malloc_initialize_hook.
+
+--- emacs-23.4-orig/configure.in
++++ emacs-23.4/configure.in
+@@ -1505,17 +1505,21 @@
+ # Do the opsystem or machine files prohibit the use of the GNU malloc?
+ # Assume not, until told otherwise.
+ GNU_MALLOC=yes
+-doug_lea_malloc=yes
+-AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
+-AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
+-AC_CACHE_CHECK(whether __after_morecore_hook exists,
+- emacs_cv_var___after_morecore_hook,
+-[AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
+- emacs_cv_var___after_morecore_hook=yes,
+- emacs_cv_var___after_morecore_hook=no)])
+-if test $emacs_cv_var___after_morecore_hook = no; then
+- doug_lea_malloc=no
+-fi
++
++AC_CACHE_CHECK(
++ [whether malloc is Doug Lea style],
++ [emacs_cv_var_doug_lea_malloc],
++ [AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM(
++ [[#include <malloc.h>
++ static void hook (void) {}]],
++ [[malloc_set_state (malloc_get_state ());
++ __after_morecore_hook = hook;
++ __malloc_initialize_hook = hook;]])],
++ [emacs_cv_var_doug_lea_malloc=yes],
++ [emacs_cv_var_doug_lea_malloc=no])])
++doug_lea_malloc=$emacs_cv_var_doug_lea_malloc
++
+ if test "${system_malloc}" = "yes"; then
+ GNU_MALLOC=no
+ GNU_MALLOC_reason="
diff --git a/emacs/23.4/28_all_gmalloc.patch b/emacs/23.4/28_all_gmalloc.patch
new file mode 100644
index 0000000..275f634
--- /dev/null
+++ b/emacs/23.4/28_all_gmalloc.patch
@@ -0,0 +1,65 @@
+Fix endless calloc loop causing temacs to hang.
+https://bugs.gentoo.org/602992
+https://bugs.gentoo.org/609680
+
+Backported from Emacs 25:
+
+commit 4b1436b702d56eedd27a0777fc7232cdfb7ac4f6
+Author: Wolfgang Jenkner <wjenkner@inode.at>
+Date: Sat Dec 26 12:12:02 2015 -0800
+
+ Always define gmalloc etc. in src/gmalloc.c
+
+--- emacs-23.4-orig/src/gmalloc.c
++++ emacs-23.4/src/gmalloc.c
+@@ -83,6 +83,14 @@
+
+ #endif /* _MALLOC_INTERNAL. */
+
++#undef malloc
++#undef realloc
++#undef calloc
++#undef free
++#define malloc gmalloc
++#define realloc grealloc
++#define calloc gcalloc
++#define free gfree
+
+ #ifdef __cplusplus
+ extern "C"
+@@ -1943,6 +1951,35 @@
+
+ #endif /* Not ELIDE_VALLOC. */
+
++#undef malloc
++#undef realloc
++#undef calloc
++#undef free
++
++void *
++malloc (size_t size)
++{
++ return gmalloc (size);
++}
++
++void *
++calloc (size_t nmemb, size_t size)
++{
++ return gcalloc (nmemb, size);
++}
++
++void
++free (void *ptr)
++{
++ gfree (ptr);
++}
++
++void *
++realloc (void *ptr, size_t size)
++{
++ return grealloc (ptr, size);
++}
++
+ #ifdef GC_MCHECK
+
+ /* Standard debugging hooks for `malloc'.
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-19 14:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-04 17:16 [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/23.4/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2017-02-19 14:49 Ulrich Müller
2016-01-17 2:42 Ulrich Müller
2015-12-20 20:29 Ulrich Müller
2014-11-10 20:53 Ulrich Müller
2014-05-10 13:22 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox