]> granicus.if.org Git - neomutt/commitdiff
drop PATCHES
authorRichard Russon <rich@flatcap.org>
Tue, 2 May 2017 22:46:40 +0000 (23:46 +0100)
committerRichard Russon <rich@flatcap.org>
Fri, 12 May 2017 13:07:47 +0000 (14:07 +0100)
Makefile.am
PATCHES [deleted file]
doc/Makefile.am
doc/applying-patches.txt [deleted file]
doc/patch-notes.txt [deleted file]
patchlist.sh [deleted file]
version.c

index e4dd4e2b1d5115a46716b0094bdf764c5d88f7f6..b06779c21df53d012666d55c886fdb50ec788b4c 100644 (file)
@@ -27,7 +27,7 @@ DOTLOCK_PERMISSION='2755'
 
 distdir = neo$(PACKAGE)-$(VERSION)
 
-BUILT_SOURCES = keymap_defs.h keymap_alldefs.h patchlist.c git_ver.h conststrings.c
+BUILT_SOURCES = keymap_defs.h keymap_alldefs.h git_ver.h conststrings.c
 
 bin_PROGRAMS = mutt $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
 
@@ -79,11 +79,10 @@ EXTRA_DIST = account.h ascii.h attach.h bcache.h browser.h buffer.h buffy.h \
        mutt_options.h mutt_regex.h mutt_sasl.h mutt_sasl_plain.h \
        mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h myvar.h nntp.h OPS \
        OPS.CRYPT OPS.MIX OPS.NOTMUCH OPS.PGP OPS.SIDEBAR OPS.SMIME pager.h \
-       PATCHES patchlist.sh pgp.h pgpewrap.c pgplib.h pgppacket.h pop.h \
-       protos.h README.md README.SSL remailer.c remailer.h rfc1524.h \
-       rfc2047.h rfc2231.h rfc3676.h rfc822.h sha1.h sidebar.h smime.h \
-       smime_keys.pl sort.h txt2c.c txt2c.sh UPDATING version.h \
-       keymap_alldefs.h
+       pgp.h pgpewrap.c pgplib.h pgppacket.h pop.h protos.h README.md \
+       README.SSL remailer.c remailer.h rfc1524.h rfc2047.h rfc2231.h \
+       rfc3676.h rfc822.h sha1.h sidebar.h smime.h smime_keys.pl sort.h \
+       txt2c.c txt2c.sh UPDATING version.h keymap_alldefs.h
 
 EXTRA_SCRIPTS = smime_keys
 
@@ -151,9 +150,6 @@ git_ver.h:
        cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \
        rm -f git_ver.h.tmp
 
-patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
-       $(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
-
 install-exec-hook:
        if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then  \
                rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;                \
diff --git a/PATCHES b/PATCHES
deleted file mode 100644 (file)
index 3120b40..0000000
--- a/PATCHES
+++ /dev/null
@@ -1,31 +0,0 @@
-patch-attach-headers-color-neomutt
-patch-compose-to-sender-neomutt
-patch-compress-neomutt
-patch-cond-date-neomutt
-patch-encrypt-to-self-neomutt
-patch-fmemopen-neomutt
-patch-forgotten-attachments-neomutt
-patch-forwref-neomutt
-patch-ifdef-neomutt
-patch-index-color-neomutt
-patch-initials-neomutt
-patch-keywords-neomutt
-patch-kyoto-neomutt
-patch-limit-current-thread-neomutt
-patch-lmdb-neomutt
-patch-lua-neomutt
-patch-multiple-fcc-neomutt
-patch-nested-if-neomutt
-patch-new-mail-neomutt
-patch-nntp-neomutt
-patch-notmuch-neomutt
-patch-progress-neomutt
-patch-quasi-delete-neomutt
-patch-reply-with-xorig-neomutt
-patch-sensible-browser-neomutt
-patch-sidebar-neomutt
-patch-skip-quoted-neomutt
-patch-status-color-neomutt
-patch-timeout-neomutt
-patch-tls-sni-neomutt
-patch-trash-neomutt
index a87cf75648317e88d41af75363cf10f65e8de8b1..22f257541854e4a7d6c39821cd14fe0aca1175d3 100644 (file)
@@ -18,7 +18,6 @@ EXTRA_DIST = dotlock.man              \
        pgpewrap.man                    \
        pgpring.man                     \
        PGP-Notes.txt                   \
-       applying-patches.txt            \
        gen-map-doc                     \
        muttrc.man.head                 \
        muttrc.man.tail                 \
@@ -27,7 +26,6 @@ EXTRA_DIST = dotlock.man              \
        manual.xml.head                 \
        manual.xml.tail                 \
        instdoc.sh.in                   \
-       patch-notes.txt                 \
        smime-notes.txt                 \
        Muttrc Muttrc.head stamp-doc-rc \
        makedoc.c makedoc_defs.h        \
@@ -43,8 +41,7 @@ HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
 
-srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt   \
-       devel-notes.txt patch-notes.txt smime-notes.txt
+srcdir_DOCFILES = PGP-Notes.txt devel-notes.txt smime-notes.txt
 
 topsrcdir_DOCFILES = COPYRIGHT LICENSE.md INSTALL ChangeLog ChangeLog.neomutt  \
        README.SSL README.md
diff --git a/doc/applying-patches.txt b/doc/applying-patches.txt
deleted file mode 100644 (file)
index ea228a0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Applying patches
-From: Thomas Roessler <roessler@does-not-exist.org>
-Date: Thu,  8 Oct 1998 14:32:53 +0200
-
-When applying patches to mutt, you may encounter strange error
-messages spit out by programs like aclocal, autoconf, automake.
-This will happen if your machine has a partial build environment
-(see devel-notes.txt for a description of what's needed for mutt
-development): Mutt has detected changes to some of the "meta source
-files" like configure.in and tries to rebuild other files such as
-aclocal.m4 or Makefile.in based on these changes; this will fail if
-your build environment is not complete.
-
-If you encounter this kind of problem, touching the following files
-after applying patches may help:
-
-       Makefile.in
-       config.h.in
-       configure
-       aclocal.m4
-
-After doing so, simply type "make"; the dependencies should take
-care of the necessary other re-building (this may quite well include
-a re-running of ./configure).
diff --git a/doc/patch-notes.txt b/doc/patch-notes.txt
deleted file mode 100644 (file)
index 1c93cd5..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From roessler@does-not-exist.org Wed Nov  7 11:49:56 2001
-Date: Wed, 7 Nov 2001 11:49:56 +0100
-From: Thomas Roessler <roessler@does-not-exist.org>
-To: mutt-dev@mutt.org
-Subject: To those shipping patches (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; format=flowed
-Status: RO
-Content-Length: 1273
-Lines: 34
-
-You folks have convinced me that the old patchlist was almost the
-right way to go for mutt identifying what patches have been applied.
-
-Thus, I've implemented this scheme (and will commit it to the CVS
-in a moment): There's a new file called PATCHES in the source tree,
-which will be empty in the official distribution.
-
-This file's format is one patch ID per line.  Patch IDs should be
-the same as the file names used for distributing patches.  The
-format for these file names should be this:
-
-     patch-<version>.<initials>.<patch-description>.<patchlevel>
-
-That is, Vsevolod's NNTP patch for mutt-1.3.42 could be named like
-this:
-
-     patch-1.3.42.vvv.nntp.1
-
- From PATCHES, patchlist.c will be automatically generated.  In
-order to properly construct PATCHES, please include the following
-chunk with your patch, replacing <your-id-here> by your patch ID.
-
-------------------------------snip------------------------------
---- PATCHES~    Tue Nov  6 19:59:33 2001
-+++ PATCHES     Tue Nov  6 19:59:42 2001
-@@ -1,0 +1 @@
-+<your-id-here>
-------------------------------snip------------------------------
-
-The patch IDs will be displayed when mutt is run with the 'v'
-command line switch.
-
---
-Thomas Roessler                        http://log.does-not-exist.org/
-
diff --git a/patchlist.sh b/patchlist.sh
deleted file mode 100755 (executable)
index d2dab1f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh --
-
-list_patches_PATCHES () {
-       cat -
-}
-
-list_patches_mq () {
-       hg qapplied | sed -e 's/^/mq-/'
-}
-
-list_patches () {
-       if [ -f .hg/patches/series ]; then
-               list_patches_mq
-       else
-               list_patches_PATCHES
-       fi
-}
-
-cat <<EOF
-/* this is an autogenerated file.  edit patchlist.sh instead. */
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "mutt.h"
-
-void mutt_print_patchlist (void)
-{
-EOF
-
-cat - | while read patch ; do
-       echo "  puts (\"${patch}\");"
-done
-
-echo "}"
index 1888a1f01a760224ab1dc7c0c6289ea5d5b3f487..b0f9013aae86470eb51b0f839437ba0f249edd39 100644 (file)
--- a/version.c
+++ b/version.c
@@ -33,7 +33,6 @@
 
 /* #include "protos.h" */
 const char *mutt_make_version(void);
-void mutt_print_patchlist(void);
 /* #include "hcache/hcache.h" */
 const char *mutt_hcache_backend_list(void);
 
@@ -425,9 +424,6 @@ void print_version(void)
   printf("SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
   printf("EXECSHELL=\"%s\"\n", EXECSHELL);
 
-  puts("");
-  mutt_print_patchlist();
-
   puts("");
   puts(_(ReachingUs));
 }