diff options
author | 7Ji | 2022-04-13 22:17:57 +0800 |
---|---|---|
committer | 7Ji | 2022-04-13 22:17:57 +0800 |
commit | 7b7c7b07eb7176f10d95237851de8ff9d8e71b17 (patch) | |
tree | 6cabd57e4b9bf1a4cd17ee9412af2774adb34e23 | |
parent | c8257bf343b60805a62c3e7555a2efe5cfa279a8 (diff) | |
download | aur-beep-sudoable.tar.gz |
Fix: prefix overwrite now in build command line instead of a patch
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | 0002-GNUmakefile-fix-install-dir-to-usr.patch | 25 | ||||
-rw-r--r-- | PKGBUILD | 13 |
3 files changed, 6 insertions, 37 deletions
@@ -1,7 +1,7 @@ pkgbase = beep-sudoable pkgdesc = Advanced PC speaker beeping program, patched so you can run it with sudo pkgver = 1.4.12 - pkgrel = 1 + pkgrel = 2 url = https://github.com/spkr-beep/beep arch = x86_64 license = GPL2 @@ -10,12 +10,9 @@ pkgbase = beep-sudoable conflicts = beep source = https://github.com/spkr-beep/beep/archive/v1.4.12/beep-1.4.12.tar.gz source = 0001-beep-main.c-yolo-it-when-running-with-sudo.patch - source = 0002-GNUmakefile-fix-install-dir-to-usr.patch sha512sums = 18fed77bc4820ecc84ac12e903d516d5228fa2038df1788cc68db76e40b3c47a271911cc45bc48ce94e3f215803c5c05cb6c08ebb47ae6d7fcf1e0bc1ac169cd sha512sums = 18208e0b8817aeb6793423e645932474b098703f042ff07630bb50da7f2b0f3c5c1b180e5f3e89784654cdff0fc4f1d2baca20e4a450f314d583bda9a0c2976f - sha512sums = 36f3d54cdf7b4c507834de7db1bfcb46e0c3d9821afc03be024f49925f260a208ef51a6b010015cfc7b46edb83f903bc75a3e3ca8b4819e39a4daeafda16a224 b2sums = 06f21cf3c40389acca50e6e420af4e738b7484e096bb689345fedb37684b15733dbb38e8a5d0d360f23e020cebe9ba321984ee43f41b0ad980648414ddbb9375 b2sums = 747710350428104c3cef987b4e0170a5396244023851a1fbe0faa4b1ffa8a847b557326bf46eedfffd82cc2c99e3de68e63488e4febbd2ad08566a812643d1d0 - b2sums = b5f5c3960567aa27b9dd61d67ed9b56a64d5c8ff06fccbcc40f3316d9c6e5a7f6341b83412fa76d904c83cc870aa8e36485d6ab70507e64de2787259df77f2fc pkgname = beep-sudoable diff --git a/0002-GNUmakefile-fix-install-dir-to-usr.patch b/0002-GNUmakefile-fix-install-dir-to-usr.patch deleted file mode 100644 index 78a6146b8a7e..000000000000 --- a/0002-GNUmakefile-fix-install-dir-to-usr.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f2ad417ec3260fdad18638d48bd1a26d21535287 Mon Sep 17 00:00:00 2001 -From: 7Ji <pugokushin@gmail.com> -Date: Wed, 13 Apr 2022 19:50:38 +0800 -Subject: [PATCH 2/2] GNUmakefile: fix install dir to /usr - ---- - GNUmakefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/GNUmakefile b/GNUmakefile -index a27b453..027b81e 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -35,7 +35,7 @@ PACKAGE_VERSION = 1.4.12 - - # We use GNU makefile conventions for directory names. - --prefix = /usr/local -+prefix = /usr - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin - sbindir = $(exec_prefix)/sbin --- -2.35.1 - @@ -4,7 +4,7 @@ pkgname=beep-sudoable pkgver=1.4.12 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced PC speaker beeping program, patched so you can run it with sudo' url='https://github.com/spkr-beep/beep' arch=('x86_64') @@ -12,17 +12,14 @@ license=('GPL2') depends=('glibc') provides=('beep') conflicts=('beep') -source=(${url}/archive/v${pkgver}/beep-${pkgver}.tar.gz 0001-beep-main.c-yolo-it-when-running-with-sudo.patch 0002-GNUmakefile-fix-install-dir-to-usr.patch) +source=(${url}/archive/v${pkgver}/beep-${pkgver}.tar.gz 0001-beep-main.c-yolo-it-when-running-with-sudo.patch) sha512sums=('18fed77bc4820ecc84ac12e903d516d5228fa2038df1788cc68db76e40b3c47a271911cc45bc48ce94e3f215803c5c05cb6c08ebb47ae6d7fcf1e0bc1ac169cd' - '18208e0b8817aeb6793423e645932474b098703f042ff07630bb50da7f2b0f3c5c1b180e5f3e89784654cdff0fc4f1d2baca20e4a450f314d583bda9a0c2976f' - '36f3d54cdf7b4c507834de7db1bfcb46e0c3d9821afc03be024f49925f260a208ef51a6b010015cfc7b46edb83f903bc75a3e3ca8b4819e39a4daeafda16a224') + '18208e0b8817aeb6793423e645932474b098703f042ff07630bb50da7f2b0f3c5c1b180e5f3e89784654cdff0fc4f1d2baca20e4a450f314d583bda9a0c2976f') b2sums=('06f21cf3c40389acca50e6e420af4e738b7484e096bb689345fedb37684b15733dbb38e8a5d0d360f23e020cebe9ba321984ee43f41b0ad980648414ddbb9375' - '747710350428104c3cef987b4e0170a5396244023851a1fbe0faa4b1ffa8a847b557326bf46eedfffd82cc2c99e3de68e63488e4febbd2ad08566a812643d1d0' - 'b5f5c3960567aa27b9dd61d67ed9b56a64d5c8ff06fccbcc40f3316d9c6e5a7f6341b83412fa76d904c83cc870aa8e36485d6ab70507e64de2787259df77f2fc') + '747710350428104c3cef987b4e0170a5396244023851a1fbe0faa4b1ffa8a847b557326bf46eedfffd82cc2c99e3de68e63488e4febbd2ad08566a812643d1d0') prepare() { patch -d "beep-${pkgver}" -Np1 -i "${srcdir}/0001-beep-main.c-yolo-it-when-running-with-sudo.patch" - patch -d "beep-${pkgver}" -Np1 -i "${srcdir}/0002-GNUmakefile-fix-install-dir-to-usr.patch" } build() { cd "beep-${pkgver}" @@ -31,5 +28,5 @@ build() { package() { cd "beep-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" prefix=/usr install } |