Update to 1.2.0 and removed unnecessary patch
This commit is contained in:
parent
6d7028f805
commit
d259fe0aab
15
.SRCINFO
15
.SRCINFO
@ -2,21 +2,18 @@ generated-by = makedeb-makepkg
|
|||||||
|
|
||||||
pkgbase = btop
|
pkgbase = btop
|
||||||
pkgdesc = A monitor of system resourecs, bpytop ported to C++
|
pkgdesc = A monitor of system resourecs, bpytop ported to C++
|
||||||
pkgver = 1.0.23
|
pkgver = 1.2.0
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://github.com/aristocratos/btop
|
url = https://github.com/aristocratos/btop
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
arch = aarch64
|
arch = aarch64
|
||||||
license = Apache
|
license = Apache
|
||||||
|
makedepends = build-essential
|
||||||
|
makedepends = gcc-10
|
||||||
|
makedepends = g++-10
|
||||||
depends = coreutils
|
depends = coreutils
|
||||||
depends = sed
|
depends = sed
|
||||||
depends = git
|
source = btop-1.2.0.tar.gz::https://github.com/aristocratos/btop/archive/v1.2.0.tar.gz
|
||||||
depends = build-essential
|
sha256sums = 59a87b9d0bb0f5010d53f0ac72ddee9fd7b5a4039bce51b94b262313e946df02
|
||||||
depends = gcc-10
|
|
||||||
depends = g++-10
|
|
||||||
source = btop-1.0.23.tar.gz::https://github.com/aristocratos/btop/archive/v1.0.23.tar.gz
|
|
||||||
source = Makefile.patch
|
|
||||||
sha256sums = 9fcda1089aaf5c59e7528c0a382f762b97fcb945933b1a750629be08bb14281d
|
|
||||||
sha256sums = 9615e689c64975915a1d8bdac2115f9fc03ec990232a630a72f1194e6364d707
|
|
||||||
|
|
||||||
pkgname = btop
|
pkgname = btop
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index c614b93..61e4234 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -41,9 +41,9 @@ override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
|
||||||
#? Try to make sure we are using GCC/G++ version 11 or later if not instructed to use g++-10
|
|
||||||
ifeq ($(CXX),g++)
|
|
||||||
V_MAJOR := $(shell echo $(CXX_VERSION) | cut -f1 -d".")
|
|
||||||
- ifneq ($(shell test $(V_MAJOR) -ge 11; echo $$?),0)
|
|
||||||
- ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0)
|
|
||||||
- override CXX := g++-11
|
|
||||||
+ ifneq ($(shell test $(V_MAJOR) -ge 10; echo $$?),0)
|
|
||||||
+ ifeq ($(shell command -v g++-10 >/dev/null; echo $$?),0)
|
|
||||||
+ override CXX := g++-10
|
|
||||||
override CXX_VERSION := $(shell $(CXX) -dumpfullversion -dumpversion || echo 0)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
@@ -79,7 +79,7 @@ DEPEXT := d
|
|
||||||
OBJEXT := o
|
|
||||||
|
|
||||||
#? Flags, Libraries and Includes
|
|
||||||
-override REQFLAGS := -std=c++20
|
|
||||||
+override REQFLAGS := -std=c++2a
|
|
||||||
WARNFLAGS := -Wall -Wextra -pedantic
|
|
||||||
OPTFLAGS ?= -O2 -ftree-loop-vectorize -flto=$(THREADS)
|
|
||||||
LDCXXFLAGS := -pthread -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector -fstack-clash-protection $(ADDFLAGS)
|
|
16
PKGBUILD
16
PKGBUILD
@ -2,26 +2,22 @@
|
|||||||
# Contributor: Caleb Maclennan <caleb@alerque.com>
|
# Contributor: Caleb Maclennan <caleb@alerque.com>
|
||||||
|
|
||||||
pkgname=btop
|
pkgname=btop
|
||||||
pkgver=1.0.23
|
pkgver=1.2.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='A monitor of system resourecs, bpytop ported to C++'
|
pkgdesc='A monitor of system resourecs, bpytop ported to C++'
|
||||||
arch=(x86_64 aarch64)
|
arch=(x86_64 aarch64)
|
||||||
url="https://github.com/aristocratos/$pkgname"
|
url="https://github.com/aristocratos/$pkgname"
|
||||||
license=(Apache)
|
license=(Apache)
|
||||||
depends=(coreutils sed git build-essential gcc-10 g++-10)
|
depends=(coreutils sed )
|
||||||
|
makedepends=(build-essential gcc-10 g++-10)
|
||||||
_archive="$pkgname-$pkgver"
|
_archive="$pkgname-$pkgver"
|
||||||
source=("$_archive.tar.gz::$url/archive/v$pkgver.tar.gz"
|
source=("$_archive.tar.gz::$url/archive/v$pkgver.tar.gz")
|
||||||
"Makefile.patch")
|
sha256sums=('59a87b9d0bb0f5010d53f0ac72ddee9fd7b5a4039bce51b94b262313e946df02')
|
||||||
sha256sums=('9fcda1089aaf5c59e7528c0a382f762b97fcb945933b1a750629be08bb14281d'
|
|
||||||
'9615e689c64975915a1d8bdac2115f9fc03ec990232a630a72f1194e6364d707')
|
|
||||||
|
|
||||||
prepare() {
|
|
||||||
patch --follow-symlinks --forward --strip=1 --input="${srcdir}/Makefile.patch" "$srcdir/$_archive/Makefile"
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$_archive"
|
cd "$_archive"
|
||||||
make all
|
make CXX=g++-10 all
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user