# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1356950485 -3600
# Node ID 3f48e3a93cd7f06db1c85b764945bcaeae8a4567
# Parent  d27efa12de84c70f32740963eb269093d8198c3b
syslinux: add MENU STARTIFNOARG

diff -r d27efa12de84 -r 3f48e3a93cd7 get-bitcoin/stuff/get-bitcoin
--- a/get-bitcoin/stuff/get-bitcoin	Mon Dec 31 13:28:06 2012 +0300
+++ b/get-bitcoin/stuff/get-bitcoin	Mon Dec 31 11:41:25 2012 +0100
@@ -6,7 +6,7 @@
 WEB_SITE="http://bitcoin.org/"
 SHORT_DESC="New digital currency for instant payments to anyone, anywhere."
 MAINTAINER="somebody@bitcoin.org"
-DEPENDS="libQtGui"
+DEPENDS="libQtGui bzlib"
 TARBALL="$PACKAGE-$VERSION-linux.tar.gz"
 SF_MIRROR="http://netcologne.dl.sourceforge.net/project"
 URL="$SF_MIRROR/$PACKAGE/Bitcoin/$PACKAGE-$VERSION/$TARBALL"
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/receipt
--- a/syslinux/receipt	Mon Dec 31 13:28:06 2012 +0300
+++ b/syslinux/receipt	Mon Dec 31 11:41:25 2012 +0100
@@ -16,6 +16,8 @@
 compile_rules()
 {
     cd $src
+    #patch -p 0 < $stuff/extra/iso9660.u
+    patch -p 0 < $stuff/extra/readconfig.u
     cp -a $stuff/iso2exe .
     make -C iso2exe
     cp $stuff/tools/isohybrid.sh .
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/stuff/extra/iso9660.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/extra/iso9660.u	Mon Dec 31 11:41:25 2012 +0100
@@ -0,0 +1,56 @@
+--- core/fs/iso9660/iso9660.c
++++ core/fs/iso9660/iso9660.c
+@@ -132,6 +132,28 @@
+ 	
+ 	de_name_len = de->name_len;
+ 	de_name = de->name;
++#define __ROCKRIDGE
++#ifdef __ROCKRIDGE
++	{
++		char *name = NULL, *end;
++		int n = (offset - de_len + de->name_len + 34) & -2;
++		int len = data[n + 2];
++		do {
++			if (* (short *) (data + n) == 0x4D4E) { // NM
++				name = data + n + 5;
++				end = data + n + len;
++			}
++			n += len;
++		} while (n + 2 < offset);
++		if (name) {
++			*end = 0;
++			if (!strcmp(name, dname)) {
++				dprintf("Found rockridge.\n");
++				return de;
++			}
++		}
++	}
++#endif
+ 	if (iso_compare_name(de_name, de_name_len, dname)) {
+ 	    dprintf("Found.\n");
+ 	    return de;
+@@ -211,6 +233,24 @@
+ 	    data = NULL;
+ 	    continue;
+ 	}
++#ifdef __ROCKRIDGE2
++	{
++		char *name = NULL;
++		int n = (offset + de->name_len + 34) & -2;
++		int len = data[n + 2], delen;
++		do {
++			if (* (short *) (data + n) == 0x4D4E) { // NM
++				name = data + n + 5;
++				delen = len - 5;
++			}
++			n += len;
++		} while (n + 2 < offset + de->length);
++		if (name) {
++			de->name_len = delen;
++			strcpy(de->name, name, delen);
++		}
++	}
++#endif
+ 	break;
+     }
+     
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/stuff/extra/md5sum.c
--- a/syslinux/stuff/extra/md5sum.c	Mon Dec 31 13:28:06 2012 +0300
+++ b/syslinux/stuff/extra/md5sum.c	Mon Dec 31 11:41:25 2012 +0100
@@ -586,7 +586,6 @@
     msg="Append to kernel parameters: ";
     for (i = 3; i < (size_t) argc; i++, msg = " ")
 	printf("%s%s",msg,argv[i]);
-    printf("\nNow select 'Start SliTaz' in top menu.");
     printf("\n\n                            Hit RETURN to continue.\n");
 
     msg = "Load error";
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/stuff/extra/readconfig.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/syslinux/stuff/extra/readconfig.u	Mon Dec 31 11:41:25 2012 +0100
@@ -0,0 +1,15 @@
+--- com32/menu/readconfig.c
++++ com32/menu/readconfig.c
+@@ -874,6 +874,12 @@
+ 		}
+ 	    } else if (looking_at(p, "start")) {
+ 		start_menu = m;
++	    } else if ((ep = looking_at(p, "startifnoarg"))) {
++	    	size_t size;
++	    	int slot;
++	    	slot = strtoul(ep, &ep, 0);
++	    	if (!syslinux_getadv(slot, &size))
++			start_menu = m;
+ 	    } else if (looking_at(p, "help")) {
+ 		if (ld.label) {
+ 		    ld.action = MA_HELP;
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/stuff/i18n.cfg
--- a/syslinux/stuff/i18n.cfg	Mon Dec 31 13:28:06 2012 +0300
+++ b/syslinux/stuff/i18n.cfg	Mon Dec 31 11:41:25 2012 +0100
@@ -2,12 +2,5 @@
 MENU BEGIN ^lang
 MENU TITLE Languages
 MENU TABMSG
-MENU START
+MENU STARTIFNOARG 1
 
-LABEL boot
-	MENU LABEL Start SliTaz
-	MENU GOTO .top
-	TEXT HELP
-	          Did you select your language first ?
-	ENDTEXT
-
diff -r d27efa12de84 -r 3f48e3a93cd7 syslinux/stuff/isolinux.cfg
--- a/syslinux/stuff/isolinux.cfg	Mon Dec 31 13:28:06 2012 +0300
+++ b/syslinux/stuff/isolinux.cfg	Mon Dec 31 11:41:25 2012 +0100
@@ -1,5 +1,4 @@
 UI vesamenu.c32
-DEFAULT us
 PROMPT 0
 TIMEOUT 80