summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--0001-curses-Fix-background-transparency-in-terminal.patch35
-rw-r--r--PKGBUILD11
3 files changed, 2 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 00c24b992549..2bd890ccb38e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,9 +11,7 @@ pkgbase = mtr-git
provides = mtr
conflicts = mtr
source = git+https://github.com/traviscross/mtr
- source = 0001-curses-Fix-background-transparency-in-terminal.patch
sha256sums = SKIP
- sha256sums = 4ff43c424870514568922244b2247a7052c14c15ca7cc649a23112dc3d7e274f
pkgname = mtr-git
diff --git a/0001-curses-Fix-background-transparency-in-terminal.patch b/0001-curses-Fix-background-transparency-in-terminal.patch
deleted file mode 100644
index 66bc6d0ee4f7..000000000000
--- a/0001-curses-Fix-background-transparency-in-terminal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 03aebf920ea002cda0d1621adea6ea8e71eed1d1 Mon Sep 17 00:00:00 2001
-From: Narthorn <narthorn@gmail.com>
-Date: Mon, 12 Oct 2015 13:24:57 +0200
-Subject: [PATCH] curses: Fix background transparency in terminal
-
-Patch comes from, and closes traviscross/mtr#72.
----
- curses.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/curses.c b/curses.c
-index 02b7937..f95f5d1 100644
---- a/curses.c
-+++ b/curses.c
-@@ -700,13 +700,15 @@ void mtr_curses_open(void)
- initscr();
- raw();
- noecho();
-+ int bg_col = 0;
- start_color();
- #ifdef HAVE_USE_DEFAULT_COLORS
-- use_default_colors();
-+ if (use_default_colors() == OK)
-+ bg_col = -1;
- #endif
- int i;
- for (i = 0; i < 8; i++)
-- init_pair(i+1, i, 0);
-+ init_pair(i+1, i, bg_col);
-
- mtr_curses_init();
- mtr_curses_redraw();
---
-2.6.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 4bca1d61eaf0..1efc6c77a5aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,21 +12,14 @@ makedepends=('git' 'ncurses')
depends=('ncurses')
provides=($_pkgname)
conflicts=($_pkgname)
-source=('git+https://github.com/traviscross/mtr'
- '0001-curses-Fix-background-transparency-in-terminal.patch')
-sha256sums=('SKIP'
- '4ff43c424870514568922244b2247a7052c14c15ca7cc649a23112dc3d7e274f')
+source=('git+https://github.com/traviscross/mtr')
+sha256sums=('SKIP')
pkgver() {
cd $_pkgname
git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd $_pkgname
- git am $srcdir/0001-curses-Fix-background-transparency-in-terminal.patch
-}
-
build() {
cd $_pkgname
./bootstrap.sh