diff options
| author | Vadim Yanitskiy | 2023-09-01 03:26:49 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy | 2023-09-01 03:26:51 +0700 |
| commit | 0f13ded2b6dc1d29659c506dbd56f2b20aff3f38 (patch) | |
| tree | 429f622a0c5c7bb3eff7fbc88a420fc382fda44c | |
| parent | 79809fdfe9f398649ef0cc68522292ec5b96a773 (diff) | |
| download | aur-0f13ded2b6dc1d29659c506dbd56f2b20aff3f38.tar.gz | |
Drop ringtools_imy_fix_tdma_durations.diff
It's no more needed to apply this patch since the upstream was fixed:
https://www.freecalypso.org/hg/freecalypso-tools/rev/a96cb97b66a2
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | ringtools_imy_fix_tdma_durations.diff | 20 |
3 files changed, 6 insertions, 35 deletions
@@ -1,7 +1,7 @@ pkgbase = freecalypso-tools-hg pkgdesc = FreeCalypso host tools package - pkgver = r963.b515a97e5dff - pkgrel = 2 + pkgver = r964.a96cb97b66a2 + pkgrel = 1 url = https://www.freecalypso.org/hg/freecalypso-tools arch = x86_64 arch = i686 @@ -9,8 +9,6 @@ pkgbase = freecalypso-tools-hg license = custom makedepends = mercurial source = hg+https://www.freecalypso.org/hg/freecalypso-tools - source = ringtools_imy_fix_tdma_durations.diff md5sums = SKIP - md5sums = b5080911de58727d42d6c7969f2c1cac pkgname = freecalypso-tools-hg @@ -2,8 +2,8 @@ _pkgname=freecalypso-tools pkgname="${_pkgname}-hg" -pkgver=r963.b515a97e5dff -pkgrel=2 +pkgver=r964.a96cb97b66a2 +pkgrel=1 pkgdesc="FreeCalypso host tools package" arch=('x86_64' 'i686') url="https://www.freecalypso.org/hg/${_pkgname}" @@ -11,21 +11,14 @@ license=('custom') groups=('freecalypso') depends=() makedepends=('mercurial') -source=("hg+https://www.freecalypso.org/hg/${_pkgname}" - "ringtools_imy_fix_tdma_durations.diff") -md5sums=('SKIP' - 'b5080911de58727d42d6c7969f2c1cac') +source=("hg+https://www.freecalypso.org/hg/${_pkgname}") +md5sums=('SKIP') pkgver() { cd "${_pkgname}" printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" } -prepare() { - cd "${_pkgname}" - hg import --no-commit "${srcdir}/ringtools_imy_fix_tdma_durations.diff" -} - build() { cd "${_pkgname}" make diff --git a/ringtools_imy_fix_tdma_durations.diff b/ringtools_imy_fix_tdma_durations.diff deleted file mode 100644 index 6f350e06f1c9..000000000000 --- a/ringtools_imy_fix_tdma_durations.diff +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Vadim Yanitskiy <fixeria@osmocom.org> -# Date 1693502195 -25200 -# Fri Sep 01 00:16:35 2023 +0700 -# Node ID 33866382d9994e07e7cb6eac65636f7f28e46b97 -# Parent b515a97e5dff252b24c41fecc139f8db19f6a637 -ringtools/imy: fix duplicate definition of tdma_durations - -diff -r b515a97e5dff -r 33866382d999 ringtools/imy/main.c ---- a/ringtools/imy/main.c Mon Aug 28 03:52:53 2023 +0000 -+++ b/ringtools/imy/main.c Fri Sep 01 00:16:35 2023 +0700 -@@ -9,7 +9,7 @@ - char *imy_filename; - char melody_str_buf[MELODY_BUF_SIZE]; - unsigned beats_per_min = 120; --unsigned tdma_durations[6][4]; -+extern unsigned tdma_durations[6][4]; - FILE *outF; - - main(argc, argv) |