# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1491208044 -7200
# Node ID 429d89fd5e0fdfb1ca0d4c4b7ab58ccb139e862a
# Parent  43defa66ccf4a3f8a435d3ec81b6fda3296084a3
bluez: fix bluez-simple-agent

diff -r 43defa66ccf4 -r 429d89fd5e0f bluez/receipt
--- a/bluez/receipt	Sun Apr 02 17:28:17 2017 +0200
+++ b/bluez/receipt	Mon Apr 03 10:27:24 2017 +0200
@@ -10,6 +10,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 #WGET_URL="http://www.kernel.org/pub/linux/bluetooth/$TARBALL"
 WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/bluetooth/$TARBALL"
+CONFIG_FILES="/etc/bluetooth"
 TAGS="bluetooth"
 
 DEPENDS="linux-bluetooth alsa-lib glib dbus pygobject dbus-python"
@@ -19,6 +20,7 @@
 compile_rules()
 {
 	sed -i 's/NEED_USB/xx&/' tools/*.c
+	sed -i 's/from gi.repo.*/try:\n  &\nexcept ImportError:\n  import gobject as GObject/' test/simple-agent
 
 	./configure \
 		--prefix=/usr \
diff -r 43defa66ccf4 -r 429d89fd5e0f linld/stuff/src/MEMTOP.ASM
--- a/linld/stuff/src/MEMTOP.ASM	Sun Apr 02 17:28:17 2017 +0200
+++ b/linld/stuff/src/MEMTOP.ASM	Mon Apr 03 10:27:24 2017 +0200
@@ -42,16 +42,15 @@
 ;***************************************************************
 ;        proc    _memtop_e801 near
 
-                ;push    cx bx
                 xor     cx,cx           ;fix to work around buggy
                 xor     dx,dx           ;  BIOSes which dont clear/set
                 stc                     ;  carry on pass/error of
                 mov     ax,0E801h
                 int     15h
                 jc      @@err
-                test    cx,cx           ;kludge to handle BIOSes
-                jnz     @@use_cxdx      ;  which report their extended
-                test    dx,dx           ;  memory in AX/BX rather than
+                push    cx              ;kludge to handle BIOSes
+                or      cx,dx           ;  which report their extended
+		pop	cx		;  memory in AX/BX rather than
                 jnz     @@use_cxdx      ;  CX/DX.  The spec I have read
 @@use_axbx:     mov     dx,bx           ;  seems to indicate AX/BX
                 ;jmp     @@end_kludge    ;  are more reasonable anyway...
@@ -59,7 +58,6 @@
 @@use_cxdx:     xchg    ax,cx
 @@end_kludge:                   ;now: dx=64k units above 16m
                                 ;     ax=1k units above 1m below 16m (max 3c00h)
-                ;pop     bx cx
                 test    dx,dx
                 jz      tokb            ;dx=0 here, ax=kbs above 1m
                 xor     ax,ax           ;ignore info on low 16M (assume full)