removed pylnp terminal patch

3 files changed, 3 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 484510c095f8..62263f77f288 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug 29 20:15:44 UTC 2016
+# Thu Sep 22 19:24:03 UTC 2016
 pkgbase = dwarffortress-lnp-git
 	pkgdesc = Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics
 	pkgver = 43.03
-	pkgrel = 4
+	pkgrel = 5
 	epoch = 0
 	install = dwarffortress-lnp-git.install
 	arch = x86_64
@@ -51,7 +51,6 @@ pkgbase = dwarffortress-lnp-git
 	source = hg+https://bitbucket.org/Pidgeot/python-lnp
 	source = http://bay12games.com/dwarves/df_43_03_linux.tar.bz2
 	source = DFAnnouncementFilter.zip::http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip
-	source = pylnp-terminal.patch
 	source = dfhack-twbt.patch
 	source = dfhack-visualizers.patch
 	source = lnp
@@ -76,7 +75,6 @@ pkgbase = dwarffortress-lnp-git
 	md5sums = SKIP
 	md5sums = 17d9ceb486fd476b4c6e8f0834d21d2e
 	md5sums = affd6273731c321d364c55a8da314fea
-	md5sums = 35e4942313f50d35e58e9c2a51874a82
 	md5sums = 856c54681faed3608cd951bf286d12d5
 	md5sums = 5cc79b5dc202d8faa02086293badfcee
 	md5sums = 389e34b6937f843c8f635d5e7326c9fc
diff --git a/PKGBUILD b/PKGBUILD
index c525711a6b51..891ca00e8359 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dwarffortress-lnp-git
 pkgver=43.03
 _pkgver=43_03
 _dfhack_pkgrel=r1
-pkgrel=4
+pkgrel=5
 epoch=0
 pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
 arch=(x86_64)
@@ -56,7 +56,6 @@ source=(git+"https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux"
         hg+"https://bitbucket.org/Pidgeot/python-lnp"
         "http://bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2"
         'DFAnnouncementFilter.zip'::'http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip'
-        "pylnp-terminal.patch"
         "dfhack-twbt.patch"
         "dfhack-visualizers.patch"
         "lnp"
@@ -85,7 +84,6 @@ md5sums=('SKIP'
          'SKIP'
          '17d9ceb486fd476b4c6e8f0834d21d2e'
          'affd6273731c321d364c55a8da314fea'
-         '35e4942313f50d35e58e9c2a51874a82'
          '856c54681faed3608cd951bf286d12d5'
          '5cc79b5dc202d8faa02086293badfcee'
          '389e34b6937f843c8f635d5e7326c9fc'
@@ -140,8 +138,6 @@ prepare() {
     -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
     -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}"
 
-  cd $srcdir/python-lnp/core
-  patch -uN terminal.py $srcdir/pylnp-terminal.patch
 
 }
 build() {
diff --git a/pylnp-terminal.patch b/pylnp-terminal.patch
deleted file mode 100644
index 455abfc3e5dc..000000000000
--- a/pylnp-terminal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- terminal.py.old	2016-07-15 18:56:06.339216999 -0700
-+++ terminal.py	2016-07-15 18:56:26.132648665 -0700
-@@ -28,7 +28,7 @@
-                     c.append(s)
-             return c
-         else:
--            return term + cmd
-+            return term + [cmd]
-         raise Exception('No terminal launcher for platform: ' + sys.platform)
- 
- def get_configured_terminal():