summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormetamer2017-02-10 20:07:28 -0800
committermetamer2017-02-10 20:07:28 -0800
commitef1f6805b39c84583f3ecdd4a80cf56a44904391 (patch)
treea2fe55aadf3557c2c12b11887ed240dc9df7d017
parentfa687a9d5f3b50328f2decac7f52bd1291b72822 (diff)
downloadaur-ef1f6805b39c84583f3ecdd4a80cf56a44904391.tar.gz
remove pylnp patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--python-lnp-get-terminal-name.patch11
3 files changed, 2 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 13fb87cb4d1..3bc77c513ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
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 = 7
+ pkgrel = 8
epoch = 0
install = dwarffortress-lnp-git.install
arch = x86_64
@@ -64,7 +64,6 @@ pkgbase = dwarffortress-lnp-git
source = DFAnnouncementFilter.zip::http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip
source = dfhack-twbt.patch
source = dfhack-visualizers.patch
- source = python-lnp-get-terminal-name.patch
source = lnp
source = dwarffortress-lnp-git.desktop
source = dwarffortress-lnp-git.install
@@ -89,7 +88,6 @@ pkgbase = dwarffortress-lnp-git
md5sums = affd6273731c321d364c55a8da314fea
md5sums = 856c54681faed3608cd951bf286d12d5
md5sums = 5cc79b5dc202d8faa02086293badfcee
- md5sums = 5576ec011c3e332d148ccfba2ca69d5c
md5sums = 389e34b6937f843c8f635d5e7326c9fc
md5sums = bba8ab4d3f70cea8b812e78445fef1f0
md5sums = 6a87f6069f54645847b846833ff62d5a
diff --git a/PKGBUILD b/PKGBUILD
index 36927605f4d..ff22bf9b17e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dwarffortress-lnp-git
pkgver=43.03
_pkgver=43_03
_dfhack_pkgrel=r1
-pkgrel=7
+pkgrel=8
epoch=0
pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
arch=(x86_64)
@@ -58,7 +58,6 @@ source=(git+"https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux"
'DFAnnouncementFilter.zip'::'http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip'
"dfhack-twbt.patch"
"dfhack-visualizers.patch"
- "python-lnp-get-terminal-name.patch"
"lnp"
"${pkgname}.desktop"
"${pkgname}.install"
@@ -87,7 +86,6 @@ md5sums=('SKIP'
'affd6273731c321d364c55a8da314fea'
'856c54681faed3608cd951bf286d12d5'
'5cc79b5dc202d8faa02086293badfcee'
- '5576ec011c3e332d148ccfba2ca69d5c'
'389e34b6937f843c8f635d5e7326c9fc'
'bba8ab4d3f70cea8b812e78445fef1f0'
'6a87f6069f54645847b846833ff62d5a')
@@ -111,9 +109,6 @@ prepare() {
git submodule init
git submodule update
- cd $srcdir/python-lnp/core
- patch -uN terminal.py $srcdir/python-lnp-get-terminal-name.patch
-
cd $srcdir/dfhack/plugins
patch -uN CMakeLists.custom.txt $srcdir/dfhack-twbt.patch
diff --git a/python-lnp-get-terminal-name.patch b/python-lnp-get-terminal-name.patch
deleted file mode 100644
index da1251ae881..00000000000
--- a/python-lnp-get-terminal-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- terminal.py.old 2017-01-29 19:11:14.936469798 -0800
-+++ terminal.py 2017-01-29 19:11:23.498852585 -0800
-@@ -25,7 +25,7 @@
- term = get_configured_terminal().get_command_line()
- log.d(
- "Using configured terminal: %s, command line %s", term,
-- get_configured_terminal.name) #pylint: disable=no-member
-+ get_configured_terminal().name) #pylint: disable=no-member
- if "$" in term:
- c = []
- for s in term: