git » minicom.git » commit 7147aff

repro rebuild

author Morten Linderud
2020-07-05 23:24:32 UTC
committer Morten Linderud
2020-07-05 23:24:32 UTC
parent 7ec69c5da7da26ac9618e3635b526ba0cbbc70d4

repro rebuild

added patch for gcc 10 from gentoo

PKGBUILD +10 -3
minicom-2.7.1-gcc-10.patch +31 -0

diff --git a/PKGBUILD b/PKGBUILD
index 2c201ed..bd4738d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=minicom
 pkgver=2.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A serial communication program"
 arch=('x86_64')
 url="http://alioth.debian.org/projects/minicom/"
@@ -14,8 +14,15 @@ license=('GPL')
 depends=('bash')
 optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
 backup=('etc/minirc.dfl')
-source=("${pkgname}-${pkgver}.tar.gz::http://ftp.debian.org/debian/pool/main/m/minicom/minicom_${pkgver}.orig.tar.gz")
-sha256sums=('532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1')
+source=("${pkgname}-${pkgver}.tar.gz::http://ftp.debian.org/debian/pool/main/m/minicom/minicom_${pkgver}.orig.tar.gz"
+        "minicom-2.7.1-gcc-10.patch")
+sha256sums=('532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1'
+            'b7d8eab87a919feb6d519c06c70145624a6560208e8c79da3a2ed2c2e086def3')
+
+prepare(){
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 < "$srcdir/minicom-2.7.1-gcc-10.patch"
+}
 
 build() {
   cd "${pkgname}-${pkgver}"
diff --git a/minicom-2.7.1-gcc-10.patch b/minicom-2.7.1-gcc-10.patch
new file mode 100644
index 0000000..43e057c
--- /dev/null
+++ b/minicom-2.7.1-gcc-10.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/705836
+--- a/src/minicom.h
++++ b/src/minicom.h
+@@ -109,13 +109,13 @@ EXTERN char *dial_tty;     /* tty to use. */
+ 
+ EXTERN char *dial_name;	    /* System we're conneced to */
+ EXTERN char *dial_number;   /* Number we've dialed. */
+-EXTERN char *dial_user;     /* Our username there */
+-EXTERN char *dial_pass;     /* Our password */
++extern char *dial_user;     /* Our username there */
++extern char *dial_pass;     /* Our password */
+ 
+ #ifdef USE_SOCKET
+-EXTERN int portfd_is_socket;	/* File descriptor is a unix socket */
+-EXTERN int portfd_is_connected;	/* 1 if the socket is connected */
+-EXTERN struct sockaddr_un portfd_sock_addr;	/* the unix socket address */
++extern int portfd_is_socket;	/* File descriptor is a unix socket */
++extern int portfd_is_connected;	/* 1 if the socket is connected */
++extern struct sockaddr_un portfd_sock_addr;	/* the unix socket address */
+ #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \
+                            ? -1 : portfd)
+ #else
+@@ -141,7 +141,7 @@ EXTERN int sbcolor;     /* Status Bar Background Color */
+ EXTERN int st_attr;	/* Status Bar attributes. */
+ 
+ /* jl 04.09.97 conversion tables */
+-EXTERN unsigned char vt_outmap[256], vt_inmap[256];
++extern unsigned char vt_outmap[256], vt_inmap[256];
+ 
+ /* MARK updated 02/17/95 - history buffer */
+ EXTERN int num_hist_lines;  /* History buffer size */