[arch-commits] Commit in lcdproc/repos/community-x86_64 (8 files)
Ike Devolder
idevolder at archlinux.org
Sun Dec 20 19:19:20 UTC 2020
Date: Sunday, December 20, 2020 @ 19:19:20
Author: idevolder
Revision: 780625
archrelease: copy trunk to community-x86_64
Added:
lcdproc/repos/community-x86_64/PKGBUILD
(from rev 780624, lcdproc/trunk/PKGBUILD)
lcdproc/repos/community-x86_64/lcdd.service
(from rev 780624, lcdproc/trunk/lcdd.service)
lcdproc/repos/community-x86_64/lcdproc-0.5.9-fix-fno-common-build.patch
(from rev 780624, lcdproc/trunk/lcdproc-0.5.9-fix-fno-common-build.patch)
lcdproc/repos/community-x86_64/lcdproc.service
(from rev 780624, lcdproc/trunk/lcdproc.service)
Deleted:
lcdproc/repos/community-x86_64/PKGBUILD
lcdproc/repos/community-x86_64/lcdd.service
lcdproc/repos/community-x86_64/lcdproc-0.5.9-fix-fno-common-build.patch
lcdproc/repos/community-x86_64/lcdproc.service
------------------------------------------+
PKGBUILD | 114 ++++++++++++++---------------
lcdd.service | 20 ++---
lcdproc-0.5.9-fix-fno-common-build.patch | 106 +++++++++++++-------------
lcdproc.service | 22 ++---
4 files changed, 130 insertions(+), 132 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-20 19:19:13 UTC (rev 780624)
+++ PKGBUILD 2020-12-20 19:19:20 UTC (rev 780625)
@@ -1,58 +0,0 @@
-# Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: Bernhard Walle <bernhard.walle at gmx.de>
-
-pkgname=lcdproc
-pkgver=0.5.9
-pkgrel=5
-pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
-arch=('x86_64')
-url="http://lcdproc.omnipotent.net/"
-license=('GPL')
-depends=('libftdi-compat')
-makedepends=('g15daemon')
-optdepends=(
- 'perl: needed for some lcdproc tools'
- 'g15daemon: needed if you want g15 support'
-)
-backup=(
- 'etc/LCDd.conf'
- 'etc/lcdexec.conf'
- 'etc/lcdproc.conf'
- 'etc/lcdvc.conf'
-)
-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'
- '2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f'
- 'f5a37c10be5f51593ef4b5ffc741e262a65f2588958861cc76fdea05209357e69e759c1ae5abf12fe4b8a67150ae800f35e83e745bf078168f0ccbc5d1e9eac3'
- 'b77725c5b100d5041b1715fec29d32a2066c5508f3edee3f94970e9df1632aae522ed164163c32acb1139e4fa95dc76a329a307b24c76a41b73bdf844dd7d036')
-
-prepare() {
- cd "$pkgname-$pkgver"
- patch -p1 -i "$srcdir/lcdproc-0.5.9-fix-fno-common-build.patch"
-}
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --enable-libusb \
- --enable-lcdproc-menus \
- --enable-stat-smbfs \
- --enable-drivers=all
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- 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"
-}
Copied: lcdproc/repos/community-x86_64/PKGBUILD (from rev 780624, lcdproc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-12-20 19:19:20 UTC (rev 780625)
@@ -0,0 +1,56 @@
+# Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: Bernhard Walle <bernhard.walle at gmx.de>
+
+pkgname=lcdproc
+pkgver=0.5.9
+pkgrel=6
+pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
+arch=('x86_64')
+url="http://lcdproc.omnipotent.net/"
+license=('GPL')
+depends=('libftdi-compat')
+optdepends=(
+ 'perl: needed for some lcdproc tools'
+)
+backup=(
+ 'etc/LCDd.conf'
+ 'etc/lcdexec.conf'
+ 'etc/lcdproc.conf'
+ 'etc/lcdvc.conf'
+)
+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'
+ '2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f'
+ 'f5a37c10be5f51593ef4b5ffc741e262a65f2588958861cc76fdea05209357e69e759c1ae5abf12fe4b8a67150ae800f35e83e745bf078168f0ccbc5d1e9eac3'
+ 'b77725c5b100d5041b1715fec29d32a2066c5508f3edee3f94970e9df1632aae522ed164163c32acb1139e4fa95dc76a329a307b24c76a41b73bdf844dd7d036')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/lcdproc-0.5.9-fix-fno-common-build.patch"
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --enable-libusb \
+ --enable-lcdproc-menus \
+ --enable-stat-smbfs \
+ --enable-drivers=all
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ 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"
+}
Deleted: lcdd.service
===================================================================
--- lcdd.service 2020-12-20 19:19:13 UTC (rev 780624)
+++ lcdd.service 2020-12-20 19:19:20 UTC (rev 780625)
@@ -1,10 +0,0 @@
-[Unit]
-Description=LCD display driver
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/LCDd -c /etc/LCDd.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: lcdproc/repos/community-x86_64/lcdd.service (from rev 780624, lcdproc/trunk/lcdd.service)
===================================================================
--- lcdd.service (rev 0)
+++ lcdd.service 2020-12-20 19:19:20 UTC (rev 780625)
@@ -0,0 +1,10 @@
+[Unit]
+Description=LCD display driver
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/LCDd -c /etc/LCDd.conf
+
+[Install]
+WantedBy=multi-user.target
Deleted: lcdproc-0.5.9-fix-fno-common-build.patch
===================================================================
--- lcdproc-0.5.9-fix-fno-common-build.patch 2020-12-20 19:19:13 UTC (rev 780624)
+++ lcdproc-0.5.9-fix-fno-common-build.patch 2020-12-20 19:19:20 UTC (rev 780625)
@@ -1,53 +0,0 @@
-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;
Copied: lcdproc/repos/community-x86_64/lcdproc-0.5.9-fix-fno-common-build.patch (from rev 780624, lcdproc/trunk/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-12-20 19:19:20 UTC (rev 780625)
@@ -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;
Deleted: lcdproc.service
===================================================================
--- lcdproc.service 2020-12-20 19:19:13 UTC (rev 780624)
+++ lcdproc.service 2020-12-20 19:19:20 UTC (rev 780625)
@@ -1,11 +0,0 @@
-[Unit]
-Description=lcdproc client
-Requires=lcdd.service
-After=network-online.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/lcdproc -c /etc/lcdproc.conf
-
-[Install]
-WantedBy=multi-user.target
Copied: lcdproc/repos/community-x86_64/lcdproc.service (from rev 780624, lcdproc/trunk/lcdproc.service)
===================================================================
--- lcdproc.service (rev 0)
+++ lcdproc.service 2020-12-20 19:19:20 UTC (rev 780625)
@@ -0,0 +1,11 @@
+[Unit]
+Description=lcdproc client
+Requires=lcdd.service
+After=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/lcdproc -c /etc/lcdproc.conf
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list