tweak ppa script, remove packages
This commit is contained in:
parent
dd56a02b94
commit
1765d161e9
9
ppa
9
ppa
|
|
@ -160,6 +160,15 @@ reinstall() {
|
|||
paclist $repo_name | cut -d' ' -f1 | xargs sudo pacman -S --noconfirm
|
||||
}
|
||||
|
||||
clean() {
|
||||
# git clean -e 'aur/*' -dxn | grep -v .git
|
||||
git clean -e '*.git*' -e 'aur/*' -dxf
|
||||
}
|
||||
|
||||
undo() {
|
||||
patch -p1 -R < undo.diff
|
||||
}
|
||||
|
||||
if [ "$#" -gt 0 ]; then
|
||||
[ -d "$src_dir" ] || mkdir -p "$src_dir"
|
||||
[ -d "$pkg_dir" ] || mkdir -p "$pkg_dir"
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
*tar.gz
|
||||
*.pkg.*
|
||||
/pkg
|
||||
/src
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
# Maintainer: Adam Goldsmith <contact@adamgoldsmith.name>
|
||||
pkgname=ethminer-bin
|
||||
pkgver=0.14.0
|
||||
pkgrel=1
|
||||
pkgdesc="Ethereum miner with OpenCL, CUDA and stratum support (precompiled binary)"
|
||||
arch=('x86_64')
|
||||
url="https://github.com/ethereum-mining/ethminer"
|
||||
license=('MIT')
|
||||
provides=('ethminer')
|
||||
conflicts=('ethminer')
|
||||
source=("https://github.com/ethereum-mining/ethminer/releases/download/v${pkgver}/ethminer-${pkgver}-Linux.tar.gz")
|
||||
md5sums=('9b4f9700bbbd60348ab6d0cee876a483')
|
||||
|
||||
package() {
|
||||
install -Dm755 "$srcdir/bin/ethminer" "$pkgdir/usr/bin/ethminer"
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
|
@ -1,126 +0,0 @@
|
|||
# Maintainer: Alfredo Ramos <alfredo dot ramos at yandex dot com>
|
||||
# Contributor: kusakata <shohei atmark kusakata period com>
|
||||
|
||||
pkgbase='freeminer'
|
||||
pkgname=("${pkgbase}" "${pkgbase}-server" "${pkgbase}-common")
|
||||
pkgver=0.4.14.8
|
||||
pkgrel=3
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://freeminer.org/'
|
||||
license=('GPL3' 'CCPL:cc-by-sa-3.0')
|
||||
|
||||
makedepends=(
|
||||
'leveldb' 'curl' 'hiredis' 'sqlite' 'luajit'
|
||||
'irrlicht' 'openal' 'enet' 'jsoncpp' 'libvorbis'
|
||||
'hicolor-icon-theme' 'freetype2' 'cmake' 'msgpack-c' 'clang'
|
||||
)
|
||||
|
||||
source=(
|
||||
"https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.zip"
|
||||
'enet_shared_lib.patch'
|
||||
'fix_msgpack.patch'
|
||||
)
|
||||
sha512sums=(
|
||||
'093c1640c9a070fdbd45074d0a4acc5b7894d23cd436dc3cf794cee8fff92930cf26f8d802b984cb9ce19bac7fccc6e0ce948c816c9e19b9e9551e373e560beb'
|
||||
'ac51ee33df27f9fb3bdf16c50b2a9da602d6c55bba7afe21492d0056cdfefa5f84ccfb306c23bd2bcf22066ca3ef2a952110ba0de350602393754f0466383004'
|
||||
'4ac827ed4b1185264c6b7df279c40548b7e5dc5957129ee6dc4fe6ff05222844dabab67cf1f8c1932cac0cc691ac040812eca662d7ff36424eb3d3827bb126a0'
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}"/${pkgbase}-${pkgver}
|
||||
|
||||
# Use Arch's enet lib
|
||||
patch -Np1 < ../enet_shared_lib.patch
|
||||
|
||||
# Fix msgpack-c v2.0.0
|
||||
patch -Np1 < ../fix_msgpack.patch
|
||||
|
||||
# Create build directory
|
||||
mkdir -p "${srcdir}"/build-{client,server}
|
||||
}
|
||||
|
||||
build() {
|
||||
# Building client
|
||||
cd "${srcdir}"/build-client
|
||||
cmake ../${pkgbase}-${pkgver} \
|
||||
-DCMAKE_C_COMPILER=clang \
|
||||
-DCMAKE_CXX_COMPILER=clang++ \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_CLIENT=1 \
|
||||
-DBUILD_SERVER=0 \
|
||||
-DRUN_IN_PLACE=0 \
|
||||
-DENABLE_SYSTEM_JSONCPP=1 \
|
||||
-DENABLE_SYSTEM_MSGPACK=1
|
||||
make
|
||||
|
||||
# Building server
|
||||
cd "${srcdir}"/build-server
|
||||
cmake ../${pkgbase}-${pkgver} \
|
||||
-DCMAKE_C_COMPILER=clang \
|
||||
-DCMAKE_CXX_COMPILER=clang++ \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_CLIENT=0 \
|
||||
-DBUILD_SERVER=1 \
|
||||
-DRUN_IN_PLACE=0 \
|
||||
-DENABLE_SYSTEM_JSONCPP=1 \
|
||||
-DENABLE_SYSTEM_MSGPACK=1
|
||||
make
|
||||
}
|
||||
|
||||
package_freeminer() {
|
||||
pkgdesc='An open source sandbox game inspired by Minecraft'
|
||||
depends=(
|
||||
"${pkgbase}-common" 'leveldb' 'curl' 'hiredis' 'sqlite'
|
||||
'luajit' 'irrlicht' 'openal' 'enet' 'jsoncpp'
|
||||
'libvorbis' 'hicolor-icon-theme' 'freetype2'
|
||||
)
|
||||
provides=("${pkgbase}=${pkgver}")
|
||||
conflicts=("${pkgbase}-git")
|
||||
|
||||
# Installing client
|
||||
cd "${srcdir}"/build-client
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# Translations
|
||||
cp -R locale "${pkgdir}"/usr/share/
|
||||
|
||||
# Provided by freeminer-common
|
||||
rm -fR "${pkgdir}"/usr/share/{${pkgbase},doc}
|
||||
|
||||
# Provided by freeminer-server
|
||||
rm -f "${pkgdir}"/usr/share/man/man6/${pkgbase}server.6
|
||||
}
|
||||
|
||||
package_freeminer-server() {
|
||||
pkgdesc='Server of an open source sandbox game inspired by Minecraft'
|
||||
depends=(
|
||||
"${pkgbase}-common" 'leveldb' 'curl' 'hiredis' 'sqlite'
|
||||
'luajit' 'enet' 'jsoncpp'
|
||||
)
|
||||
provides=("${pkgbase}-server=${pkgver}")
|
||||
conflicts=("${pkgbase}-server-git")
|
||||
|
||||
# Installing server
|
||||
cd "${srcdir}"/build-server
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# Provided by freeminer
|
||||
rm -fR "${pkgdir}"/usr/share/{metainfo,appdata,applications,icons}
|
||||
rm -f "${pkgdir}"/usr/share/man/man6/${pkgbase}.6
|
||||
|
||||
# Provided by freeminer-common
|
||||
rm -fR "${pkgdir}"/usr/share/{${pkgbase},doc}
|
||||
}
|
||||
|
||||
package_freeminer-common() {
|
||||
pkgdesc="Common data files for ${pkgbase} and ${pkgbase}-server"
|
||||
arch=('any')
|
||||
provides=("${pkgbase}-common=${pkgver}")
|
||||
conflicts=("${pkgbase}-common-git")
|
||||
|
||||
# Install common data files
|
||||
cd "${srcdir}"/${pkgbase}-${pkgver}
|
||||
mkdir -p "${pkgdir}"/usr/share/${pkgbase}/{,doc}
|
||||
cp -R {games,builtin,client,fonts,textures} "${pkgdir}"/usr/share/${pkgbase}/
|
||||
cp doc/*.txt "${pkgdir}"/usr/share/${pkgbase}/doc/
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -uprNEBZ --suppress-blank-empty a/src/main.cpp b/src/main.cpp
|
||||
--- a/src/main.cpp 2015-11-21 01:53:20.445038202 -0600
|
||||
+++ b/src/main.cpp 2015-11-21 01:57:13.407056516 -0600
|
||||
@@ -64,7 +64,7 @@ along with Freeminer. If not, see <http
|
||||
|
||||
#if USE_ENET
|
||||
// todo: move to connection
|
||||
-#include "enet/enet.h"
|
||||
+#include <enet/enet.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TOUCHSCREENGUI
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
diff -uprNEBZ --suppress-blank-empty a/src/network/networkpacket.cpp b/src/network/networkpacket.cpp
|
||||
--- a/src/network/networkpacket.cpp 2016-05-16 01:59:02.000000000 -0500
|
||||
+++ b/src/network/networkpacket.cpp 2016-07-07 22:30:52.572633557 -0500
|
||||
@@ -539,11 +539,11 @@ Buffer<u8> NetworkPacket::oldForgePacket
|
||||
}
|
||||
|
||||
//freeminer:
|
||||
-bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked *msg) {
|
||||
+bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg) {
|
||||
try {
|
||||
//msgpack::unpacked msg;
|
||||
msgpack::unpack(msg, data, datasize);
|
||||
- msgpack::object obj = msg->get();
|
||||
+ msgpack::object obj = msg.get();
|
||||
*packet = obj.as<MsgpackPacket>();
|
||||
|
||||
*command = (*packet)[MSGPACK_COMMAND].as<int>();
|
||||
@@ -576,7 +576,7 @@ int NetworkPacket::packet_unpack() {
|
||||
packet = new MsgpackPacketSafe;
|
||||
if (!packet_unpacked)
|
||||
packet_unpacked = new msgpack::unpacked;
|
||||
- if (!parse_msgpack_packet(getString(0), datasize, packet, &command, packet_unpacked)) {
|
||||
+ if (!parse_msgpack_packet(getString(0), datasize, packet, &command, *packet_unpacked)) {
|
||||
//verbosestream<<"Server: Ignoring broken packet from " <<addr_s<<" (peer_id="<<peer_id<<") size="<<datasize<<std::endl;
|
||||
return 0;
|
||||
}
|
||||
diff -uprNEBZ --suppress-blank-empty a/src/network/networkpacket.h b/src/network/networkpacket.h
|
||||
--- a/src/network/networkpacket.h 2016-05-16 01:59:02.000000000 -0500
|
||||
+++ b/src/network/networkpacket.h 2016-07-07 22:31:26.005881914 -0500
|
||||
@@ -140,6 +140,6 @@ private:
|
||||
};
|
||||
|
||||
#include "../util/msgpack_serialize.h"
|
||||
-bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked *msg);
|
||||
+bool parse_msgpack_packet(char *data, u32 datasize, MsgpackPacket *packet, int *command, msgpack::unpacked &msg);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue