summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormetamer2018-01-11 18:10:32 -0800
committermetamer2018-01-11 18:54:13 -0800
commit5f75137bd9a0bcc446a0de8381ce4728e20acf79 (patch)
tree383fbb788cddcb3fafe3b38378530793861b4b70
parent3d27739f5d186279321fb8f731a8f41d3b49307f (diff)
downloadaur-dwarffortress-lnp-git.tar.gz
Added stonesense build back in, added utils patch
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--dfhack-visualizers.patch10
-rw-r--r--lnp-utils.patch16
4 files changed, 45 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f10920831c2..1e98ec75a0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Jan 10 11:50:01 UTC 2018
+# Fri Jan 12 02:54:05 UTC 2018
pkgbase = dwarffortress-lnp-git
pkgdesc = Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics
pkgver = 44.03
- pkgrel = 1
+ pkgrel = 2
epoch = 0
install = dwarffortress-lnp-git.install
arch = x86_64
@@ -63,6 +63,8 @@ pkgbase = dwarffortress-lnp-git
source = http://bay12games.com/dwarves/df_44_03_linux.tar.bz2
source = DFAnnouncementFilter.zip::http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip
source = dfhack-twbt.patch
+ source = dfhack-visualizers.patch
+ source = lnp-utils.patch
source = lnp
source = dwarffortress-lnp-git.desktop
source = dwarffortress-lnp-git.install
@@ -86,6 +88,8 @@ pkgbase = dwarffortress-lnp-git
md5sums = 60a68261747673a91d583fa7129eb6c1
md5sums = affd6273731c321d364c55a8da314fea
md5sums = 856c54681faed3608cd951bf286d12d5
+ md5sums = 5bc2a56fb0b5760c5632d451003dc9e4
+ md5sums = b1cd403cdc9f72d77b7ee486df29d43b
md5sums = 389e34b6937f843c8f635d5e7326c9fc
md5sums = bba8ab4d3f70cea8b812e78445fef1f0
md5sums = 1c3b794a7becda3b6ce9ac453de300e6
diff --git a/PKGBUILD b/PKGBUILD
index cedb7805e2b..905fb95c785 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dwarffortress-lnp-git
pkgver=44.03
_pkgver=44_03
_dfhack_pkgrel=beta1
-pkgrel=1
+pkgrel=2
epoch=0
pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
arch=('x86_64')
@@ -53,6 +53,8 @@ source=(git+"https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux"
"http://bay12games.com/dwarves/df_${_pkgver}_linux.tar.bz2"
'DFAnnouncementFilter.zip'::'http://dffd.bay12games.com/download.php?id=7905&f=DFAnnouncementFilter.zip'
"dfhack-twbt.patch"
+ "dfhack-visualizers.patch"
+ "lnp-utils.patch"
"lnp"
"${pkgname}.desktop"
"${pkgname}.install"
@@ -80,6 +82,8 @@ md5sums=('SKIP'
'60a68261747673a91d583fa7129eb6c1'
'affd6273731c321d364c55a8da314fea'
'856c54681faed3608cd951bf286d12d5'
+ '5bc2a56fb0b5760c5632d451003dc9e4'
+ 'b1cd403cdc9f72d77b7ee486df29d43b'
'389e34b6937f843c8f635d5e7326c9fc'
'bba8ab4d3f70cea8b812e78445fef1f0'
'1c3b794a7becda3b6ce9ac453de300e6')
@@ -106,6 +110,12 @@ prepare() {
cd $srcdir/dfhack/plugins
patch -uN CMakeLists.custom.txt $srcdir/dfhack-twbt.patch
+ cd $srcdir/dfhack/plugins
+ patch -uN CMakeLists.txt $srcdir/dfhack-visualizers.patch
+
+ cd $srcdir/dfhack/plugins/stonesense
+ git checkout 4c55e14
+
mkdir -p $srcdir/dfhack/plugins/df-twbt
cd $srcdir/df-twbt
rsync -av --progress $srcdir/df-twbt $srcdir/dfhack/plugins \
@@ -228,6 +238,7 @@ package() {
# create bin
install -Dm755 "$srcdir/lnp" "$pkgdir/usr/bin/lnp"
+ patch -uN -d "$pkgdir/opt/$pkgname/LNP/utilities/" < $srcdir/lnp-utils.patch
test ! -z "$(which dwarftherapist)" \
&& mkdir -p "$pkgdir/opt/$pkgname/LNP/utilities/dwarf_therapist" \
@@ -243,7 +254,6 @@ package() {
install -Dm755 "$srcdir/DFAnnouncementFilter.jar" \
"$pkgdir/opt/$pkgname/LNP/utilities/df_announcement_filter"
-
install -Dm644 "${srcdir}/${pkgname}.desktop" \
"$pkgdir/usr/share/applications/lnp.desktop"
@@ -251,7 +261,7 @@ package() {
"$pkgdir/usr/share/icons/hicolor/128x128/apps/lnp.png"
for license in python-lnp/COPYING.txt dfhack/depends/protobuf/COPYING.txt \
- dfhack/LICENSE.rst \
+ dfhack/plugins/stonesense/LICENSE dfhack/LICENSE.rst \
; do
install -DTm644 "$srcdir/$license" \
"${pkgdir}/usr/share/licenses/${pkgname}/$license"
diff --git a/dfhack-visualizers.patch b/dfhack-visualizers.patch
new file mode 100644
index 00000000000..f2a509eb7d2
--- /dev/null
+++ b/dfhack-visualizers.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2016-04-21 09:36:00.759310999 -0700
++++ CMakeLists.txt 2016-04-21 09:40:59.192644332 -0700
+@@ -1,6 +1,6 @@
+ INCLUDE(Plugins.cmake)
+
+-OPTION(BUILD_STONESENSE "Build stonesense (needs a checkout first)." OFF)
++OPTION(BUILD_STONESENSE "Build stonesense (needs a checkout first)." ON)
+ if(BUILD_STONESENSE)
+ add_subdirectory (stonesense)
+ endif() \ No newline at end of file
diff --git a/lnp-utils.patch b/lnp-utils.patch
new file mode 100644
index 00000000000..63b2453fc0d
--- /dev/null
+++ b/lnp-utils.patch
@@ -0,0 +1,16 @@
+diff -Naur ./exclude.txt ./exclude.txt.old
+--- ./exclude.txt.old 2018-01-11 18:09:58.242468382 -0800
++++ ./exclude.txt 2018-01-11 18:19:52.485585918 -0800
+@@ -1,4 +1,3 @@
+ File Exlcusion List
+ Any file name inside square brackets will not show up in LNP's utilities list.
+
+-[*.jar]
+diff -Naur ./include.txt ./include.txt.old
+--- /include.txt.old 2018-01-11 18:09:58.242468382 -0800
++++ ./include.txt 2018-01-11 18:34:24.766491134 -0800
+@@ -1,3 +1,3 @@
+ File Include List
+ Any file name inside square brackets will show up in LNP's utilities list.
+-
++[DwarfTherapist]