[arch-commits] Commit in lcdproc/trunk (4 files)

[Ike Devolder]

    Date: Monday, June 8, 2020 @ 10:57:33
  Author: idevolder
Revision: 640545

upgpkg: lcdproc 0.5.9-4

https://bugs.archlinux.org/task/66369

Added:
  lcdproc/trunk/lcdproc-0.5.9-fix-fno-common-build.patch
  lcdproc/trunk/lcdproc.service
Modified:
  lcdproc/trunk/PKGBUILD
  lcdproc/trunk/lcdd.service

------------------------------------------+
 PKGBUILD                                 |   14 ++++++-
 lcdd.service                             |    2 -
 lcdproc-0.5.9-fix-fno-common-build.patch |   53 +++++++++++++++++++++++++++++
 lcdproc.service                          |   11 ++++++
 4 files changed, 77 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-08 10:48:38 UTC (rev 640544)
+++ PKGBUILD	2020-06-08 10:57:33 UTC (rev 640545)
@@ -3,7 +3,7 @@
 
 pkgname=lcdproc
 pkgver=0.5.9
-pkgrel=3
+pkgrel=4
 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
 arch=('x86_64')
 url="http://lcdproc.omnipotent.net/"
@@ -22,11 +22,20 @@
 )
 source=(
     "https://github.com/lcdproc/lcdproc/releases/download/v$pkgver/lcdproc-$pkgver.tar.gz"
+    'lcdproc-0.5.9-fix-fno-common-build.patch'
     'lcdd.service'
+    'lcdproc.service'
 )
 sha512sums=('48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25'
-            '33d08d9b5606b8b830cc652fe07a11ee4e7e50f9d257e412c70f64bfd02eaaa732f7124632cd459cece2526de635ef192f863889070533746232773b48b3064a')
+            '2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f'
+            'e5e9227f35dbdc4d1d4fb736970a392e374020ad0b99daa393f11717e86bbbe921f25f7d427f4617de1e59b3b03645ff19746648cf1d5e29ca1558886054bd34'
+            'f41e54d98d58146d49f2f2b485ea6e86cf6e826014ae54b2157a9a6a6aa857a6577a82bd63a6743970d0106e7a7d2d096ad3e72f59e584af7723717f115eda95')
 
+prepare() {
+    cd "$pkgname-$pkgver"
+    patch -p1 -i "$srcdir/lcdproc-0.5.9-fix-fno-common-build.patch"
+}
+
 build() {
     cd "$pkgname-$pkgver"
     ./configure \
@@ -45,4 +54,5 @@
     make DESTDIR="$pkgdir" install
     sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf"
     install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service"
+    install -Dm644 "$srcdir/lcdproc.service" "$pkgdir/usr/lib/systemd/system/lcdproc.service"
 }

Modified: lcdd.service
===================================================================
--- lcdd.service	2020-06-08 10:48:38 UTC (rev 640544)
+++ lcdd.service	2020-06-08 10:57:33 UTC (rev 640545)
@@ -3,7 +3,7 @@
 After=syslog.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/LCDd -c /etc/LCDd.conf
 ControlGroup=cpu:/
 

Added: lcdproc-0.5.9-fix-fno-common-build.patch
===================================================================
--- lcdproc-0.5.9-fix-fno-common-build.patch	                        (rev 0)
+++ lcdproc-0.5.9-fix-fno-common-build.patch	2020-06-08 10:57:33 UTC (rev 640545)
@@ -0,0 +1,53 @@
+From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad at kostecki.com>
+Date: Sun, 2 Feb 2020 18:48:07 +0100
+Subject: [PATCH] Fix compilation with GCC >= 10.x
+
+Starting with GCC >= 10.x, -fno-common is used as default
+instead of -fcommon. This patch fixes the compilation.
+
+Signed-off-by: Conrad Kostecki <conrad at kostecki.com>
+---
+ clients/lcdproc/iface.c | 1 +
+ clients/lcdproc/iface.h | 2 --
+ clients/lcdproc/main.c  | 2 ++
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
+index 40e50cb7..45be5b97 100644
+--- a/clients/lcdproc/iface.c
++++ b/clients/lcdproc/iface.c
+@@ -32,6 +32,7 @@
+ #define UNSET_INT -1
+ #define UNSET_STR "\01"
+ 
++IfaceInfo iface[MAX_INTERFACES];        /* interface info */
+ 
+ static int iface_count = 0;	/* number of interfaces */
+ static char unit_label[10] = "B";	/* default unit label is Bytes */
+diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
+index cc6dbaaf..ee188f38 100644
+--- a/clients/lcdproc/iface.h
++++ b/clients/lcdproc/iface.h
+@@ -18,8 +18,6 @@
+ /** max number of interfaces in multi-interface mode */
+ #define MAX_INTERFACES 3
+ 
+-IfaceInfo iface[MAX_INTERFACES];	/* interface info */
+-
+ /** Update screen content */
+ int iface_screen(int rep, int display, int *flags_ptr);
+ /** read interface stats from /proc/net/dev */
+diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
+index 01b02baf..7c7a4215 100644
+--- a/clients/lcdproc/main.c
++++ b/clients/lcdproc/main.c
+@@ -53,6 +53,8 @@
+ # include "eyebox.h"
+ #endif
+ 
++extern IfaceInfo iface[MAX_INTERFACES];        /* interface info */
++
+ /* The following 8 variables are defined 'external' in main.h! */
+ int Quit = 0;
+ int sock = -1;

Added: lcdproc.service
===================================================================
--- lcdproc.service	                        (rev 0)
+++ lcdproc.service	2020-06-08 10:57:33 UTC (rev 640545)
@@ -0,0 +1,11 @@
+[Unit]
+Description=lcdproc client
+Requires=lcdd.service
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/lcdproc -c /etc/lcdproc.conf
+
+[Install]
+WantedBy=multi-user.target