mintty: Update to 2.0.3. Add "epoch" to solently update package.

This commit is contained in:
Alexey Pavlov
2015-07-13 12:33:30 +03:00
parent 54f553ec0a
commit 92fcd06b54
2 changed files with 6 additions and 96 deletions

View File

@@ -1,8 +1,9 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=mintty
pkgver=2.0.1
pkgrel=2
pkgver=2.0.3
pkgrel=1
epoch=1
pkgdesc="Terminal emulator with native Windows look and feel"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -10,16 +11,13 @@ groups=('base')
depends=('sh')
url="https://mintty.github.io"
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mintty/mintty/archive/${pkgver}.tar.gz
02-mintty-add-msys-64bit.patch
alt-f2-fix.patch)
sha1sums=('18a28d22c7dabbb9bf5de54d3f7eb73bc4001281'
'f3686ce7f28a954b058c155016a884480c06d6b0'
'7726afd88e2151db2fc71e5c26863fd3a9c14fe1')
02-mintty-add-msys-64bit.patch)
sha1sums=('4e6324559b75f3ba63fa2c40b05f0116d5d2f0d0'
'f3686ce7f28a954b058c155016a884480c06d6b0')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ${srcdir}/02-mintty-add-msys-64bit.patch
patch -p1 -i ${srcdir}/alt-f2-fix.patch
}
build() {

View File

@@ -1,88 +0,0 @@
From a65c29fd2dff7e822ab6b4dcba24853041174146 Mon Sep 17 00:00:00 2001
From: mintty <mintty@users.noreply.github.com>
Date: Sun, 5 Jul 2015 19:22:32 +0200
Subject: [PATCH] hotfix Alt-F2
---
src/appinfo.h | 2 +-
src/child.c | 12 ++++++++++--
src/winmain.c | 7 +++++++
wiki/Changelog.md | 3 +++
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/child.c b/src/child.c
index f3d37b7..494faa1 100644
--- a/src/child.c
+++ b/src/child.c
@@ -486,12 +486,13 @@ child_fork(int argc, char *argv[])
close(win_fd);
// add child parameters
- int newparams = 4;
+ int newparams = 0;
char * * newargv = malloc((argc + newparams + 1) * sizeof(char *));
int i = 0, j = 0;
int addnew = 1;
while (1) {
- if (addnew && (! argv[i] || strcmp (argv[i], "-e") == 0)) {
+ // hotfix, clean up later
+ if (0 && addnew && (! argv[i] || strcmp (argv[i], "-e") == 0)) {
addnew = 0;
// insert additional parameters here
newargv[j++] = "-o";
@@ -510,6 +511,13 @@ child_fork(int argc, char *argv[])
j++;
}
+ char parbuf1[34];
+ sprintf (parbuf1, "MINTTY_ROWS=%d", term.rows);
+ putenv (parbuf1);
+ char parbuf2[34];
+ sprintf (parbuf2, "MINTTY_COLS=%d", term.cols);
+ putenv (parbuf2);
+
#if CYGWIN_VERSION_DLL_MAJOR >= 1005
execv("/proc/self/exe", newargv);
#else
diff --git a/src/winmain.c b/src/winmain.c
index dedef7f..95a23f4 100644
--- a/src/winmain.c
+++ b/src/winmain.c
@@ -790,6 +790,13 @@ main(int argc, char *argv[])
load_config(rc_file);
delete(rc_file);
+ if (getenv("MINTTY_ROWS")) {
+ set_arg_option("Rows", getenv("MINTTY_ROWS"));
+ }
+ if (getenv("MINTTY_COLS")) {
+ set_arg_option("Columns", getenv("MINTTY_COLS"));
+ }
+
for (;;) {
int opt = getopt_long(argc, argv, short_opts, opts, 0);
if (opt == -1 || opt == 'e')
diff --git a/wiki/Changelog.md b/wiki/Changelog.md
index 7ed30e0..d02d132 100644
--- a/wiki/Changelog.md
+++ b/wiki/Changelog.md
@@ -1,3 +1,6 @@
+### 2.0.2 (5 July 2015) ###
+ * Hotfix Alt-F2.
+
### 2.0.1 (1 July 2015) ###
Display:
* Fixed bold display by overstriking if BoldAsFont unset.
diff --git a/src/appinfo.h b/src/appinfo.h
index 73834e5..e3344d6 100644
--- a/src/appinfo.h
+++ b/src/appinfo.h
@@ -6,7 +6,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 0
-#define PATCH_NUMBER 1
+#define PATCH_NUMBER 2
#define BUILD_NUMBER 0
// needed for res.rc