diff --git a/testing/avarice/APKBUILD b/testing/avarice/APKBUILD index 79bd4fc399d..830aaff22c0 100644 --- a/testing/avarice/APKBUILD +++ b/testing/avarice/APKBUILD @@ -1,12 +1,7 @@ # Maintainer: Marian Buschsieweke pkgname=avarice -_releasever=2.13 -_svnver=375 -_svndate=20160229 -# The latest AVaRICE release doesn't comply on all but history environments. -# Sadly, new release are no longer created. -pkgver=${_releasever}_svn$_svnver -pkgrel=2 +pkgver=2.14 +pkgrel=0 pkgdesc="AVaRICE interfaces with GDB and allows debugging of AVR MCUs" url="http://avarice.sourceforge.net/" arch="all" @@ -14,8 +9,11 @@ license="GPL-2.0-only" makedepends="binutils-dev libusb-dev libusb-compat-dev hidapi-dev perl" depends="gdb-multiarch" subpackages="$pkgname-doc" -source="http://deb.debian.org/debian/pool/main/a/avarice/avarice_$_releasever+svn$_svnver.orig.tar.xz" -builddir="$srcdir/$pkgname-${_releasever}svn$_svndate" +source=" + https://downloads.sourceforge.net/project/avarice/avarice/avarice-2.14/avarice-2.14.tar.bz2 + + drop_keyword_unused.patch + " build() { ./configure \ @@ -33,4 +31,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8050948ebea9cc4f9d2e90a1eb97962d6335b5a7b750b92ea16e3add4e9163a9fae10cb8c72ddc303126090472aabff21ea6286ac5e33a21800f09886b63000e avarice_2.13+svn375.orig.tar.xz" +sha512sums="e0b23bd02bfa7d4dc05027f0f59ec7da868d8d0c0cd4f66595f6aaa5c335fa4eb64fc47399e51c0ed5112803ee99a3f041812bf4072dc096cc933cd17f9348a0 avarice-2.14.tar.bz2 +8e9faf7eab5807f3b100ba29e7aab857f91947981a25dccc3096c9462d777be9fb19cf410e8634884b3ce9299fe410e24d1cd107c4bdbf0a537b9f9322e7c627 drop_keyword_unused.patch" diff --git a/testing/avarice/drop_keyword_unused.patch b/testing/avarice/drop_keyword_unused.patch new file mode 100644 index 00000000000..d2c48a8ca4d --- /dev/null +++ b/testing/avarice/drop_keyword_unused.patch @@ -0,0 +1,41 @@ +Drop __unused keyword, which was used to suppress warnings about unused +parameters, but which is not recognized by our toolchain. +--- avarice-2.14.orig/src/jtag2usb.cc ++++ avarice-2.14/src/jtag2usb.cc +@@ -739,7 +739,7 @@ + + #ifdef HAVE_LIBUSB_2_0 + /* USB thread */ +-static void *usb_thread(void * data __unused) ++static void *usb_thread(void * data) + { + struct pollfd fds[2]; + +--- avarice-2.14.orig/src/jtag3io.cc ++++ avarice-2.14/src/jtag3io.cc +@@ -350,12 +350,12 @@ + throw jtag_exception("doSimpleJtagCommand(): too many failures"); + } + +-void jtag3::changeBitRate(int newBitRate __unused) ++void jtag3::changeBitRate(int newBitRate) + { + throw; + } + +-bool jtag3::synchroniseAt(int bitrate __unused) ++bool jtag3::synchroniseAt(int bitrate) + { + throw; + } +--- avarice-2.14.orig/src/jtag3prog.cc ++++ avarice-2.14/src/jtag3prog.cc +@@ -106,7 +106,7 @@ + } + + +-void jtag3::downloadToTarget(const char* filename __unused, bool program __unused, bool verify __unused) ++void jtag3::downloadToTarget(const char* filename, bool program, bool verify) + { + statusOut("\nDownload not done.\n"); + throw jtag_exception("Target programming not implemented for JTAGICE3");