# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1481996567 -3600
# Node ID 91c4d11aaec40a70dc0062c5eaa494fde7771953
# Parent  a8df27023cb2e0ca43a802f3171987b1a670a39f
magicpoint: add magicpoint.desktop

diff -r a8df27023cb2 -r 91c4d11aaec4 linld/stuff/src/HIMEM.CPP
--- a/linld/stuff/src/HIMEM.CPP	Fri Dec 16 10:45:18 2016 +0100
+++ b/linld/stuff/src/HIMEM.CPP	Sat Dec 17 18:42:47 2016 +0100
@@ -10,16 +10,18 @@
 void load_image(struct image_himem *m) {
     no_exit++;       // die() won't return to DOS
     m->remaining = m->size;
-    u32 buf= m->buf = m->fallback;
+    m->buf = m->fallback;
+    u32 buf;
     u32* bufv= &buf;
-    if(m->fallback >= _1m) {
+    if(((u16 *)&m->fallback)[1] >= 0x10) { // >= _1m ?
 	if(vcpi) {
-	    bufv = malloc_bufv_or_die(m);
+	    bufv = malloc_bufv_or_die(m);	// update m->bufv
 	}
 	else if (!skip_xmmalloc) {
-            xmm_alloc(m);
+            xmm_alloc(m);			// update m->buf
 	}
     }
+    buf = m->buf;
     do {
 	u8 xfer_buf[PAGE_SIZE];
         u16 size = read_image(m, xfer_buf, PAGE_SIZE);
diff -r a8df27023cb2 -r 91c4d11aaec4 magicpoint/receipt
--- a/magicpoint/receipt	Fri Dec 16 10:45:18 2016 +0100
+++ b/magicpoint/receipt	Sat Dec 17 18:42:47 2016 +0100
@@ -36,10 +36,34 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib/X11/mgp $install/usr/share/doc $install/usr/share/man
+	mkdir -p $fs/usr/lib/X11/mgp $fs/usr/share/applications
+	mkdir -p $install/usr/share/doc $install/usr/share/man
 	cp -f $install/usr/lib/X11/mgp/default.mgp $fs/usr/lib/X11/mgp
 	cp -a $install/usr/bin $fs/usr
 	cp $src/*.man $install/usr/share/man/
 	cp $src/COPYRIGHT $src/FAQ $src/RE* $src/SYNTAX $install/usr/share/doc
 	cp $src/USAGE $install/usr/share/doc
+	cat > $fs/usr/share/applications/magicpoint.desktop <<EOT
+[Desktop Entry]
+Type=Application
+Name=MagicPoint Presentation
+Name[fr]=Présentation Magicpoint
+Icon=x-office-presentation
+Exec=mgp %f
+MimeType=application/x-magicpoint
+Categories=GTK;Office;Viewer;
+EOT
+}
+
+post_install()
+{
+	for i in magicpoint mgp ; do
+		grep -q application/x-$i $1/usr/share/applications/defaults.list ||
+		echo "application/x-$i=magicpoint.desktop" >> $1/usr/share/applications/defaults.list
+	done
+}
+
+post_remove()
+{
+	sed -i '/=magicpoint.desktop/' $1/usr/share/applications/defaults.list 
 }
\ No newline at end of file