summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Haß2020-06-20 17:48:35 +0200
committerDaniel Haß2020-06-20 17:48:35 +0200
commit4960cadef8b7e6b3459bc46c1bb7c88a89679fdd (patch)
tree58d4c1b8b9a27afe2dfd92359a37cf26dee23ab3
parent8e195da9f7d8fc6ea1b13b8804909d68f965acb7 (diff)
downloadaur-4960cadef8b7e6b3459bc46c1bb7c88a89679fdd.tar.gz
release of package version 5 - v0.8-5
- added patch for gcc10 (big thanks to Darren Ng <Un1Gfn>!) - switched to sha256sums - proper patch handling - added license + man pages to package
-rw-r--r--.SRCINFO10
-rw-r--r--0001-getopts.patch (renamed from getopts.patch)0
-rw-r--r--0002-gcc10-extern.patch39
-rw-r--r--PKGBUILD21
4 files changed, 60 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5743db7be3b9..32850717b260 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Nov 21 19:35:08 UTC 2017
pkgbase = vpcs
pkgdesc = Simple virtual PC simulator
pkgver = 0.8
- pkgrel = 4
+ pkgrel = 5
url = http://sourceforge.net/projects/vpcs/
arch = i686
arch = x86_64
@@ -12,7 +10,11 @@ pkgbase = vpcs
makedepends = gcc
makedepends = git
source = https://github.com/GNS3/vpcs/archive/v0.8beta1.tar.gz
- md5sums = c02fa7181e6a66403318b3680368ae53
+ source = 0001-getopts.patch
+ source = 0002-gcc10-extern.patch
+ sha256sums = 769358f29353001f6eb374a49fe6569b36b46b2730166e8e11633c6dbdaaff92
+ sha256sums = cf21daa782d400dd47d66368b28a8e45923b3408a0fee36dbf34eda52867448f
+ sha256sums = 82c20736eef5163527a16a46da83434c1fdb6a9588dba776f0d5cc1a2aa0ca45
pkgname = vpcs
diff --git a/getopts.patch b/0001-getopts.patch
index e9d3b5d4d6c3..e9d3b5d4d6c3 100644
--- a/getopts.patch
+++ b/0001-getopts.patch
diff --git a/0002-gcc10-extern.patch b/0002-gcc10-extern.patch
new file mode 100644
index 000000000000..b8130fc039fc
--- /dev/null
+++ b/0002-gcc10-extern.patch
@@ -0,0 +1,39 @@
+From 9019b7fcfa89e5944e6c1ffba4a2e1f53899f4fa Mon Sep 17 00:00:00 2001
+From: Darren Ng <darren19970810@gmail.com>
+Date: Sat, 20 Jun 2020 20:43:51 +0800
+Subject: [PATCH] extern
+
+---
+ src/vpcs.c | 2 ++
+ src/vpcs.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/vpcs.c b/src/vpcs.c
+index d3d3841..4ed18da 100644
+--- a/src/vpcs.c
++++ b/src/vpcs.c
+@@ -57,6 +57,8 @@ const char *ver = "0.8c";
+ /* track the binary */
+ static const char *ident = "$Id$";
+
++pcs vpc[MAX_NUM_PTHS];
++
+ int pcid = 0; /* current vpc id */
+ int devtype = 0;
+ int lport = 20000;
+diff --git a/src/vpcs.h b/src/vpcs.h
+index e246ce5..5c16614 100644
+--- a/src/vpcs.h
++++ b/src/vpcs.h
+@@ -136,7 +136,7 @@ struct echoctl {
+ int bgcolor;
+ };
+
+-pcs vpc[MAX_NUM_PTHS];
++extern pcs vpc[MAX_NUM_PTHS];
+
+ #define delay_ms(s) usleep(s * 1000)
+
+--
+2.27.0
+
diff --git a/PKGBUILD b/PKGBUILD
index aebe0e84d418..3926e6ba073a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,24 @@
# Maintainer: Daniel Haß <aur@hass.onl>
+# Contributor: Darren Ng <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
pkgname=vpcs
pkgver=0.8
-pkgrel=4
+pkgrel=5
pkgdesc="Simple virtual PC simulator"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/vpcs/"
license=('BSD')
makedepends=('make' 'gcc' 'git')
-source=("https://github.com/GNS3/${pkgname}/archive/v${pkgver}beta1.tar.gz")
-md5sums=('c02fa7181e6a66403318b3680368ae53')
+source=("https://github.com/GNS3/${pkgname}/archive/v${pkgver}beta1.tar.gz"
+ '0001-getopts.patch'
+ '0002-gcc10-extern.patch')
+sha256sums=('769358f29353001f6eb374a49fe6569b36b46b2730166e8e11633c6dbdaaff92'
+ 'cf21daa782d400dd47d66368b28a8e45923b3408a0fee36dbf34eda52867448f'
+ '82c20736eef5163527a16a46da83434c1fdb6a9588dba776f0d5cc1a2aa0ca45')
prepare(){
- patch -p1 -d "${srcdir}/${pkgname}-${pkgver}beta1/" < "${startdir}/getopts.patch"
- cat "${srcdir}/${pkgname}-${pkgver}beta1/src/getopt.h"
+ patch -p1 -d "./${pkgname}-${pkgver}beta1/" < "./0001-getopts.patch"
+ # workaround until version including https://github.com/GNS3/vpcs/issues/23 gets released
+ patch -p1 -d "./${pkgname}-${pkgver}beta1/" < "./0002-gcc10-extern.patch"
}
build(){
@@ -23,5 +29,8 @@ build(){
package() {
mkdir -p "$pkgdir/usr/bin"
- install -Dm755 "${srcdir}/${pkgname}-${pkgver}beta1/src/${pkgname}" ${pkgdir}/usr/bin/${pkgname}
+ install -Dm755 "${srcdir}/${pkgname}-${pkgver}beta1/src/${pkgname}" ${pkgdir}/usr/bin/${pkgname}
+ install -Dvm644 "${srcdir}/${pkgname}-${pkgver}beta1/COPYING" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -dm755 "$pkgdir/usr/share/man/man1/"
+ gzip "${srcdir}/${pkgname}-${pkgver}beta1/man/vpcs.1" -cv --best > "$pkgdir/usr/share/man/man1/vpcs.1.gz"
}