sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (51a0e646db0d78994d23f9b3e064fba797c53c3f)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (51a0e646db0d78994d23f9b3e064fba797c53c3f)
Date: Sat, 20 Aug 2016 00:03:20 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

dev/null |binary
mail/mutt/CONFIGURE | 6 +++++-
mail/mutt/DETAILS | 2 +-
mail/mutt/HISTORY | 7 +++++++
mail/mutt/PRE_BUILD | 4 +++-
mail/mutt/patches/compressed_folders/PATCH_DETAILS | 12 ++----------
mail/mutt/patches/imap_copy_for_trash/PATCH_DETAILS | 2 +-
mail/mutt/patches/trash_folder/PATCH_DETAILS | 12 ++----------
8 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit 51a0e646db0d78994d23f9b3e064fba797c53c3f
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/mutt: updated devel branch to 1.7.0

diff --git a/mail/mutt/CONFIGURE b/mail/mutt/CONFIGURE
index f887980..4ba09b4 100755
--- a/mail/mutt/CONFIGURE
+++ b/mail/mutt/CONFIGURE
@@ -68,5 +68,9 @@ if [[ "${MUTT_BRANCH}" != "stable" ]]; then
config_query_option MUTT_OPTS "Enable SMTP support?" \
"y" \
"--enable-smtp" \
- "--disable-smtp"
+ "--disable-smtp" &&
+ config_query_option MUTT_OPTS "Enable sidebar?" \
+ "n" \
+ "--enable-sidebar" \
+ "--disable-sidebar"
fi
diff --git a/mail/mutt/DETAILS b/mail/mutt/DETAILS
index 4595a06..5ec38a8 100755
--- a/mail/mutt/DETAILS
+++ b/mail/mutt/DETAILS
@@ -12,7 +12,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-mercurial
;;
devel)
- VERSION=1.6.0
+ VERSION=1.7.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=ftp://ftp.mutt.org/pub/mutt/${SOURCE}
diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index ea638d2..fd4454a 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,10 @@
+2016-08-19 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated devel branch to 1.7.0
+ * CONFIGURE: added sidebar optional feature
+ * PRE_BUILD: apply 01-bug-fixes.patch to stable branch only
+ * patches/*: removed patches for 1.4.x versions, adjusted others
+ to be applied to stable branch
+
2016-04-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* PRE_BUILD, 01-bug-fixes.patch: add bugfix patch from the neomutt
project
diff --git a/mail/mutt/PRE_BUILD b/mail/mutt/PRE_BUILD
index ad078c9..0a3701b 100755
--- a/mail/mutt/PRE_BUILD
+++ b/mail/mutt/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p1 < "$SPELL_DIRECTORY/01-bug-fixes.patch" &&
+if [[ "$MUTT_BRANCH" == "stable" ]]; then
+patch -p1 < "$SPELL_DIRECTORY/01-bug-fixes.patch"
+fi &&

for PATCH in ${REAL_PATCHES}; do
message "${MESSAGE_COLOR}Applying patch ${PATCH}${DEFAULT_COLOR}" &&
diff --git a/mail/mutt/patches/compressed_folders/PATCH_DETAILS
b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
index d8e9bb3..875522a 100755
--- a/mail/mutt/patches/compressed_folders/PATCH_DETAILS
+++ b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
@@ -1,11 +1,3 @@
PATCH_SITE="http://www.spinnaker.de/mutt/compressed/";
-PATCH_BRANCHES="stable devel scm"
-
-case "${MUTT_BRANCH}" in
- stable)
- PATCH_SOURCE="patch-1.4.2.3.rr.compressed.1"
- ;;
- devel|scm)
- PATCH_SOURCE="patch-1.5.20.rr.compressed.1"
- ;;
-esac
+PATCH_BRANCHES="stable"
+PATCH_SOURCE="patch-1.5.20.rr.compressed.1"
diff --git
a/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2
b/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2
deleted file mode 100644
index 501770f..0000000
Binary files
a/mail/mutt/patches/compressed_folders/patch-1.4.2.3.rr.compressed.1.bz2 and
/dev/null differ
diff --git a/mail/mutt/patches/imap_copy_for_trash/PATCH_DETAILS
b/mail/mutt/patches/imap_copy_for_trash/PATCH_DETAILS
index def62a9..8b9bce6 100755
--- a/mail/mutt/patches/imap_copy_for_trash/PATCH_DETAILS
+++ b/mail/mutt/patches/imap_copy_for_trash/PATCH_DETAILS
@@ -1,3 +1,3 @@
PATCH_SITE="http://iodev.co.uk/mutt-patches/";
-PATCH_BRANCHES="devel scm"
+PATCH_BRANCHES="stable"
PATCH_SOURCE="mutt-1.5.24-imap_copy_for_trash.patch"
diff --git a/mail/mutt/patches/trash_folder/PATCH_DETAILS
b/mail/mutt/patches/trash_folder/PATCH_DETAILS
index fe35c77..2f85676 100755
--- a/mail/mutt/patches/trash_folder/PATCH_DETAILS
+++ b/mail/mutt/patches/trash_folder/PATCH_DETAILS
@@ -1,12 +1,4 @@
#PATCH_SITE="http://cedricduval.free.fr/mutt/patches/";

PATCH_SITE="https://blog.x-way.org/Linux/2015/09/23/Homebrew-Tap-for-Mutt-1-5-24-with-trash_folder-patch.html";
-PATCH_BRANCHES="stable devel scm"
-
-case "${MUTT_BRANCH}" in
- stable)
- PATCH_SOURCE="patch-1.4.2.3.cd.trash_folder.3.1"
- ;;
- devel|scm)
- PATCH_SOURCE="mutt-1.5.24-trash_folder.diff"
- ;;
-esac
+PATCH_BRANCHES="stable"
+PATCH_SOURCE="mutt-1.5.24-trash_folder.diff"
diff --git
a/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2
b/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2
deleted file mode 100644
index 5157b79..0000000
Binary files
a/mail/mutt/patches/trash_folder/patch-1.4.2.3.cd.trash_folder.3.1.bz2 and
/dev/null differ

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (51a0e646db0d78994d23f9b3e064fba797c53c3f), Pavel Vinogradov, 08/19/2016