[packages/dosemu] Up to 1.4.0.8
arekm
arekm at pld-linux.org
Thu May 21 15:16:04 CEST 2026
commit 2cc0177804bf7d89edffc52b06f1daff9feaa876
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 21 15:15:47 2026 +0200
Up to 1.4.0.8
dosemu-Xquit.patch | 20 ++++++-------
dosemu-doSgmlTools.patch | 8 +++---
dosemu-dosemu_conf.patch | 28 +++++++++---------
dosemu-lpt4.patch | 74 +++++++++++++++++++++---------------------------
dosemu-makehtml.patch | 28 +++++++++---------
dosemu.spec | 6 ++--
6 files changed, 77 insertions(+), 87 deletions(-)
---
diff --git a/dosemu.spec b/dosemu.spec
index 7b9e15e..5c12a66 100644
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -19,13 +19,13 @@ Summary(pl.UTF-8): Emulator DOS-a
Summary(pt_BR.UTF-8): Emulador DOS
Summary(tr.UTF-8): DOS öykünümcüsü
Name: dosemu
-Version: 1.4.0.7
+Version: 1.4.0.8
Release: 1%{?with_samba:.smb%{smbrel}}
License: GPL v2
Group: Applications/Emulators
-# git archive --format=tar --prefix=dosemu-1.4.0.7/ dosemu-1.4.0.7 | xz > dosemu-1.4.0.7.tar.xz
+# git archive --format=tar --prefix=dosemu-1.4.0.8/ dosemu-1.4.0.8 | xz > dosemu-1.4.0.8.tar.xz
Source0: %{name}-%{version}.tar.xz
-# Source0-md5: 842303d611ac5d0932825a34afd67d72
+# Source0-md5: c5686644070ef9934c0ba4f757b04a7d
#Source2: %{name}-sys.tar.gz
Source3: %{name}-PRZECZYTAJ_TO
Source4: %{name}-README.PLD
diff --git a/dosemu-Xquit.patch b/dosemu-Xquit.patch
index 0da0048..97c8fd6 100644
--- a/dosemu-Xquit.patch
+++ b/dosemu-Xquit.patch
@@ -1,6 +1,5 @@
-diff -Nur dosemu-1.4.0.orig/src/env/video/text.c dosemu-1.4.0.chng/src/env/video/text.c
---- dosemu-1.4.0.orig/src/env/video/text.c 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/env/video/text.c 2008-04-21 22:36:23.000000000 +0200
+--- dosemu-1.4.0.8.orig/src/env/video/text.c 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/env/video/text.c 2026-05-21 01:20:23.931792783 +0200
@@ -96,6 +96,11 @@
return 1;
}
@@ -13,9 +12,8 @@ diff -Nur dosemu-1.4.0.orig/src/env/video/text.c dosemu-1.4.0.chng/src/env/video
/*
* Draw a text string.
* The attribute is the VGA color/mono text attribute.
-diff -Nur dosemu-1.4.0.orig/src/plugin/X/X.c dosemu-1.4.0.chng/src/plugin/X/X.c
---- dosemu-1.4.0.orig/src/plugin/X/X.c 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/plugin/X/X.c 2008-04-21 23:03:06.000000000 +0200
+--- dosemu-1.4.0.8.orig/src/plugin/X/X.c 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/plugin/X/X.c 2026-05-21 01:20:23.932249599 +0200
@@ -383,6 +383,12 @@
static Atom comm_atom = None;
static Boolean kdos_client = FALSE; /* started by kdos */
@@ -46,7 +44,7 @@ diff -Nur dosemu-1.4.0.orig/src/plugin/X/X.c dosemu-1.4.0.chng/src/plugin/X/X.c
/* utility function for opening a connection and making certain
* I am either using or not using the X keyboard Extension.
*/
-@@ -1458,9 +1474,40 @@
+@@ -1503,9 +1519,40 @@
* atom, it means the window manager wants us to die.
*/
if(e.xclient.message_type == proto_atom && *e.xclient.data.l == delete_atom) {
@@ -89,7 +87,7 @@ diff -Nur dosemu-1.4.0.orig/src/plugin/X/X.c dosemu-1.4.0.chng/src/plugin/X/X.c
break;
}
-@@ -1490,6 +1537,24 @@
+@@ -1535,6 +1582,24 @@
keyrel_pending = 0;
}
@@ -112,9 +110,9 @@ diff -Nur dosemu-1.4.0.orig/src/plugin/X/X.c dosemu-1.4.0.chng/src/plugin/X/X.c
+ }
+
if((e.xkey.state & ControlMask) && (e.xkey.state & Mod1Mask)) {
- KeySym keysym = XKeycodeToKeysym(display, e.xkey.keycode, 0);
- if (keysym == grab_keysym) {
-@@ -1504,6 +1569,7 @@
+ int keysyms_per_keycode;
+ KeySym *sym = XGetKeyboardMapping (display, e.xkey.keycode, 1,
+@@ -1553,6 +1618,7 @@
break;
}
}
diff --git a/dosemu-doSgmlTools.patch b/dosemu-doSgmlTools.patch
index 8d1cfc4..81e2e70 100644
--- a/dosemu-doSgmlTools.patch
+++ b/dosemu-doSgmlTools.patch
@@ -1,9 +1,9 @@
---- dosemu-1.1.3/src/doc/tools/doSgmlTools.pl.old Fri Jun 21 10:56:49 2002
-+++ dosemu-1.1.3/src/doc/tools/doSgmlTools.pl Fri Jun 21 11:01:46 2002
-@@ -200,7 +200,7 @@
+--- dosemu-1.4.0.8.orig/src/doc/tools/doSgmlTools.pl
++++ dosemu-1.4.0.8/src/doc/tools/doSgmlTools.pl
+@@ -203,7 +203,7 @@
}
close (CATFILE);
-
+
- while ($file =~ /CATALOG\s+\"([^\"]+)\"/gm) {
+ while ($file =~ /CATALOG\s+([^\"]\S+)/gm) {
if ($verbose) {
diff --git a/dosemu-dosemu_conf.patch b/dosemu-dosemu_conf.patch
index 3119fc3..ba429c7 100644
--- a/dosemu-dosemu_conf.patch
+++ b/dosemu-dosemu_conf.patch
@@ -1,27 +1,27 @@
---- dosemu-1.2.0/etc/dosemu.conf.orig 2004-01-18 17:42:09.000000000 +0100
-+++ dosemu-1.2.0/etc/dosemu.conf 2004-02-01 15:22:47.078414712 +0100
-@@ -66,6 +66,7 @@
- # Note: 'wholedisk' is _not_ supported. Default: "drives/*"
-
+--- dosemu-1.4.0.8.orig/etc/dosemu.conf
++++ dosemu-1.4.0.8/etc/dosemu.conf
+@@ -72,6 +72,7 @@
+ # be mixed such as "hdimage_c /dev/hda1 /dev/hda3:ro". Default: "drives/*"
+
# $_hdimage = "drives/*"
+$_hdimage = "bootdir"
-
+
# if you want to boot from a virtual floppy:
# file name of the floppy image under DOSEMU_LIB_DIR
-@@ -235,6 +236,7 @@
- # or /dev/mouse (for the DOSEMU internal mouse driver). Default: ""
-
+@@ -309,6 +310,7 @@
+ # console "$_graphics=(1)" mode, but GPM can still be used in other modes).
+
# $_mouse_dev = ""
+$_mouse_dev = "/dev/mouse"
-
+
# Default: "" or one or more of: "emulate3buttons cleardtr"
-
---- dosemu-1.2.0/etc/dosemu.users.example.orig 2004-01-12 01:33:16.000000000 +0100
-+++ dosemu-1.2.0/etc/dosemu.users.example 2004-02-01 15:23:06.008536896 +0100
+
+--- dosemu-1.4.0.8.orig/etc/dosemu.users.example
++++ dosemu-1.4.0.8/etc/dosemu.users.example
@@ -14,7 +14,7 @@
#
# For more details look at README.txt
-
+
-#default_lib_dir= /usr/local/share/dosemu
+default_lib_dir= /var/lib/dosemu
#config_script= builtin # (or e.g. /etc/dosemu/global.conf)
diff --git a/dosemu-lpt4.patch b/dosemu-lpt4.patch
index 892b239..72b0b65 100644
--- a/dosemu-lpt4.patch
+++ b/dosemu-lpt4.patch
@@ -1,7 +1,6 @@
-diff -Nur dosemu-1.4.0.orig/etc/dosemu.conf dosemu-1.4.0.chng/etc/dosemu.conf
---- dosemu-1.4.0.orig/etc/dosemu.conf 2008-01-29 09:04:59.000000000 +0100
-+++ dosemu-1.4.0.chng/etc/dosemu.conf 2008-01-29 10:55:17.000000000 +0100
-@@ -365,6 +365,10 @@
+--- dosemu-1.4.0.8.orig/etc/dosemu.conf 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/etc/dosemu.conf 2026-05-21 01:18:27.526219019 +0200
+@@ -404,6 +404,10 @@
# $_lpt2 = "lpr -l -P lpt2"
# $_lpt3 = ""
@@ -12,10 +11,9 @@ diff -Nur dosemu-1.4.0.orig/etc/dosemu.conf dosemu-1.4.0.chng/etc/dosemu.conf
# idle time in seconds before spooling out. Default: (20)
# $_printer_timeout = (20)
-diff -Nur dosemu-1.4.0.orig/etc/global.conf dosemu-1.4.0.chng/etc/global.conf
---- dosemu-1.4.0.orig/etc/global.conf 2006-11-29 11:05:27.000000000 +0100
-+++ dosemu-1.4.0.chng/etc/global.conf 2008-01-29 09:36:58.000000000 +0100
-@@ -552,7 +552,7 @@
+--- dosemu-1.4.0.8.orig/etc/global.conf 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/etc/global.conf 2026-05-21 01:18:31.106219019 +0200
+@@ -532,7 +532,7 @@
done
endif
if (1) # no idea why but we need this...
@@ -24,10 +22,9 @@ diff -Nur dosemu-1.4.0.orig/etc/global.conf dosemu-1.4.0.chng/etc/global.conf
$yyy = "lpt", $xxx
$zzz = "$_lpt", $xxx
$zzz = $$zzz
-diff -Nur dosemu-1.4.0.orig/src/base/bios/setup.c dosemu-1.4.0.chng/src/base/bios/setup.c
---- dosemu-1.4.0.orig/src/base/bios/setup.c 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/base/bios/setup.c 2008-01-29 10:01:34.000000000 +0100
-@@ -61,6 +61,7 @@
+--- dosemu-1.4.0.8.orig/src/base/bios/setup.c 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/base/bios/setup.c 2026-05-21 01:18:40.102885685 +0200
+@@ -62,6 +62,7 @@
*/
CONF_NFLOP(configuration, config.fdisks);
CONF_NSER(configuration, config.num_ser);
@@ -35,16 +32,15 @@ diff -Nur dosemu-1.4.0.orig/src/base/bios/setup.c dosemu-1.4.0.chng/src/base/bio
CONF_NLPT(configuration, config.num_lpt);
if (config.mouse.intdrv)
configuration |= CONF_MOUSE;
-diff -Nur dosemu-1.4.0.orig/src/base/dev/misc/lpt.c dosemu-1.4.0.chng/src/base/dev/misc/lpt.c
---- dosemu-1.4.0.orig/src/base/dev/misc/lpt.c 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/base/dev/misc/lpt.c 2008-01-29 09:25:25.000000000 +0100
-@@ -33,13 +33,14 @@
+--- dosemu-1.4.0.8.orig/src/base/dev/misc/lpt.c 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/base/dev/misc/lpt.c 2026-05-21 01:18:56.942885685 +0200
+@@ -56,13 +56,14 @@
{
- {NULL, NULL, 5, 0x378, .status = LPT_NOTBUSY | LPT_ONLINE | LPT_IOERR | LPT_ACK},
- {NULL, NULL, 5, 0x278, .status = LPT_NOTBUSY | LPT_ONLINE | LPT_IOERR | LPT_ACK},
-- {NULL, NULL, 10, 0x3bc, .status = LPT_NOTBUSY | LPT_ONLINE | LPT_IOERR | LPT_ACK}
-+ {NULL, NULL, 10, 0x3bc, .status = LPT_NOTBUSY | LPT_ONLINE | LPT_IOERR | LPT_ACK},
-+ {NULL, NULL, 10, 0x2bc, .status = LPT_NOTBUSY | LPT_ONLINE | LPT_IOERR | LPT_ACK}
+ {NULL, NULL, 5, 0x378, .control = DEFAULT_CTRL, .status = DEFAULT_STAT},
+ {NULL, NULL, 5, 0x278, .control = DEFAULT_CTRL, .status = DEFAULT_STAT},
+- {NULL, NULL, 10, 0x3bc, .control = DEFAULT_CTRL, .status = DEFAULT_STAT}
++ {NULL, NULL, 10, 0x3bc, .control = DEFAULT_CTRL, .status = DEFAULT_STAT},
++ {NULL, NULL, 10, 0x2bc, .control = DEFAULT_CTRL, .status = DEFAULT_STAT}
};
static int get_printer(ioport_t port)
@@ -55,7 +51,7 @@ diff -Nur dosemu-1.4.0.orig/src/base/dev/misc/lpt.c dosemu-1.4.0.chng/src/base/d
if (lpt[i].base_port <= port && port <= lpt[i].base_port + 2)
return i;
return -1;
-@@ -215,7 +216,7 @@
+@@ -260,7 +261,7 @@
io_device.irq = EMU_NO_IRQ;
io_device.fd = -1;
@@ -64,10 +60,9 @@ diff -Nur dosemu-1.4.0.orig/src/base/dev/misc/lpt.c dosemu-1.4.0.chng/src/base/d
p_printf("LPT: initializing printer %s\n", lpt[i].dev ? lpt[i].dev : "<<NODEV>>");
lpt[i].file = NULL;
lpt[i].remaining = -1; /* mark not accessed yet */
-diff -Nur dosemu-1.4.0.orig/src/doc/README/config dosemu-1.4.0.chng/src/doc/README/config
---- dosemu-1.4.0.orig/src/doc/README/config 2007-05-05 06:22:31.000000000 +0200
-+++ dosemu-1.4.0.chng/src/doc/README/config 2008-01-29 10:55:40.000000000 +0100
-@@ -1143,14 +1143,19 @@
+--- dosemu-1.4.0.8.orig/src/doc/README/config 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/doc/README/config 2026-05-21 01:19:05.299552352 +0200
+@@ -1137,14 +1137,19 @@
<screen>
# Print commands to use for LPT1, LPT2 and LPT3.
@@ -75,7 +70,7 @@ diff -Nur dosemu-1.4.0.orig/src/doc/README/config dosemu-1.4.0.chng/src/doc/READ
+# Default: "lpr -l, lpr -l -P lpt2, lpr -l P lpt3, lpr -l P lpt4"
# Which means: use the default print queue for LPT1, "lpt2" queue for LPT2,
-# "lpt3" queue for LPT3. "-l" means raw printing mode (no preprocessing).
-+# "lpt3" queue for LPT3, "lpt4" queue for LPT4.
++# "lpt3" queue for LPT3, "lpt4" queue for LPT4.
+# "-l" means raw printing mode (no preprocessing).
$_lpt1 = "lpr -l"
@@ -89,9 +84,8 @@ diff -Nur dosemu-1.4.0.orig/src/doc/README/config dosemu-1.4.0.chng/src/doc/READ
$_printer_timeout = (20)# idle time in seconds before spooling out
</screen>
-diff -Nur dosemu-1.4.0.orig/src/doc/README/config-tech dosemu-1.4.0.chng/src/doc/README/config-tech
---- dosemu-1.4.0.orig/src/doc/README/config-tech 2003-08-20 00:15:06.000000000 +0200
-+++ dosemu-1.4.0.chng/src/doc/README/config-tech 2008-01-29 09:19:04.000000000 +0100
+--- dosemu-1.4.0.8.orig/src/doc/README/config-tech 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/doc/README/config-tech 2026-05-21 01:19:12.826219019 +0200
@@ -3366,11 +3366,11 @@
</para>
@@ -102,15 +96,14 @@ diff -Nur dosemu-1.4.0.orig/src/doc/README/config-tech dosemu-1.4.0.chng/src/doc
-to LPT1:, second to LPT2:, and third to LPT3:. If you do not specify
-a base port, the emulator will setup the bios to report 0x378, 0x278,
-and 0x3bc for LPT1:, LPT2:, and LPT3: respectively.
-+to LPT1:, second to LPT2:, third to LPT3: and fourth to LPT4. If you
-+do not specify a base port, the emulator will setup the bios to report
++to LPT1:, second to LPT2:, third to LPT3: and fourth to LPT4. If you
++do not specify a base port, the emulator will setup the bios to report
+0x378, 0x278, 0x3bc and 0x2bc for LPT1:, LPT2:, LPT3: and LPT4: respectively.
</para>
<para>
-diff -Nur dosemu-1.4.0.orig/src/include/bios.h dosemu-1.4.0.chng/src/include/bios.h
---- dosemu-1.4.0.orig/src/include/bios.h 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/include/bios.h 2008-01-29 09:11:43.000000000 +0100
+--- dosemu-1.4.0.8.orig/src/include/bios.h 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/include/bios.h 2026-05-21 01:19:21.389552352 +0200
@@ -40,6 +40,7 @@
#define BIOS_ADDRESS_LPT1 0x408
#define BIOS_ADDRESS_LPT2 0x40a
@@ -127,12 +120,11 @@ diff -Nur dosemu-1.4.0.orig/src/include/bios.h dosemu-1.4.0.chng/src/include/bio
/* 0x47b is reserved */
#define BIOS_COM1_TIMEOUT 0x47c
#define BIOS_COM2_TIMEOUT 0x47d
-diff -Nur dosemu-1.4.0.orig/src/include/lpt.h dosemu-1.4.0.chng/src/include/lpt.h
---- dosemu-1.4.0.orig/src/include/lpt.h 2007-05-04 07:59:48.000000000 +0200
-+++ dosemu-1.4.0.chng/src/include/lpt.h 2008-01-29 09:14:17.000000000 +0100
-@@ -45,7 +45,7 @@
- #define LPT_ACK 0x40
- #define LPT_NOTBUSY 0x80
+--- dosemu-1.4.0.8.orig/src/include/lpt.h 2012-12-22 20:57:21.000000000 +0100
++++ dosemu-1.4.0.8/src/include/lpt.h 2026-05-21 01:19:24.852885686 +0200
+@@ -54,7 +54,7 @@
+ #define LPT_CTRL_AUTOLF 0x2
+ #define LPT_CTRL_STROBE 0x1
-#define NUM_PRINTERS 3
+#define NUM_PRINTERS 4
diff --git a/dosemu-makehtml.patch b/dosemu-makehtml.patch
index 4b08693..dd365ab 100644
--- a/dosemu-makehtml.patch
+++ b/dosemu-makehtml.patch
@@ -1,22 +1,22 @@
---- dosemu-1.1.4/src/doc/DANG/Makefile.orig Sat Feb 15 18:16:25 2003
-+++ dosemu-1.1.4/src/doc/DANG/Makefile Sat Feb 15 18:16:56 2003
-@@ -9,6 +9,8 @@
-
+--- dosemu-1.4.0.8.orig/src/doc/DANG/Makefile
++++ dosemu-1.4.0.8/src/doc/DANG/Makefile
+@@ -13,6 +13,8 @@
+
all: $(TXT) $(HTML)
-
+
+html: $(HTML)
+
$(TXT): %.txt: %.sgml
- ../tools/doSgmlTools.pl -t -v $<
-
---- dosemu-1.1.4/src/doc/HOWTO/Makefile.orig Sat Feb 15 18:17:14 2003
-+++ dosemu-1.1.4/src/doc/HOWTO/Makefile Sat Feb 15 18:17:34 2003
-@@ -9,6 +9,8 @@
-
+ $(srcdir)/../tools/doSgmlTools.pl -t -v $<
+
+--- dosemu-1.4.0.8.orig/src/doc/HOWTO/Makefile
++++ dosemu-1.4.0.8/src/doc/HOWTO/Makefile
+@@ -13,6 +13,8 @@
+
all: $(TXT) $(HTML)
-
+
+html: $(HTML)
+
$(TXT): %.txt: %.sgml
- ../tools/doSgmlTools.pl -t $<
-
+ $(srcdir)/../tools/doSgmlTools.pl -t $<
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dosemu.git/commitdiff/2cc0177804bf7d89edffc52b06f1daff9feaa876
More information about the pld-cvs-commit
mailing list