summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormetamer2018-01-02 20:11:39 -0800
committermetamer2018-01-10 03:50:11 -0800
commit3d27739f5d186279321fb8f731a8f41d3b49307f (patch)
treef5119ded657494ef1e0a4f29fd18075e8f33cc3f
parent90953ee4d5aada0f2b1140e0adc468e36930c5c9 (diff)
downloadaur-3d27739f5d186279321fb8f731a8f41d3b49307f.tar.gz
update to 44.03
-rw-r--r--.SRCINFO40
-rw-r--r--PKGBUILD36
-rw-r--r--dfhack-visualizers.patch10
-rw-r--r--distro-fixes-64-bit.patch26
4 files changed, 31 insertions, 81 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 123dbeddf82..f10920831c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jun 25 12:22:16 UTC 2017
+# Wed Jan 10 11:50:01 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 = 43.05
+ pkgver = 44.03
pkgrel = 1
epoch = 0
install = dwarffortress-lnp-git.install
@@ -44,27 +44,25 @@ pkgbase = dwarffortress-lnp-git
options = !strip
options = !buildflags
source = git+https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux
- source = git+https://github.com/DFgraphics/Afro-Graphics.git#tag=43.05
- source = git+https://github.com/DFgraphics/CLA.git#tag=43.05-v23
- source = git+https://github.com/DFgraphics/GemSet.git#tag=43.05
- source = git+https://github.com/DFgraphics/Ironhand.git#tag=43.05
- source = git+https://github.com/DFgraphics/Jolly-Bastion.git#tag=43.05
- source = git+https://github.com/DFgraphics/Mayday.git#tag=43.05
- source = git+https://github.com/DFgraphics/Obsidian.git#tag=43.05c
- source = git+https://github.com/DFgraphics/Phoebus.git#tag=43.05c
- source = git+https://github.com/DFgraphics/Spacefox.git#tag=43.05
+ source = git+https://github.com/DFgraphics/Afro-Graphics.git#tag=44.03
+ source = git+https://github.com/DFgraphics/CLA.git#tag=44.01-v24
+ source = git+https://github.com/DFgraphics/GemSet.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Ironhand.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Jolly-Bastion.git#tag=43.04
+ source = git+https://github.com/DFgraphics/Mayday.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Obsidian.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Phoebus.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Spacefox.git#tag=44.03
source = git+https://github.com/DFgraphics/Taffer.git
- source = git+https://github.com/DFgraphics/Tergel.git#tag=43.05
- source = git+https://github.com/DFgraphics/Wanderlust.git#tag=43.05
- source = git+https://github.com/DFHack/dfhack.git#tag=0.43.05-r1
- source = git+https://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.43.05
- source = git+https://github.com/mifki/df-twbt.git#tag=v5.84
+ source = git+https://github.com/DFgraphics/Tergel.git#tag=44.03
+ source = git+https://github.com/DFgraphics/Wanderlust.git#tag=44.03
+ source = git+https://github.com/DFHack/dfhack.git#tag=0.44.03-beta1
+ source = git+https://github.com/svenstaro/dwarf_fortress_unfuck.git#tag=0.44.03
+ source = git+https://github.com/mifki/df-twbt.git#tag=v6.31
source = hg+https://bitbucket.org/Pidgeot/python-lnp
- source = http://bay12games.com/dwarves/df_43_05_linux.tar.bz2
+ 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 = distro-fixes-64-bit.patch
source = lnp
source = dwarffortress-lnp-git.desktop
source = dwarffortress-lnp-git.install
@@ -85,11 +83,9 @@ pkgbase = dwarffortress-lnp-git
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
- md5sums = 5b8ee45e906d021c053f816e443c2983
+ md5sums = 60a68261747673a91d583fa7129eb6c1
md5sums = affd6273731c321d364c55a8da314fea
md5sums = 856c54681faed3608cd951bf286d12d5
- md5sums = 5cc79b5dc202d8faa02086293badfcee
- md5sums = f0bfe1fb2c806289b9970da3e07e4d7b
md5sums = 389e34b6937f843c8f635d5e7326c9fc
md5sums = bba8ab4d3f70cea8b812e78445fef1f0
md5sums = 1c3b794a7becda3b6ce9ac453de300e6
diff --git a/PKGBUILD b/PKGBUILD
index 14d06dda5b7..cedb7805e2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
pkgname=dwarffortress-lnp-git
-pkgver=43.05
-_pkgver=43_05
-_dfhack_pkgrel=r1
+pkgver=44.03
+_pkgver=44_03
+_dfhack_pkgrel=beta1
pkgrel=1
epoch=0
pkgdesc="Installer for the Lazy Newb Pack to run Dwarf Fortress. Includes vanilla dwarf fortress, dfhack and graphics"
@@ -35,26 +35,24 @@ install=${pkgname}.install
changelog=
source=(git+"https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux"
git+"https://github.com/DFgraphics/Afro-Graphics.git"#tag=${pkgver}
- git+"https://github.com/DFgraphics/CLA.git"#tag=${pkgver}-v23
+ git+"https://github.com/DFgraphics/CLA.git"#tag=44.01-v24
git+"https://github.com/DFgraphics/GemSet.git"#tag=${pkgver}
git+"https://github.com/DFgraphics/Ironhand.git"#tag=${pkgver}
- git+"https://github.com/DFgraphics/Jolly-Bastion.git"#tag=${pkgver}
+ git+"https://github.com/DFgraphics/Jolly-Bastion.git"#tag=43.04
git+"https://github.com/DFgraphics/Mayday.git"#tag=${pkgver}
- git+"https://github.com/DFgraphics/Obsidian.git"#tag=${pkgver}c
- git+"https://github.com/DFgraphics/Phoebus.git"#tag=${pkgver}c
+ git+"https://github.com/DFgraphics/Obsidian.git"#tag=${pkgver}
+ git+"https://github.com/DFgraphics/Phoebus.git"#tag=${pkgver}
git+"https://github.com/DFgraphics/Spacefox.git"#tag=${pkgver}
git+"https://github.com/DFgraphics/Taffer.git"
git+"https://github.com/DFgraphics/Tergel.git"#tag=${pkgver}
git+"https://github.com/DFgraphics/Wanderlust.git"#tag=${pkgver}
git+"https://github.com/DFHack/dfhack.git"#tag=0.${pkgver}-${_dfhack_pkgrel}
git+"https://github.com/svenstaro/dwarf_fortress_unfuck.git"#tag=0.${pkgver}
- git+"https://github.com/mifki/df-twbt.git"#tag=v5.84
+ git+"https://github.com/mifki/df-twbt.git"#tag=v6.31
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'
"dfhack-twbt.patch"
- "dfhack-visualizers.patch"
- "distro-fixes-64-bit.patch"
"lnp"
"${pkgname}.desktop"
"${pkgname}.install"
@@ -79,11 +77,9 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- '5b8ee45e906d021c053f816e443c2983'
+ '60a68261747673a91d583fa7129eb6c1'
'affd6273731c321d364c55a8da314fea'
'856c54681faed3608cd951bf286d12d5'
- '5cc79b5dc202d8faa02086293badfcee'
- 'f0bfe1fb2c806289b9970da3e07e4d7b'
'389e34b6937f843c8f635d5e7326c9fc'
'bba8ab4d3f70cea8b812e78445fef1f0'
'1c3b794a7becda3b6ce9ac453de300e6')
@@ -110,15 +106,6 @@ 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/Lazy-Newb-Pack-Linux/pack/df_linux
- patch -uN distro_fixes.sh $srcdir/distro-fixes-64-bit.patch
-
- cd $srcdir/dfhack/plugins/stonesense
- git checkout 00f0782
-
mkdir -p $srcdir/dfhack/plugins/df-twbt
cd $srcdir/df-twbt
rsync -av --progress $srcdir/df-twbt $srcdir/dfhack/plugins \
@@ -164,6 +151,9 @@ package() {
cp -r "$srcdir/Lazy-Newb-Pack-Linux/pack/df_linux" "$pkgdir/opt/$pkgname"
cp -r "$srcdir/df_linux" "$pkgdir/opt/$pkgname"
+ cp "$srcdir/df-twbt/dist/shadows.png" "$pkgdir/opt/$pkgname/df_linux/data/art"
+ cp "$srcdir/df-twbt/dist/white1px.png" "$pkgdir/opt/$pkgname/df_linux/data/art"
+ cp "$srcdir/df-twbt/dist/transparent1px.png" "$pkgdir/opt/$pkgname/df_linux/data/art"
rm -rf "$pkgdir/opt/$pkgname/df_linux/g_src"
#rm "$pkgdir/opt/$pkgname/df_linux/libs/"{libgraphics.so,libgcc_s.so.1,libstdc++.so.6}
@@ -261,7 +251,7 @@ package() {
"$pkgdir/usr/share/icons/hicolor/128x128/apps/lnp.png"
for license in python-lnp/COPYING.txt dfhack/depends/protobuf/COPYING.txt \
- dfhack/plugins/stonesense/LICENSE dfhack/LICENSE.rst \
+ dfhack/LICENSE.rst \
; do
install -DTm644 "$srcdir/$license" \
"${pkgdir}/usr/share/licenses/${pkgname}/$license"
diff --git a/dfhack-visualizers.patch b/dfhack-visualizers.patch
deleted file mode 100644
index a0d8b763620..00000000000
--- a/dfhack-visualizers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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()
diff --git a/distro-fixes-64-bit.patch b/distro-fixes-64-bit.patch
deleted file mode 100644
index 142c6c0bb23..00000000000
--- a/distro-fixes-64-bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- distro_fixes.sh.old 2017-04-06 15:12:56.520859032 -0700
-+++ distro_fixes.sh 2017-04-06 14:55:20.578934713 -0700
-@@ -137,6 +137,23 @@
- dlog WARN "Could not find a 32-bit zlib"
- fi
-
-+elif [ x"$DF_ARCH" = x'64-bit' ] && [ x"$ARCH" = x'x86_64' ]; then
-+ if [ x"$OS" = x'arch' ] || [ x"$OS" = x'antergos' ] || [ x"$OS" = x'manjarolinux' ]; then
-+ find_zlib /usr/lib64/libz.so /usr/lib64
-+ if [ -e "/usr/lib64/libstdc++.so.6" ]; then
-+ export PRELOAD_LIB="${PRELOAD_LIB:+$PRELOAD_LIB:}/usr/lib64/libstdc++.so.6"
-+ else
-+ dlog WARN "Could not find /usr/lib64/libstdc++.so.6"
-+ fi
-+ else
-+ dlog "WARN" "64bit 'Dwarf_Fortress' on unhandled 64bit OS detected. If you get 'missing file' errors, please open an issue on Github: https://github.com/Lazy-Newb-Pack/Lazy-Newb-Pack-Linux/issues."
-+ find_zlib
-+ fi
-+
-+ if [ -z "$ZLIB_PATH" ]; then
-+ dlog WARN "Could not find a 64-bit zlib"
-+ fi
-+
- elif [ x"$DF_ARCH" = x'32-bit' ]; then
- find_zlib
- fi