Browse Source

boost: Update from 1.67.0 to 1.68.0

android-5
Fredrik Fornwall 6 years ago
parent
commit
bf80ff2f10
  1. 7
      packages/boost/build.sh
  2. 22
      packages/boost/libs-filesystem-src-operations.cpp.patch
  3. 2
      packages/ledger/build.sh
  4. 35
      packages/ledger/src-utils.h.patch
  5. 2
      packages/mpd/build.sh
  6. 2
      packages/ncmpcpp/build.sh

7
packages/boost/build.sh

@ -1,8 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://boost.org
TERMUX_PKG_DESCRIPTION="Free peer-reviewed portable C++ source libraries"
TERMUX_PKG_VERSION=1.67.0
TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba
TERMUX_PKG_VERSION=1.68.0
TERMUX_PKG_SHA256=7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7
TERMUX_PKG_SRCURL=https://dl.bintray.com/boostorg/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_DEPENDS="libbz2, liblzma"
@ -11,6 +10,8 @@ TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2)"
TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2)"
termux_step_make_install() {
CXXFLAGS+=" -std=c++14"
rm $TERMUX_PREFIX/lib/libboost* -f
rm $TERMUX_PREFIX/include/boost -rf

22
packages/boost/libs-filesystem-src-operations.cpp.patch

@ -1,22 +0,0 @@
Do not define __USE_FILE_OFFSET64 as it causes fsetpos&fgetpos to be
undefined on api levels lower than android-24.
diff -u -r ../boost_1_64_0/libs/filesystem/src/operations.cpp ./libs/filesystem/src/operations.cpp
--- ../boost_1_64_0/libs/filesystem/src/operations.cpp 2017-04-17 04:22:19.000000000 +0200
+++ ./libs/filesystem/src/operations.cpp 2017-08-08 10:08:13.607302273 +0200
@@ -15,6 +15,7 @@
#define _FILE_OFFSET_BITS 64 // at worst, these defines may have no effect,
#endif
#if !defined(__PGI)
+#if !defined(__ANDROID__)
#define __USE_FILE_OFFSET64 // but that is harmless on Windows and on POSIX
// 64-bit systems or on 32-bit systems which don't have files larger
// than can be represented by a traditional POSIX/UNIX off_t type.
@@ -25,6 +26,7 @@
// ensure that they are available to all included headers.
// That is required at least on Solaris, and possibly on other
// systems as well.
+#endif
#else
#define _FILE_OFFSET_BITS 64
#endif

2
packages/ledger/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://ledger-cli.org/
TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
TERMUX_PKG_VERSION=3.1.1
TERMUX_PKG_REVISION=4
TERMUX_PKG_REVISION=5
TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=90f06561ab692b192d46d67bc106158da9c6c6813cc3848b503243a9dfd8548a
TERMUX_PKG_DEPENDS="boost, libedit, libmpfr, utf8cpp, libgmp"

35
packages/ledger/src-utils.h.patch

@ -0,0 +1,35 @@
From c18a55f9ef9969b38e5cf7f0f319b8ec5df34809 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 9 Jul 2018 12:07:30 +0000
Subject: [PATCH] Unbreak with boost 1.68
In file included from src/main.cc:34:
In file included from src/global.h:41:
In file included from src/option.h:45:
In file included from src/scope.h:45:
In file included from src/op.h:45:
In file included from src/expr.h:45:
In file included from src/exprbase.h:57:
src/utils.h:47:10: fatal error: 'boost/uuid/sha1.hpp' file not found
#include <boost/uuid/sha1.hpp>
^
---
src/utils.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/utils.h b/src/utils.h
index b21dff7af..857b8289c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -44,7 +44,11 @@
#ifndef _UTILS_H
#define _UTILS_H
+#if (BOOST_VERSION >= 106600)
+#include <boost/uuid/detail/sha1.hpp>
+#else
#include <boost/uuid/sha1.hpp>
+#endif
/**
* @name Default values

2
packages/mpd/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://www.musicpd.org
TERMUX_PKG_DESCRIPTION="Music player daemon"
TERMUX_PKG_VERSION=0.20.20
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SHA256=d804b47a981b0398f119e9f398775706422c3d4d887dd7c0f5460904df89bbf2
TERMUX_PKG_SRCURL=https://github.com/MusicPlayerDaemon/MPD/archive/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_DEPENDS="libcurl, libid3tag, libopus, libevent, fftw, libpulseaudio, libmpdclient, boost, openal-soft, libvorbis, libsqlite, ffmpeg, libmp3lame, libbz2"

2
packages/ncmpcpp/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://rybczak.net/ncmpcpp/
TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
TERMUX_PKG_VERSION=0.8.2
TERMUX_PKG_REVISION=2
TERMUX_PKG_REVISION=3
TERMUX_PKG_SHA256=650ba3e8089624b7ad9e4cc19bc1ac6028edb7523cc111fa1686ea44c0921554
TERMUX_PKG_SRCURL=https://rybczak.net/ncmpcpp/stable/ncmpcpp-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="fftw, boost, readline, libcurl, libmpdclient, ncurses"

Loading…
Cancel
Save