From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 May 2013 17:46:30 +0000 (+0200)
Subject: lcdproc: Update to 0.5.6.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=77ebcf4e8ba8f949deb29c3ae716c524ec0dc8d9;hp=2e6c5015ec964a551ceb214052744effe1facb61

lcdproc: Update to 0.5.6.
---

diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc
index 935a79c4d..c8fc669dc 100644
--- a/config/rootfiles/packages/lcdproc
+++ b/config/rootfiles/packages/lcdproc
@@ -1,7 +1,8 @@
-etc/LCDd.conf
-etc/lcdexec.conf
-etc/lcdproc.conf
-etc/lcdvc.conf
+etc/lcdproc
+etc/lcdproc/LCDd.conf
+etc/lcdproc/lcdexec.conf
+etc/lcdproc/lcdproc.conf
+etc/lcdproc/lcdvc.conf
 usr/bin/fortune.pl
 usr/bin/iosock.pl
 usr/bin/lcdexec
@@ -13,7 +14,6 @@ usr/bin/tail.pl
 usr/bin/x11amp.pl
 usr/lib/lcdproc
 #usr/lib/lcdproc/CFontz.so
-#usr/lib/lcdproc/CFontz633.so
 #usr/lib/lcdproc/CFontzPacket.so
 #usr/lib/lcdproc/CwLnx.so
 #usr/lib/lcdproc/EyeboxOne.so
@@ -25,6 +25,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/bayrad.so
 #usr/lib/lcdproc/curses.so
 #usr/lib/lcdproc/ea65.so
+#usr/lib/lcdproc/glcd.so
 #usr/lib/lcdproc/glk.so
 #usr/lib/lcdproc/hd44780.so
 #usr/lib/lcdproc/icp_a106.so
@@ -39,6 +40,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/mtc_s16209x.so
 #usr/lib/lcdproc/picolcd.so
 #usr/lib/lcdproc/pyramid.so
+#usr/lib/lcdproc/sdeclcd.so
 #usr/lib/lcdproc/sed1330.so
 #usr/lib/lcdproc/sed1520.so
 #usr/lib/lcdproc/serialPOS.so
@@ -49,6 +51,7 @@ usr/lib/lcdproc
 #usr/lib/lcdproc/t6963.so
 #usr/lib/lcdproc/text.so
 #usr/lib/lcdproc/tyan.so
+#usr/lib/lcdproc/vlsys_m428.so
 usr/sbin/LCDd
 #usr/share/man/man1/lcdexec.1
 #usr/share/man/man1/lcdproc.1
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 01525a2b3..0e329ba5b 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.5.5
+VER        = 0.5.6
 
 THISAPP    = lcdproc-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c92d4529d36eeec6d9d6fd0a4aa3ec82
+$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
 
 install : $(TARGET)
 
@@ -77,9 +77,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --enable-libusb --enable-drivers=all --enable-permissive-menu-goto --enable-lcdproc-menus --enable-stat-nfs --enable-stat-smbfs --with-lcdport=13666 --enable-seamless-hbars --prefix=/usr --sysconfdir=/etc
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--sysconfdir=/etc/lcdproc \
+			--enable-libusb \
+			--enable-drivers=all \
+			--enable-permissive-menu-goto \
+			--enable-lcdproc-menus \
+			--enable-stat-nfs \
+			--enable-stat-smbfs \
+			--with-lcdport=13666 \
+			--enable-seamless-hbars
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcdproc /var/ipfire/backup/addons/includes/lcdproc
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcdproc \
+		/var/ipfire/backup/addons/includes/lcdproc
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch
new file mode 100644
index 000000000..b9e933d85
--- /dev/null
+++ b/src/patches/lcdproc-0.5.6-menuitem.patch
@@ -0,0 +1,11 @@
+--- server/menuitem.c	2012/04/25 19:53:15	1.37
++++ server/menuitem.c	2013/01/17 21:27:27	1.38
+@@ -33,6 +33,8 @@
+ 
+ #define MAX_NUMERIC_LEN 40
+ 
++extern Menu *main_menu;		/* Access to the main menu */
++
+ char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"};
+ char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"};
+ char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"};