summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormetamer2017-01-29 19:53:59 -0800
committermetamer2017-01-29 21:41:21 -0800
commitfa687a9d5f3b50328f2decac7f52bd1291b72822 (patch)
tree0adf3cdcc79513927235dc3d82f447a64083a922
parentbdc5695f65110b16e5211f852f7a45efdf985f33 (diff)
downloadaur-fa687a9d5f3b50328f2decac7f52bd1291b72822.tar.gz
fix issue with get_terminal_name call
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--python-lnp-get-terminal-name.patch11
3 files changed, 20 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59e439c6b39..13fb87cb4d1 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 = 6
+ pkgrel = 7
epoch = 0
install = dwarffortress-lnp-git.install
arch = x86_64
@@ -64,6 +64,7 @@ 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
@@ -88,6 +89,7 @@ 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 9d238eebcce..36927605f4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dwarffortress-lnp-git
pkgver=43.03
_pkgver=43_03
_dfhack_pkgrel=r1
-pkgrel=6
+pkgrel=7
epoch=0
pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
arch=(x86_64)
@@ -58,6 +58,7 @@ 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"
@@ -86,6 +87,7 @@ md5sums=('SKIP'
'affd6273731c321d364c55a8da314fea'
'856c54681faed3608cd951bf286d12d5'
'5cc79b5dc202d8faa02086293badfcee'
+ '5576ec011c3e332d148ccfba2ca69d5c'
'389e34b6937f843c8f635d5e7326c9fc'
'bba8ab4d3f70cea8b812e78445fef1f0'
'6a87f6069f54645847b846833ff62d5a')
@@ -109,6 +111,9 @@ 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
new file mode 100644
index 00000000000..da1251ae881
--- /dev/null
+++ b/python-lnp-get-terminal-name.patch
@@ -0,0 +1,11 @@
+--- 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: