Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (24b06db4b7413365b18b6b28f280d88ba18dd2fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (24b06db4b7413365b18b6b28f280d88ba18dd2fa)
  • Date: Wed, 6 Jan 2016 23:11:56 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

dev/null |binary
mail/mutt/HISTORY | 6 ++
mail/mutt/PRE_BUILD | 25
++--------
mail/mutt/patches/compressed_folders/PATCH_DETAILS | 2
mail/mutt/patches/trash_folder/PATCH_DETAILS | 6 +-
mail/mutt/patches/trash_folder/mutt-1.5.24-trash_folder.diff.bz2 |binary
6 files changed, 16 insertions(+), 23 deletions(-)

New commits:
commit 24b06db4b7413365b18b6b28f280d88ba18dd2fa
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mutt: Use autoreconf directly instead of ./prepare

To avoid running ./configure twice.

commit f7069b8c2d1f5f4c32dcf0c6f80834f7781a27a6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mutt: Fix PATCH_DETAILS files to use MUTT_BRANCH instead of BRANCH

commit 7e213dca66eba27468c33875c9f4fcf786c69551
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mutt: Update trash_folder patch for 1.5.24

commit 98e05ef16386d6e8da30a1ed081b7740340b0479
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mutt: Simplify PRE_BUILD, no need to edit hosted patches

diff --git a/mail/mutt/HISTORY b/mail/mutt/HISTORY
index a9147a1..3001333 100644
--- a/mail/mutt/HISTORY
+++ b/mail/mutt/HISTORY
@@ -1,3 +1,9 @@
+2016-01-06 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Simplified, no need to edit hosted patches
+ Use autoreconf directly instead of ./prepare, to avoid ./configure
+ * patches/trash_folder: Updated for 1.5.24
+ * patches/*/PATCH_DETAILS: Fixed to use MUTT_BRANCH instead of BRANCH
+
2015-11-24 Ismael Luceno <ismael AT sourcemage.org>
* mutt.gpg: Added key from Kevin J. McCarthy <kevin AT 8t8.us>
* DETAILS: Fixed hg branch for scm
diff --git a/mail/mutt/PRE_BUILD b/mail/mutt/PRE_BUILD
index 608321a..bffab7e 100755
--- a/mail/mutt/PRE_BUILD
+++ b/mail/mutt/PRE_BUILD
@@ -1,34 +1,21 @@
-function mutt_default_patch() {
- . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DETAILS" &&
- bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.bz2" >
"${PATCH_SOURCE}" &&
- if [[ -f
"${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${MUTT_BRANCH}.smgl.diff.bz2"
]]; then
- bzcat
"${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.${MUTT_BRANCH}.smgl.diff.bz2" >
"${PATCH_SOURCE}.smgl.diff"
- elif [[ -f "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" ]];
then
- bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.smgl.diff.bz2" >
"${PATCH_SOURCE}.smgl.diff"
- fi &&
- if [[ -f "${PATCH_SOURCE}.smgl.diff" ]]; then
- patch -p0 < "${PATCH_SOURCE}.smgl.diff"
- fi &&
- patch -p"${PATCH_STRIP:-1}" < "${PATCH_SOURCE}"
-}
-
default_pre_build &&
-
cd "${SOURCE_DIRECTORY}" &&

for PATCH in ${REAL_PATCHES}; do
message "${MESSAGE_COLOR}Applying patch ${PATCH}${DEFAULT_COLOR}" &&
- PATCH_SOURCE=""
- PATCH_STRIP=""
+ PATCH_SOURCE="" &&
+ PATCH_STRIP="" &&
if [[ -x "$PATCH_DIRECTORY/$PATCH/PATCH" ]]; then
. "${PATCH_DIRECTORY}/${PATCH}/PATCH" || return 1
else
- mutt_default_patch
+ . "${PATCH_DIRECTORY}/${PATCH}/PATCH_DETAILS" &&
+ bzcat "${PATCH_DIRECTORY}/${PATCH}/${PATCH_SOURCE}.bz2" |
+ patch -p"${PATCH_STRIP:-1}"
fi
done &&

if [[ ! -z "$REAL_PATCHES" ]] || [[ ! -x ./configure ]]; then
- ./prepare
+ autoreconf --install
fi &&

if gcc -dumpversion | grep -q "^4" && [[ "$MUTT_BRANCH" == "stable" ]]; then
diff --git a/mail/mutt/patches/compressed_folders/PATCH_DETAILS
b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
index 2170f9e..d8e9bb3 100755
--- a/mail/mutt/patches/compressed_folders/PATCH_DETAILS
+++ b/mail/mutt/patches/compressed_folders/PATCH_DETAILS
@@ -1,7 +1,7 @@
PATCH_SITE="http://www.spinnaker.de/mutt/compressed/";
PATCH_BRANCHES="stable devel scm"

-case "${BRANCH}" in
+case "${MUTT_BRANCH}" in
stable)
PATCH_SOURCE="patch-1.4.2.3.rr.compressed.1"
;;
diff --git a/mail/mutt/patches/trash_folder/PATCH_DETAILS
b/mail/mutt/patches/trash_folder/PATCH_DETAILS
index 7e95912..fe35c77 100755
--- a/mail/mutt/patches/trash_folder/PATCH_DETAILS
+++ b/mail/mutt/patches/trash_folder/PATCH_DETAILS
@@ -1,12 +1,12 @@
#PATCH_SITE="http://cedricduval.free.fr/mutt/patches/";
-PATCH_SITE="http://scie.nti.st/2007/6/21/mutt-trash-folder-patch-for-1-5-16";
+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 "${BRANCH}" in
+case "${MUTT_BRANCH}" in
stable)
PATCH_SOURCE="patch-1.4.2.3.cd.trash_folder.3.1"
;;
devel|scm)
- PATCH_SOURCE="trash_folder-1.5.18.patch"
+ PATCH_SOURCE="mutt-1.5.24-trash_folder.diff"
;;
esac
diff --git a/mail/mutt/patches/trash_folder/mutt-1.5.24-trash_folder.diff.bz2
b/mail/mutt/patches/trash_folder/mutt-1.5.24-trash_folder.diff.bz2
new file mode 100644
index 0000000..abc79c1
Binary files /dev/null and
b/mail/mutt/patches/trash_folder/mutt-1.5.24-trash_folder.diff.bz2 differ
diff --git a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2
b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2
deleted file mode 100644
index 52b4268..0000000
Binary files a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.bz2
and /dev/null differ
diff --git
a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2
b/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2
deleted file mode 100644
index 613d43d..0000000
Binary files
a/mail/mutt/patches/trash_folder/trash_folder-1.5.18.patch.scm.smgl.diff.bz2
and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (24b06db4b7413365b18b6b28f280d88ba18dd2fa), Ismael Luceno, 01/06/2016

Archive powered by MHonArc 2.6.24.

Top of Page