From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- .../files/lcdproc-0.5.9-fix-fno-common-build.patch | 53 ---------------------- .../files/lcdproc-0.5.9-fix-parallel-make.patch | 16 ------- .../lcdproc-0.5.9-respect-users-ldflags.patch | 25 ---------- 3 files changed, 94 deletions(-) delete mode 100644 app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch delete mode 100644 app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch delete mode 100644 app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch (limited to 'app-misc/lcdproc/files') diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch deleted file mode 100644 index 2dc472f5d22a..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -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 ---- - 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; diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch deleted file mode 100644 index 763038d14ab5..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-parallel-make.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/server/drivers/Makefile.am 2017-01-22 23:18:54.000000000 +0100 -+++ b/server/drivers/Makefile.am 2018-10-04 22:48:50.302344274 +0200 -@@ -47,11 +47,11 @@ - futaba_LDADD = @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a - g15_LDADD = @LIBG15@ - glcd_LDADD = libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@ --glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o -+glcd_DEPENDENCIES = @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a - glcdlib_LDADD = @LIBGLCD@ - glk_LDADD = libbignum.a - hd44780_LDADD = libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a --hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ -+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a - i2500vfd_LDADD = @LIBFTDI_LIBS@ - imon_LDADD = libLCD.a libbignum.a - imonlcd_LDADD = libLCD.a diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch deleted file mode 100644 index 8b48d0044108..000000000000 --- a/app-misc/lcdproc/files/lcdproc-0.5.9-respect-users-ldflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 28cca1d998fc9a74f16ea00e61c3eaa34017db7c Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki -Date: Mon, 11 May 2020 23:43:57 +0200 -Subject: [PATCH] Include AM_PROG_AR to use systems AR - -If AM_PROG_AR is not included, -the 'ar' command is directly called. - -Signed-off-by: Conrad Kostecki ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 98a2fb1c..53f7bf50 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -73,6 +73,7 @@ AC_PROG_CC_STDC - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_RANLIB -+AM_PROG_AR - AM_PROG_CC_C_O - AC_PATH_PROG([XMLTO], [xmlto], [no]) - -- cgit v1.2.3